OLD | NEW |
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 #include "platform/HostWindow.h" | 77 #include "platform/HostWindow.h" |
78 #include "platform/RuntimeEnabledFeatures.h" | 78 #include "platform/RuntimeEnabledFeatures.h" |
79 #include "platform/ScriptForbiddenScope.h" | 79 #include "platform/ScriptForbiddenScope.h" |
80 #include "platform/TraceEvent.h" | 80 #include "platform/TraceEvent.h" |
81 #include "platform/fonts/FontCache.h" | 81 #include "platform/fonts/FontCache.h" |
82 #include "platform/geometry/FloatRect.h" | 82 #include "platform/geometry/FloatRect.h" |
83 #include "platform/graphics/GraphicsContext.h" | 83 #include "platform/graphics/GraphicsContext.h" |
84 #include "platform/graphics/GraphicsContextStateSaver.h" | 84 #include "platform/graphics/GraphicsContextStateSaver.h" |
85 #include "platform/graphics/GraphicsLayer.h" | 85 #include "platform/graphics/GraphicsLayer.h" |
86 #include "platform/graphics/GraphicsLayerDebugInfo.h" | 86 #include "platform/graphics/GraphicsLayerDebugInfo.h" |
| 87 #include "platform/graphics/paint/DisplayItemList.h" |
87 #include "platform/scroll/ScrollAnimator.h" | 88 #include "platform/scroll/ScrollAnimator.h" |
88 #include "platform/text/TextStream.h" | 89 #include "platform/text/TextStream.h" |
89 #include "wtf/CurrentTime.h" | 90 #include "wtf/CurrentTime.h" |
90 #include "wtf/StdLibExtras.h" | 91 #include "wtf/StdLibExtras.h" |
91 #include "wtf/TemporaryChange.h" | 92 #include "wtf/TemporaryChange.h" |
92 | 93 |
93 namespace blink { | 94 namespace blink { |
94 | 95 |
95 using namespace HTMLNames; | 96 using namespace HTMLNames; |
96 | 97 |
(...skipping 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1380 | 1381 |
1381 void FrameView::scrollContentsSlowPath(const IntRect& updateRect) | 1382 void FrameView::scrollContentsSlowPath(const IntRect& updateRect) |
1382 { | 1383 { |
1383 if (contentsInCompositedLayer()) { | 1384 if (contentsInCompositedLayer()) { |
1384 IntRect updateRect = visibleContentRect(); | 1385 IntRect updateRect = visibleContentRect(); |
1385 ASSERT(renderView()); | 1386 ASSERT(renderView()); |
1386 renderView()->invalidatePaintRectangle(updateRect); | 1387 renderView()->invalidatePaintRectangle(updateRect); |
1387 } | 1388 } |
1388 if (RenderPart* frameRenderer = m_frame->ownerRenderer()) { | 1389 if (RenderPart* frameRenderer = m_frame->ownerRenderer()) { |
1389 if (isEnclosedInCompositingLayer()) { | 1390 if (isEnclosedInCompositingLayer()) { |
| 1391 if (RuntimeEnabledFeatures::slimmingPaintEnabled()) { |
| 1392 RenderView* renderView = this->renderView(); |
| 1393 ASSERT(renderView); |
| 1394 renderView->layer()->enclosingLayerForPaintInvalidationCrossingF
rameBoundaries()->graphicsLayerBacking()->displayItemList()->invalidate(renderVi
ew->displayItemClient()); |
| 1395 } |
1390 LayoutRect rect(frameRenderer->borderLeft() + frameRenderer->padding
Left(), | 1396 LayoutRect rect(frameRenderer->borderLeft() + frameRenderer->padding
Left(), |
1391 frameRenderer->borderTop() + frameRenderer->paddingT
op(), | 1397 frameRenderer->borderTop() + frameRenderer->paddingT
op(), |
1392 visibleWidth(), visibleHeight()); | 1398 visibleWidth(), visibleHeight()); |
1393 frameRenderer->invalidatePaintRectangle(rect); | 1399 frameRenderer->invalidatePaintRectangle(rect); |
1394 return; | 1400 return; |
1395 } | 1401 } |
1396 } | 1402 } |
1397 | 1403 |
1398 hostWindow()->invalidateRect(updateRect); | 1404 hostWindow()->invalidateRect(updateRect); |
1399 } | 1405 } |
(...skipping 2608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4008 return; | 4014 return; |
4009 | 4015 |
4010 ScrollableArea::setScrollOrigin(origin); | 4016 ScrollableArea::setScrollOrigin(origin); |
4011 | 4017 |
4012 // Update if the scroll origin changes, since our position will be different
if the content size did not change. | 4018 // Update if the scroll origin changes, since our position will be different
if the content size did not change. |
4013 if (updatePositionAtAll && updatePositionSynchronously) | 4019 if (updatePositionAtAll && updatePositionSynchronously) |
4014 updateScrollbars(scrollOffsetDouble()); | 4020 updateScrollbars(scrollOffsetDouble()); |
4015 } | 4021 } |
4016 | 4022 |
4017 } // namespace blink | 4023 } // namespace blink |
OLD | NEW |