| 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 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1312 | 1312 |
| 1313 lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean); | 1313 lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean); |
| 1314 } | 1314 } |
| 1315 | 1315 |
| 1316 void FrameView::invalidatePaintIfNeeded( | 1316 void FrameView::invalidatePaintIfNeeded( |
| 1317 const PaintInvalidationState& paintInvalidationState) { | 1317 const PaintInvalidationState& paintInvalidationState) { |
| 1318 RELEASE_ASSERT(!layoutViewItem().isNull()); | 1318 RELEASE_ASSERT(!layoutViewItem().isNull()); |
| 1319 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) | 1319 if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled()) |
| 1320 invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState); | 1320 invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState); |
| 1321 | 1321 |
| 1322 if (m_frame->selection().isCaretBoundsDirty()) | 1322 m_frame->selection().invalidateCaretRect(); |
| 1323 m_frame->selection().invalidateCaretRect(); | |
| 1324 } | 1323 } |
| 1325 | 1324 |
| 1326 void FrameView::setNeedsPaintPropertyUpdate() { | 1325 void FrameView::setNeedsPaintPropertyUpdate() { |
| 1327 m_needsPaintPropertyUpdate = true; | 1326 m_needsPaintPropertyUpdate = true; |
| 1328 if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { | 1327 if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) { |
| 1329 if (auto* layoutView = this->layoutView()) { | 1328 if (auto* layoutView = this->layoutView()) { |
| 1330 layoutView->setNeedsPaintPropertyUpdate(); | 1329 layoutView->setNeedsPaintPropertyUpdate(); |
| 1331 return; | 1330 return; |
| 1332 } | 1331 } |
| 1333 } | 1332 } |
| (...skipping 1084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2418 // tests hit that case. | 2417 // tests hit that case. |
| 2419 // We should ASSERT(isActive()); or at least return early if we can! | 2418 // We should ASSERT(isActive()); or at least return early if we can! |
| 2420 | 2419 |
| 2421 // Always called before or after performLayout(), part of the highest-level | 2420 // Always called before or after performLayout(), part of the highest-level |
| 2422 // layout() call. | 2421 // layout() call. |
| 2423 ASSERT(!isInPerformLayout()); | 2422 ASSERT(!isInPerformLayout()); |
| 2424 TRACE_EVENT0("blink,benchmark", "FrameView::performPostLayoutTasks"); | 2423 TRACE_EVENT0("blink,benchmark", "FrameView::performPostLayoutTasks"); |
| 2425 | 2424 |
| 2426 m_postLayoutTasksTimer.stop(); | 2425 m_postLayoutTasksTimer.stop(); |
| 2427 | 2426 |
| 2428 m_frame->selection().setCaretRectNeedsUpdate(); | 2427 m_frame->selection().didLayout(); |
| 2429 m_frame->selection().updateAppearance(); | |
| 2430 | 2428 |
| 2431 ASSERT(m_frame->document()); | 2429 ASSERT(m_frame->document()); |
| 2432 | 2430 |
| 2433 FontFaceSet::didLayout(*m_frame->document()); | 2431 FontFaceSet::didLayout(*m_frame->document()); |
| 2434 // Cursor update scheduling is done by the local root, which is the main frame | 2432 // Cursor update scheduling is done by the local root, which is the main frame |
| 2435 // if there are no RemoteFrame ancestors in the frame tree. Use of | 2433 // if there are no RemoteFrame ancestors in the frame tree. Use of |
| 2436 // localFrameRoot() is discouraged but will change when cursor update | 2434 // localFrameRoot() is discouraged but will change when cursor update |
| 2437 // scheduling is moved from EventHandler to PageEventHandler. | 2435 // scheduling is moved from EventHandler to PageEventHandler. |
| 2438 frame().localFrameRoot()->eventHandler().scheduleCursorUpdate(); | 2436 frame().localFrameRoot()->eventHandler().scheduleCursorUpdate(); |
| 2439 | 2437 |
| (...skipping 2559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4999 // This is the top-level frame, so no mapping necessary. | 4997 // This is the top-level frame, so no mapping necessary. |
| 5000 if (m_frame->isMainFrame()) | 4998 if (m_frame->isMainFrame()) |
| 5001 return; | 4999 return; |
| 5002 | 5000 |
| 5003 LayoutRect viewportIntersectionRect(remoteViewportIntersection()); | 5001 LayoutRect viewportIntersectionRect(remoteViewportIntersection()); |
| 5004 transformState.move( | 5002 transformState.move( |
| 5005 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y())); | 5003 LayoutSize(-viewportIntersectionRect.x(), -viewportIntersectionRect.y())); |
| 5006 } | 5004 } |
| 5007 | 5005 |
| 5008 } // namespace blink | 5006 } // namespace blink |
| OLD | NEW |