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

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change loop style Created 4 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/frame/VisualViewport.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@gmail.com> 9 * Christian Biesinger <cbiesinger@gmail.com>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 1446
1447 bool PaintLayerScrollableArea::visualViewportSuppliesScrollbars() const 1447 bool PaintLayerScrollableArea::visualViewportSuppliesScrollbars() const
1448 { 1448 {
1449 if (!layer()->isRootLayer()) 1449 if (!layer()->isRootLayer())
1450 return false; 1450 return false;
1451 1451
1452 LocalFrame* frame = box().frame(); 1452 LocalFrame* frame = box().frame();
1453 if (!frame || !frame->isMainFrame() || !frame->settings()) 1453 if (!frame || !frame->isMainFrame() || !frame->settings())
1454 return false; 1454 return false;
1455 1455
1456 return frame->settings()->viewportMetaEnabled(); 1456 return frame->settings()->viewportEnabled();
1457 } 1457 }
1458 1458
1459 Widget* PaintLayerScrollableArea::getWidget() 1459 Widget* PaintLayerScrollableArea::getWidget()
1460 { 1460 {
1461 return box().frame()->view(); 1461 return box().frame()->view();
1462 } 1462 }
1463 1463
1464 void PaintLayerScrollableArea::resetRebuildScrollbarLayerFlags() 1464 void PaintLayerScrollableArea::resetRebuildScrollbarLayerFlags()
1465 { 1465 {
1466 m_rebuildHorizontalScrollbarLayer = false; 1466 m_rebuildHorizontalScrollbarLayer = false;
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1586 } 1586 }
1587 1587
1588 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) 1588 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager)
1589 { 1589 {
1590 visitor->trace(m_scrollableArea); 1590 visitor->trace(m_scrollableArea);
1591 visitor->trace(m_hBar); 1591 visitor->trace(m_hBar);
1592 visitor->trace(m_vBar); 1592 visitor->trace(m_vBar);
1593 } 1593 }
1594 1594
1595 } // namespace blink 1595 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/VisualViewport.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698