Changeset 82773 in webkit

Timestamp:

Apr 2, 2011 1:30:01 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-04-02 Sam Weinig <​sam@webkit.org>

Reviewed by Dan Bernstein.

Implement WKBundleFrameHasHorizontalScrollbar/WKBundleFrameHasVerticalScrollbar
<rdar://problem/9225772>
​https://bugs.webkit.org/show_bug.cgi?id=57709

• WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp: (WKBundleFrameHasHorizontalScrollbar): (WKBundleFrameHasVerticalScrollbar):
• WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
• WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::hasHorizontalScrollbar): (WebKit::WebFrame::hasVerticalScrollbar):
• WebProcess/WebPage/WebFrame.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundleFrame.h (modified) (1 diff)
• WebProcess/WebPage/WebFrame.cpp (modified) (1 diff)
• WebProcess/WebPage/WebFrame.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-02  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Implement WKBundleFrameHasHorizontalScrollbar/WKBundleFrameHasVerticalScrollbar
+        <rdar://problem/9225772>
+        https://bugs.webkit.org/show_bug.cgi?id=57709
+
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        (WKBundleFrameHasHorizontalScrollbar):
+        (WKBundleFrameHasVerticalScrollbar):
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::hasHorizontalScrollbar):
+        (WebKit::WebFrame::hasVerticalScrollbar):
+        * WebProcess/WebPage/WebFrame.h:
+
 2011-04-01  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

@@ -202 +202 @@
 }
 
+bool WKBundleFrameHasHorizontalScrollbar(WKBundleFrameRef frameRef)
+{
+    return toImpl(frameRef)->hasHorizontalScrollbar();
+}
+
+bool WKBundleFrameHasVerticalScrollbar(WKBundleFrameRef frameRef)
+{
+    return toImpl(frameRef)->hasVerticalScrollbar();
+}
+
 bool WKBundleFrameGetDocumentBackgroundColor(WKBundleFrameRef frameRef, double* red, double* green, double* blue, double* alpha)
 {

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h

@@ -64 +64 @@
 WK_EXPORT WKSize WKBundleFrameGetScrollOffset(WKBundleFrameRef frame);
 
+WK_EXPORT bool WKBundleFrameHasHorizontalScrollbar(WKBundleFrameRef frame);
+WK_EXPORT bool WKBundleFrameHasVerticalScrollbar(WKBundleFrameRef frame);
+
 WK_EXPORT bool WKBundleFrameGetDocumentBackgroundColor(WKBundleFrameRef frame, double* red, double* green, double* blue, double* alpha);
 

trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp

@@ -513 +513 @@
 }
 
+bool WebFrame::hasHorizontalScrollbar() const
+{
+    if (!m_coreFrame)
+        return false;
+
+    FrameView* view = m_coreFrame->view();
+    if (!view)
+        return false;
+
+    return view->horizontalScrollbar();
+}
+
+bool WebFrame::hasVerticalScrollbar() const
+{
+    if (!m_coreFrame)
+        return false;
+
+    FrameView* view = m_coreFrame->view();
+    if (!view)
+        return false;
+
+    return view->verticalScrollbar();
+}
+
 bool WebFrame::getDocumentBackgroundColor(double* red, double* green, double* blue, double* alpha)
 {

trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h

@@ -94 +94 @@
     WebCore::IntRect visibleContentBoundsExcludingScrollbars() const;
     WebCore::IntSize scrollOffset() const;
+    bool hasHorizontalScrollbar() const;
+    bool hasVerticalScrollbar() const;
     bool getDocumentBackgroundColor(double* red, double* green, double* blue, double* alpha);