summaryrefslogtreecommitdiffstats
path: root/ui/base/animation
diff options
context:
space:
mode:
authordhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 03:12:17 +0000
committerdhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 03:12:17 +0000
commit2f47fc457801054fb68055b4649e21af609f81dc (patch)
treecb31f77630a7465c4001baf2794d25989c20e457 /ui/base/animation
parent21ee224e0862f56ce9d88f2c91950a40cfae6aa0 (diff)
downloadchromium_src-2f47fc457801054fb68055b4649e21af609f81dc.zip
chromium_src-2f47fc457801054fb68055b4649e21af609f81dc.tar.gz
chromium_src-2f47fc457801054fb68055b4649e21af609f81dc.tar.bz2
compositor_unittests target is unimplmented on Mac
Adds necessary pieces to get the WebKit compositor working with compositor_unittests target on Mac. Required gyp build flags are: 'use_aura': 1, 'use_webkit_compositor': 1, 'use_skia': 1, BUG=104390, 104555 TEST=compositor_unittests --gtest_filter=LayerWithRealCompositorTest.* passes and shows correct visual results. Review URL: http://codereview.chromium.org/8486020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/animation')
-rw-r--r--ui/base/animation/tween.cc5
-rw-r--r--ui/base/animation/tween.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/ui/base/animation/tween.cc b/ui/base/animation/tween.cc
index 3d57aef..b8f4385 100644
--- a/ui/base/animation/tween.cc
+++ b/ui/base/animation/tween.cc
@@ -11,10 +11,7 @@
#endif
#include "base/logging.h"
-
-#if !defined(OS_MACOSX)
#include "ui/gfx/interpolated_transform.h"
-#endif
namespace ui {
@@ -86,7 +83,6 @@ gfx::Rect Tween::ValueBetween(double value,
target_bounds.height()));
}
-#if !defined(OS_MACOSX)
// static
Transform Tween::ValueBetween(double value,
const Transform& start_transform,
@@ -127,6 +123,5 @@ Transform Tween::ValueBetween(double value,
return to_return;
}
-#endif
} // namespace ui
diff --git a/ui/base/animation/tween.h b/ui/base/animation/tween.h
index 02c08c5..b1641b5 100644
--- a/ui/base/animation/tween.h
+++ b/ui/base/animation/tween.h
@@ -9,10 +9,7 @@
#include "base/basictypes.h"
#include "ui/base/ui_export.h"
#include "ui/gfx/rect.h"
-
-#if !defined(OS_MACOSX)
#include "ui/gfx/transform.h"
-#endif
namespace ui {
@@ -37,11 +34,9 @@ class UI_EXPORT Tween {
static gfx::Rect ValueBetween(double value,
const gfx::Rect& start_bounds,
const gfx::Rect& target_bounds);
-#if !defined(OS_MACOSX)
static Transform ValueBetween(double value,
const Transform& start_transform,
const Transform& target_transform);
-#endif
private:
Tween();