diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 18:54:22 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-16 18:54:22 +0000 |
| commit | e0e2743d661bad1cc7309b39b0a9aea77a92bf94 (patch) | |
| tree | 6bd6023addd17d67e5f16c6dffd6d14e443239e6 /ui/gfx/compositor/layer_animator.h | |
| parent | dd248d9a36a01782916aec1e2524978ac4755626 (diff) | |
| download | chromium_src-e0e2743d661bad1cc7309b39b0a9aea77a92bf94.zip chromium_src-e0e2743d661bad1cc7309b39b0a9aea77a92bf94.tar.gz chromium_src-e0e2743d661bad1cc7309b39b0a9aea77a92bf94.tar.bz2 | |
Revert 96982 - Add gl.dll, compositor.dll, and surface.dll.
I considered merging these into ui.dll, but the respective GYP files are pretty
customized, and merging all of the special casing into ui.gyp seemed like it
would just make things messy. Plus, some components only need to link to
surface and not all of ui.
One thing that I'm not entirely sure about is the naming convention. In this
case the modules are named gl, compositor and surface instead of ui_gfx_gl, and
so on. I thought about declaring UI_GFX_GL_EXPORT, but I opted for the shorter
GL_EXPORT instead. I think Ben has been thinking about moving these
directories out of ui/gfx/ anyways since it is a bit odd for them to live there.
R=rvargas
Review URL: http://codereview.chromium.org/7645004
TBR=darin@chromium.org
Review URL: http://codereview.chromium.org/7659015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/compositor/layer_animator.h')
| -rw-r--r-- | ui/gfx/compositor/layer_animator.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/gfx/compositor/layer_animator.h b/ui/gfx/compositor/layer_animator.h index 4570e26..c30ba87 100644 --- a/ui/gfx/compositor/layer_animator.h +++ b/ui/gfx/compositor/layer_animator.h @@ -14,7 +14,6 @@ #include "third_party/skia/include/utils/SkMatrix44.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/tween.h" -#include "ui/gfx/compositor/compositor_export.h" #include "ui/gfx/point.h" namespace ui { @@ -24,7 +23,7 @@ class MultiAnimation; class Transform; // LayerAnimator manages animating various properties of a Layer. -class COMPOSITOR_EXPORT LayerAnimator : public ui::AnimationDelegate { +class LayerAnimator : public ui::AnimationDelegate { public: explicit LayerAnimator(Layer* layer); virtual ~LayerAnimator(); |