Title: [157777] trunk/Source/WebKit2
- Revision
- 157777
- Author
- m...@apple.com
- Date
- 2013-10-21 22:19:07 -0700 (Mon, 21 Oct 2013)
Log Message
Try to make the 32-bit Mac build happy.
* UIProcess/API/mac/WKBrowsingContextController.mm:
(setUpPageLoaderClient):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (157776 => 157777)
--- trunk/Source/WebKit2/ChangeLog 2013-10-22 05:16:38 UTC (rev 157776)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-22 05:19:07 UTC (rev 157777)
@@ -1,5 +1,12 @@
2013-10-21 Dan Bernstein <m...@apple.com>
+ Try to make the 32-bit Mac build happy.
+
+ * UIProcess/API/mac/WKBrowsingContextController.mm:
+ (setUpPageLoaderClient):
+
+2013-10-21 Dan Bernstein <m...@apple.com>
+
[Cocoa] Add load delegate method for didChangeBackForwardList
https://bugs.webkit.org/show_bug.cgi?id=123136
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (157776 => 157777)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-10-22 05:16:38 UTC (rev 157776)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-10-22 05:19:07 UTC (rev 157777)
@@ -490,6 +490,7 @@
[browsingContext.loadDelegate browsingContextControllerDidFinishProgress:browsingContext];
}
+#if WK_API_ENABLED
static void didChangeBackForwardList(WKPageRef page, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void *clientInfo)
{
WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
@@ -502,6 +503,7 @@
[added release];
[removed release];
}
+#endif // WK_API_ENABLED
static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WKPageRef pageRef)
{
@@ -521,7 +523,9 @@
loaderClient.didChangeProgress = didChangeProgress;
loaderClient.didFinishProgress = didFinishProgress;
+#if WK_API_ENABLED
loaderClient.didChangeBackForwardList = didChangeBackForwardList;
+#endif
WKPageSetPageLoaderClient(pageRef, &loaderClient);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes