Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (167397 => 167398)
--- 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)
@@ -195,6 +195,7 @@
Shared/EditorState.cpp
Shared/FontInfo.cpp
Shared/ImmutableDictionary.cpp
+ Shared/LayerTreeContext.cpp
Shared/MutableDictionary.cpp
Shared/NavigationActionData.cpp
Shared/OriginAndDatabases.cpp
Modified: trunk/Source/WebKit2/ChangeLog (167397 => 167398)
--- 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)
@@ -1,5 +1,34 @@
2014-04-16 Tim Horton <timothy_hor...@apple.com>
+ 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_hor...@apple.com>
+
Don't build LayerTreeHost on Mac (and clean it up)
https://bugs.webkit.org/show_bug.cgi?id=131769
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (167397 => 167398)
--- 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)
@@ -34,7 +34,6 @@
Shared/cairo/ShareableBitmapCairo.cpp
- Shared/efl/LayerTreeContextEfl.cpp
Shared/efl/NativeWebKeyboardEventEfl.cpp
Shared/efl/NativeWebTouchEventEfl.cpp
Shared/efl/NativeWebWheelEventEfl.cpp
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (167397 => 167398)
--- 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)
@@ -54,7 +54,6 @@
Shared/cairo/ShareableBitmapCairo.cpp
Shared/gtk/ArgumentCodersGtk.cpp
- Shared/gtk/LayerTreeContextGtk.cpp
Shared/gtk/NativeWebKeyboardEventGtk.cpp
Shared/gtk/NativeWebMouseEventGtk.cpp
Shared/gtk/NativeWebTouchEventGtk.cpp
Added: trunk/Source/WebKit2/Shared/LayerTreeContext.cpp (0 => 167398)
--- trunk/Source/WebKit2/Shared/LayerTreeContext.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/LayerTreeContext.cpp 2014-04-16 23:40:53 UTC (rev 167398)
@@ -0,0 +1,66 @@
+/*
+ * 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
Modified: trunk/Source/WebKit2/Shared/LayerTreeContext.h (167397 => 167398)
--- 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)
@@ -52,13 +52,7 @@
bool isEmpty() const;
-#if PLATFORM(COCOA)
- uint32_t contextID;
-#elif PLATFORM(GTK)
- uint64_t windowHandle;
-#elif PLATFORM(EFL)
- uint32_t coordinatedLayerID;
-#endif
+ uint64_t contextID;
};
bool operator==(const LayerTreeContext&, const LayerTreeContext&);
Deleted: trunk/Source/WebKit2/Shared/efl/LayerTreeContextEfl.cpp (167397 => 167398)
--- 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)
@@ -1,63 +0,0 @@
-/*
- * 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
Deleted: trunk/Source/WebKit2/Shared/gtk/LayerTreeContextGtk.cpp (167397 => 167398)
--- 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)
@@ -1,64 +0,0 @@
-/*
- * 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
-
Deleted: trunk/Source/WebKit2/Shared/mac/LayerTreeContextMac.mm (167397 => 167398)
--- 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)
@@ -1,66 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (167397 => 167398)
--- 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)
@@ -282,7 +282,7 @@
1A910071126675C4001842F5 /* FindIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A91006F126675C3001842F5 /* FindIndicator.h */; };
1A910072126675C4001842F5 /* FindIndicator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A910070126675C4001842F5 /* FindIndicator.cpp */; };
1A92DC1112F8BA460017AF65 /* LayerTreeContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */; };
- 1A92DC1312F8BAB90017AF65 /* LayerTreeContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */; };
+ 1A92DC1312F8BAB90017AF65 /* LayerTreeContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */; };
1A9E32891821636900F5D04C /* _WKRemoteObjectRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A9E328A1821636900F5D04C /* _WKRemoteObjectRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */; };
1A9E328D182165A900F5D04C /* _WKRemoteObjectInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2066,7 +2066,7 @@
1A91006F126675C3001842F5 /* FindIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindIndicator.h; sourceTree = "<group>"; };
1A910070126675C4001842F5 /* FindIndicator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FindIndicator.cpp; sourceTree = "<group>"; };
1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerTreeContext.h; sourceTree = "<group>"; };
- 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerTreeContextMac.mm; sourceTree = "<group>"; };
+ 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerTreeContext.cpp; sourceTree = "<group>"; };
1A9E32871821636900F5D04C /* _WKRemoteObjectRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRemoteObjectRegistry.h; sourceTree = "<group>"; };
1A9E32881821636900F5D04C /* _WKRemoteObjectRegistry.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKRemoteObjectRegistry.mm; sourceTree = "<group>"; };
1A9E328B182165A900F5D04C /* _WKRemoteObjectInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRemoteObjectInterface.h; sourceTree = "<group>"; };
@@ -4115,6 +4115,7 @@
BCBCB0CA1215E32100DE59CA /* ImmutableDictionary.h */,
C58CDF2B1887609F00871536 /* InteractionInformationAtPosition.cpp */,
C58CDF2C1887609F00871536 /* InteractionInformationAtPosition.h */,
+ 1A92DC1212F8BAB90017AF65 /* LayerTreeContext.cpp */,
1A92DC1012F8BA460017AF65 /* LayerTreeContext.h */,
BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */,
BCB0AEE7122F53E300B1341E /* MutableDictionary.h */,
@@ -5723,7 +5724,6 @@
CDC3830E1721242D008A2FC3 /* CookieStorageShim.h */,
CDC382F9172116D3008A2FC3 /* CookieStorageShimLibrary.cpp */,
CDC3830B172121CE008A2FC3 /* CookieStorageShimLibrary.h */,
- 1A92DC1212F8BAB90017AF65 /* LayerTreeContextMac.mm */,
C02BFF1D1251502E009CCBEA /* NativeWebKeyboardEventMac.mm */,
31EA25D0134F78B2005B1452 /* NativeWebMouseEventMac.mm */,
DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */,
@@ -8235,7 +8235,7 @@
1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */,
1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */,
BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */,
- 1A92DC1312F8BAB90017AF65 /* LayerTreeContextMac.mm in Sources */,
+ 1A92DC1312F8BAB90017AF65 /* LayerTreeContext.cpp in Sources */,
1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */,
1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */,
51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (167397 => 167398)
--- 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)
@@ -69,7 +69,7 @@
m_coordinator = std::make_unique<CompositingCoordinator>(webPage->corePage(), this);
m_coordinator->createRootLayer(webPage->size());
- m_layerTreeContext.coordinatedLayerID = toCoordinatedGraphicsLayer(m_coordinator->rootLayer())->id();
+ m_layerTreeContext.contextID = toCoordinatedGraphicsLayer(m_coordinator->rootLayer())->id();
CoordinatedSurface::setFactory(createCoordinatedSurface);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (167397 => 167398)
--- 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)
@@ -113,7 +113,7 @@
m_rootLayer->addChild(m_nonCompositedContentLayer.get());
m_nonCompositedContentLayer->setNeedsDisplay();
- m_layerTreeContext.windowHandle = m_webPage->nativeWindowHandle();
+ m_layerTreeContext.contextID = m_webPage->nativeWindowHandle();
GLContext* context = glContext();
if (!context)
