Changeset 77971 in webkit

Timestamp:

Feb 8, 2011 2:25:36 PM (13 years ago)

Author:

Martin Robinson

Message:

2011-02-08 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] DRT needs an implementation of LayoutTestController.setIconDatabaseEnabled
​https://bugs.webkit.org/show_bug.cgi?id=54033

• platform/gtk/Skipped: Unskip a test that is now passing.

2011-02-08 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] DRT needs an implementation of LayoutTestController.setIconDatabaseEnabled
​https://bugs.webkit.org/show_bug.cgi?id=54033

Add a DumpRenderTreeSupportGtk method for turning the icon database on and off.
This is a likely candidate for a new API point.

• WebCoreSupport/DumpRenderTreeSupportGtk.cpp: (DumpRenderTreeSupportGtk::setIconDatabaseEnabled): Added.
• WebCoreSupport/DumpRenderTreeSupportGtk.h:
• webkit/webkitglobals.cpp: (webkitInit): Call setIconDatabaseEnabled(true) on startup, instead of initializing the database manually. (WebKit::setIconDatabaseEnabled): Added.
• webkit/webkitglobalsprivate.h: Added declarations.

2011-02-08 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] DRT needs an implementation of LayoutTestController.setIconDatabaseEnabled
​https://bugs.webkit.org/show_bug.cgi?id=54033

Add an implementation of LayoutTestController.setIconDatabaseEnabled that just
call DumpRenderTreeSupportGtk. Turn off the icon database between tests.

• DumpRenderTree/gtk/DumpRenderTree.cpp: (resetDefaultsToConsistentValues): Turn off the icon database.
• DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: (LayoutTestController::setIconDatabaseEnabled): Call the appropriate DumpRenderTreeSupportGtk method.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (modified) (2 diffs)
• Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (modified) (1 diff)
• Source/WebKit/gtk/webkit/webkitglobals.cpp (modified) (2 diffs)
• Source/WebKit/gtk/webkit/webkitglobalsprivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (1 diff)
• Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-08  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] DRT needs an implementation of LayoutTestController.setIconDatabaseEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=54033
+
+        * platform/gtk/Skipped: Unskip a test that is now passing.
+
 2011-02-08  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -4647 +4647 @@
 fast/frames/set-parent-src-synchronously.html
 fast/frames/sandboxed-iframe-storage.html
-
-# GTK+ DRT should support enabling and disabling the icon database
-http/tests/inspector/resource-har-conversion.html

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-02-08  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] DRT needs an implementation of LayoutTestController.setIconDatabaseEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=54033
+
+        Add a DumpRenderTreeSupportGtk method for turning the icon database on and off.
+        This is a likely candidate for a new API point.
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+        (DumpRenderTreeSupportGtk::setIconDatabaseEnabled): Added.
+        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+        * webkit/webkitglobals.cpp:
+        (webkitInit): Call setIconDatabaseEnabled(true) on startup, instead
+        of initializing the database manually.
+        (WebKit::setIconDatabaseEnabled): Added.
+        * webkit/webkitglobalsprivate.h: Added declarations.
+
 2011-02-08  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

@@ -51 +51 @@
 #include "TextIterator.h"
 #include "WorkerThread.h"
+#include "webkitglobalsprivate.h"
 #include "webkitwebframe.h"
 #include "webkitwebframeprivate.h"
@@ -94 +95 @@
 {
     return s_linksIncludedInTabChain;
+}
+
+void DumpRenderTreeSupportGtk::setIconDatabaseEnabled(bool enabled)
+{
+    WebKit::setIconDatabaseEnabled(enabled);
 }
 

trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

@@ -54 +54 @@
     static void setLinksIncludedInFocusChain(bool);
     static bool linksIncludedInFocusChain();
+    static void setIconDatabaseEnabled(bool);
     static JSValueRef nodesFromRect(JSContextRef context, JSValueRef value, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
     static void dumpConfigurationForViewport(WebKitWebView* webView, gint availableWidth, gint availableHeight);

trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp

@@ -259 +259 @@
 
     Pasteboard::generalPasteboard()->setHelper(WebKit::pasteboardHelperInstance());
-
-    iconDatabase()->setEnabled(true);
-
-    GOwnPtr<gchar> iconDatabasePath(g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL));
-    iconDatabase()->open(iconDatabasePath.get());
-
-    atexit(closeIconDatabaseOnExit);
+    WebKit::setIconDatabaseEnabled(true);
 
     SoupSession* session = webkit_get_default_session();
@@ -289 +283 @@
 }
 
+void setIconDatabaseEnabled(bool enabled)
+{
+    static bool initialized = false;
+    if (enabled && !initialized) {
+        initialized = true;
+        atexit(closeIconDatabaseOnExit);
+    }
+
+    if (enabled) {
+        iconDatabase()->setEnabled(true);
+        GOwnPtr<gchar> iconDatabasePath(g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL));
+        iconDatabase()->open(iconDatabasePath.get());
+        return;
+    }
+
+    iconDatabase()->setEnabled(false);
+    iconDatabase()->close();
+}
+
+
 } /** end namespace WebKit */
 

trunk/Source/WebKit/gtk/webkit/webkitglobalsprivate.h

@@ -34 +34 @@
 PasteboardHelperGtk* pasteboardHelperInstance();
 
+void setIconDatabaseEnabled(bool);
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-08  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] DRT needs an implementation of LayoutTestController.setIconDatabaseEnabled
+        https://bugs.webkit.org/show_bug.cgi?id=54033
+
+        Add an implementation of LayoutTestController.setIconDatabaseEnabled that just
+        call DumpRenderTreeSupportGtk. Turn off the icon database between tests.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues): Turn off the icon database.
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setIconDatabaseEnabled): Call the appropriate DumpRenderTreeSupportGtk
+        method.
+
 2011-02-08  Kundu Suchismita  <suchi.kundu@nokia.com>
 

trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -446 +446 @@
 
     DumpRenderTreeSupportGtk::setLinksIncludedInFocusChain(true);
+    DumpRenderTreeSupportGtk::setIconDatabaseEnabled(false);
 }
 

trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

@@ -491 +491 @@
 }
 
-void LayoutTestController::setIconDatabaseEnabled(bool flag)
-{
-    // FIXME: implement
+void LayoutTestController::setIconDatabaseEnabled(bool enabled)
+{
+    DumpRenderTreeSupportGtk::setIconDatabaseEnabled(enabled);
 }