Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2713553010: Migrate performance monitor to inspector instrumentation. (Closed)
Patch Set: Introduce progress monitor Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "core/editing/RenderedPosition.h" 47 #include "core/editing/RenderedPosition.h"
48 #include "core/editing/markers/DocumentMarkerController.h" 48 #include "core/editing/markers/DocumentMarkerController.h"
49 #include "core/events/ErrorEvent.h" 49 #include "core/events/ErrorEvent.h"
50 #include "core/frame/BrowserControls.h" 50 #include "core/frame/BrowserControls.h"
51 #include "core/frame/EventHandlerRegistry.h" 51 #include "core/frame/EventHandlerRegistry.h"
52 #include "core/frame/FrameHost.h" 52 #include "core/frame/FrameHost.h"
53 #include "core/frame/LocalFrame.h" 53 #include "core/frame/LocalFrame.h"
54 #include "core/frame/LocalFrameClient.h" 54 #include "core/frame/LocalFrameClient.h"
55 #include "core/frame/Location.h" 55 #include "core/frame/Location.h"
56 #include "core/frame/PageScaleConstraintsSet.h" 56 #include "core/frame/PageScaleConstraintsSet.h"
57 #include "core/frame/PerformanceMonitor.h"
58 #include "core/frame/RemoteFrame.h" 57 #include "core/frame/RemoteFrame.h"
59 #include "core/frame/RemoteFrameView.h" 58 #include "core/frame/RemoteFrameView.h"
60 #include "core/frame/Settings.h" 59 #include "core/frame/Settings.h"
61 #include "core/frame/VisualViewport.h" 60 #include "core/frame/VisualViewport.h"
62 #include "core/html/HTMLFrameElement.h" 61 #include "core/html/HTMLFrameElement.h"
63 #include "core/html/HTMLPlugInElement.h" 62 #include "core/html/HTMLPlugInElement.h"
64 #include "core/html/TextControlElement.h" 63 #include "core/html/TextControlElement.h"
65 #include "core/html/parser/TextResourceDecoder.h" 64 #include "core/html/parser/TextResourceDecoder.h"
66 #include "core/input/EventHandler.h" 65 #include "core/input/EventHandler.h"
67 #include "core/inspector/InspectorInstrumentation.h" 66 #include "core/inspector/InspectorInstrumentation.h"
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 if (m_autoSizeInfo) 1167 if (m_autoSizeInfo)
1169 m_autoSizeInfo->autoSizeIfNeeded(); 1168 m_autoSizeInfo->autoSizeIfNeeded();
1170 1169
1171 m_hasPendingLayout = false; 1170 m_hasPendingLayout = false;
1172 DocumentLifecycle::Scope lifecycleScope(lifecycle(), 1171 DocumentLifecycle::Scope lifecycleScope(lifecycle(),
1173 DocumentLifecycle::LayoutClean); 1172 DocumentLifecycle::LayoutClean);
1174 1173
1175 Document* document = m_frame->document(); 1174 Document* document = m_frame->document();
1176 TRACE_EVENT_BEGIN1("devtools.timeline", "Layout", "beginData", 1175 TRACE_EVENT_BEGIN1("devtools.timeline", "Layout", "beginData",
1177 InspectorLayoutEvent::beginData(this)); 1176 InspectorLayoutEvent::beginData(this));
1178 PerformanceMonitor::willUpdateLayout(document); 1177 InspectorInstrumentation::willUpdateLayout(document);
1179 1178
1180 performPreLayoutTasks(); 1179 performPreLayoutTasks();
1181 1180
1182 // TODO(crbug.com/460956): The notion of a single root for layout is no longer 1181 // TODO(crbug.com/460956): The notion of a single root for layout is no longer
1183 // applicable. Remove or update this code. 1182 // applicable. Remove or update this code.
1184 LayoutObject* rootForThisLayout = layoutView(); 1183 LayoutObject* rootForThisLayout = layoutView();
1185 1184
1186 FontCachePurgePreventer fontCachePurgePreventer; 1185 FontCachePurgePreventer fontCachePurgePreventer;
1187 { 1186 {
1188 AutoReset<bool> changeSchedulingEnabled(&m_layoutSchedulingEnabled, false); 1187 AutoReset<bool> changeSchedulingEnabled(&m_layoutSchedulingEnabled, false);
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 checkDoesNotNeedLayout(); 1311 checkDoesNotNeedLayout();
1313 1312
1314 scheduleOrPerformPostLayoutTasks(); 1313 scheduleOrPerformPostLayoutTasks();
1315 checkDoesNotNeedLayout(); 1314 checkDoesNotNeedLayout();
1316 1315
1317 // FIXME: The notion of a single root for layout is no longer applicable. 1316 // FIXME: The notion of a single root for layout is no longer applicable.
1318 // Remove or update this code. crbug.com/460596 1317 // Remove or update this code. crbug.com/460596
1319 TRACE_EVENT_END1("devtools.timeline", "Layout", "endData", 1318 TRACE_EVENT_END1("devtools.timeline", "Layout", "endData",
1320 InspectorLayoutEvent::endData(rootForThisLayout)); 1319 InspectorLayoutEvent::endData(rootForThisLayout));
1321 InspectorInstrumentation::didUpdateLayout(m_frame.get()); 1320 InspectorInstrumentation::didUpdateLayout(m_frame.get());
1322 PerformanceMonitor::didUpdateLayout(document);
1323 1321
1324 m_nestedLayoutCount--; 1322 m_nestedLayoutCount--;
1325 if (m_nestedLayoutCount) 1323 if (m_nestedLayoutCount)
1326 return; 1324 return;
1327 1325
1328 #if DCHECK_IS_ON() 1326 #if DCHECK_IS_ON()
1329 // Post-layout assert that nobody was re-marked as needing layout during 1327 // Post-layout assert that nobody was re-marked as needing layout during
1330 // layout. 1328 // layout.
1331 layoutView()->assertSubtreeIsLaidOut(); 1329 layoutView()->assertSubtreeIsLaidOut();
1332 #endif 1330 #endif
(...skipping 3882 matching lines...) Expand 10 before | Expand all | Expand 10 after
5215 void FrameView::setAnimationHost( 5213 void FrameView::setAnimationHost(
5216 std::unique_ptr<CompositorAnimationHost> host) { 5214 std::unique_ptr<CompositorAnimationHost> host) {
5217 m_animationHost = std::move(host); 5215 m_animationHost = std::move(host);
5218 } 5216 }
5219 5217
5220 LayoutUnit FrameView::caretWidth() const { 5218 LayoutUnit FrameView::caretWidth() const {
5221 return LayoutUnit(getHostWindow()->windowToViewportScalar(1)); 5219 return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
5222 } 5220 }
5223 5221
5224 } // namespace blink 5222 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.cpp ('k') | third_party/WebKit/Source/core/frame/PerformanceMonitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698