Diff
Modified: trunk/Source/WebKit2/ChangeLog (191162 => 191163)
--- trunk/Source/WebKit2/ChangeLog 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-16 02:51:06 UTC (rev 191163)
@@ -1,3 +1,11 @@
+2015-10-15 Gyuyoung Kim <gyuyoung....@webkit.org>
+
+ EFL build fix since r191137
+
+ Unreviewed EFL build fix.
+
+ * UIProcess/CoordinatedGraphics/WebView.cpp: Removed.
+
2015-10-15 Myles C. Maxfield <mmaxfi...@apple.com>
Migrate to CGContextSetBaseCTM() and CGContextResetClip() from WKSI
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (191162 => 191163)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2015-10-16 02:51:06 UTC (rev 191163)
@@ -432,13 +432,13 @@
}
#endif
-RefPtr<WebPopupMenuProxy> WebView::createPopupMenuProxy(WebPageProxy*)
+RefPtr<WebPopupMenuProxy> WebView::createPopupMenuProxy(WebPageProxy&)
{
notImplemented();
return nullptr;
}
-RefPtr<WebContextMenuProxy> WebView::createContextMenuProxy(WebPageProxy*)
+RefPtr<WebContextMenuProxy> WebView::createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&)
{
notImplemented();
return nullptr;
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (191162 => 191163)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2015-10-16 02:51:06 UTC (rev 191163)
@@ -179,8 +179,8 @@
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
#endif
- virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
+ virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp (191162 => 191163)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp 2015-10-16 02:51:06 UTC (rev 191163)
@@ -37,7 +37,8 @@
namespace WebKit {
-WebContextMenuProxyEfl::WebContextMenuProxyEfl(EwkView*, WebPageProxy*)
+WebContextMenuProxyEfl::WebContextMenuProxyEfl(EwkView*, WebPageProxy&, const ContextMenuContextData& context, const UserData& userData)
+ : WebContextMenuProxy(context, userData)
{
}
@@ -45,7 +46,7 @@
{
}
-void WebContextMenuProxyEfl::showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&)
+void WebContextMenuProxyEfl::showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&)
{
notImplemented();
}
@@ -55,6 +56,12 @@
notImplemented();
}
+void WebContextMenuProxyEfl::cancelTracking()
+{
+ notImplemented();
+}
+
+
} // namespace WebKit
#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h (191162 => 191163)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h 2015-10-16 02:51:06 UTC (rev 191163)
@@ -41,18 +41,19 @@
class WebContextMenuProxyEfl : public WebContextMenuProxy {
public:
- static PassRefPtr<WebContextMenuProxyEfl> create(EwkView* viewImpl, WebPageProxy* page)
+ static Ref<WebContextMenuProxyEfl> create(EwkView* viewImpl, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
{
- return adoptRef(new WebContextMenuProxyEfl(viewImpl, page));
+ return adoptRef(*new WebContextMenuProxyEfl(viewImpl, page, context, userData));
}
~WebContextMenuProxyEfl();
- void showContextMenu(const WebCore::IntPoint&, const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
- void hideContextMenu();
+ virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) override;
+ virtual void hideContextMenu() override;
+ virtual void cancelTracking() override;
private:
- WebContextMenuProxyEfl(EwkView*, WebPageProxy*);
+ WebContextMenuProxyEfl(EwkView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
};
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPopupMenuListenerEfl.cpp (191162 => 191163)
--- trunk/Source/WebKit2/UIProcess/efl/WebPopupMenuListenerEfl.cpp 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPopupMenuListenerEfl.cpp 2015-10-16 02:51:06 UTC (rev 191163)
@@ -29,7 +29,7 @@
namespace WebKit {
WebPopupMenuListenerEfl::WebPopupMenuListenerEfl(WebPopupMenuProxy::Client* client)
- : WebPopupMenuProxy(client)
+ : WebPopupMenuProxy(*client)
{
}
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp (191162 => 191163)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.cpp 2015-10-16 02:51:06 UTC (rev 191163)
@@ -88,15 +88,15 @@
scene->paintToGraphicsContext(&context, m_page->pageExtendedBackgroundColor(), m_page->drawsBackground());
}
-RefPtr<WebPopupMenuProxy> WebViewEfl::createPopupMenuProxy(WebPageProxy* page)
+RefPtr<WebPopupMenuProxy> WebViewEfl::createPopupMenuProxy(WebPageProxy& page)
{
- return WebPopupMenuListenerEfl::create(page);
+ return WebPopupMenuListenerEfl::create(&page);
}
#if ENABLE(CONTEXT_MENUS)
-RefPtr<WebContextMenuProxy> WebViewEfl::createContextMenuProxy(WebPageProxy* page)
+RefPtr<WebContextMenuProxy> WebViewEfl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
{
- return WebContextMenuProxyEfl::create(m_ewkView, page);
+ return WebContextMenuProxyEfl::create(m_ewkView, page, context, userData);
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h (191162 => 191163)
--- trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2015-10-16 02:36:29 UTC (rev 191162)
+++ trunk/Source/WebKit2/UIProcess/efl/WebViewEfl.h 2015-10-16 02:51:06 UTC (rev 191163)
@@ -66,12 +66,12 @@
WebViewEfl(WebProcessPool*, WebPageGroup*);
void setCursor(const WebCore::Cursor&) override;
- RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
+ RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
void updateTextInputState() override;
void handleDownloadRequest(DownloadProxy*) override;
#if ENABLE(CONTEXT_MENUS)
- RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
#endif
#if ENABLE(FULLSCREEN_API)
