Changeset 135287 in webkit

Timestamp:

Nov 20, 2012 9:14:24 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[WTR] WebKitTestRunner should be able to run tests using fixed layout
​https://bugs.webkit.org/show_bug.cgi?id=102517

Patch by Thiago Marcos P. Santos <​thiago.santos@intel.com> on 2012-11-20
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Update EFL private API so we can create a view with fixed layout. We
can keep this as private as I don't see a real life use case for it
outside WTR and the WebInspector.

• UIProcess/API/C/efl/WKView.cpp:

(WKViewCreate):
(WKViewCreateWithFixedLayout):

• UIProcess/API/C/efl/WKView.h:
• UIProcess/API/efl/ewk_view.cpp:

(ewk_view_base_add):

• UIProcess/API/efl/ewk_view_private.h:
• UIProcess/efl/WebInspectorProxyEfl.cpp:

(WebKit::WebInspectorProxy::platformCreateInspectorPage):

Tools:

WTR will now request the creation of a view that has a page using
fixed layout for CSS Device Adaptation tests, but this feature might
be used in the future by any other test that requires a mobile-like type
of viewport (i.e. Viewport META tests should be ported).

The viewport type of the other tests remains unchanged and is restored
when the runner leaves the device-adapt/ folder.

• WebKitTestRunner/PlatformWebView.h:

(PlatformWebView):

• WebKitTestRunner/TestInvocation.cpp:

(WTR):
(WTR::shouldUseFixedLayout):
(WTR::updateLayoutType):
(WTR::TestInvocation::invoke):

• WebKitTestRunner/efl/PlatformWebViewEfl.cpp:

(WTR::PlatformWebView::PlatformWebView):
(WTR::PlatformWebView::viewSupportsOptions):
(WTR):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/efl/WKView.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/efl/WKView.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/efl/ewk_view.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/efl/ewk_view_private.h (modified) (1 diff)
• Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/PlatformWebView.h (modified) (2 diffs)
• Tools/WebKitTestRunner/TestInvocation.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-20  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [WTR] WebKitTestRunner should be able to run tests using fixed layout
+        https://bugs.webkit.org/show_bug.cgi?id=102517
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Update EFL private API so we can create a view with fixed layout. We
+        can keep this as private as I don't see a real life use case for it
+        outside WTR and the WebInspector.
+
+        * UIProcess/API/C/efl/WKView.cpp:
+        (WKViewCreate):
+        (WKViewCreateWithFixedLayout):
+        * UIProcess/API/C/efl/WKView.h:
+        * UIProcess/API/efl/ewk_view.cpp:
+        (ewk_view_base_add):
+        * UIProcess/API/efl/ewk_view_private.h:
+        * UIProcess/efl/WebInspectorProxyEfl.cpp:
+        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+
 2012-11-20  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebKit2/UIProcess/API/C/efl/WKView.cpp

@@ -29 +29 @@
 WKViewRef WKViewCreate(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef)
 {
-    return toAPI(ewk_view_base_add(canvas, contextRef, pageGroupRef));
+    return toAPI(ewk_view_base_add(canvas, contextRef, pageGroupRef, EwkViewImpl::LegacyBehavior));
+}
+
+WKViewRef WKViewCreateWithFixedLayout(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef)
+{
+    return toAPI(ewk_view_base_add(canvas, contextRef, pageGroupRef, EwkViewImpl::DefaultBehavior));
 }
 

trunk/Source/WebKit2/UIProcess/API/C/efl/WKView.h

@@ -31 +31 @@
 WK_EXPORT WKViewRef WKViewCreate(Evas* canvas, WKContextRef context, WKPageGroupRef pageGroup);
 
+WK_EXPORT WKViewRef WKViewCreateWithFixedLayout(Evas* canvas, WKContextRef context, WKPageGroupRef pageGroup);
+
 WK_EXPORT WKPageRef WKViewGetPage(WKViewRef view);
 

trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

@@ -522 +522 @@
  * Constructs a ewk_view Evas_Object with WKType parameters.
  */
-Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef)
-{
-    return createEwkView(canvas, createEwkViewSmartClass(), EwkContext::create(toImpl(contextRef)), pageGroupRef, EwkViewImpl::LegacyBehavior);
+Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef contextRef, WKPageGroupRef pageGroupRef, EwkViewImpl::ViewBehavior behavior)
+{
+    return createEwkView(canvas, createEwkViewSmartClass(), EwkContext::create(toImpl(contextRef)), pageGroupRef, behavior);
 }
 

trunk/Source/WebKit2/UIProcess/API/efl/ewk_view_private.h

@@ -22 +22 @@
 #define ewk_view_private_h
 
+#include "EwkViewImpl.h"
 #include <Evas.h>
 #include <WebKit2/WKBase.h>
 
-Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef, WKPageGroupRef);
+Evas_Object* ewk_view_base_add(Evas* canvas, WKContextRef, WKPageGroupRef, EwkViewImpl::ViewBehavior);
 
 #endif // ewk_view_private_h

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

