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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 271543003: Don't deref ChildThread::current() when null (it can be null in some tests) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1359 matching lines...) Expand 10 before | Expand all | Expand 10 after
1370 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebLocalFrame* frame) { 1370 blink::WebCookieJar* RenderFrameImpl::cookieJar(blink::WebLocalFrame* frame) {
1371 DCHECK(!frame_ || frame_ == frame); 1371 DCHECK(!frame_ || frame_ == frame);
1372 return &cookie_jar_; 1372 return &cookie_jar_;
1373 } 1373 }
1374 1374
1375 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider( 1375 blink::WebServiceWorkerProvider* RenderFrameImpl::createServiceWorkerProvider(
1376 blink::WebLocalFrame* frame) { 1376 blink::WebLocalFrame* frame) {
1377 DCHECK(!frame_ || frame_ == frame); 1377 DCHECK(!frame_ || frame_ == frame);
1378 // At this point we should have non-null data source. 1378 // At this point we should have non-null data source.
1379 DCHECK(frame->dataSource()); 1379 DCHECK(frame->dataSource());
1380 if (!ChildThread::current())
1381 return NULL; // May be null in some tests.
1380 ServiceWorkerNetworkProvider* provider = 1382 ServiceWorkerNetworkProvider* provider =
1381 ServiceWorkerNetworkProvider::FromDocumentState( 1383 ServiceWorkerNetworkProvider::FromDocumentState(
1382 DocumentState::FromDataSource(frame->dataSource())); 1384 DocumentState::FromDataSource(frame->dataSource()));
1383 int provider_id = provider ? 1385 int provider_id = provider ?
1384 provider->provider_id() : 1386 provider->provider_id() :
1385 kInvalidServiceWorkerProviderId; 1387 kInvalidServiceWorkerProviderId;
1386 return new WebServiceWorkerProviderImpl( 1388 return new WebServiceWorkerProviderImpl(
1387 ChildThread::current()->thread_safe_sender(), provider_id); 1389 ChildThread::current()->thread_safe_sender(), provider_id);
1388 } 1390 }
1389 1391
(...skipping 2003 matching lines...) Expand 10 before | Expand all | Expand 10 after
3393 weak_factory_.GetWeakPtr(), 3395 weak_factory_.GetWeakPtr(),
3394 render_view_->media_player_manager_, 3396 render_view_->media_player_manager_,
3395 stream_texture_factory, 3397 stream_texture_factory,
3396 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), 3398 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
3397 new RenderMediaLog()); 3399 new RenderMediaLog());
3398 } 3400 }
3399 3401
3400 #endif 3402 #endif
3401 3403
3402 } // namespace content 3404 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698