Title: [176509] trunk/Source
Revision
176509
Author
simon.fra...@apple.com
Date
2014-11-23 10:00:52 -0800 (Sun, 23 Nov 2014)

Log Message

Extend WKRenderObject and WKRenderLayer with some more useful data
https://bugs.webkit.org/show_bug.cgi?id=139006

Reviewed by Sam Weinig.
Source/WebCore:

Export WebCore::RenderLayerBacking::backingStoreMemoryEstimate() const.

* WebCore.exp.in:

Source/WebKit2:

Implement WKRenderLayerGetBackingStoreMemoryEstimate,
WKRenderObjectCopyTextSnippet and WKRenderObjectGetTextLength for improved
RenderLayer and RenderTree display in clients of the C SPI.

* Shared/API/c/WKRenderLayer.cpp:
(WKRenderLayerGetBackingStoreMemoryEstimate):
* Shared/API/c/WKRenderLayer.h:
* Shared/API/c/WKRenderObject.cpp:
(WKRenderObjectCopyTextSnippet):
(WKRenderObjectGetTextLength):
* Shared/API/c/WKRenderObject.h:
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebRenderLayer.cpp:
(WebKit::WebRenderLayer::create):
(WebKit::WebRenderLayer::WebRenderLayer):
* Shared/WebRenderLayer.h:
(WebKit::WebRenderLayer::backingStoreMemoryEstimate):
* Shared/WebRenderObject.cpp:
(WebKit::WebRenderObject::create):
(WebKit::WebRenderObject::WebRenderObject):
* Shared/WebRenderObject.h:
(WebKit::WebRenderObject::textSnippet):
(WebKit::WebRenderObject::textLength):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (176508 => 176509)


--- trunk/Source/WebCore/ChangeLog	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebCore/ChangeLog	2014-11-23 18:00:52 UTC (rev 176509)
@@ -1,3 +1,14 @@
+2014-11-22  Simon Fraser  <simon.fra...@apple.com>
+
+        Extend WKRenderObject and WKRenderLayer with some more useful data
+        https://bugs.webkit.org/show_bug.cgi?id=139006
+
+        Reviewed by Sam Weinig.
+
+        Export WebCore::RenderLayerBacking::backingStoreMemoryEstimate() const.
+
+        * WebCore.exp.in:
+
 2014-11-22  Antti Koivisto  <an...@apple.com>
 
         Make locale part of the SimpleLineLayout::FlowContent::Style

Modified: trunk/Source/WebCore/WebCore.exp.in (176508 => 176509)


--- trunk/Source/WebCore/WebCore.exp.in	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-11-23 18:00:52 UTC (rev 176509)
@@ -1842,6 +1842,7 @@
 __ZNK7WebCore18RenderLayerBacking11contentsBoxEv
 __ZNK7WebCore18RenderLayerBacking12tiledBackingEv
 __ZNK7WebCore18RenderLayerBacking20compositingLayerTypeEv
+__ZNK7WebCore18RenderLayerBacking26backingStoreMemoryEstimateEv
 __ZNK7WebCore19AnimationController11isSuspendedEv
 __ZNK7WebCore19AnimationController24numberOfActiveAnimationsEPNS_8DocumentE
 __ZNK7WebCore19AnimationController33allowsNewAnimationsWhileSuspendedEv

Modified: trunk/Source/WebKit2/ChangeLog (176508 => 176509)


