Title: [116407] trunk/Tools
- Revision
- 116407
- Author
- [email protected]
- Date
- 2012-05-08 02:28:30 -0700 (Tue, 08 May 2012)
Log Message
[EFL] [DRT] Clear extra views before setting a blank page
https://bugs.webkit.org/show_bug.cgi?id=85608
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-05-08
Reviewed by Kenneth Rohde Christiansen.
We need to clear the extra views before setting a blank page,
otherwise it will cause more events interactions and sometimes
trigger a unload(). This was causing frame-crash-with-page-cache.html
to leak events to the next test causing any subsequent test to
fail.
* DumpRenderTree/efl/DumpRenderTree.cpp:
(runTest):
* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
(DumpRenderTreeChrome::clearExtraViews):
(DumpRenderTreeChrome::resetDefaultsToConsistentValues):
* DumpRenderTree/efl/DumpRenderTreeChrome.h:
(DumpRenderTreeChrome):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (116406 => 116407)
--- trunk/Tools/ChangeLog 2012-05-08 09:04:05 UTC (rev 116406)
+++ trunk/Tools/ChangeLog 2012-05-08 09:28:30 UTC (rev 116407)
@@ -1,3 +1,24 @@
+2012-05-08 Thiago Marcos P. Santos <[email protected]>
+
+ [EFL] [DRT] Clear extra views before setting a blank page
+ https://bugs.webkit.org/show_bug.cgi?id=85608
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ We need to clear the extra views before setting a blank page,
+ otherwise it will cause more events interactions and sometimes
+ trigger a unload(). This was causing frame-crash-with-page-cache.html
+ to leak events to the next test causing any subsequent test to
+ fail.
+
+ * DumpRenderTree/efl/DumpRenderTree.cpp:
+ (runTest):
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::clearExtraViews):
+ (DumpRenderTreeChrome::resetDefaultsToConsistentValues):
+ * DumpRenderTree/efl/DumpRenderTreeChrome.h:
+ (DumpRenderTreeChrome):
+
2012-05-08 Balazs Kelemen <[email protected]>
[Qt] X11 plugins need to be reworked for Qt5+WK1
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp (116406 => 116407)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2012-05-08 09:04:05 UTC (rev 116406)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp 2012-05-08 09:28:30 UTC (rev 116407)
@@ -250,6 +250,8 @@
gLayoutTestController->closeWebInspector();
gLayoutTestController->setDeveloperExtrasEnabled(false);
+ browser->clearExtraViews();
+
ewk_view_uri_set(browser->mainView(), "about:blank");
gLayoutTestController.clear();
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (116406 => 116407)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-08 09:04:05 UTC (rev 116406)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-08 09:28:30 UTC (rev 116407)
@@ -166,6 +166,14 @@
return m_extraViews;
}
+void DumpRenderTreeChrome::clearExtraViews()
+{
+ Vector<Evas_Object*>::iterator it = m_extraViews.begin();
+ for (; it != m_extraViews.end(); ++it)
+ evas_object_del(*it);
+ m_extraViews.clear();
+}
+
Evas_Object* DumpRenderTreeChrome::mainFrame() const
{
return m_mainFrame;
@@ -193,11 +201,6 @@
void DumpRenderTreeChrome::resetDefaultsToConsistentValues()
{
- Vector<Evas_Object*>::iterator it = m_extraViews.begin();
- for (; it != m_extraViews.end(); ++it)
- evas_object_del(*it);
- m_extraViews.clear();
-
ewk_settings_icon_database_clear();
ewk_settings_icon_database_path_set(0);
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h (116406 => 116407)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h 2012-05-08 09:04:05 UTC (rev 116406)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.h 2012-05-08 09:28:30 UTC (rev 116407)
@@ -47,6 +47,8 @@
void removeWindow(Evas_Object*);
Vector<Evas_Object*> extraViews() const;
+ void clearExtraViews();
+
Evas_Object* mainFrame() const;
Evas_Object* mainView() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
