Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 14 insertions, 17 deletions

diff --git a/Source/WebKit2/UIProcess/efl/PageClientBase.cpp b/Source/WebKit2/UIProcess/efl/PageClientBase.cpp
index b597d29e0..0ce82aae4 100644
--- a/Source/WebKit2/UIProcess/efl/PageClientBase.cpp
+++ b/Source/WebKit2/UIProcess/efl/PageClientBase.cpp
@@ -29,10 +29,13 @@
 #include "DrawingAreaProxyImpl.h"
 #include "EwkViewImpl.h"
 #include "InputMethodContextEfl.h"
+#include "LayerTreeCoordinatorProxy.h"
+#include "LayerTreeRenderer.h"
 #include "NativeWebKeyboardEvent.h"
 #include "NotImplemented.h"
+#include "TextureMapper.h"
 #include "WebContext.h"
-#include "WebContextMenuProxy.h"
+#include "WebContextMenuProxyEfl.h"
 #include "WebPageGroup.h"
 #include "WebPageProxy.h"
 #include "WebPopupMenuProxyEfl.h"
@@ -66,7 +69,12 @@ EwkViewImpl* PageClientBase::viewImpl() const
 // PageClient
 PassOwnPtr<DrawingAreaProxy> PageClientBase::createDrawingAreaProxy()
 {
-    return DrawingAreaProxyImpl::create(m_viewImpl->page());
+    OwnPtr<DrawingAreaProxy> drawingArea = DrawingAreaProxyImpl::create(m_viewImpl->page());
+#if USE(ACCELERATED_COMPOSITING)
+    if (!m_viewImpl->isHardwareAccelerated())
+        drawingArea->layerTreeCoordinatorProxy()->layerTreeRenderer()->setAccelerationMode(TextureMapper::SoftwareMode);
+#endif
+    return drawingArea.release();
 }
 
 void PageClientBase::setViewNeedsDisplay(const WebCore::IntRect& rect)
@@ -120,6 +128,8 @@ void PageClientBase::processDidCrash()
         m_viewImpl->smartCallback<LoadProgress>().call(&loadProgress);
     }
 
+    m_viewImpl->smartCallback<TooltipTextUnset>().call();
+
     bool handled = false;
     m_viewImpl->smartCallback<WebProcessCrashed>().call(&handled);
 
@@ -182,18 +192,6 @@ void PageClientBase::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
     m_undoController.executeUndoRedo(undoOrRedo);
 }
 
-FloatRect PageClientBase::convertToDeviceSpace(const FloatRect& viewRect)
-{
-    notImplemented();
-    return viewRect;
-}
-
-FloatRect PageClientBase::convertToUserSpace(const FloatRect& viewRect)
-{
-    notImplemented();
-    return viewRect;
-}
-
 IntPoint PageClientBase::screenToWindow(const IntPoint& point)
 {
     notImplemented();
@@ -223,10 +221,9 @@ PassRefPtr<WebPopupMenuProxy> PageClientBase::createPopupMenuProxy(WebPageProxy*
     return WebPopupMenuProxyEfl::create(m_viewImpl, page);
 }
 
-PassRefPtr<WebContextMenuProxy> PageClientBase::createContextMenuProxy(WebPageProxy*)
+PassRefPtr<WebContextMenuProxy> PageClientBase::createContextMenuProxy(WebPageProxy* page)
 {
-    notImplemented();
-    return 0;
+    return WebContextMenuProxyEfl::create(m_viewImpl, page);
 }
 
 #if ENABLE(INPUT_TYPE_COLOR)