| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 2375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2386 } | 2386 } |
| 2387 | 2387 |
| 2388 bool CompositedLayerMapping::needsRepaint(const GraphicsLayer& graphicsLayer) co
nst | 2388 bool CompositedLayerMapping::needsRepaint(const GraphicsLayer& graphicsLayer) co
nst |
| 2389 { | 2389 { |
| 2390 return isScrollableAreaLayer(&graphicsLayer) ? true : m_owningLayer.needsRep
aint(); | 2390 return isScrollableAreaLayer(&graphicsLayer) ? true : m_owningLayer.needsRep
aint(); |
| 2391 } | 2391 } |
| 2392 | 2392 |
| 2393 void CompositedLayerMapping::adjustForCompositedScrolling(const GraphicsLayer* g
raphicsLayer, IntSize& offset) const | 2393 void CompositedLayerMapping::adjustForCompositedScrolling(const GraphicsLayer* g
raphicsLayer, IntSize& offset) const |
| 2394 { | 2394 { |
| 2395 if (graphicsLayer == m_scrollingContentsLayer.get() || graphicsLayer == m_fo
regroundLayer.get()) { | 2395 if (graphicsLayer == m_scrollingContentsLayer.get() || graphicsLayer == m_fo
regroundLayer.get()) { |
| 2396 if (m_owningLayer.getScrollableArea()) { | 2396 if (PaintLayerScrollableArea* scrollableArea = m_owningLayer.getScrollab
leArea()) { |
| 2397 DoubleSize adjustedScrollOffset = m_owningLayer.getScrollableArea()-
>adjustedScrollOffset(); | 2397 DoubleSize adjustedScrollOffset = scrollableArea->adjustedScrollOffs
et(); |
| 2398 offset.expand(-adjustedScrollOffset.width(), -adjustedScrollOffset.h
eight()); | 2398 offset.expand(-adjustedScrollOffset.width(), -adjustedScrollOffset.h
eight()); |
| 2399 } | 2399 } |
| 2400 } | 2400 } |
| 2401 } | 2401 } |
| 2402 | 2402 |
| 2403 void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G
raphicsContext& context, | 2403 void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G
raphicsContext& context, |
| 2404 GraphicsLayerPaintingPhase graphicsLayerPaintingPhase, const IntRect& intere
stRect) const | 2404 GraphicsLayerPaintingPhase graphicsLayerPaintingPhase, const IntRect& intere
stRect) const |
| 2405 { | 2405 { |
| 2406 // https://code.google.com/p/chromium/issues/detail?id=343772 | 2406 // https://code.google.com/p/chromium/issues/detail?id=343772 |
| 2407 DisableCompositingQueryAsserts disabler; | 2407 DisableCompositingQueryAsserts disabler; |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2666 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { | 2666 } else if (graphicsLayer == m_scrollingContentsLayer.get()) { |
| 2667 name = "Scrolling Contents Layer"; | 2667 name = "Scrolling Contents Layer"; |
| 2668 } else { | 2668 } else { |
| 2669 ASSERT_NOT_REACHED(); | 2669 ASSERT_NOT_REACHED(); |
| 2670 } | 2670 } |
| 2671 | 2671 |
| 2672 return name; | 2672 return name; |
| 2673 } | 2673 } |
| 2674 | 2674 |
| 2675 } // namespace blink | 2675 } // namespace blink |
| OLD | NEW |