Title: [117540] trunk
- Revision
- 117540
- Author
- rak...@webkit.org
- Date
- 2012-05-17 21:46:34 -0700 (Thu, 17 May 2012)
Log Message
[EFL][DRT] Call resetInternalsObject() after each test.
https://bugs.webkit.org/show_bug.cgi?id=86793
Reviewed by Antonio Gomes.
We need to reset the internals object's settings after running
each test so that there are no interferences between each test's
results.
Source/WebKit/efl:
* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
(DumpRenderTreeSupportEfl::globalContextRefForFrame):
* WebCoreSupport/DumpRenderTreeSupportEfl.h:
Tools:
* DumpRenderTree/efl/DumpRenderTree.cpp:
(runTest):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (117539 => 117540)
--- trunk/Source/WebKit/efl/ChangeLog 2012-05-18 04:41:07 UTC (rev 117539)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-05-18 04:46:34 UTC (rev 117540)
@@ -1,3 +1,18 @@
+2012-05-17 Raphael Kubo da Costa <rak...@webkit.org>
+
+ [EFL][DRT] Call resetInternalsObject() after each test.
+ https://bugs.webkit.org/show_bug.cgi?id=86793
+
+ Reviewed by Antonio Gomes.
+
+ We need to reset the internals object's settings after running
+ each test so that there are no interferences between each test's
+ results.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::globalContextRefForFrame):
+ * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
2012-05-17 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
Memory leak in NetworkInfoClient
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (117539 => 117540)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-05-18 04:41:07 UTC (rev 117539)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-05-18 04:46:34 UTC (rev 117540)
@@ -27,6 +27,7 @@
#include "ewk_private.h"
#include "ewk_view_private.h"
+#include <APICast.h>
#include <AnimationController.h>
#include <CSSComputedStyleDeclaration.h>
#include <DocumentLoader.h>
@@ -577,6 +578,15 @@
proxy->executeScriptInWorld(scriptWorld.get(), script, true);
}
+JSGlobalContextRef DumpRenderTreeSupportEfl::globalContextRefForFrame(const Evas_Object* ewkFrame)
+{
+ WebCore::Frame* coreFrame = EWKPrivate::coreFrame(ewkFrame);
+ if (!coreFrame)
+ return 0;
+
+ return toGlobalRef(coreFrame->script()->globalObject(WebCore::mainThreadNormalWorld())->globalExec());
+}
+
void DumpRenderTreeSupportEfl::setMockScrollbarsEnabled(bool enable)
{
WebCore::Settings::setMockScrollbarsEnabled(enable);
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (117539 => 117540)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-05-18 04:41:07 UTC (rev 117539)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-05-18 04:46:34 UTC (rev 117540)
@@ -89,6 +89,7 @@
static String historyItemTarget(const Ewk_History_Item*);
static bool isTargetItem(const Ewk_History_Item*);
static void evaluateScriptInIsolatedWorld(const Evas_Object* ewkFrame, int worldID, JSObjectRef globalObject, const String& script);
+ static JSGlobalContextRef globalContextRefForFrame(const Evas_Object* ewkFrame);
static void setMockScrollbarsEnabled(bool);
Modified: trunk/Tools/ChangeLog (117539 => 117540)
--- trunk/Tools/ChangeLog 2012-05-18 04:41:07 UTC (rev 117539)
+++ trunk/Tools/ChangeLog 2012-05-18 04:46:34 UTC (rev 117540)
@@ -1,3 +1,17 @@
+2012-05-17 Raphael Kubo da Costa <rak...@webkit.org>
+
+ [EFL][DRT] Call resetInternalsObject() after each test.
+ https://bugs.webkit.org/show_bug.cgi?id=86793
+
+ Reviewed by Antonio Gomes.
+
+ We need to reset the internals object's settings after running
+ each test so that there are no interferences between each test's
+ results.
+
+ * DumpRenderTree/efl/DumpRenderTree.cpp:
+ (runTest):
+
2012-05-17 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r117526.
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp (117539 => 117540)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2012-05-18 04:41:07 UTC (rev 117539)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2012-05-18 04:46:34 UTC (rev 117540)
@@ -35,6 +35,7 @@
#include "NotImplemented.h"
#include "PixelDumpSupport.h"
#include "WebCoreSupport/DumpRenderTreeSupportEfl.h"
+#include "WebCoreTestSupport.h"
#include "WorkQueue.h"
#include "ewk_private.h"
#include <EWebKit.h>
@@ -252,6 +253,9 @@
browser->clearExtraViews();
+ // FIXME: Move to DRTChrome::resetDefaultsToConsistentValues() after bug 85209 lands.
+ WebCoreTestSupport::resetInternalsObject(DumpRenderTreeSupportEfl::globalContextRefForFrame(browser->mainFrame()));
+
ewk_view_uri_set(browser->mainView(), "about:blank");
gLayoutTestController.clear();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