--- trunk/Source/WebKit2/ChangeLog	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/ChangeLog	2014-11-23 18:00:52 UTC (rev 176509)
@@ -1,3 +1,36 @@
+2014-11-22  Simon Fraser  <simon.fra...@apple.com>
+
+        Extend WKRenderObject and WKRenderLayer with some more useful data
+        https://bugs.webkit.org/show_bug.cgi?id=139006
+
+        Reviewed by Sam Weinig.
+        
+        Implement WKRenderLayerGetBackingStoreMemoryEstimate,
+        WKRenderObjectCopyTextSnippet and WKRenderObjectGetTextLength for improved
+        RenderLayer and RenderTree display in clients of the C SPI.        
+
+        * Shared/API/c/WKRenderLayer.cpp:
+        (WKRenderLayerGetBackingStoreMemoryEstimate):
+        * Shared/API/c/WKRenderLayer.h:
+        * Shared/API/c/WKRenderObject.cpp:
+        (WKRenderObjectCopyTextSnippet):
+        (WKRenderObjectGetTextLength):
+        * Shared/API/c/WKRenderObject.h:
+        * Shared/UserMessageCoders.h:
+        (WebKit::UserMessageEncoder::baseEncode):
+        (WebKit::UserMessageDecoder::baseDecode):
+        * Shared/WebRenderLayer.cpp:
+        (WebKit::WebRenderLayer::create):
+        (WebKit::WebRenderLayer::WebRenderLayer):
+        * Shared/WebRenderLayer.h:
+        (WebKit::WebRenderLayer::backingStoreMemoryEstimate):
+        * Shared/WebRenderObject.cpp:
+        (WebKit::WebRenderObject::create):
+        (WebKit::WebRenderObject::WebRenderObject):
+        * Shared/WebRenderObject.h:
+        (WebKit::WebRenderObject::textSnippet):
+        (WebKit::WebRenderObject::textLength):
+
 2014-11-21  Jer Noble  <jer.no...@apple.com>
 
         Support multiple signatures of diagnostic logging.

Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp (176508 => 176509)


--- trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp	2014-11-23 18:00:52 UTC (rev 176509)
@@ -53,7 +53,7 @@
     if (!renderLayer->renderer()->elementTagName().isNull())
         return toCopiedAPI(renderLayer->renderer()->elementTagName());
 
-    return 0;
+    return nullptr;
 }
 
 WKStringRef WKRenderLayerCopyElementID(WKRenderLayerRef renderLayerRef)
@@ -62,7 +62,7 @@
     if (!renderLayer->renderer()->elementID().isNull())
         return toCopiedAPI(renderLayer->renderer()->elementID());
 
-    return 0;
+    return nullptr;
 }
 
 WKArrayRef WKRenderLayerGetElementClassNames(WKRenderLayerRef renderLayerRef)
@@ -110,6 +110,11 @@
     return kWKCompositingLayerTypeNone;
 }
 
+WK_EXPORT double WKRenderLayerGetBackingStoreMemoryEstimate(WKRenderLayerRef renderLayerRef)
+{
+    return toImpl(renderLayerRef)->backingStoreMemoryEstimate();
+}
+
 WKArrayRef WKRenderLayerGetNegativeZOrderList(WKRenderLayerRef renderLayerRef)
 {
     return toAPI(toImpl(renderLayerRef)->negativeZOrderList());

Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.h (176508 => 176509)


--- trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.h	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.h	2014-11-23 18:00:52 UTC (rev 176509)
@@ -62,6 +62,7 @@
 typedef enum WKCompositingLayerType WKCompositingLayerType;
 
 WK_EXPORT WKCompositingLayerType WKRenderLayerGetCompositingLayerType(WKRenderLayerRef renderLayer);
+WK_EXPORT double WKRenderLayerGetBackingStoreMemoryEstimate(WKRenderLayerRef renderLayer);
 
 WK_EXPORT WKArrayRef WKRenderLayerGetNegativeZOrderList(WKRenderLayerRef renderLayer);
 WK_EXPORT WKArrayRef WKRenderLayerGetNormalFlowList(WKRenderLayerRef renderLayer);

Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderObject.cpp (176508 => 176509)


--- trunk/Source/WebKit2/Shared/API/c/WKRenderObject.cpp	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/API/c/WKRenderObject.cpp	2014-11-23 18:00:52 UTC (rev 176509)
@@ -42,13 +42,27 @@
     return toCopiedAPI(toImpl(renderObjectRef)->name());
 }
 
+WKStringRef WKRenderObjectCopyTextSnippet(WKRenderObjectRef renderObjectRef)
+{
+    WebRenderObject* renderObject = toImpl(renderObjectRef);
+    if (!renderObject->textSnippet().isNull())
+        return toCopiedAPI(renderObject->textSnippet());
+
+    return nullptr;
+}
+
+unsigned WKRenderObjectGetTextLength(WKRenderObjectRef renderObjectRef)
+{
+    return toImpl(renderObjectRef)->textLength();
+}
+
 WKStringRef WKRenderObjectCopyElementTagName(WKRenderObjectRef renderObjectRef)
 {
     WebRenderObject* renderObject = toImpl(renderObjectRef);
     if (!renderObject->elementTagName().isNull())
         return toCopiedAPI(renderObject->elementTagName());
 
-    return 0;
+    return nullptr;
 }
 
 WKStringRef WKRenderObjectCopyElementID(WKRenderObjectRef renderObjectRef)
@@ -57,7 +71,7 @@
     if (!renderObject->elementID().isNull())
         return toCopiedAPI(renderObject->elementID());
 
-    return 0;
+    return nullptr;
 }
 
 WKArrayRef WKRenderObjectGetElementClassNames(WKRenderObjectRef renderObjectRef)

Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderObject.h (176508 => 176509)


--- trunk/Source/WebKit2/Shared/API/c/WKRenderObject.h	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/API/c/WKRenderObject.h	2014-11-23 18:00:52 UTC (rev 176509)
@@ -36,7 +36,8 @@
 WK_EXPORT WKTypeID WKRenderObjectGetTypeID();
 
 WK_EXPORT WKStringRef WKRenderObjectCopyName(WKRenderObjectRef renderObject);
-
+WK_EXPORT WKStringRef WKRenderObjectCopyTextSnippet(WKRenderObjectRef renderObject);
+WK_EXPORT unsigned WKRenderObjectGetTextLength(WKRenderObjectRef renderObject);
 WK_EXPORT WKStringRef WKRenderObjectCopyElementTagName(WKRenderObjectRef renderObject);
 WK_EXPORT WKStringRef WKRenderObjectCopyElementID(WKRenderObjectRef renderObject);
 WK_EXPORT WKArrayRef WKRenderObjectGetElementClassNames(WKRenderObjectRef renderObject);

Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (176508 => 176509)


--- trunk/Source/WebKit2/Shared/UserMessageCoders.h	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h	2014-11-23 18:00:52 UTC (rev 176509)
@@ -155,6 +155,7 @@
             encoder << renderLayer->isClipped();
             encoder << static_cast<uint32_t>(renderLayer->compositingLayerType());
             encoder << renderLayer->absoluteBoundingBox();
+            encoder << renderLayer->backingStoreMemoryEstimate();
             encoder << Owner(coder, renderLayer->negativeZOrderList());
             encoder << Owner(coder, renderLayer->normalFlowList());
             encoder << Owner(coder, renderLayer->positiveZOrderList());
@@ -168,6 +169,8 @@
             encoder << Owner(coder, renderObject->elementClassNames());
             encoder << renderObject->absolutePosition();
             encoder << renderObject->frameRect();
+            encoder << renderObject->textSnippet();
+            encoder << renderObject->textLength();
             encoder << Owner(coder, renderObject->children());
             return true;
         }
@@ -390,6 +393,7 @@
             bool isClipped;
             uint32_t compositingLayerTypeAsUInt32;
             WebCore::IntRect absoluteBoundingBox;
+            double backingStoreMemoryEstimate;
             RefPtr<API::Object> negativeZOrderList;
             RefPtr<API::Object> normalFlowList;
             RefPtr<API::Object> positiveZOrderList;
@@ -409,6 +413,8 @@
                 return false;
             if (!decoder.decode(absoluteBoundingBox))
                 return false;
+            if (!decoder.decode(backingStoreMemoryEstimate))
+                return false;
             Owner negativeZOrderListCoder(coder, negativeZOrderList);
             if (!decoder.decode(negativeZOrderListCoder))
                 return false;
@@ -419,14 +425,16 @@
             if (!decoder.decode(positiveZOrderListCoder))
                 return false;
             coder.m_root = WebRenderLayer::create(static_pointer_cast<WebRenderObject>(renderer), isReflection, isClipping, isClipped, static_cast<WebRenderLayer::CompositingLayerType>(compositingLayerTypeAsUInt32),
-                absoluteBoundingBox, static_pointer_cast<API::Array>(negativeZOrderList), static_pointer_cast<API::Array>(normalFlowList),
+                absoluteBoundingBox, backingStoreMemoryEstimate, static_pointer_cast<API::Array>(negativeZOrderList), static_pointer_cast<API::Array>(normalFlowList),
                 static_pointer_cast<API::Array>(positiveZOrderList));
             break;
         }
         case API::Object::Type::RenderObject: {
             String name;
+            String textSnippet;
             String elementTagName;
             String elementID;
+            unsigned textLength;
             RefPtr<API::Object> elementClassNames;
             WebCore::IntPoint absolutePosition;
             WebCore::IntRect frameRect;
@@ -445,12 +453,16 @@
                 return false;
             if (!decoder.decode(frameRect))
                 return false;
+            if (!decoder.decode(textSnippet))
+                return false;
+            if (!decoder.decode(textLength))
+                return false;
             Owner messageCoder(coder, children);
             if (!decoder.decode(messageCoder))
                 return false;
             if (children && children->type() != API::Object::Type::Array)
                 return false;
-            coder.m_root = WebRenderObject::create(name, elementTagName, elementID, static_pointer_cast<API::Array>(elementClassNames), absolutePosition, frameRect, static_pointer_cast<API::Array>(children));
+            coder.m_root = WebRenderObject::create(name, elementTagName, elementID, static_pointer_cast<API::Array>(elementClassNames), absolutePosition, frameRect, textSnippet, textLength, static_pointer_cast<API::Array>(children));
             break;
         }
         case API::Object::Type::URL: {

Modified: trunk/Source/WebKit2/Shared/WebRenderLayer.cpp (176508 => 176509)


--- trunk/Source/WebKit2/Shared/WebRenderLayer.cpp	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/WebRenderLayer.cpp	2014-11-23 18:00:52 UTC (rev 176509)
@@ -62,9 +62,9 @@
     return adoptRef(new WebRenderLayer(rootLayer));
 }
 
-PassRefPtr<WebRenderLayer> WebRenderLayer::create(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType type, WebCore::IntRect absoluteBoundingBox, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList)
+PassRefPtr<WebRenderLayer> WebRenderLayer::create(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType type, WebCore::IntRect absoluteBoundingBox, double backingStoreMemoryEstimate, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList)
 {
-    return adoptRef(new WebRenderLayer(renderer, isReflection, isClipping, isClipped, type, absoluteBoundingBox, negativeZOrderList, normalFlowList, positiveZOrderList));
+    return adoptRef(new WebRenderLayer(renderer, isReflection, isClipping, isClipped, type, absoluteBoundingBox, backingStoreMemoryEstimate, negativeZOrderList, normalFlowList, positiveZOrderList));
 }
 
 PassRefPtr<API::Array> WebRenderLayer::createArrayFromLayerList(Vector<RenderLayer*>* list)
@@ -104,10 +104,13 @@
             m_compositingLayerType = Container;
             break;
         }
+
+        m_backingStoreMemoryEstimate = backing->backingStoreMemoryEstimate();
     } else {
         m_isClipping = false;
         m_isClipped = false;
         m_compositingLayerType = None;
+        m_backingStoreMemoryEstimate = 0;
     }
 
     m_absoluteBoundingBox = layer->absoluteBoundingBox();
@@ -117,13 +120,14 @@
     m_positiveZOrderList = createArrayFromLayerList(layer->posZOrderList());
 }
 
-WebRenderLayer::WebRenderLayer(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType type, WebCore::IntRect absoluteBoundingBox, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList)
+WebRenderLayer::WebRenderLayer(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType type, WebCore::IntRect absoluteBoundingBox, double backingStoreMemoryEstimate, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList)
     : m_renderer(renderer)
     , m_isReflection(isReflection)
     , m_isClipping(isClipping)
     , m_isClipped(isClipped)
     , m_compositingLayerType(type)
     , m_absoluteBoundingBox(absoluteBoundingBox)
+    , m_backingStoreMemoryEstimate(backingStoreMemoryEstimate)
     , m_negativeZOrderList(negativeZOrderList)
     , m_normalFlowList(normalFlowList)
     , m_positiveZOrderList(positiveZOrderList)

Modified: trunk/Source/WebKit2/Shared/WebRenderLayer.h (176508 => 176509)


--- trunk/Source/WebKit2/Shared/WebRenderLayer.h	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/WebRenderLayer.h	2014-11-23 18:00:52 UTC (rev 176509)
@@ -41,7 +41,7 @@
     enum CompositingLayerType { None, Normal, Tiled, Media, Container };
 
     static PassRefPtr<WebRenderLayer> create(WebPage*);
-    static PassRefPtr<WebRenderLayer> create(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType, WebCore::IntRect absoluteBoundingBox, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList);
+    static PassRefPtr<WebRenderLayer> create(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType, WebCore::IntRect absoluteBoundingBox, double backingStoreMemoryEstimate, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList);
 
     API::Array* negativeZOrderList() const { return m_negativeZOrderList.get(); }
     API::Array* normalFlowList() const { return m_normalFlowList.get(); }
@@ -53,10 +53,11 @@
     bool isClipped() const { return m_isClipped; }
     CompositingLayerType compositingLayerType() const { return m_compositingLayerType; } 
     WebCore::IntRect absoluteBoundingBox() const { return m_absoluteBoundingBox; }
+    double backingStoreMemoryEstimate() const { return m_backingStoreMemoryEstimate; }
 
 private:
     explicit WebRenderLayer(WebCore::RenderLayer*);
-    WebRenderLayer(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType, WebCore::IntRect absoluteBoundingBox, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList);
+    WebRenderLayer(PassRefPtr<WebRenderObject> renderer, bool isReflection, bool isClipping, bool isClipped, CompositingLayerType, WebCore::IntRect absoluteBoundingBox, double backingStoreMemoryEstimate, PassRefPtr<API::Array> negativeZOrderList, PassRefPtr<API::Array> normalFlowList, PassRefPtr<API::Array> positiveZOrderList);
 
     static PassRefPtr<API::Array> createArrayFromLayerList(Vector<WebCore::RenderLayer*>*);
 
@@ -66,6 +67,7 @@
     bool m_isClipped;
     CompositingLayerType m_compositingLayerType;
     WebCore::IntRect m_absoluteBoundingBox;
+    double m_backingStoreMemoryEstimate;
 
     RefPtr<API::Array> m_negativeZOrderList;
     RefPtr<API::Array> m_normalFlowList;

Modified: trunk/Source/WebKit2/Shared/WebRenderObject.cpp (176508 => 176509)


--- trunk/Source/WebKit2/Shared/WebRenderObject.cpp	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/WebRenderObject.cpp	2014-11-23 18:00:52 UTC (rev 176509)
@@ -46,26 +46,27 @@
 {
     Frame* mainFrame = page->mainFrame();
     if (!mainFrame)
-        return 0;
+        return nullptr;
 
     if (!mainFrame->loader().client().hasHTMLView())
-        return 0;
+        return nullptr;
 
     RenderView* contentRenderer = mainFrame->contentRenderer();
     if (!contentRenderer)
-        return 0;
+        return nullptr;
 
     return adoptRef(new WebRenderObject(contentRenderer, true));
 }
 
-PassRefPtr<WebRenderObject> WebRenderObject::create(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, PassRefPtr<API::Array> children)
+PassRefPtr<WebRenderObject> WebRenderObject::create(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, const String& textSnippet, unsigned textLength, PassRefPtr<API::Array> children)
 {
-    return adoptRef(new WebRenderObject(name, elementTagName, elementID, elementClassNames, absolutePosition, frameRect, children));
+    return adoptRef(new WebRenderObject(name, elementTagName, elementID, elementClassNames, absolutePosition, frameRect, textSnippet, textLength, children));
 }
 
 WebRenderObject::WebRenderObject(RenderObject* renderer, bool shouldIncludeDescendants)
 {
     m_name = renderer->renderName();
+    m_textLength = 0;
 
     if (Node* node = renderer->node()) {
         if (is<Element>(*node)) {
@@ -83,6 +84,17 @@
                 m_elementClassNames = API::Array::create(WTF::move(classNames));
             }
         }
+
+        if (node->isTextNode()) {
+            String value = node->nodeValue();
+            m_textLength = value.length();
+
+            const int maxSnippetLength = 40;
+            if (value.length() > maxSnippetLength)
+                m_textSnippet = value.substring(0, maxSnippetLength);
+            else
+                m_textSnippet = value;
+        }
     }
 
     // FIXME: broken with transforms
@@ -122,14 +134,16 @@
     m_children = API::Array::create(WTF::move(children));
 }
 
-WebRenderObject::WebRenderObject(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, PassRefPtr<API::Array> children)
+WebRenderObject::WebRenderObject(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, const String& textSnippet, unsigned textLength, PassRefPtr<API::Array> children)
     : m_children(children)
     , m_name(name)
     , m_elementTagName(elementTagName)
     , m_elementID(elementID)
+    , m_textSnippet(textSnippet)
     , m_elementClassNames(elementClassNames)
     , m_absolutePosition(absolutePosition)
     , m_frameRect(frameRect)
+    , m_textLength(textLength)
 {
 }
 

Modified: trunk/Source/WebKit2/Shared/WebRenderObject.h (176508 => 176509)


--- trunk/Source/WebKit2/Shared/WebRenderObject.h	2014-11-23 04:37:15 UTC (rev 176508)
+++ trunk/Source/WebKit2/Shared/WebRenderObject.h	2014-11-23 18:00:52 UTC (rev 176509)
@@ -51,13 +51,18 @@
         return adoptRef(new WebRenderObject(renderer, false));
     }
 
-    static PassRefPtr<WebRenderObject> create(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, PassRefPtr<API::Array> children);
+    static PassRefPtr<WebRenderObject> create(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, const String& textSnippet, unsigned textLength, PassRefPtr<API::Array> children);
 
     virtual ~WebRenderObject();
 
     API::Array* children() const { return m_children.get(); }
 
     const String& name() const { return m_name; }
+
+    // Only non-empty for RenderText objects.
+    const String& textSnippet() const { return m_textSnippet; }
+    unsigned textLength() const { return m_textLength; }
+
     const String& elementTagName() const { return m_elementTagName; }
     const String& elementID() const { return m_elementID; }
     API::Array* elementClassNames() const { return m_elementClassNames.get(); }
@@ -66,16 +71,18 @@
 
 private:
     WebRenderObject(WebCore::RenderObject*, bool shouldIncludeDescendants);
-    WebRenderObject(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, PassRefPtr<API::Array> children);
+    WebRenderObject(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, const String& textSnippet, unsigned textLength, PassRefPtr<API::Array> children);
 
     RefPtr<API::Array> m_children;
 
     String m_name;
     String m_elementTagName;
     String m_elementID;
+    String m_textSnippet;
     RefPtr<API::Array> m_elementClassNames;
     WebCore::IntPoint m_absolutePosition;
     WebCore::IntRect m_frameRect;
+    unsigned m_textLength;
 };
 
 } // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to