Title: [177706] trunk/Source/WebKit2
- Revision
- 177706
- Author
- [email protected]
- Date
- 2014-12-23 16:37:09 -0800 (Tue, 23 Dec 2014)
Log Message
Fix 32-build.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::transformHandlesToObjects):
(WebKit::WebProcess::transformObjectsToHandles):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (177705 => 177706)
--- trunk/Source/WebKit2/ChangeLog 2014-12-24 00:14:53 UTC (rev 177705)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-24 00:37:09 UTC (rev 177706)
@@ -1,3 +1,11 @@
+2014-12-23 Anders Carlsson <[email protected]>
+
+ Fix 32-build.
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::transformHandlesToObjects):
+ (WebKit::WebProcess::transformObjectsToHandles):
+
2014-12-23 Timothy Horton <[email protected]>
Install a TextIndicator for link immediate actions
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (177705 => 177706)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-24 00:14:53 UTC (rev 177705)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-24 00:37:09 UTC (rev 177706)
@@ -303,21 +303,23 @@
virtual bool shouldTransformObject(id object) const override
{
+#if WK_API_ENABLED
if (dynamic_objc_cast<WKBrowsingContextHandle>(object))
return true;
-
+#endif
return false;
}
virtual RetainPtr<id> transformObject(id object) const
{
+#if WK_API_ENABLED
if (auto* handle = dynamic_objc_cast<WKBrowsingContextHandle>(object)) {
if (auto* webPage = m_webProcess.webPage(handle._pageID))
return wrapper(*webPage);
return [NSNull null];
}
-
+#endif
return object;
}
@@ -332,17 +334,19 @@
struct Transformer final : ObjCObjectGraph::Transformer {
virtual bool shouldTransformObject(id object) const override
{
+#if WK_API_ENABLED
if (dynamic_objc_cast<WKWebProcessPlugInBrowserContextController>(object))
return true;
-
+#endif
return false;
}
virtual RetainPtr<id> transformObject(id object) const
{
+#if WK_API_ENABLED
if (auto* controller = dynamic_objc_cast<WKWebProcessPlugInBrowserContextController>(object))
return controller.handle;
-
+#endif
return object;
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
