Diff
Modified: trunk/LayoutTests/ChangeLog (128490 => 128491)
--- trunk/LayoutTests/ChangeLog 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/LayoutTests/ChangeLog 2012-09-13 19:26:12 UTC (rev 128491)
@@ -1,3 +1,14 @@
+2012-09-13 Sudarsana Nagineni <[email protected]>
+
+ [WK2][WTR] WebKitTestRunner needs testRunner.callShouldCloseOnWebView
+ https://bugs.webkit.org/show_bug.cgi?id=96366
+
+ Reviewed by Anders Carlsson.
+
+ Unskip passing test fast/events/onbeforeunload-focused-iframe.html
+
+ * platform/wk2/Skipped:
+
2012-09-13 Tony Chang <[email protected]>
Flexitem margins should be based on content width, not width
Modified: trunk/LayoutTests/platform/wk2/Skipped (128490 => 128491)
--- trunk/LayoutTests/platform/wk2/Skipped 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/LayoutTests/platform/wk2/Skipped 2012-09-13 19:26:12 UTC (rev 128491)
@@ -666,9 +666,6 @@
# WebKitTestRunner should dump text/plain content as text
http/tests/incremental/slow-utf8-text.pl
-# WebKitTestRunner needs layoutTestController.callShouldCloseOnWebView
-fast/events/onbeforeunload-focused-iframe.html
-
# WebKitTestRunner needs layoutTestController.setHandlesAuthenticationChallenges
http/tests/misc/authentication-redirect-1/authentication-sent-to-redirect-cross-origin.html
http/tests/misc/authentication-redirect-2/authentication-sent-to-redirect-same-origin.html
Modified: trunk/Source/WebKit2/ChangeLog (128490 => 128491)
--- trunk/Source/WebKit2/ChangeLog 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-13 19:26:12 UTC (rev 128491)
@@ -1,3 +1,17 @@
+2012-09-13 Sudarsana Nagineni <[email protected]>
+
+ [WK2][WTR] WebKitTestRunner needs testRunner.callShouldCloseOnWebView
+ https://bugs.webkit.org/show_bug.cgi?id=96366
+
+ Reviewed by Anders Carlsson.
+
+ Implement testRunner.callShouldCloseOnWebView for WebKitTestRunner
+ by calling shouldClose() on the FrameLoader.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+ (WKBundleFrameCallShouldCloseOnWebView):
+ * WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
+
2012-09-13 Thiago Marcos P. Santos <[email protected]>
[EFL] Assertion reached on RenderThemeEFL when setting a theme to an invalid path
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (128490 => 128491)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp 2012-09-13 19:26:12 UTC (rev 128491)
@@ -262,3 +262,12 @@
return 0;
}
+
+bool WKBundleFrameCallShouldCloseOnWebView(WKBundleFrameRef frameRef)
+{
+ Frame* coreFrame = toImpl(frameRef)->coreFrame();
+ if (!coreFrame)
+ return true;
+
+ return coreFrame->loader()->shouldClose();
+}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h (128490 => 128491)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h 2012-09-13 19:26:12 UTC (rev 128491)
@@ -52,6 +52,7 @@
WK_EXPORT bool WKBundleFrameContainsAnyFormElements(WKBundleFrameRef frame);
WK_EXPORT void WKBundleFrameSetTextDirection(WKBundleFrameRef frame, WKStringRef);
+WK_EXPORT bool WKBundleFrameCallShouldCloseOnWebView(WKBundleFrameRef frame);
#ifdef __cplusplus
}
Modified: trunk/Tools/ChangeLog (128490 => 128491)
--- trunk/Tools/ChangeLog 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/Tools/ChangeLog 2012-09-13 19:26:12 UTC (rev 128491)
@@ -1,3 +1,20 @@
+2012-09-13 Sudarsana Nagineni <[email protected]>
+
+ [WK2][WTR] WebKitTestRunner needs testRunner.callShouldCloseOnWebView
+ https://bugs.webkit.org/show_bug.cgi?id=96366
+
+ Reviewed by Anders Carlsson.
+
+ Implement testRunner.callShouldCloseOnWebView for WebKitTestRunner
+ by calling shouldClose() on the FrameLoader.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::callShouldCloseOnWebView):
+ (WTR):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (TestRunner):
+
2012-09-13 Sheriff Bot <[email protected]>
Unreviewed, rolling out r128453.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (128490 => 128491)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-09-13 19:26:12 UTC (rev 128491)
@@ -174,6 +174,8 @@
void denyWebNotificationPermission(in DOMString origin);
void removeAllWebNotificationPermissions();
void simulateWebNotificationClick(in object notification);
+
+ boolean callShouldCloseOnWebView();
};
}
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (128490 => 128491)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-13 19:26:12 UTC (rev 128491)
@@ -760,4 +760,10 @@
InjectedBundle::shared().postSimulateWebNotificationClick(notificationID);
}
+bool TestRunner::callShouldCloseOnWebView()
+{
+ WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::shared().page()->page());
+ return WKBundleFrameCallShouldCloseOnWebView(mainFrame);
+}
+
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (128490 => 128491)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-09-13 19:21:26 UTC (rev 128490)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-09-13 19:26:12 UTC (rev 128491)
@@ -247,6 +247,8 @@
void setPageVisibility(JSStringRef state);
void resetPageVisibility();
+ bool callShouldCloseOnWebView();
+
private:
static const double waitToDumpWatchdogTimerInterval;
