diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit2/WebProcess/WebPage/WebFrame.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/WebFrame.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/WebFrame.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp index 6840914b4..c65c5e5bc 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp @@ -31,6 +31,7 @@ #include "InjectedBundleNodeHandle.h" #include "InjectedBundleRangeHandle.h" #include "InjectedBundleScriptWorld.h" +#include "PluginView.h" #include "WKAPICast.h" #include "WKBundleAPICast.h" #include "WebChromeClient.h" @@ -54,6 +55,7 @@ #include <WebCore/JSElement.h> #include <WebCore/JSRange.h> #include <WebCore/Page.h> +#include <WebCore/PluginDocument.h> #include <WebCore/RenderTreeAsText.h> #include <WebCore/ResourceBuffer.h> #include <WebCore/SecurityOrigin.h> @@ -544,6 +546,17 @@ JSGlobalContextRef WebFrame::jsContextForWorld(InjectedBundleScriptWorld* world) return toGlobalRef(m_coreFrame->script()->globalObject(world->coreWorld())->globalExec()); } +bool WebFrame::handlesPageScaleGesture() const +{ + if (!m_coreFrame->document()->isPluginDocument()) + return 0; + + PluginDocument* pluginDocument = static_cast<PluginDocument*>(m_coreFrame->document()); + PluginView* pluginView = static_cast<PluginView*>(pluginDocument->pluginWidget()); + + return pluginView->handlesPageScaleFactor(); +} + IntRect WebFrame::contentBounds() const { if (!m_coreFrame) |