Title: [122656] trunk
- Revision
- 122656
- Author
- [email protected]
- Date
- 2012-07-13 19:07:48 -0700 (Fri, 13 Jul 2012)
Log Message
Internals: Clean up the mock PagePopupDriver correctly.
https://bugs.webkit.org/show_bug.cgi?id=91250
Source/WebCore:
Unreviewed, a trivial testing code fix.
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::reset):
Resetting PaePopupDriver here instead of Backup::restoreTo.
Also, close the mock popup before resetting PagePopupDriver by clearing m_pagePopupDriver.
* testing/MockPagePopupDriver.cpp:
(WebCore::MockPagePopupDriver::~MockPagePopupDriver):
Close the popup.
LayoutTests:
* platform/chromium/TestExpectations: Remove CRASH expectation for date-apparance.html.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (122655 => 122656)
--- trunk/LayoutTests/ChangeLog 2012-07-14 02:03:21 UTC (rev 122655)
+++ trunk/LayoutTests/ChangeLog 2012-07-14 02:07:48 UTC (rev 122656)
@@ -1,3 +1,10 @@
+2012-07-13 Kent Tamura <[email protected]>
+
+ Internals: Clean up the mock PagePopupDriver correctly.
+ https://bugs.webkit.org/show_bug.cgi?id=91250
+
+ * platform/chromium/TestExpectations: Remove CRASH expectation for date-apparance.html.
+
2012-07-13 Kiran Muppala <[email protected]>
REGRESSION: RenderInline boundingBox ignores relative position offset
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (122655 => 122656)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-14 02:03:21 UTC (rev 122655)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-14 02:07:48 UTC (rev 122656)
@@ -3741,9 +3741,6 @@
BUGWK90980 LINUX MAC DEBUG : fast/forms/textarea/textarea-state-restore.html = PASS TIMEOUT
BUGWK90980 WIN : fast/forms/textarea/textarea-state-restore.html = PASS TIMEOUT
-// Started crashing after 122558
-BUGWK91250 DEBUG : fast/forms/date/date-appearance.html = CRASH
-
// Started crashing after 122286
BUGWK91133 WIN : storage/indexeddb/constants.html = PASS CRASH
Modified: trunk/Source/WebCore/ChangeLog (122655 => 122656)
--- trunk/Source/WebCore/ChangeLog 2012-07-14 02:03:21 UTC (rev 122655)
+++ trunk/Source/WebCore/ChangeLog 2012-07-14 02:07:48 UTC (rev 122656)
@@ -1,3 +1,19 @@
+2012-07-13 Kent Tamura <[email protected]>
+
+ Internals: Clean up the mock PagePopupDriver correctly.
+ https://bugs.webkit.org/show_bug.cgi?id=91250
+
+ Unreviewed, a trivial testing code fix.
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::reset):
+ Resetting PaePopupDriver here instead of Backup::restoreTo.
+ Also, close the mock popup before resetting PagePopupDriver by clearing m_pagePopupDriver.
+ * testing/MockPagePopupDriver.cpp:
+ (WebCore::MockPagePopupDriver::~MockPagePopupDriver):
+ Close the popup.
+
2012-07-13 Tony Payne <[email protected]>
Remove Widget from screenColorProfile
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (122655 => 122656)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2012-07-14 02:03:21 UTC (rev 122655)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2012-07-14 02:07:48 UTC (rev 122656)
@@ -124,11 +124,6 @@
#if ENABLE(DIALOG_ELEMENT)
RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabled);
#endif
-
-#if ENABLE(PAGE_POPUP)
- if (page->chrome())
- page->chrome()->client()->resetPagePopupDriver();
-#endif
}
InternalSettings* InternalSettings::from(Page* page)
@@ -155,6 +150,11 @@
setUserPreferredLanguages(Vector<String>());
page()->setPagination(Page::Pagination());
page()->setPageScaleFactor(1, IntPoint(0, 0));
+#if ENABLE(PAGE_POPUP)
+ m_pagePopupDriver.clear();
+ if (page()->chrome())
+ page()->chrome()->client()->resetPagePopupDriver();
+#endif
m_backup.restoreTo(page(), settings());
m_backup = Backup(page(), settings());
Modified: trunk/Source/WebCore/testing/MockPagePopupDriver.cpp (122655 => 122656)
--- trunk/Source/WebCore/testing/MockPagePopupDriver.cpp 2012-07-14 02:03:21 UTC (rev 122655)
+++ trunk/Source/WebCore/testing/MockPagePopupDriver.cpp 2012-07-14 02:07:48 UTC (rev 122656)
@@ -101,6 +101,7 @@
MockPagePopupDriver::~MockPagePopupDriver()
{
+ closePagePopup(m_mockPagePopup.get());
}
PagePopup* MockPagePopupDriver::openPagePopup(PagePopupClient* client, const IntRect& originBoundsInRootView)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
