Changeset 93434 in webkit

Timestamp:

Aug 19, 2011 1:37:17 PM (13 years ago)

Author:

fsamuel@chromium.org

Message:

Expose Fixed Layout Size mode to Chromium's WebKit API
​https://bugs.webkit.org/show_bug.cgi?id=66568

Reviewed by Darin Fisher.

• public/WebView.h:
• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::isFixedLayoutModeEnabled):
(WebKit::WebViewImpl::enableFixedLayoutMode):
(WebKit::WebViewImpl::fixedLayoutSize):
(WebKit::WebViewImpl::setFixedLayoutSize):

• src/WebViewImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebView.h (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (1 diff)
• src/WebViewImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-19  Fady Samuel  <fsamuel@chromium.org>
+
+        Expose Fixed Layout Size mode to Chromium's WebKit API
+        https://bugs.webkit.org/show_bug.cgi?id=66568
+
+        Reviewed by Darin Fisher.
+
+        * public/WebView.h:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::isFixedLayoutModeEnabled):
+        (WebKit::WebViewImpl::enableFixedLayoutMode):
+        (WebKit::WebViewImpl::fixedLayoutSize):
+        (WebKit::WebViewImpl::setFixedLayoutSize):
+        * src/WebViewImpl.h:
+
 2011-08-17  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebKit/chromium/public/WebView.h

@@ -214 +214 @@
 
 
+    // Fixed Layout --------------------------------------------------------
+
+    // In fixed layout mode, the layout of the page is independent of the
+    // view port size, given by WebWidget::size().
+
+    virtual bool isFixedLayoutModeEnabled() const = 0;
+    virtual void enableFixedLayoutMode(bool enable) = 0;
+
+    virtual WebSize fixedLayoutSize() const = 0;
+    virtual void setFixedLayoutSize(const WebSize&) = 0;
+
+
     // Media ---------------------------------------------------------------
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1863 +1863 @@
 }
 
+bool WebViewImpl::isFixedLayoutModeEnabled() const
+{
+    if (!page())
+        return false;
+
+    Frame* frame = page()->mainFrame();
+    if (!frame)
+        return false;
+
+    return frame->view()->useFixedLayout();
+}
+
+void WebViewImpl::enableFixedLayoutMode(bool enable)
+{
+    if (!page())
+        return;
+
+    Frame* frame = page()->mainFrame();
+    if (!frame)
+        return;
+
+    frame->view()->setUseFixedLayout(enable);
+}
+
+WebSize WebViewImpl::fixedLayoutSize() const
+{
+    if (!page())
+        return WebSize();
+
+    Frame* frame = page()->mainFrame();
+    if (!frame)
+        return WebSize();
+
+    return frame->view()->fixedLayoutSize();
+}
+
+void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
+{
+    if (!page())
+        return;
+
+    Frame* frame = page()->mainFrame();
+    if (!frame)
+        return;
+
+    frame->view()->setFixedLayoutSize(layoutSize);
+}
+
 void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action,
                                            const WebPoint& location)

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -158 +158 @@
     virtual float pageScaleFactor() const;
     virtual void scalePage(float scaleFactor, WebPoint origin);
+    virtual bool isFixedLayoutModeEnabled() const;
+    virtual void enableFixedLayoutMode(bool enable);
+    virtual WebSize fixedLayoutSize() const;
+    virtual void setFixedLayoutSize(const WebSize&);
     virtual void performMediaPlayerAction(
         const WebMediaPlayerAction& action,