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

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: Fix more tests Created 4 years, 9 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) 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 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1443 1443
1444 bool PaintLayerScrollableArea::visualViewportSuppliesScrollbars() const 1444 bool PaintLayerScrollableArea::visualViewportSuppliesScrollbars() const
1445 { 1445 {
1446 if (!layer()->isRootLayer()) 1446 if (!layer()->isRootLayer())
1447 return false; 1447 return false;
1448 1448
1449 LocalFrame* frame = box().frame(); 1449 LocalFrame* frame = box().frame();
1450 if (!frame || !frame->isMainFrame() || !frame->settings()) 1450 if (!frame || !frame->isMainFrame() || !frame->settings())
1451 return false; 1451 return false;
1452 1452
1453 return frame->settings()->viewportMetaEnabled(); 1453 return frame->settings()->viewportEnabled();
1454 } 1454 }
1455 1455
1456 Widget* PaintLayerScrollableArea::widget() 1456 Widget* PaintLayerScrollableArea::widget()
1457 { 1457 {
1458 return box().frame()->view(); 1458 return box().frame()->view();
1459 } 1459 }
1460 1460
1461 void PaintLayerScrollableArea::resetRebuildScrollbarLayerFlags() 1461 void PaintLayerScrollableArea::resetRebuildScrollbarLayerFlags()
1462 { 1462 {
1463 m_rebuildHorizontalScrollbarLayer = false; 1463 m_rebuildHorizontalScrollbarLayer = false;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 } 1574 }
1575 1575
1576 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager) 1576 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager)
1577 { 1577 {
1578 visitor->trace(m_scrollableArea); 1578 visitor->trace(m_scrollableArea);
1579 visitor->trace(m_hBar); 1579 visitor->trace(m_hBar);
1580 visitor->trace(m_vBar); 1580 visitor->trace(m_vBar);
1581 } 1581 }
1582 1582
1583 } // namespace blink 1583 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698