Source/WebKit/chromium/src/WebWorkerClientImpl.cpp - Issue 10951014: Merge 128415

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: Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

Issue 10951014: Merge 128415 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

===================================================================

--- Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (revision 128925)

+++ Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (working copy)

@@ -105,6 +105,7 @@

void WebWorkerClientImpl::terminateWorkerContext()

{

+ m_webFrame = 0;

m_proxy->terminateWorkerContext();

}

@@ -211,7 +212,7 @@

void WebWorkerClientImpl::openFileSystem(WebFileSystem::Type type, long long size, bool create,

WebFileSystemCallbacks* callbacks)

{

- if (!m_webFrame->client()) {

+ if (m_proxy->askedToTerminate()) {

callbacks->didFail(WebFileErrorAbort);

return;

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »