Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1318)

Unified Diff: Source/core/platform/ScrollView.cpp

Issue 13963006: Remove frame flattening support as Chromium has no intention of using it (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/ScrollView.h ('k') | Source/core/rendering/RenderFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/ScrollView.cpp
diff --git a/Source/core/platform/ScrollView.cpp b/Source/core/platform/ScrollView.cpp
index e823c67d421d0c3c11c4dee652aae8a5f05c1ee3..21d158b4e5be7aa2698eff0c848455fa3c616ec5 100644
--- a/Source/core/platform/ScrollView.cpp
+++ b/Source/core/platform/ScrollView.cpp
@@ -82,7 +82,7 @@ void ScrollView::removeChild(Widget* child)
void ScrollView::setHasHorizontalScrollbar(bool hasBar)
{
- ASSERT(!hasBar || !avoidScrollbarCreation());
+ ASSERT(!hasBar);
if (hasBar && !m_horizontalScrollbar) {
m_horizontalScrollbar = createScrollbar(HorizontalScrollbar);
addChild(m_horizontalScrollbar.get());
@@ -93,14 +93,14 @@ void ScrollView::setHasHorizontalScrollbar(bool hasBar)
removeChild(m_horizontalScrollbar.get());
m_horizontalScrollbar = 0;
}
-
+
if (AXObjectCache* cache = axObjectCache())
cache->handleScrollbarUpdate(this);
}
void ScrollView::setHasVerticalScrollbar(bool hasBar)
{
- ASSERT(!hasBar || !avoidScrollbarCreation());
+ ASSERT(!hasBar);
if (hasBar && !m_verticalScrollbar) {
m_verticalScrollbar = createScrollbar(VerticalScrollbar);
addChild(m_verticalScrollbar.get());
@@ -425,13 +425,13 @@ void ScrollView::updateScrollbars(const IntSize& desiredOffset)
newHasVerticalScrollbar = (vScroll == ScrollbarAlwaysOn);
if (m_scrollbarsSuppressed || (hScroll != ScrollbarAuto && vScroll != ScrollbarAuto)) {
- if (hasHorizontalScrollbar != newHasHorizontalScrollbar && (hasHorizontalScrollbar || !avoidScrollbarCreation()))
+ if (hasHorizontalScrollbar != newHasHorizontalScrollbar)
setHasHorizontalScrollbar(newHasHorizontalScrollbar);
- if (hasVerticalScrollbar != newHasVerticalScrollbar && (hasVerticalScrollbar || !avoidScrollbarCreation()))
+ if (hasVerticalScrollbar != newHasVerticalScrollbar)
setHasVerticalScrollbar(newHasVerticalScrollbar);
} else {
bool sendContentResizedNotification = false;
-
+
IntSize docSize = totalContentsSize();
IntSize fullVisibleSize = visibleContentRect(IncludeScrollbars).size();
@@ -454,7 +454,7 @@ void ScrollView::updateScrollbars(const IntSize& desiredOffset)
newHasHorizontalScrollbar = false;
bool scrollbarIsOverlay = ScrollbarTheme::theme()->usesOverlayScrollbars();
- if (hasHorizontalScrollbar != newHasHorizontalScrollbar && (hasHorizontalScrollbar || !avoidScrollbarCreation())) {
+ if (hasHorizontalScrollbar != newHasHorizontalScrollbar) {
if (!scrollbarIsOverlay)
sendContentResizedNotification = true;
if (scrollOrigin().y() && !newHasHorizontalScrollbar && !scrollbarIsOverlay)
@@ -464,7 +464,7 @@ void ScrollView::updateScrollbars(const IntSize& desiredOffset)
setHasHorizontalScrollbar(newHasHorizontalScrollbar);
}
- if (hasVerticalScrollbar != newHasVerticalScrollbar && (hasVerticalScrollbar || !avoidScrollbarCreation())) {
+ if (hasVerticalScrollbar != newHasVerticalScrollbar) {
if (!scrollbarIsOverlay)
sendContentResizedNotification = true;
if (scrollOrigin().x() && !newHasVerticalScrollbar && !scrollbarIsOverlay)
« no previous file with comments | « Source/core/platform/ScrollView.h ('k') | Source/core/rendering/RenderFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698