projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a1640f)
[Qt] REGRESSION(r108108): It made 3 fast/repaint tests fail
authormihnea@adobe.com <mihnea@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Feb 2012 16:29:33 +0000 (16:29 +0000)
committermihnea@adobe.com <mihnea@adobe.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Feb 2012 16:29:33 +0000 (16:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=78960

Reviewed by Csaba Osztrogonác.

Source/WebKit/qt:

* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):
(QWebSettings::QWebSettings):
* Api/qwebsettings.h:

Tools:

* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::overridePreference):

LayoutTests:

* fast/repaint/japanese-rl-selection-repaint-in-regions.html:
* fast/repaint/line-flow-with-floats-in-regions.html:
* fast/repaint/overflow-flipped-writing-mode-block-in-regions.html:
* fast/repaint/region-painting-invalidation.html:
* fast/repaint/region-painting-via-layout.html:
* platform/qt/Skipped:

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

12 files changed:
LayoutTests/ChangeLog patch | blob | history
LayoutTests/fast/repaint/japanese-rl-selection-repaint-in-regions.html patch | blob | history
LayoutTests/fast/repaint/line-flow-with-floats-in-regions.html patch | blob | history
LayoutTests/fast/repaint/overflow-flipped-writing-mode-block-in-regions.html patch | blob | history
LayoutTests/fast/repaint/region-painting-invalidation.html patch | blob | history
LayoutTests/fast/repaint/region-painting-via-layout.html patch | blob | history
LayoutTests/platform/qt/Skipped patch | blob | history
Source/WebKit/qt/Api/qwebsettings.cpp patch | blob | history
Source/WebKit/qt/Api/qwebsettings.h patch | blob | history
Source/WebKit/qt/ChangeLog patch | blob | history
Tools/ChangeLog patch | blob | history
Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0153305..085af0d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-22  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [Qt] REGRESSION(r108108): It made 3 fast/repaint tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=78960
+
+        Reviewed by Csaba Osztrogonác.
+
+        * fast/repaint/japanese-rl-selection-repaint-in-regions.html:
+        * fast/repaint/line-flow-with-floats-in-regions.html:
+        * fast/repaint/overflow-flipped-writing-mode-block-in-regions.html:
+        * fast/repaint/region-painting-invalidation.html:
+        * fast/repaint/region-painting-via-layout.html:
+        * platform/qt/Skipped:
+
 2012-02-22  Eric Carlson  <eric.carlson@apple.com>
 
         [Chromium] video-referer.html fails
diff --git a/LayoutTests/fast/repaint/japanese-rl-selection-repaint-in-regions.html b/LayoutTests/fast/repaint/japanese-rl-selection-repaint-in-regions.html
index 19917cf..11f09fc 100644 (file)
--- a/LayoutTests/fast/repaint/japanese-rl-selection-repaint-in-regions.html
+++ b/LayoutTests/fast/repaint/japanese-rl-selection-repaint-in-regions.html
@@ -2,6 +2,10 @@
 <html style="border:10px solid maroon; -webkit-writing-mode:vertical-rl">
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<script>
+    if (window.layoutTestController)
+        window.layoutTestController.overridePreference("WebKitCSSRegionsEnabled", "1");
+</script>
 <script src="resources/repaint.js"></script>
 <script>
 function repaintTest()
diff --git a/LayoutTests/fast/repaint/line-flow-with-floats-in-regions.html b/LayoutTests/fast/repaint/line-flow-with-floats-in-regions.html
index b4864c6..5ef487b 100644 (file)
--- a/LayoutTests/fast/repaint/line-flow-with-floats-in-regions.html
+++ b/LayoutTests/fast/repaint/line-flow-with-floats-in-regions.html
@@ -1,4 +1,8 @@
 <body style="margin: 0;" onload="loaded()">
+    <script>
+        if (window.layoutTestController)
+            window.layoutTestController.overridePreference("WebKitCSSRegionsEnabled", "1");
+    </script>
     <script src="resources/line-flow-with-floats.js"></script>
     <script>
         function test(doc)
diff --git a/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block-in-regions.html b/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block-in-regions.html
index fb1379b..a8aa579 100644 (file)
--- a/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block-in-regions.html
+++ b/LayoutTests/fast/repaint/overflow-flipped-writing-mode-block-in-regions.html
@@ -1,5 +1,7 @@
 <script src="resources/repaint.js"></script>
 <script>
+    if (window.layoutTestController)
+        window.layoutTestController.overridePreference("WebKitCSSRegionsEnabled", "1");
     onload = runRepaintTest;
 
     function repaintTest()
diff --git a/LayoutTests/fast/repaint/region-painting-invalidation.html b/LayoutTests/fast/repaint/region-painting-invalidation.html
index a60b090..685a496 100644 (file)
--- a/LayoutTests/fast/repaint/region-painting-invalidation.html
+++ b/LayoutTests/fast/repaint/region-painting-invalidation.html
@@ -1,6 +1,10 @@
 <html>
 <head>
 <title>Test for https://bugs.webkit.org/show_bug.cgi?id=78787</title>
+<script>
+    if (window.layoutTestController)
+        window.layoutTestController.overridePreference("WebKitCSSRegionsEnabled", "1");
+</script>
 <style type="text/css">
 #content {
     -webkit-flow-into: flow1;
