Title: [120463] trunk/Source/WebKit/blackberry
- Revision
- 120463
- Author
- commit-qu...@webkit.org
- Date
- 2012-06-15 08:29:44 -0700 (Fri, 15 Jun 2012)
Log Message
[BlackBerry] Remove BackingStoreClient::scrollsHorizontally/scrollsVeritically()
https://bugs.webkit.org/show_bug.cgi?id=89210
Patch by Yong Li <y...@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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (120462 => 120463)
--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-06-15 15:19:50 UTC (rev 120462)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2012-06-15 15:29:44 UTC (rev 120463)
@@ -1557,10 +1557,8 @@
#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
@@ -1800,8 +1798,6 @@
if (!m_webPage->isVisible())
return;
- ASSERT(m_client->scrollsHorizontally());
-
m_webPage->client()->drawHorizontalScrollbar();
}
@@ -1810,8 +1806,6 @@
if (!m_webPage->isVisible())
return;
- ASSERT(m_client->scrollsVertically());
-
m_webPage->client()->drawVerticalScrollbar();
}
Modified: trunk/Source/WebKit/blackberry/ChangeLog (120462 => 120463)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-06-15 15:19:50 UTC (rev 120462)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-06-15 15:29:44 UTC (rev 120463)
@@ -1,3 +1,21 @@
+2012-06-15 Yong Li <y...@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....@gmail.com>
Unreviewed, rolling out r120404.
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp (120462 => 120463)
--- trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp 2012-06-15 15:19:50 UTC (rev 120462)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.cpp 2012-06-15 15:29:44 UTC (rev 120463)
@@ -380,16 +380,6 @@
&& m_frame->page()->focusController()->focusedFrame() == m_frame;
}
-bool BackingStoreClient::scrollsHorizontally() const
-{
- return transformedActualVisibleSize().width() < transformedContentsSize().width();
-}
-
-bool BackingStoreClient::scrollsVertically() const
-{
- return transformedActualVisibleSize().height() < transformedContentsSize().height();
-}
-
bool BackingStoreClient::isClientGeneratedScroll() const
{
return m_isClientGeneratedScroll;
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.h (120462 => 120463)
--- trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.h 2012-06-15 15:19:50 UTC (rev 120462)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/BackingStoreClient.h 2012-06-15 15:29:44 UTC (rev 120463)
@@ -94,9 +94,6 @@
bool isFocused() const;
- bool scrollsHorizontally() const;
- bool scrollsVertically() const;
-
bool isClientGeneratedScroll() const;
void setIsClientGeneratedScroll(bool);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
