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

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

Issue 132163004: Remove WebGraphicsContext3D getter from cc::ContextProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 6090 matching lines...) Expand 10 before | Expand all | Expand 10 after
6101 } else { 6101 } else {
6102 scoped_refptr<cc::ContextProvider> context_provider = 6102 scoped_refptr<cc::ContextProvider> context_provider =
6103 RenderThreadImpl::current()->SharedMainThreadContextProvider(); 6103 RenderThreadImpl::current()->SharedMainThreadContextProvider();
6104 6104
6105 if (!context_provider.get()) { 6105 if (!context_provider.get()) {
6106 LOG(ERROR) << "Failed to get context3d for media player"; 6106 LOG(ERROR) << "Failed to get context3d for media player";
6107 return NULL; 6107 return NULL;
6108 } 6108 }
6109 6109
6110 stream_texture_factory.reset(new StreamTextureFactoryImpl( 6110 stream_texture_factory.reset(new StreamTextureFactoryImpl(
6111 context_provider->Context3d(), gpu_channel_host, routing_id_)); 6111 context_provider->ContextGL(), gpu_channel_host, routing_id_));
6112 } 6112 }
6113 6113
6114 scoped_ptr<WebMediaPlayerAndroid> web_media_player_android( 6114 scoped_ptr<WebMediaPlayerAndroid> web_media_player_android(
6115 new WebMediaPlayerAndroid( 6115 new WebMediaPlayerAndroid(
6116 frame, 6116 frame,
6117 client, 6117 client,
6118 AsWeakPtr(), 6118 AsWeakPtr(),
6119 media_player_manager_, 6119 media_player_manager_,
6120 stream_texture_factory.release(), 6120 stream_texture_factory.release(),
6121 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), 6121 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
6373 for (size_t i = 0; i < icon_urls.size(); i++) { 6373 for (size_t i = 0; i < icon_urls.size(); i++) {
6374 WebURL url = icon_urls[i].iconURL(); 6374 WebURL url = icon_urls[i].iconURL();
6375 if (!url.isEmpty()) 6375 if (!url.isEmpty())
6376 urls.push_back(FaviconURL(url, 6376 urls.push_back(FaviconURL(url,
6377 ToFaviconType(icon_urls[i].iconType()))); 6377 ToFaviconType(icon_urls[i].iconType())));
6378 } 6378 }
6379 SendUpdateFaviconURL(urls); 6379 SendUpdateFaviconURL(urls);
6380 } 6380 }
6381 6381
6382 } // namespace content 6382 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698