Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3

* changes:
  Merge WebKit at r75315: Update WebKit version
  Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
  Merge WebKit at r75315: Stub out AXObjectCache::remove()
  Merge WebKit at r75315: Fix ImageBuffer
  Merge WebKit at r75315: Fix PluginData::initPlugins()
  Merge WebKit at r75315: Fix conflicts
  Merge WebKit at r75315: Fix Makefiles
  Merge WebKit at r75315: Move Android-specific WebCore files to Source
  Merge WebKit at r75315: Initial merge by git.

1 files changed, 25 insertions, 1 deletions

diff --git a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 754b20a..e958751 100644
--- a/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -82,6 +82,27 @@ using namespace WebCore;
 
 QMap<int, QWebScriptWorld*> m_worldMap;
 
+QDRTNode::QDRTNode()
+    : m_node(0)
+{
+}
+
+QDRTNode::QDRTNode(WebCore::Node* node)
+    : m_node(0)
+{
+    if (node) {
+        m_node = node;
+        m_node->ref();
+    }
+}
+
+QDRTNode::~QDRTNode()
+{
+    if (m_node)
+        m_node->deref();
+}
+
+
 DumpRenderTreeSupportQt::DumpRenderTreeSupportQt()
 {
 }
@@ -854,7 +875,10 @@ QVariantList DumpRenderTreeSupportQt::nodesFromRect(const QWebElement& document,
     for (int i = 0; i < nodes->length(); i++) {
         QVariant v;
         // QWebElement will be null if the Node is not an HTML Element
-        v.setValue(QWebElement(nodes->item(i)));
+        if (nodes->item(i)->isHTMLElement())
+            v.setValue(QWebElement(nodes->item(i)));
+        else
+            v.setValue(QDRTNode(nodes->item(i)));
         res << v;
     }
     return res;