Title: [122467] trunk
- Revision
- 122467
- Author
- commit-qu...@webkit.org
- Date
- 2012-07-12 09:01:01 -0700 (Thu, 12 Jul 2012)
Log Message
[GTK] Implement disableImageLoading in DRT
https://bugs.webkit.org/show_bug.cgi?id=87973
Patch by Arnaud Renevier <a...@renevier.net> on 2012-07-12
Reviewed by Martin Robinson.
Tools:
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::disableImageLoading):
LayoutTests:
Add TEXT expectation to favicon-loads-with-icon-loading-override.html
which was only working by accident.
* platform/gtk/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (122466 => 122467)
--- trunk/LayoutTests/ChangeLog 2012-07-12 15:59:49 UTC (rev 122466)
+++ trunk/LayoutTests/ChangeLog 2012-07-12 16:01:01 UTC (rev 122467)
@@ -1,3 +1,15 @@
+2012-07-12 Arnaud Renevier <a...@renevier.net>
+
+ [GTK] Implement disableImageLoading in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=87973
+
+ Reviewed by Martin Robinson.
+
+ Add TEXT expectation to favicon-loads-with-icon-loading-override.html
+ which was only working by accident.
+
+ * platform/gtk/TestExpectations:
+
2012-07-12 Adam Barth <aba...@webkit.org>
Parse the viewport meta tag like iOS
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (122466 => 122467)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-07-12 15:59:49 UTC (rev 122466)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-07-12 16:01:01 UTC (rev 122467)
@@ -1210,7 +1210,7 @@
BUGWK87088 : fast/js/names.html = TEXT
-BUGWK87973 : http/tests/misc/favicon-loads-with-images-disabled.html = TEXT
+BUGWKGTK : http/tests/misc/favicon-loads-with-icon-loading-override.html = TEXT
BUGWK84102 : fast/profiler/dead-time.html = TEXT
BUGWK84102 : fast/profiler/stop-profiling-after-setTimeout.html = TEXT
Modified: trunk/Tools/ChangeLog (122466 => 122467)
--- trunk/Tools/ChangeLog 2012-07-12 15:59:49 UTC (rev 122466)
+++ trunk/Tools/ChangeLog 2012-07-12 16:01:01 UTC (rev 122467)
@@ -1,3 +1,15 @@
+2012-07-12 Arnaud Renevier <a...@renevier.net>
+
+ [GTK] Implement disableImageLoading in DRT
+ https://bugs.webkit.org/show_bug.cgi?id=87973
+
+ Reviewed by Martin Robinson.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::disableImageLoading):
+
2012-07-12 Simon Hausmann <simon.hausm...@nokia.com>
[Qt] Internal symbols are exported on Linux
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (122466 => 122467)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-07-12 15:59:49 UTC (rev 122466)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-07-12 16:01:01 UTC (rev 122467)
@@ -464,6 +464,7 @@
"enable-caret-browsing", FALSE,
"enable-page-cache", FALSE,
"auto-resize-window", TRUE,
+ "auto-load-images", TRUE,
"enable-java-applet", FALSE,
"enable-plugins", TRUE,
"enable-hyperlink-auditing", FALSE,
Modified: trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (122466 => 122467)
--- trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-07-12 15:59:49 UTC (rev 122466)
+++ trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-07-12 16:01:01 UTC (rev 122467)
@@ -449,8 +449,11 @@
void LayoutTestController::disableImageLoading()
{
- // FIXME: Implement for testing fix for https://bugs.webkit.org/show_bug.cgi?id=27896
- // Also need to make sure image loading is re-enabled for each new test.
+ WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+ ASSERT(view);
+
+ WebKitWebSettings* settings = webkit_web_view_get_settings(view);
+ g_object_set(G_OBJECT(settings), "auto-load-images", FALSE, NULL);
}
void LayoutTestController::setMockDeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
