Index: Source/web/WebViewImpl.cpp |
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp |
index 1ffda430d9d61943fc716fb04abe198a8c466a39..9fd2a564b924bc481cbac938f4f32db25da4ba75 100644 |
--- a/Source/web/WebViewImpl.cpp |
+++ b/Source/web/WebViewImpl.cpp |
@@ -86,6 +86,9 @@ |
#include "core/page/PointerLockController.h" |
#include "core/page/ScopedPageLoadDeferrer.h" |
#include "core/page/TouchDisambiguation.h" |
+#include "core/paint/DeprecatedPaintLayer.h" |
+#include "core/timing/DOMWindowPerformance.h" |
+#include "core/timing/Performance.h" |
#include "modules/accessibility/AXObject.h" |
#include "modules/accessibility/AXObjectCacheImpl.h" |
#include "modules/credentialmanager/CredentialManagerClient.h" |
@@ -125,6 +128,7 @@ |
#include "public/web/WebActiveWheelFlingParameters.h" |
#include "public/web/WebAutofillClient.h" |
#include "public/web/WebBeginFrameArgs.h" |
+#include "public/web/WebFrame.h" |
#include "public/web/WebFrameClient.h" |
#include "public/web/WebHitTestResult.h" |
#include "public/web/WebInputElement.h" |
@@ -1925,7 +1929,6 @@ void WebViewImpl::setNeedsLayoutAndFullPaintInvalidation() |
{ |
if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame()->view()) |
return; |
- |
chrishtr
2015/05/09 00:51:52
Spurious edit.
MikeB
2015/05/11 23:10:52
Done.
|
FrameView* view = mainFrameImpl()->frame()->view(); |
view->setNeedsLayout(); |
view->setNeedsFullPaintInvalidation(); |
@@ -4339,6 +4342,27 @@ void WebViewImpl::applyViewportDeltas( |
DoubleSize(outerViewportDelta.width, outerViewportDelta.height), /* programmaticScroll */ false); |
} |
+void WebViewImpl::recordFrameTimingEvent(FrameTimingEventType eventType, int64_t FrameId, const WebVector<std::pair<int, double>>& events) |
+{ |
+ Frame* frame = m_page ? m_page->mainFrame() : 0; |
+ |
+ while (frame && frame->frameID() != FrameId) { |
+ frame = frame->tree().traverseNext(); |
+ } |
+ |
+ if (!frame || !frame->domWindow() || !frame->domWindow()->document()) |
+ return; // Can't find frame, it may have been cleaned up from the DOM. |
+ |
+ blink::DOMWindow* domWindow = frame->domWindow(); |
+ blink::Performance* performance = DOMWindowPerformance::performance(*domWindow); |
+ for (size_t i = 0; i < events.size(); ++i) { |
+ if (eventType == CompositeEvent) |
+ performance->addCompositeTiming(domWindow->document(), events[i].first, events[i].second); |
+ else if (eventType == RenderEvent) |
+ performance->addRenderTiming(domWindow->document(), events[i].first, events[i].second); |
+ } |
+} |
+ |
void WebViewImpl::updateLayerTreeViewport() |
{ |
if (!page() || !m_layerTreeView) |