Title: [159704] trunk/Source/WebKit2
- Revision
- 159704
- Author
- ander...@apple.com
- Date
- 2013-11-22 12:06:42 -0800 (Fri, 22 Nov 2013)
Log Message
Fix 32-bit build.
* UIProcess/API/mac/WKBrowsingContextController.mm:
(-[WKBrowsingContextController dealloc]):
(-[WKBrowsingContextController _initWithPageRef:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159703 => 159704)
--- trunk/Source/WebKit2/ChangeLog 2013-11-22 19:48:03 UTC (rev 159703)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-22 20:06:42 UTC (rev 159704)
@@ -1,3 +1,11 @@
+2013-11-22 Anders Carlsson <ander...@apple.com>
+
+ Fix 32-bit build.
+
+ * UIProcess/API/mac/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController dealloc]):
+ (-[WKBrowsingContextController _initWithPageRef:]):
+
2013-11-22 Dan Bernstein <m...@apple.com>
Debug builds unconditionally dump remote layer tree transactions to stderr.
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (159703 => 159704)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-22 19:48:03 UTC (rev 159703)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-11-22 20:06:42 UTC (rev 159704)
@@ -54,6 +54,8 @@
using namespace WebKit;
+#if WK_API_ENABLED
+
class PageLoadStateObserver : public PageLoadState::Observer {
public:
PageLoadStateObserver(WKBrowsingContextController *controller)
@@ -75,6 +77,8 @@
WKBrowsingContextController *m_controller;
};
+#endif
+
static inline NSString *autoreleased(WKStringRef string)
{
return string ? CFBridgingRelease(WKStringCopyCFString(kCFAllocatorDefault, adoptWK(string).get())) : nil;
@@ -119,7 +123,9 @@
- (void)dealloc
{
+#if WK_API_ENABLED
toImpl(_data->_pageRef.get())->pageLoadState().removeObserver(*_data->_pageLoadStateObserver);
+#endif
WKPageSetPageLoaderClient(_data->_pageRef.get(), nullptr);
@@ -709,8 +715,10 @@
_data = [[WKBrowsingContextControllerData alloc] init];
_data->_pageRef = pageRef;
+#if WK_API_ENABLED
_data->_pageLoadStateObserver = std::make_unique<PageLoadStateObserver>(self);
toImpl(_data->_pageRef.get())->pageLoadState().addObserver(*_data->_pageLoadStateObserver);
+#endif
setUpPageLoaderClient(self, pageRef);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
