third_party/WebKit/Source/core/loader/FrameFetchContext.cpp - Issue 2125273002: Fix a problem with duplicate calls to FrameFetchContext::dispatchDidFail

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

Issue 2125273002: Fix a problem with duplicate calls to FrameFetchContext::dispatchDidFail (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename the set Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/scheduler/renderer/web_view_scheduler_impl_unittest.cc ('k') | third_party/WebKit/public/platform/WebFrameScheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

index 7672e99fef0350776a9a29091905cab548acfd74..d73172a9cd1df5ad8970d02f9e63b744619ea34c 100644

--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

@@ -321,7 +321,7 @@ void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, Resour

TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, "data", InspectorSendRequestEvent::data(identifier, frame(), request));

InspectorInstrumentation::willSendRequest(frame(), identifier, masterDocumentLoader(), request, redirectResponse, initiatorInfo);

if (frame()->frameScheduler())

- frame()->frameScheduler()->incrementPendingResourceLoadCount();

+ frame()->frameScheduler()->didStartLoading(identifier);

}

void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, const ResourceResponse& response, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext, Resource* resource)

@@ -372,7 +372,7 @@ void FrameFetchContext::dispatchDidFinishLoading(unsigned long identifier, doubl

TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data", InspectorResourceFinishEvent::data(identifier, finishTime, false));

InspectorInstrumentation::didFinishLoading(frame(), identifier, finishTime, encodedDataLength);

if (frame()->frameScheduler())

- frame()->frameScheduler()->decrementPendingResourceLoadCount();

+ frame()->frameScheduler()->didStopLoading(identifier);

}

void FrameFetchContext::dispatchDidFail(unsigned long identifier, const ResourceError& error, bool isInternalRequest)

@@ -385,7 +385,7 @@ void FrameFetchContext::dispatchDidFail(unsigned long identifier, const Resource

if (!isInternalRequest)

frame()->console().didFailLoading(identifier, error);

if (frame()->frameScheduler())

- frame()->frameScheduler()->decrementPendingResourceLoadCount();

+ frame()->frameScheduler()->didStopLoading(identifier);

}

void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(unsigned long identifier, Resource* resource, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext)