Title: [99691] trunk
- Revision
- 99691
- Author
- [email protected]
- Date
- 2011-11-09 05:14:34 -0800 (Wed, 09 Nov 2011)
Log Message
[GTK][DRT] window internals object is not reset after each test
https://bugs.webkit.org/show_bug.cgi?id=71890
Reviewed by Xan Lopez.
Source/WebKit/gtk:
DRTSupport infrastructure to reset the Internals object, like in Qt.
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::resetInternalsObject):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
Tools:
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(runTest): reset the Internals object after each test.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (99690 => 99691)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-11-09 13:03:58 UTC (rev 99690)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-11-09 13:14:34 UTC (rev 99691)
@@ -1,3 +1,16 @@
+2011-11-09 Philippe Normand <[email protected]>
+
+ [GTK][DRT] window internals object is not reset after each test
+ https://bugs.webkit.org/show_bug.cgi?id=71890
+
+ Reviewed by Xan Lopez.
+
+ DRTSupport infrastructure to reset the Internals object, like in Qt.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::resetInternalsObject):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
2011-11-07 Adam Barth <[email protected]>
Move static "policy" state from SecurityOrigin.cpp to SecurityPolicy.cpp
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (99690 => 99691)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2011-11-09 13:03:58 UTC (rev 99690)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2011-11-09 13:14:34 UTC (rev 99691)
@@ -59,6 +59,7 @@
#include "SecurityPolicy.h"
#include "Settings.h"
#include "TextIterator.h"
+#include "WebCoreTestSupport.h"
#include "WebKitDOMRangePrivate.h"
#include "WorkerThread.h"
#include "webkitglobalsprivate.h"
@@ -890,3 +891,18 @@
return 0;
#endif
}
+
+void DumpRenderTreeSupportGtk::resetInternalsObject(WebKitWebFrame* frame)
+{
+ Frame* coreFrame = core(frame);
+ if (!coreFrame)
+ return;
+
+ JSLock lock(SilenceAssertionsOnly);
+
+ JSGlobalContextRef globalContext = webkit_web_frame_get_global_context(frame);
+ ExecState* exec = toJS(globalContext);
+
+ JSContextRef context = toRef(exec);
+ WebCoreTestSupport::resetInternalsObject(context);
+}
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (99690 => 99691)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2011-11-09 13:03:58 UTC (rev 99690)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2011-11-09 13:14:34 UTC (rev 99691)
@@ -126,6 +126,8 @@
static void setMockGeolocationError(WebKitWebView*, int errorCode, const gchar* errorMessage);
static int numberOfPendingGeolocationPermissionRequests(WebKitWebView*);
+ static void resetInternalsObject(WebKitWebFrame*);
+
private:
static bool s_drtRun;
static bool s_linksIncludedInTabChain;
Modified: trunk/Tools/ChangeLog (99690 => 99691)
--- trunk/Tools/ChangeLog 2011-11-09 13:03:58 UTC (rev 99690)
+++ trunk/Tools/ChangeLog 2011-11-09 13:14:34 UTC (rev 99691)
@@ -1,3 +1,13 @@
+2011-11-09 Philippe Normand <[email protected]>
+
+ [GTK][DRT] window internals object is not reset after each test
+ https://bugs.webkit.org/show_bug.cgi?id=71890
+
+ Reviewed by Xan Lopez.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (runTest): reset the Internals object after each test.
+
2011-11-09 Tor Arne Vestbø <[email protected]>
[Qt] Detect presence of QtUiTools and enable it only when available
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (99690 => 99691)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-11-09 13:03:58 UTC (rev 99690)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-11-09 13:14:34 UTC (rev 99691)
@@ -723,6 +723,8 @@
webViewList = 0;
}
+ DumpRenderTreeSupportGtk::resetInternalsObject(mainFrame);
+
// A blank load seems to be necessary to reset state after certain tests.
webkit_web_view_open(webView, "about:blank");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
