<!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>[167398] 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/167398">167398</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-16 16:40:53 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deduplicate LayerTreeContext
https://bugs.webkit.org/show_bug.cgi?id=131773
Reviewed by Simon Fraser.
There are three identical implementations, one for each platform, for no reason.
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* Shared/LayerTreeContext.cpp: Renamed from Source/WebKit2/Shared/mac/LayerTreeContextMac.mm.
(WebKit::LayerTreeContext::LayerTreeContext):
(WebKit::LayerTreeContext::~LayerTreeContext):
(WebKit::LayerTreeContext::encode):
(WebKit::LayerTreeContext::decode):
(WebKit::LayerTreeContext::isEmpty):
(WebKit::operator==):
* Shared/LayerTreeContext.h:
(WebKit::operator!=): Deleted.
* Shared/efl/LayerTreeContextEfl.cpp: Removed.
* Shared/gtk/LayerTreeContextGtk.cpp: Removed.
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::initialize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedLayerTreeContexth">trunk/Source/WebKit2/Shared/LayerTreeContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedLayerTreeContextcpp">trunk/Source/WebKit2/Shared/LayerTreeContext.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedeflLayerTreeContextEflcpp">trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkLayerTreeContextGtkcpp">trunk/Source/WebKit2/Shared/gtk/LayerTreeContextGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacLayerTreeContextMacmm">trunk/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> Shared/EditorState.cpp
</span><span class="cx"> Shared/FontInfo.cpp
</span><span class="cx"> Shared/ImmutableDictionary.cpp
</span><ins>+ Shared/LayerTreeContext.cpp
</ins><span class="cx"> Shared/MutableDictionary.cpp
</span><span class="cx"> Shared/NavigationActionData.cpp
</span><span class="cx"> Shared/OriginAndDatabases.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-04-16 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Deduplicate LayerTreeContext
+ https://bugs.webkit.org/show_bug.cgi?id=131773
+
+ Reviewed by Simon Fraser.
+
+ There are three identical implementations, one for each platform, for no reason.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * Shared/LayerTreeContext.cpp: Renamed from Source/WebKit2/Shared/mac/LayerTreeContextMac.mm.
+ (WebKit::LayerTreeContext::LayerTreeContext):
+ (WebKit::LayerTreeContext::~LayerTreeContext):
+ (WebKit::LayerTreeContext::encode):
+ (WebKit::LayerTreeContext::decode):
+ (WebKit::LayerTreeContext::isEmpty):
+ (WebKit::operator==):
+ * Shared/LayerTreeContext.h:
+ (WebKit::operator!=): Deleted.
+ * Shared/efl/LayerTreeContextEfl.cpp: Removed.
+ * Shared/gtk/LayerTreeContextGtk.cpp: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+ (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::initialize):
+
+2014-04-16 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Don't build LayerTreeHost on Mac (and clean it up)
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131769
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> Shared/cairo/ShareableBitmapCairo.cpp
</span><span class="cx">
</span><del>- Shared/efl/LayerTreeContextEfl.cpp
</del><span class="cx"> Shared/efl/NativeWebKeyboardEventEfl.cpp
</span><span class="cx"> Shared/efl/NativeWebTouchEventEfl.cpp
</span><span class="cx"> Shared/efl/NativeWebWheelEventEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> Shared/cairo/ShareableBitmapCairo.cpp
</span><span class="cx">
</span><span class="cx"> Shared/gtk/ArgumentCodersGtk.cpp
</span><del>- Shared/gtk/LayerTreeContextGtk.cpp
</del><span class="cx"> Shared/gtk/NativeWebKeyboardEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebMouseEventGtk.cpp
</span><span class="cx"> Shared/gtk/NativeWebTouchEventGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedLayerTreeContextcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/LayerTreeContext.cpp (0 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/LayerTreeContext.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/LayerTreeContext.cpp 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "LayerTreeContext.h"
+
+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
+
+namespace WebKit {
+
+LayerTreeContext::LayerTreeContext()
+ : contextID(0)
+{
+}
+
+LayerTreeContext::~LayerTreeContext()
+{
+}
+
+void LayerTreeContext::encode(IPC::ArgumentEncoder& encoder) const
+{
+ encoder << contextID;
+}
+
+bool LayerTreeContext::decode(IPC::ArgumentDecoder& decoder, LayerTreeContext& result)
+{
+ if (!decoder.decode(result.contextID))
+ return false;
+
+ return true;
+}
+
+bool LayerTreeContext::isEmpty() const
+{
+ return !contextID;
+}
+
+bool operator==(const LayerTreeContext& a, const LayerTreeContext& b)
+{
+ return a.contextID == b.contextID;
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedLayerTreeContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/LayerTreeContext.h (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/LayerTreeContext.h 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/Shared/LayerTreeContext.h 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -52,13 +52,7 @@
</span><span class="cx">
</span><span class="cx"> bool isEmpty() const;
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- uint32_t contextID;
-#elif PLATFORM(GTK)
- uint64_t windowHandle;
-#elif PLATFORM(EFL)
- uint32_t coordinatedLayerID;
-#endif
</del><ins>+ uint64_t contextID;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool operator==(const LayerTreeContext&, const LayerTreeContext&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedeflLayerTreeContextEflcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 Samsung Electronics. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "LayerTreeContext.h"
-
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-
-namespace WebKit {
-
-LayerTreeContext::LayerTreeContext()
- : coordinatedLayerID(0)
-{
-}
-
-LayerTreeContext::~LayerTreeContext()
-{
-}
-
-void LayerTreeContext::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << coordinatedLayerID;
-}
-
-bool LayerTreeContext::decode(IPC::ArgumentDecoder& decoder, LayerTreeContext& context)
-{
- return decoder.decode(context.coordinatedLayerID);
-}
-
-bool LayerTreeContext::isEmpty() const
-{
- return !coordinatedLayerID;
-}
-
-bool operator==(const LayerTreeContext& a, const LayerTreeContext& b)
-{
- return a.coordinatedLayerID == b.coordinatedLayerID;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkLayerTreeContextGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/gtk/LayerTreeContextGtk.cpp (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/LayerTreeContextGtk.cpp 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/Shared/gtk/LayerTreeContextGtk.cpp 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "LayerTreeContext.h"
-
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-
-namespace WebKit {
-
-LayerTreeContext::LayerTreeContext()
- : windowHandle(0)
-{
-}
-
-LayerTreeContext::~LayerTreeContext()
-{
-}
-
-void LayerTreeContext::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << windowHandle;
-}
-
-bool LayerTreeContext::decode(IPC::ArgumentDecoder& decoder, LayerTreeContext& context)
-{
- return decoder.decode(context.windowHandle);
-}
-
-bool LayerTreeContext::isEmpty() const
-{
- return !windowHandle;
-}
-
-bool operator==(const LayerTreeContext& a, const LayerTreeContext& b)
-{
- return a.windowHandle == b.windowHandle;
-}
-
-} // namespace WebKit
-
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacLayerTreeContextMacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "LayerTreeContext.h"
-
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-
-namespace WebKit {
-
-LayerTreeContext::LayerTreeContext()
- : contextID(0)
-{
-}
-
-LayerTreeContext::~LayerTreeContext()
-{
-}
-
-void LayerTreeContext::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << contextID;
-}
-
-bool LayerTreeContext::decode(IPC::ArgumentDecoder& decoder, LayerTreeContext& result)
-{
- if (!decoder.decode(result.contextID))
- return false;
-
- return true;
-}
-
-bool LayerTreeContext::isEmpty() const
-{
- return !contextID;
-}
-
-bool operator==(const LayerTreeContext& a, const LayerTreeContext& b)
-{
- return a.contextID == b.contextID;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> 1A910071126675C4001842F5 /* FindIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A91006F126675C3001842F5 /* FindIndicator.h */; };
</span><span class="cx"> 1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A910070126675C4001842F5 /* FindIndicator.cpp */; };
</span><span class="cx"> 1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */; };
</span><del>- 1A92DC1312F8BAB90017AF65 /* LayerTreeContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */; };
</del><ins>+ 1A92DC1312F8BAB90017AF65 /* LayerTreeContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */; };
</ins><span class="cx"> 1A9E32891821636900F5D04C /* _WKRemoteObjectRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A9E328A1821636900F5D04C /* _WKRemoteObjectRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */; };
</span><span class="cx"> 1A9E328D182165A900F5D04C /* _WKRemoteObjectInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2066,7 +2066,7 @@
</span><span class="cx"> 1A91006F126675C3001842F5 /* FindIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicator.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A910070126675C4001842F5 /* FindIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindIndicator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeContext.h; sourceTree = "<group>"; };
</span><del>- 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerTreeContextMac.mm; sourceTree = "<group>"; };
</del><ins>+ 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerTreeContext.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRemoteObjectRegistry.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKRemoteObjectRegistry.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRemoteObjectInterface.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4115,6 +4115,7 @@
</span><span class="cx"> BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */,
</span><span class="cx"> C58CDF2B1887609F00871536 /* InteractionInformationAtPosition.cpp */,
</span><span class="cx"> C58CDF2C1887609F00871536 /* InteractionInformationAtPosition.h */,
</span><ins>+ 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */,
</ins><span class="cx"> 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */,
</span><span class="cx"> BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */,
</span><span class="cx"> BCB0AEE7122F53E300B1341E /* MutableDictionary.h */,
</span><span class="lines">@@ -5723,7 +5724,6 @@
</span><span class="cx"> CDC3830E1721242D008A2FC3 /* CookieStorageShim.h */,
</span><span class="cx"> CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */,
</span><span class="cx"> CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */,
</span><del>- 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */,
</del><span class="cx"> C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */,
</span><span class="cx"> 31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */,
</span><span class="cx"> DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */,
</span><span class="lines">@@ -8235,7 +8235,7 @@
</span><span class="cx"> 1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */,
</span><span class="cx"> 1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */,
</span><span class="cx"> BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */,
</span><del>- 1A92DC1312F8BAB90017AF65 /* LayerTreeContextMac.mm in Sources */,
</del><ins>+ 1A92DC1312F8BAB90017AF65 /* LayerTreeContext.cpp in Sources */,
</ins><span class="cx"> 1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */,
</span><span class="cx"> 1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */,
</span><span class="cx"> 51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> m_coordinator = std::make_unique<CompositingCoordinator>(webPage->corePage(), this);
</span><span class="cx">
</span><span class="cx"> m_coordinator->createRootLayer(webPage->size());
</span><del>- m_layerTreeContext.coordinatedLayerID = toCoordinatedGraphicsLayer(m_coordinator->rootLayer())->id();
</del><ins>+ m_layerTreeContext.contextID = toCoordinatedGraphicsLayer(m_coordinator->rootLayer())->id();
</ins><span class="cx">
</span><span class="cx"> CoordinatedSurface::setFactory(createCoordinatedSurface);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (167397 => 167398)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-04-16 23:30:02 UTC (rev 167397)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2014-04-16 23:40:53 UTC (rev 167398)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> m_rootLayer->addChild(m_nonCompositedContentLayer.get());
</span><span class="cx"> m_nonCompositedContentLayer->setNeedsDisplay();
</span><span class="cx">
</span><del>- m_layerTreeContext.windowHandle = m_webPage->nativeWindowHandle();
</del><ins>+ m_layerTreeContext.contextID = m_webPage->nativeWindowHandle();
</ins><span class="cx">
</span><span class="cx"> GLContext* context = glContext();
</span><span class="cx"> if (!context)
</span></span></pre>
</div>
</div>
</body>
</html>