Diff
Modified: trunk/Source/WebKit2/ChangeLog (191145 => 191146)
--- trunk/Source/WebKit2/ChangeLog 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 23:03:17 UTC (rev 191146)
@@ -1,3 +1,16 @@
+2015-10-15 Dean Jackson <d...@apple.com>
+
+ Fix the iOS build. And hopefully not breaking the other builds
+ at the same time.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebContextMenuProxy.cpp:
+ * UIProcess/WebContextMenuProxy.h:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+
2015-10-15 Anders Carlsson <ander...@apple.com>
Use the context inside WebContextMenuProxyMac
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191145 => 191146)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 23:03:17 UTC (rev 191146)
@@ -220,7 +220,9 @@
#endif
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) = 0;
+#if ENABLE(CONTEXT_MENUS)
virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) = 0;
+#endif
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp (191145 => 191146)
--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp 2015-10-15 23:03:17 UTC (rev 191146)
@@ -26,6 +26,8 @@
#include "config.h"
#include "WebContextMenuProxy.h"
+#if ENABLE(CONTEXT_MENUS)
+
namespace WebKit {
WebContextMenuProxy::WebContextMenuProxy(const ContextMenuContextData& context, const UserData& userData)
@@ -39,3 +41,5 @@
}
} // namespace WebKit
+
+#endif
Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191145 => 191146)
--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-15 23:03:17 UTC (rev 191146)
@@ -26,13 +26,14 @@
#ifndef WebContextMenuProxy_h
#define WebContextMenuProxy_h
+#if ENABLE(CONTEXT_MENUS)
+
#include "ContextMenuContextData.h"
#include "UserData.h"
#include <wtf/RefCounted.h>
namespace WebKit {
-class ContextMenuContextData;
class WebContextMenuItem;
class WebContextMenuProxy : public RefCounted<WebContextMenuProxy> {
@@ -52,4 +53,6 @@
} // namespace WebKit
+#endif
+
#endif // WebPopupMenuProxy_h
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (191145 => 191146)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 23:03:17 UTC (rev 191146)
@@ -96,7 +96,9 @@
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
#endif
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
+#if ENABLE(CONTEXT_MENUS)
virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
+#endif
virtual void setTextIndicator(Ref<WebCore::TextIndicator>, WebCore::TextIndicatorWindowLifetime) override;
virtual void clearTextIndicator(WebCore::TextIndicatorWindowDismissalAnimation) override;
virtual void setTextIndicatorAnimationProgress(float) override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (191145 => 191146)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 23:03:17 UTC (rev 191146)
@@ -435,10 +435,12 @@
return nullptr;
}
+#if ENABLE(CONTEXT_MENUS)
RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy&, const UserData&)
{
return nullptr;
}
+#endif
void PageClientImpl::setTextIndicator(Ref<TextIndicator> textIndicator, TextIndicatorWindowLifetime)
{
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (191145 => 191146)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 23:03:17 UTC (rev 191146)
@@ -121,7 +121,9 @@
virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
+#if ENABLE(CONTEXT_MENUS)
virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
+#endif
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (191145 => 191146)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 23:02:43 UTC (rev 191145)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 23:03:17 UTC (rev 191146)
@@ -492,10 +492,12 @@
return WebPopupMenuProxyMac::create(m_wkView, page);
}
+#if ENABLE(CONTEXT_MENUS)
RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
{
return WebContextMenuProxyMac::create(m_wkView, page, context, userData);
}
+#endif
#if ENABLE(INPUT_TYPE_COLOR)
RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy* page, const WebCore::Color& initialColor, const WebCore::IntRect& rect)
