Title: [147776] trunk/Source/WebKit2
- Revision
- 147776
- Author
- [email protected]
- Date
- 2013-04-05 12:27:11 -0700 (Fri, 05 Apr 2013)
Log 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 <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147775 => 147776)
--- trunk/Source/WebKit2/ChangeLog 2013-04-05 19:24:05 UTC (rev 147775)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-05 19:27:11 UTC (rev 147776)
@@ -1,3 +1,18 @@
+2013-04-05 Ed Bartosh <[email protected]>
+
+ [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 <[email protected]>
Allow the Web Inspector to use WebSQL.
Modified: trunk/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp (147775 => 147776)
--- trunk/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp 2013-04-05 19:24:05 UTC (rev 147775)
+++ trunk/Source/WebKit2/UIProcess/API/CoordinatedGraphics/WKCoordinatedScene.cpp 2013-04-05 19:27:11 UTC (rev 147776)
@@ -26,6 +26,8 @@
*/
#include "config.h"
+#if USE(COORDINATED_GRAPHICS)
+
#include "WKCoordinatedScene.h"
#include "WKCoordinatedSceneAPICast.h"
@@ -47,3 +49,4 @@
{
toImpl(layer)->scrollBy(WebCore::FloatSize(offset.width, offset.height));
}
+#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/WebView.cpp (147775 => 147776)
--- trunk/Source/WebKit2/UIProcess/efl/WebView.cpp 2013-04-05 19:24:05 UTC (rev 147775)
+++ trunk/Source/WebKit2/UIProcess/efl/WebView.cpp 2013-04-05 19:27:11 UTC (rev 147776)
@@ -94,8 +94,10 @@
void WebView::initialize()
{
m_page->initializeWebPage();
+#if USE(COORDINATED_GRAPHICS)
if (CoordinatedGraphicsScene* scene = coordinatedGraphicsScene())
scene->setActive(true);
+#endif
}
void WebView::setSize(const WebCore::IntSize& size)
@@ -133,6 +135,7 @@
return m_userViewportTransform.mapPoint(point);
}
+#if USE(COORDINATED_GRAPHICS)
void WebView::paintToCurrentGLContext()
{
CoordinatedGraphicsScene* scene = coordinatedGraphicsScene();
@@ -145,13 +148,15 @@
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));
const FloatPoint& position = contentPosition();
@@ -159,8 +164,9 @@
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
}
Evas_Object* WebView::evasObject()
@@ -256,6 +262,7 @@
return transform.toAffineTransform();
}
+#if USE(COORDINATED_GRAPHICS)
CoordinatedGraphicsScene* WebView::coordinatedGraphicsScene()
{
DrawingAreaProxy* drawingArea = m_page->drawingArea();
@@ -268,6 +275,7 @@
return layerTreeHostProxy->coordinatedGraphicsScene();
}
+#endif
void WebView::updateViewportSize()
{
@@ -436,6 +444,7 @@
notImplemented();
}
+#if USE(COORDINATED_GRAPHICS)
void WebView::enterAcceleratedCompositingMode(const LayerTreeContext&)
{
if (CoordinatedGraphicsScene* scene = coordinatedGraphicsScene())
@@ -447,6 +456,7 @@
if (CoordinatedGraphicsScene* scene = coordinatedGraphicsScene())
scene->setActive(false);
}
+#endif
void WebView::updateAcceleratedCompositingMode(const LayerTreeContext&)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
