Title: [133724] trunk/Source/WebKit2
- Revision
- 133724
- Author
- [email protected]
- Date
- 2012-11-06 22:46:00 -0800 (Tue, 06 Nov 2012)
Log Message
Move DrawingAreaImpl methods graphicsLayerFactory, setRootCompositingLayer & scheduleCompositingLayerSync under ACCELERATED_COMPOSITING
https://bugs.webkit.org/show_bug.cgi?id=101427
Patch by Vivek Galatage <[email protected]> on 2012-11-06
Reviewed by Anders Carlsson.
Moving these methods under the ACCELERATED_COMPOSITING flag.
This fixes broken wincairo due to use of override specifier.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit):
* WebProcess/WebPage/DrawingAreaImpl.h:
(DrawingAreaImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (133723 => 133724)
--- trunk/Source/WebKit2/ChangeLog 2012-11-07 06:31:20 UTC (rev 133723)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-07 06:46:00 UTC (rev 133724)
@@ -1,3 +1,18 @@
+2012-11-06 Vivek Galatage <[email protected]>
+
+ Move DrawingAreaImpl methods graphicsLayerFactory, setRootCompositingLayer & scheduleCompositingLayerSync under ACCELERATED_COMPOSITING
+ https://bugs.webkit.org/show_bug.cgi?id=101427
+
+ Reviewed by Anders Carlsson.
+
+ Moving these methods under the ACCELERATED_COMPOSITING flag.
+ This fixes broken wincairo due to use of override specifier.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit):
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ (DrawingAreaImpl):
+
2012-11-06 Viatcheslav Ostapenko <[email protected]>
[EFL][WK2] API test crash with accelerated compositing on.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (133723 => 133724)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-11-07 06:31:20 UTC (rev 133723)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-11-07 06:46:00 UTC (rev 133724)
@@ -307,6 +307,7 @@
#endif
}
+#if USE(ACCELERATED_COMPOSITING)
GraphicsLayerFactory* DrawingAreaImpl::graphicsLayerFactory()
{
if (m_layerTreeHost)
@@ -361,6 +362,7 @@
return;
m_layerTreeHost->scheduleLayerFlush();
}
+#endif
void DrawingAreaImpl::updateBackingStoreState(uint64_t stateID, bool respondImmediately, float deviceScaleFactor, const WebCore::IntSize& size, const WebCore::IntSize& scrollOffset)
{
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (133723 => 133724)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2012-11-07 06:31:20 UTC (rev 133723)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2012-11-07 06:46:00 UTC (rev 133724)
@@ -68,9 +68,11 @@
virtual void setPaintingEnabled(bool);
virtual void updatePreferences(const WebPreferencesStore&) OVERRIDE;
+#if USE(ACCELERATED_COMPOSITING)
virtual WebCore::GraphicsLayerFactory* graphicsLayerFactory() OVERRIDE;
virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) OVERRIDE;
virtual void scheduleCompositingLayerFlush() OVERRIDE;
+#endif
#if PLATFORM(WIN)
virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
