From 42de7f208c6d126fe54e444eb1acc6a9f8083402 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 19 Jan 2015 22:08:57 +0800
Subject: [PATCH] add position to frameData

---
 webkit/client.js | 19 ++-----------------
 webkit/frame.js  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 webkit/frame.js

diff --git a/webkit/client.js b/webkit/client.js
index d4a831f..05c3f15 100644
--- a/webkit/client.js
+++ b/webkit/client.js
@@ -1,5 +1,6 @@
 
 var webpage = require('webpage');
+var frame = require('./frame');
 
 
 function setCookies(page, cookies) {
@@ -40,22 +41,6 @@ function execScripts(page, scripts, arr) {
 }
 
 
-function frameData(page, data) {
-    data.url = page.frameUrl;
-    data.name = page.frameName;
-    data.content = page.frameContent;
-    data.childCount = page.framesCount;
-    data.childFrames = [];
-    for(var i=0; i<data.childCount; i++) {
-        var node = {};
-        data.childFrames.push(node);
-        page.switchToFrame(i);
-        frameData(page, node);
-        page.switchToParentFrame();
-    }
-}
-
-
 function urlopen(req, callback) {
 
     var page = webpage.create();
@@ -201,7 +186,7 @@ function urlopen(req, callback) {
         execScripts(page, req.execScripts.postInjected, result.execScriptsOutput.postInjected);
 
         var fdata = {};
-        frameData(page, fdata);
+        frame.frameData(page, fdata);
         fdata.content = null;
         result.frameData = fdata;
         page.switchToMainFrame();
diff --git a/webkit/frame.js b/webkit/frame.js
new file mode 100644
index 0000000..0c6f587
--- /dev/null
+++ b/webkit/frame.js
@@ -0,0 +1,32 @@
+
+function frameData(page, data) {
+    data.url = page.frameUrl;
+    data.name = page.frameName;
+    data.content = page.frameContent;
+    data.childCount = page.framesCount;
+    data.childFrames = [];
+
+    var posList = page.evaluate(framePosition);
+
+    for(var i=0; i<data.childCount; i++) {
+        var node = {};
+        node.position = posList[i];
+        data.childFrames.push(node);
+        page.switchToFrame(i);
+        frameData(page, node);
+        page.switchToParentFrame();
+    }
+}
+
+function framePosition() {
+    var nodes = document.getElementsByTagName('iframe');
+    var results = [];
+    for(var i=0; i<nodes.length; i++) {
+        var pos = nodes[i].getBoundingClientRect();
+        results.push(pos);
+    }
+    return results;
+}
+
+module.exports.frameData = frameData;
+