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

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

Issue 23171029: Fix a crash that EnsureMediaStreamClient() does not guarantee media_stream_client_ get created (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2982 matching lines...) Expand 10 before | Expand all | Expand 10 after
2993 return NULL; 2993 return NULL;
2994 } 2994 }
2995 2995
2996 WebMediaPlayer* RenderViewImpl::createMediaPlayer( 2996 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
2997 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { 2997 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
2998 FOR_EACH_OBSERVER( 2998 FOR_EACH_OBSERVER(
2999 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); 2999 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
3000 3000
3001 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 3001 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
3002 #if defined(ENABLE_WEBRTC) 3002 #if defined(ENABLE_WEBRTC)
3003 EnsureMediaStreamClient(); 3003 EnsureMediaStreamClient();
scherkus (not reviewing) 2013/08/23 22:21:40 I know you want to merge this so we should keep it
3004 #if !defined(GOOGLE_TV) 3004 #if !defined(GOOGLE_TV)
3005 if (media_stream_client_->IsMediaStream(url)) { 3005 if (media_stream_client_ && media_stream_client_->IsMediaStream(url)) {
3006 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 3006 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
3007 bool found_neon = 3007 bool found_neon =
3008 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0; 3008 (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
3009 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon); 3009 UMA_HISTOGRAM_BOOLEAN("Platform.WebRtcNEONFound", found_neon);
3010 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) 3010 #endif // defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
3011 return new WebMediaPlayerMS( 3011 return new WebMediaPlayerMS(
3012 frame, client, AsWeakPtr(), media_stream_client_, new RenderMediaLog()); 3012 frame, client, AsWeakPtr(), media_stream_client_, new RenderMediaLog());
3013 } 3013 }
3014 #endif // !defined(GOOGLE_TV) 3014 #endif // !defined(GOOGLE_TV)
3015 #endif // defined(ENABLE_WEBRTC) 3015 #endif // defined(ENABLE_WEBRTC)
(...skipping 3520 matching lines...) Expand 10 before | Expand all | Expand 10 after
6536 WebURL url = icon_urls[i].iconURL(); 6536 WebURL url = icon_urls[i].iconURL();
6537 if (!url.isEmpty()) 6537 if (!url.isEmpty())
6538 urls.push_back(FaviconURL(url, 6538 urls.push_back(FaviconURL(url,
6539 ToFaviconType(icon_urls[i].iconType()))); 6539 ToFaviconType(icon_urls[i].iconType())));
6540 } 6540 }
6541 SendUpdateFaviconURL(urls); 6541 SendUpdateFaviconURL(urls);
6542 } 6542 }
6543 6543
6544 6544
6545 } // namespace content 6545 } // 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