Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 4 insertions, 15 deletions

diff --git a/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp b/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
index a4a585b96..6ee01efdd 100644
--- a/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
+++ b/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
@@ -34,14 +34,12 @@
 #include "Chrome.h"
 #include "ChromeClientImpl.h"
 #include "ScrollbarGroup.h"
-#include "platform/WebClipboard.h"
 #include "WebCursorInfo.h"
 #include "WebDataSourceImpl.h"
 #include "WebElement.h"
 #include "WebInputEvent.h"
 #include "WebInputEventConversion.h"
 #include "WebKit.h"
-#include "platform/WebKitPlatformSupport.h"
 #include "WebPlugin.h"
 #include "platform/WebRect.h"
 #include "platform/WebString.h"
@@ -75,14 +73,14 @@
 #include "ScrollbarTheme.h"
 #include "UserGestureIndicator.h"
 #include "WheelEvent.h"
+#include <public/Platform.h>
+#include <public/WebClipboard.h>
 
 #if ENABLE(GESTURE_EVENTS)
 #include "PlatformGestureEvent.h"
 #endif
 
-#if WEBKIT_USING_SKIA
 #include "PlatformContextSkia.h"
-#endif
 
 using namespace WebCore;
 
@@ -126,11 +124,7 @@ void WebPluginContainerImpl::paint(GraphicsContext* gc, const IntRect& damageRec
     IntPoint origin = view->windowToContents(IntPoint(0, 0));
     gc->translate(static_cast<float>(origin.x()), static_cast<float>(origin.y()));
 
-#if WEBKIT_USING_SKIA
     WebCanvas* canvas = gc->platformContext()->canvas();
-#elif WEBKIT_USING_CG
-    WebCanvas* canvas = gc->platformContext();
-#endif
 
     IntRect windowRect =
         IntRect(view->contentsToWindow(damageRect.location()), damageRect.size());
@@ -259,11 +253,7 @@ bool WebPluginContainerImpl::printPage(int pageNumber,
                                        WebCore::GraphicsContext* gc)
 {
     gc->save();
-#if WEBKIT_USING_SKIA
     WebCanvas* canvas = gc->platformContext()->canvas();
-#elif WEBKIT_USING_CG
-    WebCanvas* canvas = gc->platformContext();
-#endif
     bool ret = m_webPlugin->printPage(pageNumber, canvas);
     gc->restore();
     return ret;
@@ -279,7 +269,7 @@ void WebPluginContainerImpl::copy()
     if (!m_webPlugin->hasSelection())
         return;
 
-    webKitPlatformSupport()->clipboard()->writeHTML(m_webPlugin->selectionAsMarkup(), WebURL(), m_webPlugin->selectionAsText(), false);
+    WebKit::Platform::current()->clipboard()->writeHTML(m_webPlugin->selectionAsMarkup(), WebURL(), m_webPlugin->selectionAsText(), false);
 }
 
 WebElement WebPluginContainerImpl::element()
@@ -714,9 +704,8 @@ WebCore::IntRect WebPluginContainerImpl::windowClipRect() const
     if (m_element->renderer()->document()->renderer()) {
         // Take our element and get the clip rect from the enclosing layer and
         // frame view.
-        RenderLayer* layer = m_element->renderer()->enclosingLayer();
         clipRect.intersect(
-            m_element->document()->view()->windowClipRectForLayer(layer, true));
+            m_element->document()->view()->windowClipRectForFrameOwner(m_element, true));
     }
 
     return clipRect;