Title: [191013] trunk/Source/WebKit2
- Revision
- 191013
- Author
- [email protected]
- Date
- 2015-10-13 16:28:03 -0700 (Tue, 13 Oct 2015)
Log Message
Fix iOS-family builds.
* UIProcess/API/C/mac/WKPagePrivateMac.mm:
(WKPageGetObjectRegistry):
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController _remoteObjectRegistry]):
* UIProcess/API/mac/WKViewInternal.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191012 => 191013)
--- trunk/Source/WebKit2/ChangeLog 2015-10-13 23:01:14 UTC (rev 191012)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-13 23:28:03 UTC (rev 191013)
@@ -1,3 +1,13 @@
+2015-10-13 Dean Jackson <[email protected]>
+
+ Fix iOS-family builds.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm:
+ (WKPageGetObjectRegistry):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController _remoteObjectRegistry]):
+ * UIProcess/API/mac/WKViewInternal.h:
+
2015-10-13 Anders Carlsson <[email protected]>
Fix 32-bit build.
Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (191012 => 191013)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-10-13 23:01:14 UTC (rev 191012)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-10-13 23:28:03 UTC (rev 191013)
@@ -104,7 +104,7 @@
_WKRemoteObjectRegistry *WKPageGetObjectRegistry(WKPageRef pageRef)
{
-#if WK_API_ENABLED
+#if WK_API_ENABLED && !TARGET_OS_IPHONE
return toImpl(pageRef)->wkView()._remoteObjectRegistry;
#else
return nil;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (191012 => 191013)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-13 23:01:14 UTC (rev 191012)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-13 23:28:03 UTC (rev 191013)
@@ -751,7 +751,11 @@
- (_WKRemoteObjectRegistry *)_remoteObjectRegistry
{
+#if WK_API_ENABLED && !TARGET_OS_IPHONE
return _page->wkView()._remoteObjectRegistry;
+#else
+ return nil;
+#endif
}
- (pid_t)processIdentifier
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (191012 => 191013)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-13 23:01:14 UTC (rev 191012)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-13 23:28:03 UTC (rev 191013)
@@ -23,6 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if !TARGET_OS_IPHONE
+
#import "WKViewPrivate.h"
#import "APIObject.h"
@@ -168,3 +170,5 @@
#endif
@end
+
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
