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

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2339873002: Replace hide-scrollbars flag with a web setting. (Closed)
Patch Set: check for presence of settings using DCHECK + sync. Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 3381 matching lines...) Expand 10 before | Expand all | Expand 10 after
3392 // If the page's overflow setting has disabled scrolling, do not allow anyth ing to override that setting. 3392 // If the page's overflow setting has disabled scrolling, do not allow anyth ing to override that setting.
3393 // http://crbug.com/426447 3393 // http://crbug.com/426447
3394 LayoutObject* viewport = viewportLayoutObject(); 3394 LayoutObject* viewport = viewportLayoutObject();
3395 if (viewport && !shouldIgnoreOverflowHidden()) { 3395 if (viewport && !shouldIgnoreOverflowHidden()) {
3396 if (viewport->style()->overflowX() == OverflowHidden) 3396 if (viewport->style()->overflowX() == OverflowHidden)
3397 horizontalMode = ScrollbarAlwaysOff; 3397 horizontalMode = ScrollbarAlwaysOff;
3398 if (viewport->style()->overflowY() == OverflowHidden) 3398 if (viewport->style()->overflowY() == OverflowHidden)
3399 verticalMode = ScrollbarAlwaysOff; 3399 verticalMode = ScrollbarAlwaysOff;
3400 } 3400 }
3401 3401
3402 DCHECK(m_frame->settings());
3403 if (m_frame->settings()->hideScrollbars()) {
3404 horizontalMode = ScrollbarAlwaysOff;
3405 verticalMode = ScrollbarAlwaysOff;
3406 }
3407
3402 if (horizontalMode != horizontalScrollbarMode() && !m_horizontalScrollbarLoc k) { 3408 if (horizontalMode != horizontalScrollbarMode() && !m_horizontalScrollbarLoc k) {
3403 m_horizontalScrollbarMode = horizontalMode; 3409 m_horizontalScrollbarMode = horizontalMode;
3404 needsUpdate = true; 3410 needsUpdate = true;
3405 } 3411 }
3406 3412
3407 if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) { 3413 if (verticalMode != verticalScrollbarMode() && !m_verticalScrollbarLock) {
3408 m_verticalScrollbarMode = verticalMode; 3414 m_verticalScrollbarMode = verticalMode;
3409 needsUpdate = true; 3415 needsUpdate = true;
3410 } 3416 }
3411 3417
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
4394 } 4400 }
4395 4401
4396 bool FrameView::canThrottleRendering() const 4402 bool FrameView::canThrottleRendering() const
4397 { 4403 {
4398 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) 4404 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
4399 return false; 4405 return false;
4400 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4406 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4401 } 4407 }
4402 4408
4403 } // namespace blink 4409 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698