Changeset 120463 in webkit

Timestamp:

Jun 15, 2012, 8:29:44 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Remove BackingStoreClient::scrollsHorizontally/scrollsVeritically()
​https://bugs.webkit.org/show_bug.cgi?id=89210

Patch by Yong Li <​yoli@rim.com> on 2012-06-15
Reviewed by Antonio Gomes.

Remove BackingStoreClient::scrollsHorizontally()/scrollsVeritically(), because
calling them is neither nessary nor safe.

• Api/BackingStore.cpp:

(BlackBerry::WebKit::BackingStorePrivate::blitContents):
(BlackBerry::WebKit::BackingStorePrivate::blitHorizontalScrollbar):
(BlackBerry::WebKit::BackingStorePrivate::blitVerticalScrollbar):

• WebKitSupport/BackingStoreClient.cpp:
• WebKitSupport/BackingStoreClient.h:

(BackingStoreClient):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/BackingStore.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• WebKitSupport/BackingStoreClient.cpp (modified) (1 diff)
• WebKitSupport/BackingStoreClient.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/BackingStore.cpp

@@ -1558 +1558 @@
 #if ENABLE_SCROLLBARS
     if (isScrollingOrZooming() && m_client->isMainFrame()) {
-        if (m_client->scrollsHorizontally())
-            blitHorizontalScrollbar(origin);
-        if (m_client->scrollsVertically())
-            blitVerticalScrollbar(origin);
+        blitHorizontalScrollbar(origin);
+        blitVerticalScrollbar(origin);
     }
 #endif
@@ -1801 +1799 @@
         return;
 
-    ASSERT(m_client->scrollsHorizontally());
-
     m_webPage->client()->drawHorizontalScrollbar();
 }
@@ -1810 +1806 @@
     if (!m_webPage->isVisible())
         return;
-
-    ASSERT(m_client->scrollsVertically());
 
     m_webPage->client()->drawVerticalScrollbar();

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-06-15  Yong Li  <yoli@rim.com>
+
+        [BlackBerry] Remove BackingStoreClient::scrollsHorizontally/scrollsVeritically()
+        https://bugs.webkit.org/show_bug.cgi?id=89210
+
+        Reviewed by Antonio Gomes.
+
+        Remove BackingStoreClient::scrollsHorizontally()/scrollsVeritically(), because
+        calling them is neither nessary nor safe.
+
+        * Api/BackingStore.cpp:
+        (BlackBerry::WebKit::BackingStorePrivate::blitContents):
+        (BlackBerry::WebKit::BackingStorePrivate::blitHorizontalScrollbar):
+        (BlackBerry::WebKit::BackingStorePrivate::blitVerticalScrollbar):
+        * WebKitSupport/BackingStoreClient.cpp:
+        * WebKitSupport/BackingStoreClient.h:
+        (BackingStoreClient):
+
 2012-06-15  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp

@@ -381 +381 @@
 }
 
-bool BackingStoreClient::scrollsHorizontally() const
-{
-    return transformedActualVisibleSize().width() < transformedContentsSize().width();
-}
-
-bool BackingStoreClient::scrollsVertically() const
-{
-    return transformedActualVisibleSize().height() < transformedContentsSize().height();
-}
-
 bool BackingStoreClient::isClientGeneratedScroll() const
 {

trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.h

@@ -95 +95 @@
     bool isFocused() const;
 
-    bool scrollsHorizontally() const;
-    bool scrollsVertically() const;
-
     bool isClientGeneratedScroll() const;
     void setIsClientGeneratedScroll(bool);