Changeset 116469 in webkit

Timestamp:

May 8, 2012 5:24:15 PM (12 years ago)

Author:

andersca@apple.com

Message:

Can't scroll PDF in subframe
​https://bugs.webkit.org/show_bug.cgi?id=85932
<rdar://problem/11405527>

Reviewed by Sam Weinig.

• WebProcess/Plugins/PDF/BuiltInPDFView.h:
• WebProcess/Plugins/PDF/BuiltInPDFView.mm:

(WebKit::BuiltInPDFView::updateScrollbars):
Trigger a layout when scrollbars come and go so the non fast scrollable region gets recomputed.

(WebKit::BuiltInPDFView::scrollableAreaBoundingBox):
Implement this by calling out to the PluginView.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PDF/BuiltInPDFView.h (modified) (1 diff)
• WebProcess/Plugins/PDF/BuiltInPDFView.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-08  Anders Carlsson  <andersca@apple.com>
+
+        Can't scroll PDF in subframe
+        https://bugs.webkit.org/show_bug.cgi?id=85932
+        <rdar://problem/11405527>
+
+        Reviewed by Sam Weinig.
+
+        * WebProcess/Plugins/PDF/BuiltInPDFView.h:
+        * WebProcess/Plugins/PDF/BuiltInPDFView.mm:
+        (WebKit::BuiltInPDFView::updateScrollbars):
+        Trigger a layout when scrollbars come and go so the non fast scrollable region gets recomputed.
+
+        (WebKit::BuiltInPDFView::scrollableAreaBoundingBox):
+        Implement this by calling out to the PluginView.
+
 2012-05-06  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.h

@@ -120 +120 @@
     virtual WebCore::IntRect scrollCornerRect() const;
     virtual WebCore::ScrollableArea* enclosingScrollableArea() const;
+    virtual WebCore::IntRect scrollableAreaBoundingBox() const OVERRIDE;
     virtual void setScrollOffset(const WebCore::IntPoint&);
     virtual int scrollSize(WebCore::ScrollbarOrientation) const;

trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm

@@ -197 +197 @@
 void BuiltInPDFView::updateScrollbars()
 {
+    bool hadScrollbars = m_horizontalScrollbar || m_verticalScrollbar;
+
     if (m_horizontalScrollbar) {
         if (m_pluginSize.width() >= m_pdfDocumentSize.width())
@@ -235 +237 @@
         return;
 
-    if (m_verticalScrollbar || m_horizontalScrollbar)
-        frameView->addScrollableArea(this);
-    else
-        frameView->removeScrollableArea(this);
+    bool hasScrollbars = m_horizontalScrollbar || m_verticalScrollbar;
+    if (hadScrollbars != hasScrollbars) {
+        if (hasScrollbars)
+            frameView->addScrollableArea(this);
+        else
+            frameView->removeScrollableArea(this);
+
+        frameView->setNeedsLayout();
+    }
 }
 
@@ -689 +696 @@
 }
 
+IntRect BuiltInPDFView::scrollableAreaBoundingBox() const
+{
+    return pluginView()->frameRect();
+}
+
 void BuiltInPDFView::setScrollOffset(const IntPoint& offset)
 {