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 2920 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2931 | 2931 |
2932 if (targetState >= DocumentLifecycle::PrePaintClean) { | 2932 if (targetState >= DocumentLifecycle::PrePaintClean) { |
2933 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) | 2933 if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) |
2934 invalidateTreeIfNeededRecursive(); | 2934 invalidateTreeIfNeededRecursive(); |
2935 | 2935 |
2936 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { | 2936 if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
2937 if (view.compositor()->inCompositingMode()) | 2937 if (view.compositor()->inCompositingMode()) |
2938 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); | 2938 scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); |
2939 } | 2939 } |
2940 | 2940 |
| 2941 if (LocalFrame* localFrame = m_frame->localFrameRoot()) { |
| 2942 // This is needed since, at present, the ScrollingCoordinator doesn't |
| 2943 // send rects for oopif sub-frames. |
| 2944 // TODO(wjmaclean): Remove this pathway when ScrollingCoordinator |
| 2945 // operates on a per-frame basis. https://crbug.com/680606 |
| 2946 frame().page()->chromeClient().updateTouchRectsForSubframeIfNecessary( |
| 2947 localFrame); |
| 2948 } |
2941 updateCompositedSelectionIfNeeded(); | 2949 updateCompositedSelectionIfNeeded(); |
2942 } | 2950 } |
2943 | 2951 |
2944 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step | 2952 // TODO(pdr): prePaint should be under the "Paint" devtools timeline step |
2945 // for slimming paint v2. | 2953 // for slimming paint v2. |
2946 if (targetState >= DocumentLifecycle::PrePaintClean) | 2954 if (targetState >= DocumentLifecycle::PrePaintClean) |
2947 prePaint(); | 2955 prePaint(); |
2948 } | 2956 } |
2949 | 2957 |
2950 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) | 2958 if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
(...skipping 2047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4998 // This is the top-level frame, so no mapping necessary. | 5006 // This is the top-level frame, so no mapping necessary. |
4999 if (m_frame->isMainFrame()) | 5007 if (m_frame->isMainFrame()) |
5000 return; | 5008 return; |
5001 | 5009 |
5002 LayoutRect viewportIntersectionRect(remoteViewportIntersection()); | 5010 LayoutRect viewportIntersectionRect(remoteViewportIntersection()); |
5003 transformState.move( | 5011 transformState.move( |
5004 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y())); | 5012 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y())); |
5005 } | 5013 } |
5006 | 5014 |
5007 } // namespace blink | 5015 } // namespace blink |
OLD | NEW |