Diff
Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (187869 => 187870)
--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-08-04 18:38:16 UTC (rev 187869)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-08-04 18:43:35 UTC (rev 187870)
@@ -1,3 +1,18 @@
+2015-08-04 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r186046.
+
+ 2015-06-28 Dan Bernstein <m...@apple.com>
+
+ REGRESSION (r185915): Source-incompatible change in WKPageUIClient
+ https://bugs.webkit.org/show_bug.cgi?id=146396
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/C/WKPageUIClient.h: Renamed
+ runJavaScript{Alert,Confirm,Prompt}_deprecatedForUseWithV0 back to runJavaScript{Alert,Confirm,Prompt}
+ in client versions prior to V5.
+
2015-07-23 Babak Shafiei <bshaf...@apple.com>
Merge r187248.
Modified: branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (187869 => 187870)
--- branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-08-04 18:38:16 UTC (rev 187869)
+++ branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-08-04 18:43:35 UTC (rev 187870)
@@ -111,9 +111,9 @@
WKPageTakeFocusCallback takeFocus;
WKPageFocusCallback focus;
WKPageUnfocusCallback unfocus;
- WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
- WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
- WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt;
WKPageSetStatusTextCallback setStatusText;
WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
@@ -156,9 +156,9 @@
WKPageTakeFocusCallback takeFocus;
WKPageFocusCallback focus;
WKPageUnfocusCallback unfocus;
- WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
- WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
- WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt;
WKPageSetStatusTextCallback setStatusText;
WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
@@ -207,9 +207,9 @@
WKPageTakeFocusCallback takeFocus;
WKPageFocusCallback focus;
WKPageUnfocusCallback unfocus;
- WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
- WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
- WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt;
WKPageSetStatusTextCallback setStatusText;
WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
@@ -263,9 +263,9 @@
WKPageTakeFocusCallback takeFocus;
WKPageFocusCallback focus;
WKPageUnfocusCallback unfocus;
- WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
- WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
- WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt;
WKPageSetStatusTextCallback setStatusText;
WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
@@ -390,9 +390,9 @@
WKPageTakeFocusCallback takeFocus;
WKPageFocusCallback focus;
WKPageUnfocusCallback unfocus;
- WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert_deprecatedForUseWithV0;
- WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm_deprecatedForUseWithV0;
- WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt_deprecatedForUseWithV0;
+ WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert;
+ WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm;
+ WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt;
WKPageSetStatusTextCallback setStatusText;
WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
Modified: branches/safari-600.8-branch/Tools/ChangeLog (187869 => 187870)
--- branches/safari-600.8-branch/Tools/ChangeLog 2015-08-04 18:38:16 UTC (rev 187869)
+++ branches/safari-600.8-branch/Tools/ChangeLog 2015-08-04 18:43:35 UTC (rev 187870)
@@ -1,3 +1,24 @@
+2015-08-04 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r186046.
+
+ 2015-06-28 Dan Bernstein <m...@apple.com>
+
+ REGRESSION (r185915): Source-incompatible change in WKPageUIClient
+ https://bugs.webkit.org/show_bug.cgi?id=146396
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp:
+ (TestWebKitAPI::runJavaScriptAlert): Removed _deprecatedForUseWithV0 suffix from the name.
+ (TestWebKitAPI::TEST): Updated for renames.
+ * TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm:
+ (runJavaScriptAlert): Removed suffix.
+ (TestWebKitAPI::FullscreenZoomInitialFrame::initializeView): Updated.
+ * TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm:
+ (runJavaScriptAlert): Removed suffix.
+ (TestWebKitAPI::PageVisibilityStateWithWindowChanges::initializeView): Updated.
+
2015-07-22 Matthew Hanson <matthew_han...@apple.com>
Add ModalAlertsSPI.cpp, which was missed in the merge of r185915.
Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp (187869 => 187870)
--- branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2015-08-04 18:38:16 UTC (rev 187869)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2015-08-04 18:43:35 UTC (rev 187870)
@@ -33,7 +33,7 @@
static bool done;
-static void runJavaScriptAlert_deprecatedForUseWithV0(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
+static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
{
ASSERT_NOT_NULL(frame);
@@ -54,7 +54,7 @@
memset(&uiClient, 0, sizeof(uiClient));
uiClient.base.version = 0;
- uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert_deprecatedForUseWithV0;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
WKPageSetPageUIClient(webView.page(), &uiClient.base);
Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm (187869 => 187870)
--- branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2015-08-04 18:38:16 UTC (rev 187869)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2015-08-04 18:43:35 UTC (rev 187870)
@@ -55,7 +55,7 @@
// WebKit2 WKPageUIClient
-static void runJavaScriptAlert_deprecatedForUseWithV0(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
+static void runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
{
EXPECT_TRUE(isWaitingForPageSignalToContinue);
isWaitingForPageSignalToContinue = false;
@@ -102,7 +102,7 @@
memset(&uiClient, 0, sizeof(uiClient));
uiClient.base.version = 0;
- uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert_deprecatedForUseWithV0;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
WKPageSetPageUIClient(wkView.pageRef, &uiClient.base);
}
