Title: [158776] trunk/Source/WebKit2
- Revision
- 158776
- Author
- [email protected]
- Date
- 2013-11-06 12:49:19 -0800 (Wed, 06 Nov 2013)
Log Message
Fix the 32-bit build.
* UIProcess/API/mac/WKBrowsingContextController.h:
* UIProcess/API/mac/WKBrowsingContextController.mm:
(-[WKBrowsingContextController dealloc]):
(-[WKBrowsingContextController _initWithPageRef:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158775 => 158776)
--- trunk/Source/WebKit2/ChangeLog 2013-11-06 20:48:59 UTC (rev 158775)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-06 20:49:19 UTC (rev 158776)
@@ -1,3 +1,12 @@
+2013-11-06 Sam Weinig <[email protected]>
+
+ Fix the 32-bit build.
+
+ * UIProcess/API/mac/WKBrowsingContextController.h:
+ * UIProcess/API/mac/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController dealloc]):
+ (-[WKBrowsingContextController _initWithPageRef:]):
+
2013-11-06 Dan Bernstein <[email protected]>
[Cocoa] Add -[WKBrowsingContextController unreachableURL]
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h (158775 => 158776)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-11-06 20:48:59 UTC (rev 158775)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-11-06 20:49:19 UTC (rev 158776)
@@ -43,9 +43,9 @@
#pragma mark Delegates
@property (assign) id <WKBrowsingContextLoadDelegate> loadDelegate;
-@property (assign) id <WKBrowsingContextPolicyDelegate> policyDelegate;
#if WK_API_ENABLED
+@property (assign) id <WKBrowsingContextPolicyDelegate> policyDelegate;
@property (assign) id <WKBrowsingContextHistoryDelegate> historyDelegate;
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (158775 => 158776)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-06 20:48:59 UTC (rev 158775)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-06 20:49:19 UTC (rev 158776)
@@ -90,8 +90,10 @@
// Delegate for load callbacks.
id<WKBrowsingContextLoadDelegate> _loadDelegate;
+#if WK_API_ENABLED
// Delegate for policy callbacks.
id<WKBrowsingContextPolicyDelegate> _policyDelegate;
+#endif
}
@end
@@ -104,7 +106,10 @@
- (void)dealloc
{
WKPageSetPageLoaderClient(_data->_pageRef.get(), nullptr);
+
+#if WK_API_ENABLED
WKPageSetPagePolicyClient(_data->_pageRef.get(), nullptr);
+#endif
[_data release];
[super dealloc];
@@ -127,6 +132,7 @@
_data->_loadDelegate = loadDelegate;
}
+#if WK_API_ENABLED
- (id<WKBrowsingContextPolicyDelegate>)policyDelegate
{
return _data->_policyDelegate;
@@ -136,6 +142,7 @@
{
_data->_policyDelegate = policyDelegate;
}
+#endif
#pragma mark Loading
@@ -578,6 +585,7 @@
WKPageSetPageLoaderClient(pageRef, &loaderClient);
}
+#if WK_API_ENABLED
static WKPolicyDecisionHandler makePolicyDecisionBlock(WKFramePolicyListenerRef listener)
{
WKRetain(listener); // Released in the decision handler below.
@@ -659,6 +667,7 @@
WKPageSetPagePolicyClient(pageRef, &policyClient);
}
+#endif
/* This should only be called from associate view. */
@@ -672,7 +681,10 @@
_data->_pageRef = pageRef;
setUpPageLoaderClient(self, pageRef);
+
+#if WK_API_ENABLED
setUpPagePolicyClient(self, pageRef);
+#endif
return self;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
