Changeset 28384 in webkit

Timestamp:

Dec 4, 2007 4:16:38 AM (16 years ago)

Author:

alp@webkit.org

Message:

2007-12-04 Xan Lopez <​xan@gnome.org>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=15561
GTK port needs DumpRenderTree implementation

Start work on the GTK+ DRT.

This does not work yet, and there are a few lingering style issues
(nothing major) but this patch has been stuck in the bug tracker for
too long already.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebKit.pro (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebView/webkitprivate.h (modified) (2 diffs)
• WebKit/gtk/WebView/webkitwebframe.cpp (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/DumpRenderTree.h (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk (added)
• WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp (added)
• WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro (added)
• WebKitTools/DumpRenderTree/gtk/DumpRenderTreeGtk.h (added)
• WebKitTools/DumpRenderTree/gtk/GCControllerGtk.cpp (added)
• WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (added)
• WebKitTools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp (added)

trunk/ChangeLog

@@ +1 @@
+2007-12-04  Xan Lopez  <xan@gnome.org>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15561
+        GTK port needs DumpRenderTree implementation
+
+        Start work on the GTK+ DRT.
+
+        * WebKit.pro:
+
 2007-11-30  Alp Toker  <alp@atoker.com>
 

trunk/WebKit.pro

@@ -15 +15 @@
 
 gtk-port:SUBDIRS += \
-        WebKitTools/GtkLauncher
+        WebKitTools/GtkLauncher \
+        WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2007-12-04  Xan Lopez  <xan@gnome.org>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15561
+        GTK port needs DumpRenderTree implementation
+
+        Start work on the GTK+ DRT.
+
+        Add a couple of proposed new API entry points. They are currently for
+        internal use only by DRT and not in the public headers.
+
+        * WebView/webkitprivate.h:
+        * WebView/webkitwebframe.cpp:
+
 2007-12-03  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKit/gtk/WebView/webkitprivate.h

@@ -36 +36 @@
  */
 
+#include "webkitdefines.h"
 #include "webkitsettings.h"
 #include "webkitwebview.h"
@@ -92 +93 @@
 
     WebKitWebFrame* webkit_web_frame_init_with_web_view(WebKitWebView*, WebCore::HTMLFrameOwnerElement*);
+
+
+    // TODO: Move these to webkitwebframe.h once these functions are fully
+    // implemented and their API has been discussed.
+
+    WEBKIT_API GSList*
+    webkit_web_frame_get_children (WebKitWebFrame* frame);
+
+    WEBKIT_API gchar*
+    webkit_web_frame_get_inner_text (WebKitWebFrame* frame);
 }
 

trunk/WebKit/gtk/WebView/webkitwebframe.cpp

@@ -386 +386 @@
 }
 
-}
+/**
+ * webkit_web_frame_get_children:
+ * @frame: a #WebKitWebFrame
+ *
+ * Return value: child frames of @frame
+ */
+GSList* webkit_web_frame_get_children(WebKitWebFrame* frame)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
+
+    GSList* children = NULL;
+    Frame* coreFrame = core(frame);
+
+    for (Frame* child = coreFrame->tree()->firstChild(); child; child = child->tree()->nextSibling()) {
+        FrameLoader* loader = child->loader();
+        WebKit::FrameLoaderClient* client = static_cast<WebKit::FrameLoaderClient*>(loader->client());
+        if (client)
+          children = g_slist_append(children, client->webFrame());
+    }
+
+    return children;
+}
+
+/**
+ * webkit_web_frame_get_inner_text:
+ * @frame: a #WebKitWebFrame
+ *
+ * Return value: inner text of @frame
+ */
+gchar* webkit_web_frame_get_inner_text(WebKitWebFrame* frame)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
+
+    Frame* coreFrame = core(frame);
+    FrameView* view = coreFrame->view();
+
+    if (view->layoutPending())
+        view->layout();
+
+    Element* documentElement = coreFrame->document()->documentElement();
+    String string =  documentElement->innerText();
+    return g_strdup(string.utf8().data());
+}
+
+}

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2007-12-04  Xan Lopez  <xan@gnome.org>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15561
+        GTK port needs DumpRenderTree implementation
+
+        Start work on the GTK+ DRT.
+
+        This does not work yet, and there are a few lingering style issues
+        (nothing major) but this patch has been stuck in the bug tracker for
+        too long already.
+
+        * DumpRenderTree/DumpRenderTree.h:
+        * DumpRenderTree/gtk: Added.
+        * DumpRenderTree/gtk/DumpRenderTree.cpp: Added.
+        (autocorrectURL):
+        (shouldLogFrameLoadDelegates):
+        (dumpFrameScrollPosition):
+        (displayWebView):
+        (appendString):
+        (dumpFramesAsText):
+        (dumpRenderTreeAsText):
+        (dump):
+        (runTest):
+        (main):
+        * DumpRenderTree/gtk/DumpRenderTree.pro: Added.
+        * DumpRenderTree/gtk/DumpRenderTreeGtk.h: Added.
+        * DumpRenderTree/gtk/GCControllerGtk.cpp: Added.
+        (GCController::collect):
+        (GCController::collectOnAlternateThread):
+        (GCController::getJSObjectCount):
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: Added.
+        (LayoutTestController::~LayoutTestController):
+        (LayoutTestController::addDisallowedURL):
+        (LayoutTestController::clearBackForwardList):
+        (LayoutTestController::copyDecodedHostName):
+        (LayoutTestController::copyEncodedHostName):
+        (LayoutTestController::display):
+        (LayoutTestController::keepWebHistory):
+        (LayoutTestController::notifyDone):
+        (LayoutTestController::queueBackNavigation):
+        (LayoutTestController::queueForwardNavigation):
+        (LayoutTestController::queueLoad):
+        (LayoutTestController::queueReload):
+        (LayoutTestController::queueScript):
+        (LayoutTestController::setAcceptsEditing):
+        (LayoutTestController::setCustomPolicyDelegate):
+        (LayoutTestController::setMainFrameIsFirstResponder):
+        (LayoutTestController::setTabKeyCyclesThroughElements):
+        (LayoutTestController::setUseDashboardCompatibilityMode):
+        (LayoutTestController::setUserStyleSheetEnabled):
+        (LayoutTestController::setUserStyleSheetLocation):
+        (LayoutTestController::setWindowIsKey):
+        (LayoutTestController::setWaitToDump):
+        (LayoutTestController::windowCount):
+        (LayoutTestController::setPrivateBrowsingEnabled):
+        (LayoutTestController::setAuthorAndUserStylesEnabled):
+        * DumpRenderTree/gtk/WorkQueueItemGtk.cpp: Added.
+        (JSStringCopyUTF8CString):
+        (LoadItem::invoke):
+        (ReloadItem::invoke):
+        (ScriptItem::invoke):
+        (BackForwardItem::invoke):
+
 2007-12-03  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/DumpRenderTree.h

@@ -34 +34 @@
 #if PLATFORM(MAC)
 #include "DumpRenderTreeMac.h"
-#else if PLATFORM(WIN)
+#elif PLATFORM(WIN)
 #include "DumpRenderTreeWin.h"
+#elif PLATFORM(GTK)
+#include "DumpRenderTreeGtk.h"
 #endif
 
+#if PLATFORM(CF)
 #include <CoreFoundation/CoreFoundation.h>
+extern CFRunLoopTimerRef waitToDumpWatchdog;
+#endif
 
 class LayoutTestController;
 
 extern volatile bool done;
-
-extern CFRunLoopTimerRef waitToDumpWatchdog;
 
 // FIXME: This is a bad abstraction.  We should insted pass this to other controller objects which need access to it.