Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebPluginContainerImpl.cpp

diff --git a/src/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp b/src/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
index bbd9fac..67823f3 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
+++ b/src/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
@@ -33,7 +33,6 @@
 
 #include "ChromeClientImpl.h"
 #include "ScrollbarGroup.h"
-#include "WebCursorInfo.h"
 #include "WebDataSourceImpl.h"
 #include "WebElement.h"
 #include "WebInputEvent.h"
@@ -48,7 +47,8 @@
 #include "HTMLNames.h"
 #include "WebPrintParams.h"
 #include "bindings/v8/ScriptController.h"
-#include "core/dom/Clipboard.h"
+#include "core/clipboard/Clipboard.h"
+#include "core/clipboard/DataObject.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
@@ -64,22 +64,22 @@
 #include "core/frame/FrameView.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
-#include "core/platform/ScrollAnimator.h"
-#include "core/platform/ScrollView.h"
-#include "core/platform/ScrollbarTheme.h"
-#include "core/platform/chromium/ChromiumDataObject.h"
-#include "core/platform/chromium/KeyboardCodes.h"
-#include "core/platform/graphics/GraphicsContext.h"
-#include "core/platform/graphics/GraphicsLayer.h"
 #include "core/plugins/PluginOcclusionSupport.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderBox.h"
 #include "platform/HostWindow.h"
+#include "platform/KeyboardCodes.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/UserGestureIndicator.h"
+#include "platform/graphics/GraphicsContext.h"
+#include "platform/graphics/GraphicsLayer.h"
+#include "platform/scroll/ScrollAnimator.h"
+#include "platform/scroll/ScrollView.h"
+#include "platform/scroll/ScrollbarTheme.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebClipboard.h"
 #include "public/platform/WebCompositorSupport.h"
+#include "public/platform/WebCursorInfo.h"
 #include "public/platform/WebDragData.h"
 #include "public/platform/WebExternalTextureLayer.h"
 #include "public/platform/WebRect.h"
@@ -91,7 +91,7 @@
 
 using namespace WebCore;
 
-namespace WebKit {
+namespace blink {
 
 // Public methods --------------------------------------------------------------
 
@@ -216,11 +216,6 @@ void WebPluginContainerImpl::widgetPositionsUpdated()
     reportGeometry();
 }
 
-void WebPluginContainerImpl::clipRectChanged()
-{
-    reportGeometry();
-}
-
 void WebPluginContainerImpl::eventListenersRemoved()
 {
     // We're no longer registered to receive touch events, so don't try to remove
@@ -341,7 +336,7 @@ void WebPluginContainerImpl::copy()
     if (!m_webPlugin->hasSelection())
         return;
 
-    WebKit::Platform::current()->clipboard()->writeHTML(m_webPlugin->selectionAsMarkup(), WebURL(), m_webPlugin->selectionAsText(), false);
+    blink::Platform::current()->clipboard()->writeHTML(m_webPlugin->selectionAsMarkup(), WebURL(), m_webPlugin->selectionAsText(), false);
 }
 
 bool WebPluginContainerImpl::executeEditCommand(const WebString& name)
@@ -466,7 +461,7 @@ void WebPluginContainerImpl::loadFrameRequest(const WebURLRequest& request, cons
         WebDataSourceImpl::setNextPluginLoadObserver(observer.release());
     }
 
-    FrameLoadRequest frameRequest(frame->document()->securityOrigin(), request.toResourceRequest(), target);
+    FrameLoadRequest frameRequest(frame->document(), request.toResourceRequest(), target);
     UserGestureIndicator gestureIndicator(request.hasUserGesture() ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
     frame->loader().load(frameRequest);
 }
@@ -589,6 +584,11 @@ bool WebPluginContainerImpl::supportsKeyboardFocus() const
     return m_webPlugin->supportsKeyboardFocus();
 }
 
+bool WebPluginContainerImpl::supportsInputMethod() const
+{
+    return m_webPlugin->supportsInputMethod();
+}
+
 bool WebPluginContainerImpl::canProcessDrag() const
 {
     return m_webPlugin->canProcessDrag();
@@ -702,8 +702,7 @@ void WebPluginContainerImpl::handleMouseEvent(MouseEvent* event)
     Page* page = parentView->frame().page();
     if (!page)
         return;
-    ChromeClientImpl* chromeClient = toChromeClientImpl(page->chrome().client());
-    chromeClient->setCursorForPlugin(cursorInfo);
+    toChromeClientImpl(page->chrome().client()).setCursorForPlugin(cursorInfo);
 }
 
 void WebPluginContainerImpl::handleDragEvent(MouseEvent* event)
@@ -897,4 +896,4 @@ WebCore::IntRect WebPluginContainerImpl::windowClipRect() const
     return clipRect;
 }
 
-} // namespace WebKit
+} // namespace blink