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

Side by Side Diff: third_party/WebKit/Source/core/timing/PerformanceBase.cpp

Issue 2655143002: Drop replacesCurrentHistoryItem, NavigationType (Closed)
Patch Set: More compile fixes Created 3 years, 10 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2012 Intel Inc. All rights reserved. 3 * Copyright (C) 2012 Intel Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 m_timeOrigin(timeOrigin), 74 m_timeOrigin(timeOrigin),
75 m_observerFilterOptions(PerformanceEntry::Invalid), 75 m_observerFilterOptions(PerformanceEntry::Invalid),
76 m_deliverObservationsTimer( 76 m_deliverObservationsTimer(
77 std::move(taskRunner), 77 std::move(taskRunner),
78 this, 78 this,
79 &PerformanceBase::deliverObservationsTimerFired) {} 79 &PerformanceBase::deliverObservationsTimerFired) {}
80 80
81 PerformanceBase::~PerformanceBase() {} 81 PerformanceBase::~PerformanceBase() {}
82 82
83 PerformanceNavigationTiming::NavigationType PerformanceBase::getNavigationType( 83 PerformanceNavigationTiming::NavigationType PerformanceBase::getNavigationType(
84 NavigationType type, 84 FrameLoadType type,
85 const Document* document) { 85 const Document* document) {
86 if (document && 86 if (document &&
87 document->pageVisibilityState() == PageVisibilityStatePrerender) { 87 document->pageVisibilityState() == PageVisibilityStatePrerender) {
88 return PerformanceNavigationTiming::NavigationType::Prerender; 88 return PerformanceNavigationTiming::NavigationType::Prerender;
89 } 89 }
90 switch (type) { 90 switch (type) {
91 case NavigationTypeReload: 91 case FrameLoadTypeReload:
92 case FrameLoadTypeReloadMainResource:
92 return PerformanceNavigationTiming::NavigationType::Reload; 93 return PerformanceNavigationTiming::NavigationType::Reload;
93 case NavigationTypeBackForward: 94 case FrameLoadTypeBackForward:
95 case FrameLoadTypeInitialHistoryLoad:
94 return PerformanceNavigationTiming::NavigationType::BackForward; 96 return PerformanceNavigationTiming::NavigationType::BackForward;
95 case NavigationTypeLinkClicked: 97 case FrameLoadTypeStandard:
96 case NavigationTypeFormSubmitted: 98 case FrameLoadTypeReplaceCurrentItem:
97 case NavigationTypeFormResubmitted: 99 case FrameLoadTypeInitialInChildFrame:
98 case NavigationTypeOther: 100 case FrameLoadTypeReloadBypassingCache:
99 return PerformanceNavigationTiming::NavigationType::Navigate; 101 return PerformanceNavigationTiming::NavigationType::Navigate;
100 } 102 }
101 NOTREACHED(); 103 NOTREACHED();
102 return PerformanceNavigationTiming::NavigationType::Navigate; 104 return PerformanceNavigationTiming::NavigationType::Navigate;
103 } 105 }
104 106
105 const AtomicString& PerformanceBase::interfaceName() const { 107 const AtomicString& PerformanceBase::interfaceName() const {
106 return EventTargetNames::Performance; 108 return EventTargetNames::Performance;
107 } 109 }
108 110
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 381
380 bool allowRedirectDetails = 382 bool allowRedirectDetails =
381 allowsTimingRedirect(navigationTimingInfo->redirectChain(), finalResponse, 383 allowsTimingRedirect(navigationTimingInfo->redirectChain(), finalResponse,
382 *securityOrigin, context); 384 *securityOrigin, context);
383 385
384 unsigned long long transferSize = navigationTimingInfo->transferSize(); 386 unsigned long long transferSize = navigationTimingInfo->transferSize();
385 unsigned long long encodedBodyLength = finalResponse.encodedBodyLength(); 387 unsigned long long encodedBodyLength = finalResponse.encodedBodyLength();
386 unsigned long long decodedBodyLength = finalResponse.decodedBodyLength(); 388 unsigned long long decodedBodyLength = finalResponse.decodedBodyLength();
387 bool didReuseConnection = finalResponse.connectionReused(); 389 bool didReuseConnection = finalResponse.connectionReused();
388 PerformanceNavigationTiming::NavigationType type = 390 PerformanceNavigationTiming::NavigationType type =
389 getNavigationType(documentLoader->getNavigationType(), frame->document()); 391 getNavigationType(documentLoader->loadType(), frame->document());
390 392
391 m_navigationTiming = new PerformanceNavigationTiming( 393 m_navigationTiming = new PerformanceNavigationTiming(
392 timeOrigin(), documentLoadTiming.unloadEventStart(), 394 timeOrigin(), documentLoadTiming.unloadEventStart(),
393 documentLoadTiming.unloadEventEnd(), documentLoadTiming.loadEventStart(), 395 documentLoadTiming.unloadEventEnd(), documentLoadTiming.loadEventStart(),
394 documentLoadTiming.loadEventEnd(), documentLoadTiming.redirectCount(), 396 documentLoadTiming.loadEventEnd(), documentLoadTiming.redirectCount(),
395 documentTiming ? documentTiming->domInteractive() : 0, 397 documentTiming ? documentTiming->domInteractive() : 0,
396 documentTiming ? documentTiming->domContentLoadedEventStart() : 0, 398 documentTiming ? documentTiming->domContentLoadedEventStart() : 0,
397 documentTiming ? documentTiming->domContentLoadedEventEnd() : 0, 399 documentTiming ? documentTiming->domContentLoadedEventEnd() : 0,
398 documentTiming ? documentTiming->domComplete() : 0, type, 400 documentTiming ? documentTiming->domComplete() : 0, type,
399 documentLoadTiming.redirectStart(), documentLoadTiming.redirectEnd(), 401 documentLoadTiming.redirectStart(), documentLoadTiming.redirectEnd(),
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 visitor->trace(m_resourceTimingBuffer); 602 visitor->trace(m_resourceTimingBuffer);
601 visitor->trace(m_navigationTiming); 603 visitor->trace(m_navigationTiming);
602 visitor->trace(m_userTiming); 604 visitor->trace(m_userTiming);
603 visitor->trace(m_observers); 605 visitor->trace(m_observers);
604 visitor->trace(m_activeObservers); 606 visitor->trace(m_activeObservers);
605 visitor->trace(m_suspendedObservers); 607 visitor->trace(m_suspendedObservers);
606 EventTargetWithInlineData::trace(visitor); 608 EventTargetWithInlineData::trace(visitor);
607 } 609 }
608 610
609 } // namespace blink 611 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/timing/PerformanceBase.h ('k') | third_party/WebKit/Source/core/timing/PerformanceBaseTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698