<!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>[161329] 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/161329">161329</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-05 20:09:57 -0800 (Sun, 05 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add encoding of ViewportConstraint and ScrollingParameter types
https://bugs.webkit.org/show_bug.cgi?id=126497
Reviewed by Andreas Kling.
Add encoding/decoding of ScrollableAreaParameters, FixedPositionViewportConstraints
and StickyPositionViewportConstraints.
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<WebCore::ScrollableAreaParameters>::encode):
(IPC::ArgumentCoder<WebCore::ScrollableAreaParameters>::decode):
(IPC::ArgumentCoder<WebCore::FixedPositionViewportConstraints>::encode):
(IPC::ArgumentCoder<WebCore::FixedPositionViewportConstraints>::decode):
(IPC::ArgumentCoder<WebCore::StickyPositionViewportConstraints>::encode):
(IPC::ArgumentCoder<WebCore::StickyPositionViewportConstraints>::decode):
* Shared/WebCoreArgumentCoders.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161328 => 161329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-01-06 04:09:02 UTC (rev 161328)
+++ trunk/Source/WebKit2/ChangeLog        2014-01-06 04:09:57 UTC (rev 161329)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-04 Simon Fraser <simon.fraser@apple.com>
+
+ Add encoding of ViewportConstraint and ScrollingParameter types
+ https://bugs.webkit.org/show_bug.cgi?id=126497
+
+ Reviewed by Andreas Kling.
+
+ Add encoding/decoding of ScrollableAreaParameters, FixedPositionViewportConstraints
+ and StickyPositionViewportConstraints.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<WebCore::ScrollableAreaParameters>::encode):
+ (IPC::ArgumentCoder<WebCore::ScrollableAreaParameters>::decode):
+ (IPC::ArgumentCoder<WebCore::FixedPositionViewportConstraints>::encode):
+ (IPC::ArgumentCoder<WebCore::FixedPositionViewportConstraints>::decode):
+ (IPC::ArgumentCoder<WebCore::StickyPositionViewportConstraints>::encode):
+ (IPC::ArgumentCoder<WebCore::StickyPositionViewportConstraints>::decode):
+ * Shared/WebCoreArgumentCoders.h:
+
</ins><span class="cx"> 2014-01-05 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Move responsibility for remote layer tree committing to RemoteLayerTreeDrawingArea
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (161328 => 161329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp        2014-01-06 04:09:02 UTC (rev 161328)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp        2014-01-06 04:09:57 UTC (rev 161329)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><ins>+#include <WebCore/ScrollingConstraints.h>
+#include <WebCore/ScrollingCoordinator.h>
</ins><span class="cx"> #include <WebCore/TextCheckerClient.h>
</span><span class="cx"> #include <WebCore/TransformationMatrix.h>
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="lines">@@ -1274,6 +1276,158 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ArgumentCoder<WebCore::ScrollableAreaParameters>::encode(ArgumentEncoder& encoder, const WebCore::ScrollableAreaParameters& parameters)
+{
+ encoder.encodeEnum(parameters.horizontalScrollElasticity);
+ encoder.encodeEnum(parameters.verticalScrollElasticity);
+
+ encoder.encodeEnum(parameters.horizontalScrollbarMode);
+ encoder.encodeEnum(parameters.verticalScrollbarMode);
+
+ encoder << parameters.hasEnabledHorizontalScrollbar;
+ encoder << parameters.hasEnabledHorizontalScrollbar;
+}
+
+bool ArgumentCoder<WebCore::ScrollableAreaParameters>::decode(ArgumentDecoder& decoder, WebCore::ScrollableAreaParameters& params)
+{
+ if (!decoder.decodeEnum(params.horizontalScrollElasticity))
+ return false;
+ if (!decoder.decodeEnum(params.verticalScrollElasticity))
+ return false;
+
+ if (!decoder.decodeEnum(params.horizontalScrollbarMode))
+ return false;
+ if (!decoder.decodeEnum(params.verticalScrollbarMode))
+ return false;
+
+ if (!decoder.decode(params.hasEnabledHorizontalScrollbar))
+ return false;
+ if (!decoder.decode(params.hasEnabledVerticalScrollbar))
+ return false;
+
+ return true;
+}
+
+void ArgumentCoder<WebCore::FixedPositionViewportConstraints>::encode(ArgumentEncoder& encoder, const WebCore::FixedPositionViewportConstraints& viewportConstraints)
+{
+ encoder << viewportConstraints.alignmentOffset();
+ encoder << viewportConstraints.anchorEdges();
+
+ encoder << viewportConstraints.viewportRectAtLastLayout();
+ encoder << viewportConstraints.layerPositionAtLastLayout();
+}
+
+bool ArgumentCoder<WebCore::FixedPositionViewportConstraints>::decode(ArgumentDecoder& decoder, WebCore::FixedPositionViewportConstraints& viewportConstraints)
+{
+ FloatSize alignmentOffset;
+ if (!decoder.decode(alignmentOffset))
+ return false;
+
+ ViewportConstraints::AnchorEdges anchorEdges;
+ if (!decoder.decode(anchorEdges))
+ return false;
+
+ FloatRect viewportRectAtLastLayout;
+ if (!decoder.decode(viewportRectAtLastLayout))
+ return false;
+
+ FloatPoint layerPositionAtLastLayout;
+ if (!decoder.decode(layerPositionAtLastLayout))
+ return false;
+
+ viewportConstraints = WebCore::FixedPositionViewportConstraints();
+ viewportConstraints.setAlignmentOffset(alignmentOffset);
+ viewportConstraints.setAnchorEdges(anchorEdges);
+
+ viewportConstraints.setViewportRectAtLastLayout(viewportRectAtLastLayout);
+ viewportConstraints.setLayerPositionAtLastLayout(layerPositionAtLastLayout);
+
+ return true;
+}
+
+void ArgumentCoder<WebCore::StickyPositionViewportConstraints>::encode(ArgumentEncoder& encoder, const WebCore::StickyPositionViewportConstraints& viewportConstraints)
+{
+ encoder << viewportConstraints.alignmentOffset();
+ encoder << viewportConstraints.anchorEdges();
+
+ encoder << viewportConstraints.leftOffset();
+ encoder << viewportConstraints.rightOffset();
+ encoder << viewportConstraints.topOffset();
+ encoder << viewportConstraints.bottomOffset();
+
+ encoder << viewportConstraints.constrainingRectAtLastLayout();
+ encoder << viewportConstraints.containingBlockRect();
+ encoder << viewportConstraints.stickyBoxRect();
+
+ encoder << viewportConstraints.stickyOffsetAtLastLayout();
+ encoder << viewportConstraints.layerPositionAtLastLayout();
+}
+
+bool ArgumentCoder<WebCore::StickyPositionViewportConstraints>::decode(ArgumentDecoder& decoder, WebCore::StickyPositionViewportConstraints& viewportConstraints)
+{
+ FloatSize alignmentOffset;
+ if (!decoder.decode(alignmentOffset))
+ return false;
+
+ ViewportConstraints::AnchorEdges anchorEdges;
+ if (!decoder.decode(anchorEdges))
+ return false;
+
+ float leftOffset;
+ if (!decoder.decode(leftOffset))
+ return false;
+
+ float rightOffset;
+ if (!decoder.decode(rightOffset))
+ return false;
+
+ float topOffset;
+ if (!decoder.decode(topOffset))
+ return false;
+
+ float bottomOffset;
+ if (!decoder.decode(bottomOffset))
+ return false;
+
+ FloatRect constrainingRectAtLastLayout;
+ if (!decoder.decode(constrainingRectAtLastLayout))
+ return false;
+
+ FloatRect containingBlockRect;
+ if (!decoder.decode(containingBlockRect))
+ return false;
+
+ FloatRect stickyBoxRect;
+ if (!decoder.decode(stickyBoxRect))
+ return false;
+
+ FloatSize stickyOffsetAtLastLayout;
+ if (!decoder.decode(stickyOffsetAtLastLayout))
+ return false;
+
+ FloatPoint layerPositionAtLastLayout;
+ if (!decoder.decode(layerPositionAtLastLayout))
+ return false;
+
+ viewportConstraints = WebCore::StickyPositionViewportConstraints();
+ viewportConstraints.setAlignmentOffset(alignmentOffset);
+ viewportConstraints.setAnchorEdges(anchorEdges);
+
+ viewportConstraints.setLeftOffset(leftOffset);
+ viewportConstraints.setRightOffset(rightOffset);
+ viewportConstraints.setTopOffset(topOffset);
+ viewportConstraints.setBottomOffset(bottomOffset);
+
+ viewportConstraints.setConstrainingRectAtLastLayout(constrainingRectAtLastLayout);
+ viewportConstraints.setContainingBlockRect(containingBlockRect);
+ viewportConstraints.setStickyBoxRect(stickyBoxRect);
+
+ viewportConstraints.setStickyOffsetAtLastLayout(stickyOffsetAtLastLayout);
+ viewportConstraints.setLayerPositionAtLastLayout(layerPositionAtLastLayout);
+
+ return true;
+}
+
</ins><span class="cx"> #if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
</span><span class="cx"> static void encodeFilterOperation(ArgumentEncoder& encoder, const FilterOperation& filter)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (161328 => 161329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h        2014-01-06 04:09:02 UTC (rev 161328)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h        2014-01-06 04:09:57 UTC (rev 161329)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> class FloatPoint3D;
</span><span class="cx"> class FloatRect;
</span><span class="cx"> class FloatSize;
</span><ins>+class FixedPositionViewportConstraints;
</ins><span class="cx"> class HTTPHeaderMap;
</span><span class="cx"> class IDBKeyPath;
</span><span class="cx"> class IntPoint;
</span><span class="lines">@@ -53,6 +54,7 @@
</span><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><ins>+class StickyPositionViewportConstraints;
</ins><span class="cx"> class TextCheckingRequestData;
</span><span class="cx"> class TransformationMatrix;
</span><span class="cx"> class UserStyleSheet;
</span><span class="lines">@@ -71,6 +73,7 @@
</span><span class="cx"> struct PasteboardImage;
</span><span class="cx"> struct PasteboardWebContent;
</span><span class="cx"> struct PluginInfo;
</span><ins>+struct ScrollableAreaParameters;
</ins><span class="cx"> struct TextCheckingResult;
</span><span class="cx"> struct ViewportAttributes;
</span><span class="cx"> struct WindowFeatures;
</span><span class="lines">@@ -328,6 +331,21 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::UserScript&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct ArgumentCoder<WebCore::ScrollableAreaParameters> {
+ static void encode(ArgumentEncoder&, const WebCore::ScrollableAreaParameters&);
+ static bool decode(ArgumentDecoder&, WebCore::ScrollableAreaParameters&);
+};
+
+template<> struct ArgumentCoder<WebCore::FixedPositionViewportConstraints> {
+ static void encode(ArgumentEncoder&, const WebCore::FixedPositionViewportConstraints&);
+ static bool decode(ArgumentDecoder&, WebCore::FixedPositionViewportConstraints&);
+};
+
+template<> struct ArgumentCoder<WebCore::StickyPositionViewportConstraints> {
+ static void encode(ArgumentEncoder&, const WebCore::StickyPositionViewportConstraints&);
+ static bool decode(ArgumentDecoder&, WebCore::StickyPositionViewportConstraints&);
+};
+
</ins><span class="cx"> #if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::FilterOperations> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
</span></span></pre>
</div>
</div>
</body>
</html>