Diff
Modified: tags/Safari-601.1.37.1/Source/WebKit2/ChangeLog (186052 => 186053)
--- tags/Safari-601.1.37.1/Source/WebKit2/ChangeLog 2015-06-28 20:33:17 UTC (rev 186052)
+++ tags/Safari-601.1.37.1/Source/WebKit2/ChangeLog 2015-06-28 20:36:40 UTC (rev 186053)
@@ -1,3 +1,18 @@
+2015-06-28 Lucas Forschler <[email protected]>
+
+ Merge r186046
+
+ 2015-06-28 Dan Bernstein <[email protected]>
+
+ 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-06-25 Babak Shafiei <[email protected]>
Custom patch to turn off ENABLE_PICTURE_SIZES. rdar://problem/21537375
Modified: tags/Safari-601.1.37.1/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (186052 => 186053)
--- tags/Safari-601.1.37.1/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-06-28 20:33:17 UTC (rev 186052)
+++ tags/Safari-601.1.37.1/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-06-28 20:36:40 UTC (rev 186053)
@@ -116,9 +116,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;
@@ -161,9 +161,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;
@@ -212,9 +212,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;
@@ -268,9 +268,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;
@@ -327,9 +327,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;
@@ -466,9 +466,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: tags/Safari-601.1.37.1/Tools/ChangeLog (186052 => 186053)
--- tags/Safari-601.1.37.1/Tools/ChangeLog 2015-06-28 20:33:17 UTC (rev 186052)
+++ tags/Safari-601.1.37.1/Tools/ChangeLog 2015-06-28 20:36:40 UTC (rev 186053)
@@ -1,3 +1,24 @@
+2015-06-28 Lucas Forschler <[email protected]>
+
+ Merge r186046
+
+ 2015-06-28 Dan Bernstein <[email protected]>
+
+ 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-06-25 Alex Christensen <[email protected]>
[Content Extensions] Add a way to match a domain but not subdomains
Modified: tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp (186052 => 186053)
--- tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2015-06-28 20:33:17 UTC (rev 186052)
+++ tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp 2015-06-28 20:36:40 UTC (rev 186053)
@@ -36,7 +36,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);
@@ -57,7 +57,7 @@
memset(&uiClient, 0, sizeof(uiClient));
uiClient.base.version = 0;
- uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert_deprecatedForUseWithV0;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
WKPageSetPageUIClient(webView.page(), &uiClient.base);
Modified: tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm (186052 => 186053)
--- tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm 2015-06-28 20:33:17 UTC (rev 186052)
+++ tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/mac/FullscreenZoomInitialFrame.mm 2015-06-28 20:36:40 UTC (rev 186053)
@@ -57,7 +57,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;
@@ -112,7 +112,7 @@
memset(&uiClient, 0, sizeof(uiClient));
uiClient.base.version = 0;
- uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert_deprecatedForUseWithV0;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
WKPageSetPageUIClient(wkView.pageRef, &uiClient.base);
Modified: tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm (186052 => 186053)
--- tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2015-06-28 20:33:17 UTC (rev 186052)
+++ tags/Safari-601.1.37.1/Tools/TestWebKitAPI/Tests/mac/PageVisibilityStateWithWindowChanges.mm 2015-06-28 20:36:40 UTC (rev 186053)
@@ -52,7 +52,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;
@@ -99,7 +99,7 @@
memset(&uiClient, 0, sizeof(uiClient));
uiClient.base.version = 0;
- uiClient.runJavaScriptAlert_deprecatedForUseWithV0 = runJavaScriptAlert_deprecatedForUseWithV0;
+ uiClient.runJavaScriptAlert = runJavaScriptAlert;
WKPageSetPageUIClient(wkView.pageRef, &uiClient.base);
}
