Title: [99748] trunk
- Revision
- 99748
- Author
- [email protected]
- Date
- 2011-11-09 12:10:58 -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 Martin Robinson.
.:
* Source/autotools/symbols.filter: Revert un-needed symbol.
Source/WebKit/gtk:
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Remove problematic
calls to WebCoreSupport which belongs to libWebCoreInternals, not libwebkitgtk.
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
Tools:
Call WebCoreTestSupport::resetInternalsObject without going
through DumpRenderTreeSupport.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(runTest):
Modified Paths
Diff
Modified: trunk/ChangeLog (99747 => 99748)
--- trunk/ChangeLog 2011-11-09 20:05:40 UTC (rev 99747)
+++ trunk/ChangeLog 2011-11-09 20:10:58 UTC (rev 99748)
@@ -1,5 +1,14 @@
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 Martin Robinson.
+
+ * Source/autotools/symbols.filter: Revert un-needed symbol.
+
+2011-11-09 Philippe Normand <[email protected]>
+
Unreviewed, attempt to fix GTK 32-bits Release build after r99691.
* Source/autotools/symbols.filter: Add the missing symbol for resetInternalsObject.
Modified: trunk/Source/WebKit/gtk/ChangeLog (99747 => 99748)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-11-09 20:05:40 UTC (rev 99747)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-11-09 20:10:58 UTC (rev 99748)
@@ -3,6 +3,17 @@
[GTK][DRT] window internals object is not reset after each test
https://bugs.webkit.org/show_bug.cgi?id=71890
+ Reviewed by Martin Robinson.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Remove problematic
+ calls to WebCoreSupport which belongs to libWebCoreInternals, not libwebkitgtk.
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
+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.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (99747 => 99748)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2011-11-09 20:05:40 UTC (rev 99747)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2011-11-09 20:10:58 UTC (rev 99748)
@@ -59,7 +59,6 @@
#include "SecurityPolicy.h"
#include "Settings.h"
#include "TextIterator.h"
-#include "WebCoreTestSupport.h"
#include "WebKitDOMRangePrivate.h"
#include "WorkerThread.h"
#include "webkitglobalsprivate.h"
@@ -891,18 +890,3 @@
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 (99747 => 99748)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2011-11-09 20:05:40 UTC (rev 99747)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2011-11-09 20:10:58 UTC (rev 99748)
@@ -126,8 +126,6 @@
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/Source/autotools/symbols.filter (99747 => 99748)
--- trunk/Source/autotools/symbols.filter 2011-11-09 20:05:40 UTC (rev 99747)
+++ trunk/Source/autotools/symbols.filter 2011-11-09 20:10:58 UTC (rev 99748)
@@ -81,7 +81,6 @@
_ZN7WebCore10ScrollView23setScrollbarsSuppressedEbb;
_ZN7WebCore9FrameView17paintControlTintsEv;
_ZN7WebCore9FrameView19scrollElementToRectEPNS_7ElementERKNS_7IntRectE;
-_ZN18WebCoreTestSupport20resetInternalsObjectEPK15OpaqueJSContext;
local:
_Z*;
cti*;
Modified: trunk/Tools/ChangeLog (99747 => 99748)
--- trunk/Tools/ChangeLog 2011-11-09 20:05:40 UTC (rev 99747)
+++ trunk/Tools/ChangeLog 2011-11-09 20:10:58 UTC (rev 99748)
@@ -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 Martin Robinson.
+
+ Call WebCoreTestSupport::resetInternalsObject without going
+ through DumpRenderTreeSupport.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (runTest):
+
2011-11-09 Beth Dakin <[email protected]>
Build fix.
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (99747 => 99748)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-11-09 20:05:40 UTC (rev 99747)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2011-11-09 20:10:58 UTC (rev 99748)
@@ -723,7 +723,7 @@
webViewList = 0;
}
- DumpRenderTreeSupportGtk::resetInternalsObject(mainFrame);
+ WebCoreTestSupport::resetInternalsObject(webkit_web_frame_get_global_context(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
