summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings
diff options
context:
space:
mode:
authorreveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 21:22:55 +0000
committerreveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 21:22:55 +0000
commitb4da2039c0db81b2d0fbc238269ac3807700e495 (patch)
tree6690a890736c8a37c1a6115cf813cbeec9c30532 /webkit/compositor_bindings
parentc7031f9b97bb97e460c825aa84a854e6f1f68b0e (diff)
downloadchromium_src-b4da2039c0db81b2d0fbc238269ac3807700e495.zip
chromium_src-b4da2039c0db81b2d0fbc238269ac3807700e495.tar.gz
chromium_src-b4da2039c0db81b2d0fbc238269ac3807700e495.tar.bz2
cc: Rename TextureUpdate to ResourceUpdate.
sed -e ' s/TextureUpdateQueue/ResourceUpdateQueue/g s/texture_update_queue/resource_update_queue/g s/TextureUpdateController/ResourceUpdateController/g s/texture_update_controller/resource_update_controller/g ' BUG= TEST=cc_unittests Review URL: https://codereview.chromium.org/11270047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings')
-rw-r--r--webkit/compositor_bindings/web_external_texture_layer_impl.cc10
-rw-r--r--webkit/compositor_bindings/web_external_texture_layer_impl.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/webkit/compositor_bindings/web_external_texture_layer_impl.cc b/webkit/compositor_bindings/web_external_texture_layer_impl.cc
index 60fb4d2..b47dff9 100644
--- a/webkit/compositor_bindings/web_external_texture_layer_impl.cc
+++ b/webkit/compositor_bindings/web_external_texture_layer_impl.cc
@@ -5,13 +5,13 @@
#include "config.h"
#include "web_external_texture_layer_impl.h"
+#include "cc/resource_update_queue.h"
#include "cc/texture_layer.h"
-#include "cc/texture_update_queue.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayerClient.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
-#include "webcore_convert.h"
#include "web_layer_impl.h"
+#include "webcore_convert.h"
using namespace cc;
@@ -81,7 +81,7 @@ void WebExternalTextureLayerImpl::setRateLimitContext(bool rateLimit)
class WebTextureUpdaterImpl : public WebTextureUpdater {
public:
- explicit WebTextureUpdaterImpl(TextureUpdateQueue& queue)
+ explicit WebTextureUpdaterImpl(ResourceUpdateQueue& queue)
: m_queue(queue)
{
}
@@ -93,10 +93,10 @@ public:
}
private:
- TextureUpdateQueue& m_queue;
+ ResourceUpdateQueue& m_queue;
};
-unsigned WebExternalTextureLayerImpl::prepareTexture(TextureUpdateQueue& queue)
+unsigned WebExternalTextureLayerImpl::prepareTexture(ResourceUpdateQueue& queue)
{
ASSERT(m_client);
WebTextureUpdaterImpl updaterImpl(queue);
diff --git a/webkit/compositor_bindings/web_external_texture_layer_impl.h b/webkit/compositor_bindings/web_external_texture_layer_impl.h
index cf82629..95f6df45c 100644
--- a/webkit/compositor_bindings/web_external_texture_layer_impl.h
+++ b/webkit/compositor_bindings/web_external_texture_layer_impl.h
@@ -30,7 +30,7 @@ public:
virtual void setRateLimitContext(bool) OVERRIDE;
// TextureLayerClient implementation.
- virtual unsigned prepareTexture(cc::TextureUpdateQueue&) OVERRIDE;
+ virtual unsigned prepareTexture(cc::ResourceUpdateQueue&) OVERRIDE;
virtual WebGraphicsContext3D* context() OVERRIDE;
private: