<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176509] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176509">176509</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-11-23 10:00:52 -0800 (Sun, 23 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKRenderLayercpp">trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKRenderLayerh">trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKRenderObjectcpp">trunk/Source/WebKit2/Shared/API/c/WKRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKRenderObjecth">trunk/Source/WebKit2/Shared/API/c/WKRenderObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebRenderLayercpp">trunk/Source/WebKit2/Shared/WebRenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebRenderLayerh">trunk/Source/WebKit2/Shared/WebRenderLayer.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebRenderObjectcpp">trunk/Source/WebKit2/Shared/WebRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebRenderObjecth">trunk/Source/WebKit2/Shared/WebRenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-22 Simon Fraser <simon.fraser@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:
+
</ins><span class="cx"> 2014-11-22 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Make locale part of the SimpleLineLayout::FlowContent::Style
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1842,6 +1842,7 @@
</span><span class="cx"> __ZNK7WebCore18RenderLayerBacking11contentsBoxEv
</span><span class="cx"> __ZNK7WebCore18RenderLayerBacking12tiledBackingEv
</span><span class="cx"> __ZNK7WebCore18RenderLayerBacking20compositingLayerTypeEv
</span><ins>+__ZNK7WebCore18RenderLayerBacking26backingStoreMemoryEstimateEv
</ins><span class="cx"> __ZNK7WebCore19AnimationController11isSuspendedEv
</span><span class="cx"> __ZNK7WebCore19AnimationController24numberOfActiveAnimationsEPNS_8DocumentE
</span><span class="cx"> __ZNK7WebCore19AnimationController33allowsNewAnimationsWhileSuspendedEv
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-11-22 Simon Fraser <simon.fraser@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):
+
</ins><span class="cx"> 2014-11-21 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Support multiple signatures of diagnostic logging.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.cpp (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> if (!renderLayer->renderer()->elementTagName().isNull())
</span><span class="cx"> return toCopiedAPI(renderLayer->renderer()->elementTagName());
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKRenderLayerCopyElementID(WKRenderLayerRef renderLayerRef)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> if (!renderLayer->renderer()->elementID().isNull())
</span><span class="cx"> return toCopiedAPI(renderLayer->renderer()->elementID());
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKArrayRef WKRenderLayerGetElementClassNames(WKRenderLayerRef renderLayerRef)
</span><span class="lines">@@ -110,6 +110,11 @@
</span><span class="cx"> return kWKCompositingLayerTypeNone;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WK_EXPORT double WKRenderLayerGetBackingStoreMemoryEstimate(WKRenderLayerRef renderLayerRef)
+{
+ return toImpl(renderLayerRef)->backingStoreMemoryEstimate();
+}
+
</ins><span class="cx"> WKArrayRef WKRenderLayerGetNegativeZOrderList(WKRenderLayerRef renderLayerRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(renderLayerRef)->negativeZOrderList());
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderLayer.h (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> typedef enum WKCompositingLayerType WKCompositingLayerType;
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKCompositingLayerType WKRenderLayerGetCompositingLayerType(WKRenderLayerRef renderLayer);
</span><ins>+WK_EXPORT double WKRenderLayerGetBackingStoreMemoryEstimate(WKRenderLayerRef renderLayer);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT WKArrayRef WKRenderLayerGetNegativeZOrderList(WKRenderLayerRef renderLayer);
</span><span class="cx"> WK_EXPORT WKArrayRef WKRenderLayerGetNormalFlowList(WKRenderLayerRef renderLayer);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderObject.cpp (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -42,13 +42,27 @@
</span><span class="cx"> return toCopiedAPI(toImpl(renderObjectRef)->name());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+}
+
</ins><span class="cx"> WKStringRef WKRenderObjectCopyElementTagName(WKRenderObjectRef renderObjectRef)
</span><span class="cx"> {
</span><span class="cx"> WebRenderObject* renderObject = toImpl(renderObjectRef);
</span><span class="cx"> if (!renderObject->elementTagName().isNull())
</span><span class="cx"> return toCopiedAPI(renderObject->elementTagName());
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKRenderObjectCopyElementID(WKRenderObjectRef renderObjectRef)
</span><span class="lines">@@ -57,7 +71,7 @@
</span><span class="cx"> if (!renderObject->elementID().isNull())
</span><span class="cx"> return toCopiedAPI(renderObject->elementID());
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKArrayRef WKRenderObjectGetElementClassNames(WKRenderObjectRef renderObjectRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKRenderObject.h (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx"> WK_EXPORT WKTypeID WKRenderObjectGetTypeID();
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKStringRef WKRenderObjectCopyName(WKRenderObjectRef renderObject);
</span><del>-
</del><ins>+WK_EXPORT WKStringRef WKRenderObjectCopyTextSnippet(WKRenderObjectRef renderObject);
+WK_EXPORT unsigned WKRenderObjectGetTextLength(WKRenderObjectRef renderObject);
</ins><span class="cx"> WK_EXPORT WKStringRef WKRenderObjectCopyElementTagName(WKRenderObjectRef renderObject);
</span><span class="cx"> WK_EXPORT WKStringRef WKRenderObjectCopyElementID(WKRenderObjectRef renderObject);
</span><span class="cx"> WK_EXPORT WKArrayRef WKRenderObjectGetElementClassNames(WKRenderObjectRef renderObject);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> encoder << renderLayer->isClipped();
</span><span class="cx"> encoder << static_cast<uint32_t>(renderLayer->compositingLayerType());
</span><span class="cx"> encoder << renderLayer->absoluteBoundingBox();
</span><ins>+ encoder << renderLayer->backingStoreMemoryEstimate();
</ins><span class="cx"> encoder << Owner(coder, renderLayer->negativeZOrderList());
</span><span class="cx"> encoder << Owner(coder, renderLayer->normalFlowList());
</span><span class="cx"> encoder << Owner(coder, renderLayer->positiveZOrderList());
</span><span class="lines">@@ -168,6 +169,8 @@
</span><span class="cx"> encoder << Owner(coder, renderObject->elementClassNames());
</span><span class="cx"> encoder << renderObject->absolutePosition();
</span><span class="cx"> encoder << renderObject->frameRect();
</span><ins>+ encoder << renderObject->textSnippet();
+ encoder << renderObject->textLength();
</ins><span class="cx"> encoder << Owner(coder, renderObject->children());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -390,6 +393,7 @@
</span><span class="cx"> bool isClipped;
</span><span class="cx"> uint32_t compositingLayerTypeAsUInt32;
</span><span class="cx"> WebCore::IntRect absoluteBoundingBox;
</span><ins>+ double backingStoreMemoryEstimate;
</ins><span class="cx"> RefPtr<API::Object> negativeZOrderList;
</span><span class="cx"> RefPtr<API::Object> normalFlowList;
</span><span class="cx"> RefPtr<API::Object> positiveZOrderList;
</span><span class="lines">@@ -409,6 +413,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(absoluteBoundingBox))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(backingStoreMemoryEstimate))
+ return false;
</ins><span class="cx"> Owner negativeZOrderListCoder(coder, negativeZOrderList);
</span><span class="cx"> if (!decoder.decode(negativeZOrderListCoder))
</span><span class="cx"> return false;
</span><span class="lines">@@ -419,14 +425,16 @@
</span><span class="cx"> if (!decoder.decode(positiveZOrderListCoder))
</span><span class="cx"> return false;
</span><span class="cx"> coder.m_root = WebRenderLayer::create(static_pointer_cast<WebRenderObject>(renderer), isReflection, isClipping, isClipped, static_cast<WebRenderLayer::CompositingLayerType>(compositingLayerTypeAsUInt32),
</span><del>- absoluteBoundingBox, static_pointer_cast<API::Array>(negativeZOrderList), static_pointer_cast<API::Array>(normalFlowList),
</del><ins>+ absoluteBoundingBox, backingStoreMemoryEstimate, static_pointer_cast<API::Array>(negativeZOrderList), static_pointer_cast<API::Array>(normalFlowList),
</ins><span class="cx"> static_pointer_cast<API::Array>(positiveZOrderList));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::RenderObject: {
</span><span class="cx"> String name;
</span><ins>+ String textSnippet;
</ins><span class="cx"> String elementTagName;
</span><span class="cx"> String elementID;
</span><ins>+ unsigned textLength;
</ins><span class="cx"> RefPtr<API::Object> elementClassNames;
</span><span class="cx"> WebCore::IntPoint absolutePosition;
</span><span class="cx"> WebCore::IntRect frameRect;
</span><span class="lines">@@ -445,12 +453,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(frameRect))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(textSnippet))
+ return false;
+ if (!decoder.decode(textLength))
+ return false;
</ins><span class="cx"> Owner messageCoder(coder, children);
</span><span class="cx"> if (!decoder.decode(messageCoder))
</span><span class="cx"> return false;
</span><span class="cx"> if (children && children->type() != API::Object::Type::Array)
</span><span class="cx"> return false;
</span><del>- coder.m_root = WebRenderObject::create(name, elementTagName, elementID, static_pointer_cast<API::Array>(elementClassNames), absolutePosition, frameRect, static_pointer_cast<API::Array>(children));
</del><ins>+ coder.m_root = WebRenderObject::create(name, elementTagName, elementID, static_pointer_cast<API::Array>(elementClassNames), absolutePosition, frameRect, textSnippet, textLength, static_pointer_cast<API::Array>(children));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::URL: {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebRenderLayer.cpp (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx"> return adoptRef(new WebRenderLayer(rootLayer));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
</del><ins>+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)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebRenderLayer(renderer, isReflection, isClipping, isClipped, type, absoluteBoundingBox, negativeZOrderList, normalFlowList, positiveZOrderList));
</del><ins>+ return adoptRef(new WebRenderLayer(renderer, isReflection, isClipping, isClipped, type, absoluteBoundingBox, backingStoreMemoryEstimate, negativeZOrderList, normalFlowList, positiveZOrderList));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<API::Array> WebRenderLayer::createArrayFromLayerList(Vector<RenderLayer*>* list)
</span><span class="lines">@@ -104,10 +104,13 @@
</span><span class="cx"> m_compositingLayerType = Container;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ m_backingStoreMemoryEstimate = backing->backingStoreMemoryEstimate();
</ins><span class="cx"> } else {
</span><span class="cx"> m_isClipping = false;
</span><span class="cx"> m_isClipped = false;
</span><span class="cx"> m_compositingLayerType = None;
</span><ins>+ m_backingStoreMemoryEstimate = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_absoluteBoundingBox = layer->absoluteBoundingBox();
</span><span class="lines">@@ -117,13 +120,14 @@
</span><span class="cx"> m_positiveZOrderList = createArrayFromLayerList(layer->posZOrderList());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
</del><ins>+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)
</ins><span class="cx"> : m_renderer(renderer)
</span><span class="cx"> , m_isReflection(isReflection)
</span><span class="cx"> , m_isClipping(isClipping)
</span><span class="cx"> , m_isClipped(isClipped)
</span><span class="cx"> , m_compositingLayerType(type)
</span><span class="cx"> , m_absoluteBoundingBox(absoluteBoundingBox)
</span><ins>+ , m_backingStoreMemoryEstimate(backingStoreMemoryEstimate)
</ins><span class="cx"> , m_negativeZOrderList(negativeZOrderList)
</span><span class="cx"> , m_normalFlowList(normalFlowList)
</span><span class="cx"> , m_positiveZOrderList(positiveZOrderList)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebRenderLayer.h (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> enum CompositingLayerType { None, Normal, Tiled, Media, Container };
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<WebRenderLayer> create(WebPage*);
</span><del>- 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);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> API::Array* negativeZOrderList() const { return m_negativeZOrderList.get(); }
</span><span class="cx"> API::Array* normalFlowList() const { return m_normalFlowList.get(); }
</span><span class="lines">@@ -53,10 +53,11 @@
</span><span class="cx"> bool isClipped() const { return m_isClipped; }
</span><span class="cx"> CompositingLayerType compositingLayerType() const { return m_compositingLayerType; }
</span><span class="cx"> WebCore::IntRect absoluteBoundingBox() const { return m_absoluteBoundingBox; }
</span><ins>+ double backingStoreMemoryEstimate() const { return m_backingStoreMemoryEstimate; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit WebRenderLayer(WebCore::RenderLayer*);
</span><del>- 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);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<API::Array> createArrayFromLayerList(Vector<WebCore::RenderLayer*>*);
</span><span class="cx">
</span><span class="lines">@@ -66,6 +67,7 @@
</span><span class="cx"> bool m_isClipped;
</span><span class="cx"> CompositingLayerType m_compositingLayerType;
</span><span class="cx"> WebCore::IntRect m_absoluteBoundingBox;
</span><ins>+ double m_backingStoreMemoryEstimate;
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Array> m_negativeZOrderList;
</span><span class="cx"> RefPtr<API::Array> m_normalFlowList;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebRenderObject.cpp (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,26 +46,27 @@
</span><span class="cx"> {
</span><span class="cx"> Frame* mainFrame = page->mainFrame();
</span><span class="cx"> if (!mainFrame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!mainFrame->loader().client().hasHTMLView())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RenderView* contentRenderer = mainFrame->contentRenderer();
</span><span class="cx"> if (!contentRenderer)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return adoptRef(new WebRenderObject(contentRenderer, true));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
</del><ins>+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)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebRenderObject(name, elementTagName, elementID, elementClassNames, absolutePosition, frameRect, children));
</del><ins>+ return adoptRef(new WebRenderObject(name, elementTagName, elementID, elementClassNames, absolutePosition, frameRect, textSnippet, textLength, children));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebRenderObject::WebRenderObject(RenderObject* renderer, bool shouldIncludeDescendants)
</span><span class="cx"> {
</span><span class="cx"> m_name = renderer->renderName();
</span><ins>+ m_textLength = 0;
</ins><span class="cx">
</span><span class="cx"> if (Node* node = renderer->node()) {
</span><span class="cx"> if (is<Element>(*node)) {
</span><span class="lines">@@ -83,6 +84,17 @@
</span><span class="cx"> m_elementClassNames = API::Array::create(WTF::move(classNames));
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ 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;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: broken with transforms
</span><span class="lines">@@ -122,14 +134,16 @@
</span><span class="cx"> m_children = API::Array::create(WTF::move(children));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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)
</del><ins>+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)
</ins><span class="cx"> : m_children(children)
</span><span class="cx"> , m_name(name)
</span><span class="cx"> , m_elementTagName(elementTagName)
</span><span class="cx"> , m_elementID(elementID)
</span><ins>+ , m_textSnippet(textSnippet)
</ins><span class="cx"> , m_elementClassNames(elementClassNames)
</span><span class="cx"> , m_absolutePosition(absolutePosition)
</span><span class="cx"> , m_frameRect(frameRect)
</span><ins>+ , m_textLength(textLength)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebRenderObject.h (176508 => 176509)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,13 +51,18 @@
</span><span class="cx"> return adoptRef(new WebRenderObject(renderer, false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> virtual ~WebRenderObject();
</span><span class="cx">
</span><span class="cx"> API::Array* children() const { return m_children.get(); }
</span><span class="cx">
</span><span class="cx"> const String& name() const { return m_name; }
</span><ins>+
+ // Only non-empty for RenderText objects.
+ const String& textSnippet() const { return m_textSnippet; }
+ unsigned textLength() const { return m_textLength; }
+
</ins><span class="cx"> const String& elementTagName() const { return m_elementTagName; }
</span><span class="cx"> const String& elementID() const { return m_elementID; }
</span><span class="cx"> API::Array* elementClassNames() const { return m_elementClassNames.get(); }
</span><span class="lines">@@ -66,16 +71,18 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebRenderObject(WebCore::RenderObject*, bool shouldIncludeDescendants);
</span><del>- WebRenderObject(const String& name, const String& elementTagName, const String& elementID, PassRefPtr<API::Array> elementClassNames, WebCore::IntPoint absolutePosition, WebCore::IntRect frameRect, PassRefPtr<API::Array> children);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Array> m_children;
</span><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> String m_elementTagName;
</span><span class="cx"> String m_elementID;
</span><ins>+ String m_textSnippet;
</ins><span class="cx"> RefPtr<API::Array> m_elementClassNames;
</span><span class="cx"> WebCore::IntPoint m_absolutePosition;
</span><span class="cx"> WebCore::IntRect m_frameRect;
</span><ins>+ unsigned m_textLength;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>