diff options
| author | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 10:17:22 +0000 |
|---|---|---|
| committer | aberent@google.com <aberent@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 10:17:22 +0000 |
| commit | 31d4df856f3bd49eab7799becf1dec8a91855353 (patch) | |
| tree | 0deb88f0c48c942c8d464eaf52840ac898e03a5c /content | |
| parent | 6b38f963cf555576157f063e9c026a94814f93a2 (diff) | |
| download | chromium_src-31d4df856f3bd49eab7799becf1dec8a91855353.zip chromium_src-31d4df856f3bd49eab7799becf1dec8a91855353.tar.gz chromium_src-31d4df856f3bd49eab7799becf1dec8a91855353.tar.bz2 | |
Revert 212008 "cc: Remove TextureLayer::SetTextureId and Texture..."
Temporary revert of this as Android Build Sheriff until the
Android UI stops using SetTextureId. Needed since it is currently
impossible to roll the version of chromium used by Android past
this change.
> cc: Remove TextureLayer::SetTextureId and TextureLayer::WillModifyTexture
>
> These are not used anymore except for clearing the client-provided texture, so
> this removes 1 of 4 TextureLayer paths, and implifies externally-exposed state.
>
> BUG=None
>
> Review URL: https://chromiumcodereview.appspot.com/19303003
BUG=261151
TBR=piman@chromium.org
Review URL: https://codereview.chromium.org/19463010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_android.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 64cec6a..081c309 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -801,7 +801,7 @@ void RenderWidgetHostViewAndroid::AcceleratedSurfaceSuspend() { void RenderWidgetHostViewAndroid::AcceleratedSurfaceRelease() { // This tells us we should free the frontbuffer. if (texture_id_in_layer_) { - texture_layer_->ClearTexture(); + texture_layer_->SetTextureId(0); texture_layer_->SetIsDrawable(false); ImageTransportFactoryAndroid::GetInstance()->DeleteTexture( texture_id_in_layer_); |