@@ -99 +99 @@
         return 0;
 
-    m_inspectorView = ewk_view_base_add(ecore_evas_get(m_inspectorWindow), toAPI(page()->process()->context()), toAPI(inspectorPageGroup()));
+    m_inspectorView = ewk_view_base_add(ecore_evas_get(m_inspectorWindow), toAPI(page()->process()->context()), toAPI(inspectorPageGroup()), EwkViewImpl::LegacyBehavior);
     EwkViewImpl* inspectorViewImpl = EwkViewImpl::fromEvasObject(m_inspectorView);
     inspectorViewImpl->setThemePath(TEST_THEME_DIR "/default.edj");

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-20  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [WTR] WebKitTestRunner should be able to run tests using fixed layout
+        https://bugs.webkit.org/show_bug.cgi?id=102517
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WTR will now request the creation of a view that has a page using
+        fixed layout for CSS Device Adaptation tests, but this feature might
+        be used in the future by any other test that requires a mobile-like type
+        of viewport (i.e. Viewport META tests should be ported).
+
+        The viewport type of the other tests remains unchanged and is restored
+        when the runner leaves the device-adapt/ folder.
+
+        * WebKitTestRunner/PlatformWebView.h:
+        (PlatformWebView):
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR):
+        (WTR::shouldUseFixedLayout):
+        (WTR::updateLayoutType):
+        (WTR::TestInvocation::invoke):
+        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+        (WTR::PlatformWebView::PlatformWebView):
+        (WTR::PlatformWebView::viewSupportsOptions):
+        (WTR):
+
 2012-11-20  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/WebKitTestRunner/PlatformWebView.h

@@ -90 +90 @@
     bool windowIsKey() const { return m_windowIsKey; }
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(EFL)
     bool viewSupportsOptions(WKDictionaryRef) const;
 #else
@@ -102 +102 @@
     PlatformWindow m_window;
     bool m_windowIsKey;
+#if PLATFORM(EFL)
+    bool m_usingFixedLayout;
+#endif
 #if PLATFORM(QT)
     QEventLoop* m_modalEventLoop;

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -166 +167 @@
 }
 
+#if ENABLE(CSS_DEVICE_ADAPTATION)
+static bool shouldUseFixedLayout(const char* pathOrURL)
+{
+    return strstr(pathOrURL, "device-adapt/") || strstr(pathOrURL, "device-adapt\\");
+}
+#endif
+
+static void updateLayoutType(const char* pathOrURL)
+{
+#if ENABLE(CSS_DEVICE_ADAPTATION)
+    WKRetainPtr<WKMutableDictionaryRef> viewOptions = adoptWK(WKMutableDictionaryCreate());
+    WKRetainPtr<WKStringRef> useFixedLayoutKey = adoptWK(WKStringCreateWithUTF8CString("UseFixedLayout"));
+    WKRetainPtr<WKBooleanRef> useFixedLayoutValue = adoptWK(WKBooleanCreate(shouldUseFixedLayout(pathOrURL)));
+    WKDictionaryAddItem(viewOptions.get(), useFixedLayoutKey.get(), useFixedLayoutValue.get());
+
+    TestController::shared().ensureViewSupportsOptions(viewOptions.get());
+#else
+    UNUSED_PARAM(pathOrURL);
+#endif
+}
+
 void TestInvocation::invoke()
 {
     sizeWebViewForCurrentTest(m_pathOrURL.c_str());
+    updateLayoutType(m_pathOrURL.c_str());
     updateTiledDrawingForCurrentTest(m_pathOrURL.c_str());
 

trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Samsung Electronics
+ * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -49 +50 @@
 }
 
-PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKDictionaryRef /*options*/)
+PlatformWebView::PlatformWebView(WKContextRef context, WKPageGroupRef pageGroup, WKDictionaryRef options)
 {
+    WKRetainPtr<WKStringRef> useFixedLayoutKey(AdoptWK, WKStringCreateWithUTF8CString("UseFixedLayout"));
+    m_usingFixedLayout = options ? WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useFixedLayoutKey.get()))) : false;
+
     m_window = initEcoreEvas();
     Evas* evas = ecore_evas_get(m_window);
-    m_view = toImpl(WKViewCreate(evas, context, pageGroup));
+
+    if (m_usingFixedLayout) {
+        m_view = toImpl(WKViewCreateWithFixedLayout(evas, context, pageGroup));
+        evas_object_resize(m_view, 800, 600);
+    } else
+        m_view = toImpl(WKViewCreate(evas, context, pageGroup));
 
     ewk_view_theme_set(m_view, THEME_DIR"/default.edj");
@@ -121 +130 @@
 }
 
+bool PlatformWebView::viewSupportsOptions(WKDictionaryRef options) const
+{
+    WKRetainPtr<WKStringRef> useFixedLayoutKey(AdoptWK, WKStringCreateWithUTF8CString("UseFixedLayout"));
+
+    return m_usingFixedLayout == (options ? WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(options, useFixedLayoutKey.get()))) : false);
+}
+
 } // namespace WTR