Source/WebKit/chromium/src/DatabaseObserver.cpp - Issue 9380014: Merge 107174

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/DatabaseObserver.cpp

Issue 9380014: Merge 107174 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 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:

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

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

--- Source/WebKit/chromium/src/DatabaseObserver.cpp (revision 107408)

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

@@ -165,7 +165,10 @@

WorkerContext* workerContext = static_cast<WorkerContext*>(scriptExecutionContext);

WorkerLoaderProxy* workerLoaderProxy = &workerContext->thread()->workerLoaderProxy();

WebWorkerBase* webWorker = static_cast<WebWorkerBase*>(workerLoaderProxy);

- return allowDatabaseForWorker(webWorker->commonClient(), webWorker->view()->mainFrame(), name, displayName, estimatedSize);

+ WebView* view = webWorker->view();

+ if (!view)

+ return false;

+ return allowDatabaseForWorker(webWorker->commonClient(), view->mainFrame(), name, displayName, estimatedSize);

#else

ASSERT_NOT_REACHED();

#endif

« no previous file with comments | « no previous file | Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp » ('j') | no next file with comments »