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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 120263006: Avoid any race conditions with RenderFrame getting notified that it's prerendering. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 6 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/crash_logging.h" 8 #include "base/debug/crash_logging.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 if (chrome_observer_.get()) { 358 if (chrome_observer_.get()) {
359 content_settings->SetContentSettingRules( 359 content_settings->SetContentSettingRules(
360 chrome_observer_->content_setting_rules()); 360 chrome_observer_->content_setting_rules());
361 } 361 }
362 362
363 new extensions::ExtensionFrameHelper(render_frame); 363 new extensions::ExtensionFrameHelper(render_frame);
364 364
365 #if defined(ENABLE_PLUGINS) 365 #if defined(ENABLE_PLUGINS)
366 new PepperHelper(render_frame); 366 new PepperHelper(render_frame);
367 #endif 367 #endif
368
369 // TODO(jam): when a RenderFrame is per WebFrame, this can be simplified by
370 // getting a RenderFrame's WebFrame and calling its parent() method.
371 if (render_frame->GetRenderView()->GetMainRenderFrame() != render_frame) {
372 // Avoid any race conditions from having the browser tell subframes that
373 // they're prerendering.
374 if (prerender::PrerenderHelper::IsPrerendering(
375 render_frame->GetRenderView()->GetMainRenderFrame())) {
376 new prerender::PrerenderHelper(render_frame);
377 }
378 }
368 } 379 }
369 380
370 void ChromeContentRendererClient::RenderViewCreated( 381 void ChromeContentRendererClient::RenderViewCreated(
371 content::RenderView* render_view) { 382 content::RenderView* render_view) {
372 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get()); 383 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get());
373 new PageLoadHistograms(render_view); 384 new PageLoadHistograms(render_view);
374 #if defined(ENABLE_PRINTING) 385 #if defined(ENABLE_PRINTING)
375 new printing::PrintWebViewHelper(render_view); 386 new printing::PrintWebViewHelper(render_view);
376 #endif 387 #endif
377 #if defined(ENABLE_SPELLCHECK) 388 #if defined(ENABLE_SPELLCHECK)
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1373 CommandLine* command_line = CommandLine::ForCurrentProcess(); 1384 CommandLine* command_line = CommandLine::ForCurrentProcess();
1374 return !command_line->HasSwitch(switches::kExtensionProcess); 1385 return !command_line->HasSwitch(switches::kExtensionProcess);
1375 } 1386 }
1376 1387
1377 blink::WebWorkerPermissionClientProxy* 1388 blink::WebWorkerPermissionClientProxy*
1378 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( 1389 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
1379 content::RenderFrame* render_frame, 1390 content::RenderFrame* render_frame,
1380 blink::WebFrame* frame) { 1391 blink::WebFrame* frame) {
1381 return new WorkerPermissionClientProxy(render_frame, frame); 1392 return new WorkerPermissionClientProxy(render_frame, frame);
1382 } 1393 }
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