diff options
author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-29 21:22:13 +0000 |
---|---|---|
committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-29 21:22:13 +0000 |
commit | ab6627371cb52d504cdc0bb33ca6ead8a7f8ac70 (patch) | |
tree | 61d64d4d0d4fba470b9d3b0a62f0f3e1a8e986d7 /ui/aura/window.h | |
parent | f65d3ac3652849f5645ad8982ce5639752439140 (diff) | |
download | chromium_src-ab6627371cb52d504cdc0bb33ca6ead8a7f8ac70.zip chromium_src-ab6627371cb52d504cdc0bb33ca6ead8a7f8ac70.tar.gz chromium_src-ab6627371cb52d504cdc0bb33ca6ead8a7f8ac70.tar.bz2 |
Merge Compositor and CompositorCC
This also removes a few unused calls.
BUG=None
TEST=compiles, tests pass
Review URL: http://codereview.chromium.org/9297041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window.h')
-rw-r--r-- | ui/aura/window.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ui/aura/window.h b/ui/aura/window.h index cf3eb94..457cb50 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -139,9 +139,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate { // Marks the a portion of window as needing to be painted. void SchedulePaintInRect(const gfx::Rect& rect); - // Sets the contents of the window. - void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin); - // Assigns a new external texture to the window's layer. void SetExternalTexture(ui::Texture* texture); |