Chromium Code Reviews| 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 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1016 else if (rootLayoutObject && rootLayoutObject->stretchesToViewpo rt()) | 1016 else if (rootLayoutObject && rootLayoutObject->stretchesToViewpo rt()) |
| 1017 rootLayoutObject->setChildNeedsLayout(); | 1017 rootLayoutObject->setChildNeedsLayout(); |
| 1018 } | 1018 } |
| 1019 | 1019 |
| 1020 // We need to set m_doFullPaintInvalidation before triggering layout as LayoutObject::checkForPaintInvalidation | 1020 // We need to set m_doFullPaintInvalidation before triggering layout as LayoutObject::checkForPaintInvalidation |
| 1021 // checks the boolean to disable local paint invalidations. | 1021 // checks the boolean to disable local paint invalidations. |
| 1022 m_doFullPaintInvalidation |= layoutView()->shouldDoFullPaintInvalida tionForNextLayout(); | 1022 m_doFullPaintInvalidation |= layoutView()->shouldDoFullPaintInvalida tionForNextLayout(); |
| 1023 } | 1023 } |
| 1024 | 1024 |
| 1025 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink.deb ug.layout"), "LayoutTree", | 1025 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink.deb ug.layout"), "LayoutTree", |
| 1026 this, TracedLayoutObject::create(*layoutView())); | 1026 this, TracedLayoutObject::create(*layoutView(), false)); |
| 1027 | 1027 |
| 1028 performLayout(inSubtreeLayout); | 1028 performLayout(inSubtreeLayout); |
| 1029 | 1029 |
| 1030 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink.deb ug.layout"), "LayoutTree", | |
| 1031 this, TracedLayoutObject::create(*layoutView())); | |
| 1032 | |
| 1033 ASSERT(m_layoutSubtreeRootList.isEmpty()); | 1030 ASSERT(m_layoutSubtreeRootList.isEmpty()); |
| 1034 } // Reset m_layoutSchedulingEnabled to its previous value. | 1031 } // Reset m_layoutSchedulingEnabled to its previous value. |
| 1035 | 1032 |
| 1036 if (!inSubtreeLayout && !document->printing()) | 1033 if (!inSubtreeLayout && !document->printing()) |
| 1037 adjustViewSize(); | 1034 adjustViewSize(); |
| 1038 | 1035 |
| 1039 m_frameTimingRequestsDirty = true; | 1036 m_frameTimingRequestsDirty = true; |
| 1040 | 1037 |
| 1041 // FIXME: Could find the common ancestor layer of all dirty subtrees and mar k from there. crbug.com/462719 | 1038 // FIXME: Could find the common ancestor layer of all dirty subtrees and mar k from there. crbug.com/462719 |
| 1042 layoutView()->enclosingLayer()->updateLayerPositionsAfterLayout(); | 1039 layoutView()->enclosingLayer()->updateLayerPositionsAfterLayout(); |
| 1043 | 1040 |
| 1041 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink.debug.l ayout"), "LayoutTree", | |
|
szager1
2015/09/03 22:34:41
Moving this after updateLayerPositionsAfterLayout(
| |
| 1042 this, TracedLayoutObject::create(*layoutView(), true)); | |
| 1043 | |
| 1044 layoutView()->compositor()->didLayout(); | 1044 layoutView()->compositor()->didLayout(); |
| 1045 | 1045 |
| 1046 m_layoutCount++; | 1046 m_layoutCount++; |
| 1047 | 1047 |
| 1048 if (AXObjectCache* cache = document->axObjectCache()) { | 1048 if (AXObjectCache* cache = document->axObjectCache()) { |
| 1049 const KURL& url = document->url(); | 1049 const KURL& url = document->url(); |
| 1050 if (url.isValid() && !url.isAboutBlankURL()) | 1050 if (url.isValid() && !url.isAboutBlankURL()) |
| 1051 cache->handleLayoutComplete(document); | 1051 cache->handleLayoutComplete(document); |
| 1052 } | 1052 } |
| 1053 updateAnnotatedRegions(); | 1053 updateAnnotatedRegions(); |
| (...skipping 2910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3964 | 3964 |
| 3965 if (!graphicsLayer) | 3965 if (!graphicsLayer) |
| 3966 return; | 3966 return; |
| 3967 | 3967 |
| 3968 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); | 3968 DeprecatedPaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentL ayoutObject(), paintInvalidationContainer, viewRect); |
| 3969 | 3969 |
| 3970 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); | 3970 graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, Web Rect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosing IntRect(viewRect))); |
| 3971 } | 3971 } |
| 3972 | 3972 |
| 3973 } // namespace blink | 3973 } // namespace blink |
| OLD | NEW |