Changeset 147776 in webkit

Timestamp:

Apr 5, 2013 12:27:11 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] --no-tiled-backing-store build fails because of not used #if USE(COORDINATED_GRAPHICS)
​https://bugs.webkit.org/show_bug.cgi?id=113629

Patch by Ed Bartosh <​bartosh@gmail.com> on 2013-04-05
Reviewed by Simon Fraser.

Wrapped code related to coordinated graphics with #if USE(COORDINATED_GRAPHICS)

• UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:
• UIProcess/efl/WebView.cpp:

(WebKit::WebView::initialize):
(WebKit):
(WebKit::WebView::paintToCairoSurface):
(WebKit::WebView::updateViewportSize):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp (modified) (2 diffs)
• UIProcess/efl/WebView.cpp (modified) (8 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-05  Ed Bartosh  <bartosh@gmail.com>
+
+        [EFL][WK2] --no-tiled-backing-store build fails because of not used #if USE(COORDINATED_GRAPHICS)
+        https://bugs.webkit.org/show_bug.cgi?id=113629
+
+        Reviewed by Simon Fraser.
+
+        Wrapped code related to coordinated graphics with #if USE(COORDINATED_GRAPHICS)
+        * UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp:
+        * UIProcess/efl/WebView.cpp:
+        (WebKit::WebView::initialize):
+        (WebKit):
+        (WebKit::WebView::paintToCairoSurface):
+        (WebKit::WebView::updateViewportSize):
+
 2013-04-05  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp

@@ -27 +27 @@
 
 #include "config.h"
+#if USE(COORDINATED_GRAPHICS)
+
 #include "WKCoordinatedScene.h"
 
@@ -48 +50 @@
     toImpl(layer)->scrollBy(WebCore::FloatSize(offset.width, offset.height));
 }
+#endif

trunk/Source/WebKit2/UIProcess/efl/WebView.cpp

@@ -95 +95 @@
 {
     m_page->initializeWebPage();
+#if USE(COORDINATED_GRAPHICS)
     if (CoordinatedGraphicsScene* scene = coordinatedGraphicsScene())
         scene->setActive(true);
+#endif
 }
 
@@ -134 +136 @@
 }
 
+#if USE(COORDINATED_GRAPHICS)
 void WebView::paintToCurrentGLContext()
 {
@@ -146 +149 @@
     scene->paintToCurrentGLContext(transformToScene().toTransformationMatrix(), /* opacity */ 1, viewport);
 }
+#endif
 
 void WebView::paintToCairoSurface(cairo_surface_t* surface)
 {
+#if USE(COORDINATED_GRAPHICS)
     CoordinatedGraphicsScene* scene = coordinatedGraphicsScene();
     if (!scene)
         return;
-
+#endif
     PlatformContextCairo context(cairo_create(surface));
 
@@ -160 +165 @@
     cairo_matrix_t transform = { effectiveScale, 0, 0, effectiveScale, - position.x() * m_page->deviceScaleFactor(), - position.y() * m_page->deviceScaleFactor() };
     cairo_set_matrix(context.cr(), &transform);
-
+#if USE(COORDINATED_GRAPHICS)
     scene->paintToGraphicsContext(&context);
+#endif
 }
 
@@ -257 +263 @@
 }
 
+#if USE(COORDINATED_GRAPHICS)
 CoordinatedGraphicsScene* WebView::coordinatedGraphicsScene()
 {
@@ -269 +276 @@
     return layerTreeHostProxy->coordinatedGraphicsScene();
 }
+#endif
 
 void WebView::updateViewportSize()
@@ -437 +445 @@
 }
 
+#if USE(COORDINATED_GRAPHICS)
 void WebView::enterAcceleratedCompositingMode(const LayerTreeContext&)
 {
@@ -448 +457 @@
         scene->setActive(false);
 }
+#endif
 
 void WebView::updateAcceleratedCompositingMode(const LayerTreeContext&)