Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)

New snapshot with more Windows build fixes

1 files changed, 10 insertions, 7 deletions

diff --git a/Source/WebKit/chromium/public/WebView.h b/Source/WebKit/chromium/public/WebView.h
index c15298204..96642f666 100644
--- a/Source/WebKit/chromium/public/WebView.h
+++ b/Source/WebKit/chromium/public/WebView.h
@@ -62,6 +62,7 @@ struct WebActiveWheelFlingParameters;
 struct WebMediaPlayerAction;
 struct WebPluginAction;
 struct WebPoint;
+struct WebRenderingStats;
 
 class WebView : public WebWidget {
 public:
@@ -249,6 +250,11 @@ public:
     virtual float minimumPageScaleFactor() const = 0;
     virtual float maximumPageScaleFactor() const = 0;
 
+    // Prevent the web page from setting a maximum scale via the viewport meta
+    // tag. This is an accessibility feature that lets folks zoom in to web
+    // pages even if the web page tries to block scaling.
+    virtual void setIgnoreViewportTagMaximumScale(bool) = 0;
+
     // The ratio of the current device's screen DPI to the target device's screen DPI.
     virtual float deviceScaleFactor() const = 0;
 
@@ -442,13 +448,6 @@ public:
 
     // GPU acceleration support --------------------------------------------
 
-    // Returns the (on-screen) WebGraphicsContext3D associated with
-    // this WebView. One will be created if it doesn't already exist.
-    // This is used to set up sharing between this context (which is
-    // that used by the compositor) and contexts for WebGL and other
-    // APIs.
-    virtual WebGraphicsContext3D* graphicsContext3D() = 0;
-
     // Context that's in the compositor's share group, but is not the compositor context itself.
     // Can be used for allocating resources that the compositor will later access.
     virtual WebGraphicsContext3D* sharedGraphicsContext3D() = 0;
@@ -459,6 +458,10 @@ public:
 
     virtual bool setEditableSelectionOffsets(int start, int end) = 0;
 
+    // Fills in a WebRenderingStats struct containing information about the state of the compositor.
+    // This call is relatively expensive in threaded mode as it blocks on the compositor thread.
+    virtual void renderingStats(WebRenderingStats&) const { }
+
     // Visibility -----------------------------------------------------------
 
     // Sets the visibility of the WebView.