diff options
| author | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 07:19:14 +0000 |
|---|---|---|
| committer | reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 07:19:14 +0000 |
| commit | a76f1d23e1ba09f1b3206bacc0a8b43f6e8be204 (patch) | |
| tree | 0a9fa1b17f93eb666b1b8fb7fa7b2a6973ed2d5d /ui/compositor | |
| parent | 2084cd0ddce0dccb9c7c868aeb5a3301fa2160d3 (diff) | |
| download | chromium_src-a76f1d23e1ba09f1b3206bacc0a8b43f6e8be204.zip chromium_src-a76f1d23e1ba09f1b3206bacc0a8b43f6e8be204.tar.gz chromium_src-a76f1d23e1ba09f1b3206bacc0a8b43f6e8be204.tar.bz2 | |
ui: Add PrepareTexture() function to ui::Texture.
Replace the texture_id()/set_texture_id() interface of ui::Texture
with virtual PrepareTexture() function. This prevents use of the
texture without a subclassed instance of ui::Texture being aware
of it.
BUG=132342
TEST=manual
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11192070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor')
| -rw-r--r-- | ui/compositor/compositor.cc | 3 | ||||
| -rw-r--r-- | ui/compositor/compositor.h | 5 | ||||
| -rw-r--r-- | ui/compositor/layer.cc | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index dbaac60..31f47c7 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -124,8 +124,7 @@ WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateContextCommon( } Texture::Texture(bool flipped, const gfx::Size& size, float device_scale_factor) - : texture_id_(0), - flipped_(flipped), + : flipped_(flipped), size_(size), device_scale_factor_(device_scale_factor) { } diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h index c079159..c5dc3ba 100644 --- a/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -96,11 +96,11 @@ class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> { public: Texture(bool flipped, const gfx::Size& size, float device_scale_factor); - unsigned int texture_id() const { return texture_id_; } - void set_texture_id(unsigned int id) { texture_id_ = id; } bool flipped() const { return flipped_; } gfx::Size size() const { return size_; } float device_scale_factor() const { return device_scale_factor_; } + + virtual unsigned int PrepareTexture() = 0; virtual WebKit::WebGraphicsContext3D* HostContext3D() = 0; protected: @@ -109,7 +109,6 @@ class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> { private: friend class base::RefCounted<Texture>; - unsigned int texture_id_; bool flipped_; gfx::Size size_; // in pixel float device_scale_factor_; diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index 0d47afe..82bad5f 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -514,7 +514,7 @@ void Layer::paintContents(WebKit::WebCanvas* web_canvas, unsigned Layer::prepareTexture(WebKit::WebTextureUpdater& /* updater */) { DCHECK(layer_updated_externally_); - return texture_->texture_id(); + return texture_->PrepareTexture(); } WebKit::WebGraphicsContext3D* Layer::context() { |