OLD | NEW |
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@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1484 compositor->setNeedsCompositingUpdate(CompositingUpdateOnScroll); | 1484 compositor->setNeedsCompositingUpdate(CompositingUpdateOnScroll); |
1485 } | 1485 } |
1486 } | 1486 } |
1487 | 1487 |
1488 bool RenderLayerScrollableArea::usesCompositedScrolling() const | 1488 bool RenderLayerScrollableArea::usesCompositedScrolling() const |
1489 { | 1489 { |
1490 // Scroll form controls on the main thread so they exhibit correct touch scr
oll event bubbling | 1490 // Scroll form controls on the main thread so they exhibit correct touch scr
oll event bubbling |
1491 if (m_box && (m_box->isIntristicallyScrollable(VerticalScrollbar) || m_box->
isIntristicallyScrollable(HorizontalScrollbar))) | 1491 if (m_box && (m_box->isIntristicallyScrollable(VerticalScrollbar) || m_box->
isIntristicallyScrollable(HorizontalScrollbar))) |
1492 return false; | 1492 return false; |
1493 | 1493 |
| 1494 DisableCompositingQueryAsserts disabler; |
1494 return m_box->hasCompositedLayerMapping() && m_box->compositedLayerMapping()
->scrollingLayer(); | 1495 return m_box->hasCompositedLayerMapping() && m_box->compositedLayerMapping()
->scrollingLayer(); |
1495 } | 1496 } |
1496 | 1497 |
1497 bool RenderLayerScrollableArea::adjustForForceCompositedScrollingMode(bool value
) const | 1498 bool RenderLayerScrollableArea::adjustForForceCompositedScrollingMode(bool value
) const |
1498 { | 1499 { |
1499 switch (m_forceNeedsCompositedScrolling) { | 1500 switch (m_forceNeedsCompositedScrolling) { |
1500 case DoNotForceCompositedScrolling: | 1501 case DoNotForceCompositedScrolling: |
1501 return value; | 1502 return value; |
1502 case CompositedScrollingAlwaysOn: | 1503 case CompositedScrollingAlwaysOn: |
1503 return true; | 1504 return true; |
(...skipping 13 matching lines...) Expand all Loading... |
1517 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo
sitedScrollingMode mode) | 1518 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompo
sitedScrollingMode mode) |
1518 { | 1519 { |
1519 if (m_forceNeedsCompositedScrolling == mode) | 1520 if (m_forceNeedsCompositedScrolling == mode) |
1520 return; | 1521 return; |
1521 | 1522 |
1522 m_forceNeedsCompositedScrolling = mode; | 1523 m_forceNeedsCompositedScrolling = mode; |
1523 layer()->didUpdateNeedsCompositedScrolling(); | 1524 layer()->didUpdateNeedsCompositedScrolling(); |
1524 } | 1525 } |
1525 | 1526 |
1526 } // Namespace WebCore | 1527 } // Namespace WebCore |
OLD | NEW |