<!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>[177750] trunk/Source/WebKit2</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/177750">177750</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-26 14:16:30 -0800 (Fri, 26 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle more types in the UserData encode/decode functions
https://bugs.webkit.org/show_bug.cgi?id=139959
Reviewed by Dan Bernstein.
* Shared/UserData.cpp:
(WebKit::UserData::encode):
(WebKit::UserData::decode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177749 => 177750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-26 20:24:34 UTC (rev 177749)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-26 22:16:30 UTC (rev 177750)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-12-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Handle more types in the UserData encode/decode functions
+ https://bugs.webkit.org/show_bug.cgi?id=139959
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/UserData.cpp:
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+
+2014-12-26 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move handle encoding functions to their respective implementation files
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139957
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (177749 => 177750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-26 20:24:34 UTC (rev 177749)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-26 22:16:30 UTC (rev 177750)
</span><span class="lines">@@ -40,8 +40,14 @@
</span><span class="cx"> #include "APIURL.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "APIURLResponse.h"
</span><ins>+#include "APIUserContentURLPattern.h"
</ins><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><ins>+#include "ShareableBitmap.h"
+#include "WebCertificateInfo.h"
+#include "WebImage.h"
+#include "WebRenderLayer.h"
+#include "WebRenderObject.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -169,6 +175,12 @@
</span><span class="cx"> static_cast<const API::Boolean&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::CertificateInfo: {
+ const auto& certificateInfo = static_cast<const WebCertificateInfo&>(object);
+ encoder << certificateInfo.certificateInfo();
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::Data:
</span><span class="cx"> static_cast<const API::Data&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="lines">@@ -197,6 +209,23 @@
</span><span class="cx"> static_cast<const API::FrameHandle&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::Image: {
+ auto& image = static_cast<const WebImage&>(object);
+
+ ShareableBitmap::Handle handle;
+ ASSERT(!image.bitmap() || image.bitmap()->isBackedBySharedMemory());
+ if (!image.bitmap() || !image.bitmap()->isBackedBySharedMemory() || !image.bitmap()->createHandle(handle)) {
+ // Initial false indicates no allocated bitmap or is not shareable.
+ encoder << false;
+ break;
+ }
+
+ // Initial true indicates a bitmap was allocated and is shareable.
+ encoder << true;
+ encoder << handle;
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::PageGroupHandle:
</span><span class="cx"> static_cast<const API::PageGroupHandle&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="lines">@@ -213,6 +242,38 @@
</span><span class="cx"> static_cast<const API::Rect&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::RenderLayer: {
+ auto& renderLayer = static_cast<const WebRenderLayer&>(object);
+
+ encode(encoder, renderLayer.renderer());
+ encoder << renderLayer.isReflection();
+ encoder << renderLayer.isClipping();
+ encoder << renderLayer.isClipped();
+ encoder << static_cast<uint32_t>(renderLayer.compositingLayerType());
+ encoder << renderLayer.absoluteBoundingBox();
+ encoder << renderLayer.backingStoreMemoryEstimate();
+ encode(encoder, renderLayer.negativeZOrderList());
+ encode(encoder, renderLayer.normalFlowList());
+ encode(encoder, renderLayer.positiveZOrderList());
+ encode(encoder, renderLayer.frameContentsLayer());
+ break;
+ }
+
+ case API::Object::Type::RenderObject: {
+ auto& renderObject = static_cast<const WebRenderObject&>(object);
+
+ encoder << renderObject.name();
+ encoder << renderObject.elementTagName();
+ encoder << renderObject.elementID();
+ encode(encoder, renderObject.elementClassNames());
+ encoder << renderObject.absolutePosition();
+ encoder << renderObject.frameRect();
+ encoder << renderObject.textSnippet();
+ encoder << renderObject.textLength();
+ encode(encoder, renderObject.children());
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::SerializedScriptValue: {
</span><span class="cx"> auto& serializedScriptValue = static_cast<const API::SerializedScriptValue&>(object);
</span><span class="cx"> encoder << serializedScriptValue.dataReference();
</span><span class="lines">@@ -245,6 +306,12 @@
</span><span class="cx"> static_cast<const API::UInt64&>(object).encode(encoder);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::UserContentURLPattern: {
+ auto& urlPattern = static_cast<const API::UserContentURLPattern&>(object);
+ encoder << urlPattern.patternString();
+ break;
+ }
+
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -280,6 +347,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::CertificateInfo: {
+ WebCore::CertificateInfo certificateInfo;
+ if (!decoder.decode(certificateInfo))
+ return false;
+ result = WebCertificateInfo::create(certificateInfo);
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::Data:
</span><span class="cx"> if (!API::Data::decode(decoder, result))
</span><span class="cx"> return false;
</span><span class="lines">@@ -323,6 +398,22 @@
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::Image: {
+ bool didEncode = false;
+ if (!decoder.decode(didEncode))
+ return false;
+
+ if (!didEncode)
+ break;
+
+ ShareableBitmap::Handle handle;
+ if (!decoder.decode(handle))
+ return false;
+
+ result = WebImage::create(ShareableBitmap::create(handle));
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::Null:
</span><span class="cx"> result = nullptr;
</span><span class="cx"> break;
</span><span class="lines">@@ -347,6 +438,83 @@
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::RenderLayer: {
+ RefPtr<API::Object> renderer;
+ bool isReflection;
+ bool isClipping;
+ bool isClipped;
+ uint32_t compositingLayerTypeAsUInt32;
+ WebCore::IntRect absoluteBoundingBox;
+ double backingStoreMemoryEstimate;
+ RefPtr<API::Object> negativeZOrderList;
+ RefPtr<API::Object> normalFlowList;
+ RefPtr<API::Object> positiveZOrderList;
+ RefPtr<API::Object> frameContentsLayer;
+
+ if (!decode(decoder, renderer))
+ return false;
+ if (renderer->type() != API::Object::Type::RenderObject)
+ return false;
+ if (!decoder.decode(isReflection))
+ return false;
+ if (!decoder.decode(isClipping))
+ return false;
+ if (!decoder.decode(isClipped))
+ return false;
+ if (!decoder.decode(compositingLayerTypeAsUInt32))
+ return false;
+ if (!decoder.decode(absoluteBoundingBox))
+ return false;
+ if (!decoder.decode(backingStoreMemoryEstimate))
+ return false;
+ if (!decode(decoder, negativeZOrderList))
+ return false;
+ if (!decode(decoder, normalFlowList))
+ return false;
+ if (!decode(decoder, positiveZOrderList))
+ return false;
+ if (!decode(decoder, frameContentsLayer))
+ return false;
+
+ result = WebRenderLayer::create(static_pointer_cast<WebRenderObject>(renderer), isReflection, isClipping, isClipped, static_cast<WebRenderLayer::CompositingLayerType>(compositingLayerTypeAsUInt32), absoluteBoundingBox, backingStoreMemoryEstimate, static_pointer_cast<API::Array>(negativeZOrderList), static_pointer_cast<API::Array>(normalFlowList), static_pointer_cast<API::Array>(positiveZOrderList), static_pointer_cast<WebRenderLayer>(frameContentsLayer));
+ 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;
+ RefPtr<API::Object> children;
+
+ if (!decoder.decode(name))
+ return false;
+ if (!decoder.decode(elementTagName))
+ return false;
+ if (!decoder.decode(elementID))
+ return false;
+ if (!decode(decoder, elementClassNames))
+ return false;
+ if (!decoder.decode(absolutePosition))
+ return false;
+ if (!decoder.decode(frameRect))
+ return false;
+ if (!decoder.decode(textSnippet))
+ return false;
+ if (!decoder.decode(textLength))
+ return false;
+ if (!decode(decoder, children))
+ return false;
+ if (children && children->type() != API::Object::Type::Array)
+ return false;
+ result = WebRenderObject::create(name, elementTagName, elementID, static_pointer_cast<API::Array>(elementClassNames), absolutePosition, frameRect, textSnippet, textLength, static_pointer_cast<API::Array>(children));
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::SerializedScriptValue: {
</span><span class="cx"> IPC::DataReference dataReference;
</span><span class="cx"> if (!decoder.decode(dataReference))
</span><span class="lines">@@ -391,6 +559,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::UserContentURLPattern: {
+ String string;
+ if (!decoder.decode(string))
+ return false;
+ result = API::UserContentURLPattern::create(string);
+ break;
+ }
+
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>