Changeset 116461 in webkit

Timestamp:

May 8, 2012 3:50:11 PM (12 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL][DRT] WebKit/DRT should not paint webview for the pixel tests.
​https://bugs.webkit.org/show_bug.cgi?id=79853

Reviewed by Eric Seidel.

Screen buffer can be different from rendered results.
For example, WebKit/Efl just moves tiles for ewk_view_tiled when scrolling
contents.
It means that pixel tests can't check regression of ewk_view_tiled.

This patch changes a way to provide bitmap from painting webview to capturing
evas.

• DumpRenderTree/efl/PixelDumpSupportEfl.cpp:

(createBitmapContextFromWebView):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/efl/PixelDumpSupportEfl.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-08  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL][DRT] WebKit/DRT should not paint webview for the pixel tests.
+        https://bugs.webkit.org/show_bug.cgi?id=79853
+
+        Reviewed by Eric Seidel.
+
+        Screen buffer can be different from rendered results.
+        For example, WebKit/Efl just moves tiles for ewk_view_tiled when scrolling
+        contents.
+        It means that pixel tests can't check regression of ewk_view_tiled.
+
+        This patch changes a way to provide bitmap from painting webview to capturing
+        evas.
+
+        * DumpRenderTree/efl/PixelDumpSupportEfl.cpp:
+        (createBitmapContextFromWebView):
+
 2012-05-08  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
 

trunk/Tools/DumpRenderTree/efl/PixelDumpSupportEfl.cpp

@@ -38 +38 @@
 #include "RefPtrCairo.h"
 #include "WebCoreSupport/DumpRenderTreeSupportEfl.h"
-#include "ewk_private.h"
+#include <Ecore_Evas.h>
+#include <Evas.h>
 
 PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool, bool, bool, bool drawSelectionRect)
 {
-    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(browser->mainView()));
-    Ewk_View_Private_Data* privateData = static_cast<Ewk_View_Private_Data*>(smartData->_priv);
-    const Evas_Object* mainFrame = browser->mainFrame();
+    const Evas_Object* mainView = browser->mainView();
+    Evas* evas = evas_object_evas_get(mainView);
+    Ecore_Evas* ecoreEvas = ecore_evas_ecore_evas_get(evas);
 
-    int x, y, width, height;
-    if (!ewk_frame_visible_content_geometry_get(mainFrame, EINA_TRUE, &x, &y, &width, &height))
-        return 0;
+    int width, height;
+    evas_object_geometry_get(mainView, 0, 0, &width, &height);
 
-    RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height));
-    RefPtr<cairo_t> context = adoptRef(cairo_create(surface.get()));
+    const void* pixels = ecore_evas_buffer_pixels_get(ecoreEvas);
+    RefPtr<cairo_surface_t> viewSurface = adoptRef(cairo_image_surface_create_for_data(static_cast<unsigned char*>(const_cast<void*>(pixels)), CAIRO_FORMAT_ARGB32, width, height, width * 4));
 
-    const Eina_Rectangle rect = { x, y, width, height };
-    if (!ewk_view_paint(privateData, context.get(), &rect))
-        return 0;
+    RefPtr<cairo_surface_t> imageSurface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height));
+    RefPtr<cairo_t> context = adoptRef(cairo_create(imageSurface.get()));
+
+    cairo_set_source_surface(context.get(), viewSurface.get(), 0, 0);
+    cairo_paint(context.get());
 
     if (drawSelectionRect) {
+        const Evas_Object* mainFrame = browser->mainFrame();
         const WebCore::IntRect selectionRect = DumpRenderTreeSupportEfl::selectionRectangle(mainFrame);