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

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

Issue 5362003: Stopgap fix for crash in issue 53867 comment 15 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 10 years 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 | media/base/pipeline_impl.h » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2829 matching lines...) Expand 10 before | Expand all | Expand 10 after
2840 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, 2840 appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
2841 routing_id()); 2841 routing_id());
2842 2842
2843 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; 2843 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
2844 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); 2844 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
2845 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( 2845 scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
2846 new webkit_glue::VideoRendererImpl(pts_logging)); 2846 new webkit_glue::VideoRendererImpl(pts_logging));
2847 collection->AddVideoRenderer(renderer); 2847 collection->AddVideoRenderer(renderer);
2848 video_renderer = renderer; 2848 video_renderer = renderer;
2849 2849
2850 return new webkit_glue::WebMediaPlayerImpl( 2850 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
2851 client, collection.release(), bridge_factory_simple, 2851 new webkit_glue::WebMediaPlayerImpl(client, collection.release()));
2852 bridge_factory_buffered, 2852 if (!result->Initialize(bridge_factory_simple,
2853 cmd_line->HasSwitch(switches::kSimpleDataSource),video_renderer); 2853 bridge_factory_buffered,
2854 cmd_line->HasSwitch(switches::kSimpleDataSource),
2855 video_renderer)) {
2856 return NULL;
2857 }
2858 return result.release();
2854 } 2859 }
2855 2860
2856 WebApplicationCacheHost* RenderView::createApplicationCacheHost( 2861 WebApplicationCacheHost* RenderView::createApplicationCacheHost(
2857 WebFrame* frame, WebApplicationCacheHostClient* client) { 2862 WebFrame* frame, WebApplicationCacheHostClient* client) {
2858 return new RendererWebApplicationCacheHostImpl( 2863 return new RendererWebApplicationCacheHostImpl(
2859 FromWebView(frame->view()), client, 2864 FromWebView(frame->view()), client,
2860 RenderThread::current()->appcache_dispatcher()->backend_proxy()); 2865 RenderThread::current()->appcache_dispatcher()->backend_proxy());
2861 } 2866 }
2862 2867
2863 // TODO(jochen): remove after roll. 2868 // TODO(jochen): remove after roll.
(...skipping 2821 matching lines...) Expand 10 before | Expand all | Expand 10 after
5685 external_popup_menu_.reset(); 5690 external_popup_menu_.reset();
5686 } 5691 }
5687 #endif 5692 #endif
5688 5693
5689 void RenderView::AddErrorToRootConsole(const string16& message) { 5694 void RenderView::AddErrorToRootConsole(const string16& message) {
5690 if (webview() && webview()->mainFrame()) { 5695 if (webview() && webview()->mainFrame()) {
5691 webview()->mainFrame()->addMessageToConsole( 5696 webview()->mainFrame()->addMessageToConsole(
5692 WebConsoleMessage(WebConsoleMessage::LevelError, message)); 5697 WebConsoleMessage(WebConsoleMessage::LevelError, message));
5693 } 5698 }
5694 } 5699 }
OLDNEW
« no previous file with comments | « no previous file | media/base/pipeline_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698