- Revision
- 121568
- Author
- [email protected]
- Date
- 2012-06-29 09:48:06 -0700 (Fri, 29 Jun 2012)
Log Message
[GTK] Enable CSS grid layout LayoutTests on GTK+
https://bugs.webkit.org/show_bug.cgi?id=90226
Reviewed by Martin Robinson.
Source/WebKit/gtk:
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled): Pass through to Settings object.
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
(DumpRenderTreeSupportGtk):
Tools:
This feature is disabled via Settings by default, but for testing,
we enable it using layoutTestController.overridePreferences. Add the
necessary plumbing for DRT.
WTR already works because support was added for Apple Mac earlier.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues): Feature is off by default.
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::overridePreference): Add handling of WebKitCSSGridLayoutEnabled.
LayoutTests:
* platform/gtk/TestExpectations: Tests should pass.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121567 => 121568)
--- trunk/LayoutTests/ChangeLog 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/LayoutTests/ChangeLog 2012-06-29 16:48:06 UTC (rev 121568)
@@ -1,3 +1,12 @@
+2012-06-29 Tony Chang <[email protected]>
+
+ [GTK] Enable CSS grid layout LayoutTests on GTK+
+ https://bugs.webkit.org/show_bug.cgi?id=90226
+
+ Reviewed by Martin Robinson.
+
+ * platform/gtk/TestExpectations: Tests should pass.
+
2012-06-29 Stephen White <[email protected]>
Unreviewed gardening.
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (121567 => 121568)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-29 16:48:06 UTC (rev 121568)
@@ -228,10 +228,6 @@
BUGWKGTK SKIP : http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html = TEXT
BUGWKGTK SKIP : http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html = TEXT
-// CSS Grid Layout is not yet enabled.
-BUGWK60731 : fast/css-grid-layout = TEXT IMAGE
-BUGWK60731 : fast/css-grid-layout/grid-disabled-by-default.html = PASS
-
// <style scoped> is not yet enabled.
BUGWK49142 : fast/css/style-scoped = TEXT
Modified: trunk/Source/WebKit/gtk/ChangeLog (121567 => 121568)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-06-29 16:48:06 UTC (rev 121568)
@@ -1,3 +1,15 @@
+2012-06-29 Tony Chang <[email protected]>
+
+ [GTK] Enable CSS grid layout LayoutTests on GTK+
+ https://bugs.webkit.org/show_bug.cgi?id=90226
+
+ Reviewed by Martin Robinson.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled): Pass through to Settings object.
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ (DumpRenderTreeSupportGtk):
+
2012-06-29 Konrad Piascik <[email protected]>
Don't hardcode target dpi of 160 (it should be 96 on desktop)
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (121567 => 121568)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-06-29 16:48:06 UTC (rev 121568)
@@ -796,6 +796,11 @@
core(webView)->settings()->setPageCacheSupportsPlugins(enabled);
}
+void DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled(WebKitWebView* webView, bool enabled)
+{
+ core(webView)->settings()->setCSSGridLayoutEnabled(enabled);
+}
+
bool DumpRenderTreeSupportGtk::elementDoesAutoCompleteForElementWithId(WebKitWebFrame* frame, JSStringRef id)
{
Frame* coreFrame = core(frame);
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (121567 => 121568)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-06-29 16:48:06 UTC (rev 121568)
@@ -122,6 +122,7 @@
static void setHixie76WebSocketProtocolEnabled(WebKitWebView*, bool enabled);
static void setPageCacheSupportsPlugins(WebKitWebView*, bool enabled);
+ static void setCSSGridLayoutEnabled(WebKitWebView*, bool enabled);
static void deliverAllMutationsIfNecessary();
static void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const char* urlScheme);
Modified: trunk/Tools/ChangeLog (121567 => 121568)
--- trunk/Tools/ChangeLog 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/Tools/ChangeLog 2012-06-29 16:48:06 UTC (rev 121568)
@@ -1,3 +1,21 @@
+2012-06-29 Tony Chang <[email protected]>
+
+ [GTK] Enable CSS grid layout LayoutTests on GTK+
+ https://bugs.webkit.org/show_bug.cgi?id=90226
+
+ Reviewed by Martin Robinson.
+
+ This feature is disabled via Settings by default, but for testing,
+ we enable it using layoutTestController.overridePreferences. Add the
+ necessary plumbing for DRT.
+
+ WTR already works because support was added for Apple Mac earlier.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues): Feature is off by default.
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::overridePreference): Add handling of WebKitCSSGridLayoutEnabled.
+
2012-06-29 Ádám Kallai <[email protected]>
[Qt] Added Qt port for garden-o-matic.
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (121567 => 121568)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-06-29 16:48:06 UTC (rev 121568)
@@ -473,6 +473,7 @@
DumpRenderTreeSupportGtk::resetGeolocationClientMock(webView);
DumpRenderTreeSupportGtk::setHixie76WebSocketProtocolEnabled(webView, true);
+ DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled(webView, false);
}
static bool useLongRunningServerMode(int argc, char *argv[])
Modified: trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (121567 => 121568)
--- trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-06-29 16:01:12 UTC (rev 121567)
+++ trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-06-29 16:48:06 UTC (rev 121568)
@@ -807,6 +807,9 @@
} else if (g_str_equal(originalName.get(), "WebKitPageCacheSupportsPluginsPreferenceKey")) {
DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins(webkit_web_frame_get_web_view(mainFrame), booleanFromValue(valueAsString.get()));
return;
+ } else if (g_str_equal(originalName.get(), "WebKitCSSGridLayoutEnabled")) {
+ DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled(webkit_web_frame_get_web_view(mainFrame), booleanFromValue(valueAsString.get()));
+ return;
} else {
fprintf(stderr, "LayoutTestController::overridePreference tried to override "
"unknown preference '%s'.\n", originalName.get());