diff --git a/LayoutTests/fast/repaint/region-painting-via-layout.html b/LayoutTests/fast/repaint/region-painting-via-layout.html
index 2e2df3a..4b65d27 100644 (file)
--- a/LayoutTests/fast/repaint/region-painting-via-layout.html
+++ b/LayoutTests/fast/repaint/region-painting-via-layout.html
@@ -1,6 +1,10 @@
 <html>
 <head>
 <title>Test for https://bugs.webkit.org/show_bug.cgi?id=69932</title>
+<script>
+    if (window.layoutTestController)
+        window.layoutTestController.overridePreference("WebKitCSSRegionsEnabled", "1");
+</script>
 <style type="text/css">
 #content {
     -webkit-flow-into: flow1;
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 5ef2cba..05db365 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2629,12 +2629,6 @@ http/tests/navigation/https-in-page-cache.html
 # https://bugs.webkit.org/show_bug.cgi?id=76564
 fast/workers/worker-crash-with-invalid-location.html
 
-# [Qt] REGRESSION(r108108): It made 3 fast/repaint tests fail
-# https://bugs.webkit.org/show_bug.cgi?id=78960
-fast/repaint/line-flow-with-floats-in-regions.html
-fast/repaint/overflow-flipped-writing-mode-block-in-regions.html
-fast/repaint/region-painting-via-layout.html
-
 # [Qt] REGRESSION(r108112): sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.2_decodeURIComponent/S15.1.3.2_A1.2_T2.html crashes intermittently
 # https://bugs.webkit.org/show_bug.cgi?id=79029
 sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.2_decodeURIComponent/S15.1.3.2_A1.2_T2.html
diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp
index 89e9821..2885f01 100644 (file)
--- a/Source/WebKit/qt/Api/qwebsettings.cpp
+++ b/Source/WebKit/qt/Api/qwebsettings.cpp
@@ -171,6 +171,10 @@ void QWebSettingsPrivate::apply()
 #endif
 #endif
 
+        value = attributes.value(QWebSettings::CSSRegionsEnabled,
+                                 global->attributes.value(QWebSettings::CSSRegionsEnabled));
+        settings->setCSSRegionsEnabled(value);
+
         value = attributes.value(QWebSettings::HyperlinkAuditingEnabled,
                                  global->attributes.value(QWebSettings::HyperlinkAuditingEnabled));
 
@@ -515,6 +519,7 @@ QWebSettings::QWebSettings()
     d->attributes.insert(QWebSettings::LocalContentCanAccessFileUrls, true);
     d->attributes.insert(QWebSettings::AcceleratedCompositingEnabled, true);
     d->attributes.insert(QWebSettings::WebGLEnabled, false);
+    d->attributes.insert(QWebSettings::CSSRegionsEnabled, false);
     d->attributes.insert(QWebSettings::HyperlinkAuditingEnabled, false);
     d->attributes.insert(QWebSettings::TiledBackingStoreEnabled, false);
     d->attributes.insert(QWebSettings::FrameFlatteningEnabled, false);
diff --git a/Source/WebKit/qt/Api/qwebsettings.h b/Source/WebKit/qt/Api/qwebsettings.h
index 40f7f73..136ee8d 100644 (file)
--- a/Source/WebKit/qt/Api/qwebsettings.h
+++ b/Source/WebKit/qt/Api/qwebsettings.h
@@ -81,6 +81,7 @@ public:
         SiteSpecificQuirksEnabled,
         JavascriptCanCloseWindows,
         WebGLEnabled,
+        CSSRegionsEnabled,
         HyperlinkAuditingEnabled
     };
     enum WebGraphic {
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 877ab62..0f4913f 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2012-02-22  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [Qt] REGRESSION(r108108): It made 3 fast/repaint tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=78960
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        (QWebSettings::QWebSettings):
+        * Api/qwebsettings.h:
+
 2012-02-22  Simon Hausmann  <simon.hausmann@nokia.com>
 
         [Qt] Move QMenu dependant scrollbar context menu handling out of WebCore
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 88e1fcb..05afaf5 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-22  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [Qt] REGRESSION(r108108): It made 3 fast/repaint tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=78960
+
+        Reviewed by Csaba Osztrogonác.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::overridePreference):
+
 2012-02-22  Hao Zheng  <zhenghao@chromium.org>
 
         [chromium] Build WebKit with MEDIA_STREAM disabled.
diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 5e8d651..66fdf1e 100644 (file)
--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -692,6 +692,8 @@ void LayoutTestController::overridePreference(const QString& name, const QVarian
         settings->setAttribute(QWebSettings::PluginsEnabled, value.toBool());
     else if (name == "WebKitWebGLEnabled")
         settings->setAttribute(QWebSettings::WebGLEnabled, value.toBool());
+    else if (name == "WebKitCSSRegionsEnabled")
+        settings->setAttribute(QWebSettings::CSSRegionsEnabled, value.toBool());
     else if (name == "WebKitHyperlinkAuditingEnabled")
         settings->setAttribute(QWebSettings::HyperlinkAuditingEnabled, value.toBool());
     else if (name == "WebKitHixie76WebSocketProtocolEnabled")
Domain: Web Framework / Uncategorized;