Title: [194266] branches/safari-601-branch/Source/WebKit2
- Revision
- 194266
- Author
- matthew_han...@apple.com
- Date
- 2015-12-18 01:59:41 -0800 (Fri, 18 Dec 2015)
Log Message
Merge r188606. rdar://problem/23905024
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (194265 => 194266)
--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-18 09:59:38 UTC (rev 194265)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-12-18 09:59:41 UTC (rev 194266)
@@ -1,5 +1,16 @@
2015-12-18 Matthew Hanson <matthew_han...@apple.com>
+ Merge r188606. rdar://problem/23905024
+
+ 2015-08-18 Anders Carlsson <ander...@apple.com>
+
+ Fix build, and fix the version check.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+
+2015-12-18 Matthew Hanson <matthew_han...@apple.com>
+
Merge r188602. rdar://problem/23905024
2015-08-18 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (194265 => 194266)
--- branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-18 09:59:38 UTC (rev 194265)
+++ branches/safari-601-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-12-18 09:59:41 UTC (rev 194266)
@@ -1332,6 +1332,7 @@
toImpl(pageRef)->setPolicyClient(std::make_unique<PolicyClient>(wkClient));
}
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
static void fixUpBotchedPageUIClient(WKPageRef pageRef, const WKPageUIClientBase& wkClient)
{
struct BotchedWKPageUIClientV4 {
@@ -1463,6 +1464,7 @@
WKPageSetPageUIClient(pageRef, &fixedPageUIClient.base);
}
+#endif
namespace WebKit {
@@ -1579,7 +1581,7 @@
void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClientBase* wkClient)
{
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
if (wkClient && wkClient->version == 4) {
fixUpBotchedPageUIClient(pageRef, *wkClient);
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
