Diff
Modified: trunk/Source/WebCore/ChangeLog (133832 => 133833)
--- trunk/Source/WebCore/ChangeLog 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebCore/ChangeLog 2012-11-08 02:52:49 UTC (rev 133833)
@@ -1,3 +1,16 @@
+2012-11-07 Anders Carlsson <ander...@apple.com>
+
+ Add RemoteGraphicsLayer class
+ https://bugs.webkit.org/show_bug.cgi?id=101535
+
+ Reviewed by Simon Fraser.
+
+ * WebCore.exp.in:
+ Export GraphicsLayer symbols required by WebKit2.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Make GraphicsLayerFactory.h a private header.
+
2012-11-07 Adam Barth <aba...@webkit.org>
[V8] Don't leak <img> elements in content scripts
Modified: trunk/Source/WebCore/WebCore.exp.in (133832 => 133833)
--- trunk/Source/WebCore/WebCore.exp.in 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-11-08 02:52:49 UTC (rev 133833)
@@ -2152,11 +2152,32 @@
#endif
#if USE(ACCELERATED_COMPOSITING)
+__ZN7WebCore13GraphicsLayer11setChildrenERKN3WTF6VectorIPS0_Lm0EEE
+__ZN7WebCore13GraphicsLayer12replaceChildEPS0_S1_
+__ZN7WebCore13GraphicsLayer12setZPositionEf
+__ZN7WebCore13GraphicsLayer13addChildAboveEPS0_S1_
+__ZN7WebCore13GraphicsLayer13addChildBelowEPS0_S1_
+__ZN7WebCore13GraphicsLayer15addChildAtIndexEPS0_i
+__ZN7WebCore13GraphicsLayer15willBeDestroyedEv
+__ZN7WebCore13GraphicsLayer16removeFromParentEv
+__ZN7WebCore13GraphicsLayer16resumeAnimationsEv
+__ZN7WebCore13GraphicsLayer17distributeOpacityEf
__ZN7WebCore13GraphicsLayer17removeAllChildrenEv
+__ZN7WebCore13GraphicsLayer17suspendAnimationsEd
+__ZN7WebCore13GraphicsLayer18setBackgroundColorERKNS_5ColorE
+__ZN7WebCore13GraphicsLayer20clearBackgroundColorEv
+__ZN7WebCore13GraphicsLayer20setReplicatedByLayerEPS0_
__ZN7WebCore13GraphicsLayer6createEPNS_19GraphicsLayerClientE
__ZN7WebCore13GraphicsLayer6createEPNS_20GraphicsLayerFactoryEPNS_19GraphicsLayerClientE
+__ZN7WebCore13GraphicsLayer8addChildEPS0_
+__ZN7WebCore13GraphicsLayerC2EPNS_19GraphicsLayerClientE
+__ZN7WebCore13GraphicsLayerD2Ev
+__ZN7WebCore16FilterOperationsaSERKS0_
+__ZNK7WebCore13GraphicsLayer18accumulatedOpacityEv
+__ZNK7WebCore13GraphicsLayer18getDebugBorderInfoERNS_5ColorERf
+__ZNK7WebCore13GraphicsLayer26backingStoreMemoryEstimateEv
+__ZNK7WebCore18RenderLayerBacking11contentsBoxEv
__ZNK7WebCore18RenderLayerBacking20compositingLayerTypeEv
-__ZNK7WebCore18RenderLayerBacking11contentsBoxEv
#endif
#if USE(APPKIT)
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (133832 => 133833)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-08 02:52:49 UTC (rev 133833)
@@ -549,7 +549,7 @@
1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */; };
1AC2260C0DB69F190089B669 /* JSDOMApplicationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC2260A0DB69F190089B669 /* JSDOMApplicationCache.cpp */; };
1AC2260D0DB69F190089B669 /* JSDOMApplicationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC2260B0DB69F190089B669 /* JSDOMApplicationCache.h */; };
- 1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC69592161A1E53003732CB /* GraphicsLayerFactory.h */; };
+ 1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC69592161A1E53003732CB /* GraphicsLayerFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
1ACD1B630B029739007E5016 /* DOMCSSStyleDeclarationInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E711440AC5D5340053270F /* DOMCSSStyleDeclarationInternal.h */; };
1ACE53DF0A8D18810022947D /* JSDOMParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACE53DD0A8D18810022947D /* JSDOMParser.cpp */; };
1ACE53E00A8D18810022947D /* JSDOMParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACE53DE0A8D18810022947D /* JSDOMParser.h */; };
@@ -10702,7 +10702,7 @@
9712A58A15004EDA0048AF10 /* IDBKeyRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBKeyRange.h; path = Modules/indexeddb/IDBKeyRange.h; sourceTree = "<group>"; };
9712A58B15004EDA0048AF10 /* IDBKeyRange.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = IDBKeyRange.idl; path = Modules/indexeddb/IDBKeyRange.idl; sourceTree = "<group>"; };
9712A58C15004EDA0048AF10 /* IDBBackingStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBBackingStore.cpp; path = Modules/indexeddb/IDBBackingStore.cpp; sourceTree = "<group>"; };
- 9712A58D15004EDA0048AF10 /* IDBBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBLevelDBBackingStore.h; path = Modules/indexeddb/IDBLevelDBBackingStore.h; sourceTree = "<group>"; };
+ 9712A58D15004EDA0048AF10 /* IDBLevelDBBackingStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBLevelDBBackingStore.h; path = Modules/indexeddb/IDBLevelDBBackingStore.h; sourceTree = "<group>"; };
9712A58E15004EDA0048AF10 /* IDBLevelDBCoding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBLevelDBCoding.cpp; path = Modules/indexeddb/IDBLevelDBCoding.cpp; sourceTree = "<group>"; };
9712A58F15004EDA0048AF10 /* IDBLevelDBCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDBLevelDBCoding.h; path = Modules/indexeddb/IDBLevelDBCoding.h; sourceTree = "<group>"; };
9712A59015004EDA0048AF10 /* IDBObjectStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IDBObjectStore.cpp; path = Modules/indexeddb/IDBObjectStore.cpp; sourceTree = "<group>"; };
Modified: trunk/Source/WebKit2/ChangeLog (133832 => 133833)
--- trunk/Source/WebKit2/ChangeLog 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-08 02:52:49 UTC (rev 133833)
@@ -1,3 +1,26 @@
+2012-11-07 Anders Carlsson <ander...@apple.com>
+
+ Add RemoteGraphicsLayer class
+ https://bugs.webkit.org/show_bug.cgi?id=101535
+
+ Reviewed by Simon Fraser.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/mac/RemoteGraphicsLayer.h:
+ * WebProcess/WebPage/mac/RemoteGraphicsLayer.mm:
+ Add RemoteGraphicsLayer, a subclass of WebCore::GraphicsLayer.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeController.h:
+ Make RemoteLayerTreeController a GraphicsLayerFactory.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeController.mm:
+ (WebKit::RemoteLayerTreeController::createGraphicsLayer):
+ Create a new RemoteGraphicsLayer.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::graphicsLayerFactory):
+ Return the layer tree controller.
+
2012-11-07 Byungwoo Lee <bw80....@samsung.com>
[WK2] Make WebVibrationProxy to be a member of WebPageProxy.
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (133832 => 133833)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-11-08 02:52:49 UTC (rev 133833)
@@ -222,6 +222,8 @@
1AB16AE21648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16AE01648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h */; };
1AB16AE9164B3A8800290D62 /* RemoteLayerTreeController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB16AE7164B3A8800290D62 /* RemoteLayerTreeController.mm */; };
1AB16AEA164B3A8800290D62 /* RemoteLayerTreeController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16AE8164B3A8800290D62 /* RemoteLayerTreeController.h */; };
+ 1AB16AED164B41E400290D62 /* RemoteGraphicsLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB16AEB164B41E400290D62 /* RemoteGraphicsLayer.mm */; };
+ 1AB16AEE164B41E400290D62 /* RemoteGraphicsLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB16AEC164B41E400290D62 /* RemoteGraphicsLayer.h */; };
1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */; };
1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */; };
1AB7D6191288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D6171288B9D900CFD08C /* DownloadProxyMessageReceiver.cpp */; };
@@ -1400,6 +1402,8 @@
1AB16AE01648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeDrawingAreaProxy.h; sourceTree = "<group>"; };
1AB16AE7164B3A8800290D62 /* RemoteLayerTreeController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreeController.mm; sourceTree = "<group>"; };
1AB16AE8164B3A8800290D62 /* RemoteLayerTreeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeController.h; sourceTree = "<group>"; };
+ 1AB16AEB164B41E400290D62 /* RemoteGraphicsLayer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteGraphicsLayer.mm; sourceTree = "<group>"; };
+ 1AB16AEC164B41E400290D62 /* RemoteGraphicsLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteGraphicsLayer.h; sourceTree = "<group>"; };
1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxy.h; sourceTree = "<group>"; };
1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxy.cpp; sourceTree = "<group>"; };
1AB7D5E91288B8C000CFD08C /* DownloadProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DownloadProxy.messages.in; sourceTree = "<group>"; };
@@ -3914,6 +3918,8 @@
BC963D6C113DD19500574BE2 /* mac */ = {
isa = PBXGroup;
children = (
+ 1AB16AEC164B41E400290D62 /* RemoteGraphicsLayer.h */,
+ 1AB16AEB164B41E400290D62 /* RemoteGraphicsLayer.mm */,
1AB16AE8164B3A8800290D62 /* RemoteLayerTreeController.h */,
1AB16AE7164B3A8800290D62 /* RemoteLayerTreeController.mm */,
1AB16ADC1648598400290D62 /* RemoteLayerTreeDrawingArea.h */,
@@ -4854,6 +4860,7 @@
1AB16ADE1648598400290D62 /* RemoteLayerTreeDrawingArea.h in Headers */,
1AB16AE21648656D00290D62 /* RemoteLayerTreeDrawingAreaProxy.h in Headers */,
1AB16AEA164B3A8800290D62 /* RemoteLayerTreeController.h in Headers */,
+ 1AB16AEE164B41E400290D62 /* RemoteGraphicsLayer.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5792,6 +5799,7 @@
9F4F59441648B67F00493B7E /* SharedWorkerProcessProxyMac.mm in Sources */,
9F4F59461648BA8E00493B7E /* NetworkProcessManagerMac.mm in Sources */,
1AB16AE9164B3A8800290D62 /* RemoteLayerTreeController.mm in Sources */,
+ 1AB16AED164B41E400290D62 /* RemoteGraphicsLayer.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Copied: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h (from rev 133831, trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.h) (0 => 133833)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h 2012-11-08 02:52:49 UTC (rev 133833)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2012 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.
+ */
+
+#ifndef RemoteGraphicsLayer_h
+#define RemoteGraphicsLayer_h
+
+#include <WebCore/GraphicsLayer.h>
+
+namespace WebKit {
+
+class RemoteLayerTreeController;
+
+class RemoteGraphicsLayer : public WebCore::GraphicsLayer {
+public:
+ static PassOwnPtr<WebCore::GraphicsLayer> create(WebCore::GraphicsLayerClient*, RemoteLayerTreeController*);
+ virtual ~RemoteGraphicsLayer();
+
+private:
+ RemoteGraphicsLayer(WebCore::GraphicsLayerClient*, RemoteLayerTreeController*);
+
+ // WebCore::GraphicsLayer
+ virtual void setNeedsDisplay() OVERRIDE;
+ virtual void setNeedsDisplayInRect(const WebCore::FloatRect&) OVERRIDE;
+
+ RemoteLayerTreeController* m_controller;
+};
+
+} // namespace WebKit
+
+#endif // RemoteGraphicsLayer_h
Copied: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm (from rev 133831, trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.mm) (0 => 133833)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.mm 2012-11-08 02:52:49 UTC (rev 133833)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2012 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 "RemoteGraphicsLayer.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+PassOwnPtr<GraphicsLayer> RemoteGraphicsLayer::create(GraphicsLayerClient* client, RemoteLayerTreeController* controller)
+{
+ return adoptPtr(new RemoteGraphicsLayer(client, controller));
+}
+
+RemoteGraphicsLayer::RemoteGraphicsLayer(GraphicsLayerClient* client, RemoteLayerTreeController* controller)
+ : GraphicsLayer(client)
+ , m_controller(controller)
+{
+}
+
+RemoteGraphicsLayer::~RemoteGraphicsLayer()
+{
+}
+
+void RemoteGraphicsLayer::setNeedsDisplay()
+{
+ FloatRect hugeRect(-std::numeric_limits<float>::max() / 2, -std::numeric_limits<float>::max() / 2,
+ std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
+ setNeedsDisplayInRect(hugeRect);
+}
+
+void RemoteGraphicsLayer::setNeedsDisplayInRect(const FloatRect&)
+{
+ // FIXME: Implement this.
+}
+
+} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.h (133832 => 133833)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.h 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.h 2012-11-08 02:52:49 UTC (rev 133833)
@@ -26,17 +26,20 @@
#ifndef RemoteLayerTree_h
#define RemoteLayerTree_h
-#include <wtf/PassOwnPtr.h>
+#include <WebCore/GraphicsLayerFactory.h>
namespace WebKit {
-class RemoteLayerTreeController {
+class RemoteLayerTreeController : public WebCore::GraphicsLayerFactory {
public:
static PassOwnPtr<RemoteLayerTreeController> create();
~RemoteLayerTreeController();
private:
RemoteLayerTreeController();
+
+ // WebCore::GraphicsLayerFactory
+ virtual PassOwnPtr<WebCore::GraphicsLayer> createGraphicsLayer(WebCore::GraphicsLayerClient*) OVERRIDE;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.mm (133832 => 133833)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.mm 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeController.mm 2012-11-08 02:52:49 UTC (rev 133833)
@@ -26,6 +26,11 @@
#import "config.h"
#import "RemoteLayerTreeController.h"
+#import "RemoteGraphicsLayer.h"
+#import <wtf/PassOwnPtr.h>
+
+using namespace WebCore;
+
namespace WebKit {
PassOwnPtr<RemoteLayerTreeController> RemoteLayerTreeController::create()
@@ -41,4 +46,9 @@
{
}
+PassOwnPtr<GraphicsLayer> RemoteLayerTreeController::createGraphicsLayer(GraphicsLayerClient* client)
+{
+ return RemoteGraphicsLayer::create(client, this);
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (133832 => 133833)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2012-11-08 02:52:49 UTC (rev 133833)
@@ -45,6 +45,7 @@
virtual void setNeedsDisplay(const WebCore::IntRect&) OVERRIDE;
virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset) OVERRIDE;
+ virtual WebCore::GraphicsLayerFactory* graphicsLayerFactory() OVERRIDE;
virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) OVERRIDE;
virtual void scheduleCompositingLayerFlush() OVERRIDE;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (133832 => 133833)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2012-11-08 02:52:48 UTC (rev 133832)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2012-11-08 02:52:49 UTC (rev 133833)
@@ -55,6 +55,11 @@
{
}
+GraphicsLayerFactory* RemoteLayerTreeDrawingArea::graphicsLayerFactory()
+{
+ return m_remoteLayerTreeController.get();
+}
+
void RemoteLayerTreeDrawingArea::setRootCompositingLayer(GraphicsLayer*)
{
}
