[EFL] Many of the css3/device-adapt/* tests failed after r188548.

https://bugs.webkit.org/show_bug.cgi?id=148927

Patch by Hunseop Jeong <hs85.jeong@samsung.com> on 2015-09-07
Reviewed by Csaba Osztrogonác.

device-adapt/* tests need the fixedLayout option but useFixedLayout option is
overwritten by updatePlatformSpecificViewOptionsForTest after r188548.

* WebKitTestRunner/TestController.cpp:
(WTR::shouldUseFixedLayout): Removed the unnecessary indentations.
* WebKitTestRunner/efl/TestControllerEfl.cpp:
(WTR::shouldUseFixedLayout): Return true if the test is related with 'device-adapt'.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189464 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 24796dc..674f868 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2015-09-07  Hunseop Jeong  <hs85.jeong@samsung.com>
+
+        [EFL] Many of the css3/device-adapt/* tests failed after r188548.
+        https://bugs.webkit.org/show_bug.cgi?id=148927
+
+        Reviewed by Csaba Osztrogonác.
+
+        device-adapt/* tests need the fixedLayout option but useFixedLayout option is
+        overwritten by updatePlatformSpecificViewOptionsForTest after r188548.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::shouldUseFixedLayout): Removed the unnecessary indentations.
+        * WebKitTestRunner/efl/TestControllerEfl.cpp:
+        (WTR::shouldUseFixedLayout): Return true if the test is related with 'device-adapt'.
+
 2015-09-07  Andy Estes  <aestes@apple.com>
 
         Fix the Production build after r189455.

diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index aaefa1c..a6460aa 100644 (file)
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -789,8 +789,8 @@ const char* TestController::networkProcessName()
 static bool shouldUseFixedLayout(const TestInvocation& test)
 {
 #if ENABLE(CSS_DEVICE_ADAPTATION)
-        if (test.urlContains("device-adapt/") || test.urlContains("device-adapt\\"))
-            return true;
+    if (test.urlContains("device-adapt/") || test.urlContains("device-adapt\\"))
+        return true;
 #endif
 
     return false;

diff --git a/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp b/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp
index 69d20df..26741f5 100644 (file)
--- a/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp
+++ b/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp
@@ -136,6 +136,11 @@ const char* TestController::platformLibraryPathForTesting()
 
 static bool shouldUseFixedLayout(const TestInvocation& test)
 {
+#if ENABLE(CSS_DEVICE_ADAPTATION)
+    if (test.urlContains("device-adapt/") || test.urlContains("device-adapt\\"))
+        return true;
+#endif
+
 #if USE(COORDINATED_GRAPHICS)
     if (test.urlContains("sticky/") || test.urlContains("sticky\\"))
         return true;