diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 18:40:09 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 18:40:09 +0000 |
| commit | d72d9e051eda1a9b8b25412e725b17848f2d8385 (patch) | |
| tree | e247d5013fda419f332142573ad87fba15792858 /content | |
| parent | 5f0a11757f3e804aab1a42f523d9b21be311941f (diff) | |
| download | chromium_src-d72d9e051eda1a9b8b25412e725b17848f2d8385.zip chromium_src-d72d9e051eda1a9b8b25412e725b17848f2d8385.tar.gz chromium_src-d72d9e051eda1a9b8b25412e725b17848f2d8385.tar.bz2 | |
Re-land "cc: Remove TextureLayer::SetTextureId and TextureLayer::WillModifyTexture"
Reason for re-land: Change was found not guilty; charges were dropped.
> Revert 261380 "cc: Remove TextureLayer::SetTextureId and Texture..."
>
> [Reason for revert: failure in WindowUtilTest.RecreateLayers
> in test suite wm_core_unittests
> on bot Linux ChromiumOS Tests (dbg)(1) Build]
>
> > 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 simplifies externally-exposed state.
> >
> > BUG=337922
> >
> > Review URL: https://codereview.chromium.org/213743005
>
> TBR=piman@chromium.org
>
> Review URL: https://codereview.chromium.org/224153003
TBR=nick@chromium.org
Review URL: https://codereview.chromium.org/224363003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/shell/renderer/test_runner/TestPlugin.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/content/shell/renderer/test_runner/TestPlugin.cpp b/content/shell/renderer/test_runner/TestPlugin.cpp index 91045ce..5fdec5d 100644 --- a/content/shell/renderer/test_runner/TestPlugin.cpp +++ b/content/shell/renderer/test_runner/TestPlugin.cpp @@ -222,11 +222,8 @@ bool TestPlugin::initialize(WebPluginContainer* container) void TestPlugin::destroy() { - if (m_layer.get()) { - m_layer->WillModifyTexture(); - m_layer->SetTextureMailbox(cc::TextureMailbox(), - scoped_ptr<cc::SingleReleaseCallback>()); - } + if (m_layer.get()) + m_layer->ClearTexture(); if (m_container) m_container->setWebLayer(0); m_webLayer.reset(); |