summaryrefslogtreecommitdiffstats
path: root/views/animation
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 00:03:07 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 00:03:07 +0000
commitc5b90374f3e454dbc5d5f2a4f23c49e7cba93147 (patch)
tree5d7980ec19bf794793fc31dcb1aa1245bc29f897 /views/animation
parenta32abb551892ef6a9987a5372b3c9896adb7a55e (diff)
downloadchromium_src-c5b90374f3e454dbc5d5f2a4f23c49e7cba93147.zip
chromium_src-c5b90374f3e454dbc5d5f2a4f23c49e7cba93147.tar.gz
chromium_src-c5b90374f3e454dbc5d5f2a4f23c49e7cba93147.tar.bz2
Temporarily revert certain Omnibox, toolbar, tab animations, and other
UI changes for purposes of testing and merging into mstone-5. Also ++kThemePackVersion and regenerate the cached theme pak. Reverted changes: r45213: GTK: Override cursor colors in chrome-theme mode. r45103: Support drawing nano tabs in the tabstrip. r45084: GTK: Position the EV certificate stuff inside a green bubble. r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon... r44957: GTK: Tint the geolocation icons in gtk mode. r44943: Changes FormatURL to not strip http if the host starts with ft... r44930: Remove an icon that is no longer used. r44929: SSL UI changes, Windows, code side (images are separate). r44859: SSL UI changes (icons). TBRed since trybots hate binary patches. r44822: GTK: Select better greens in the native omnibox popup. r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat... r44789: [Mac] Bookmark star missing on NTP and BMM. r44775: [Mac] Centralize hack to make tests work with AutocompleteClas... r44678: Display the SECURITY_WARNING status in the location bar for the r44648: [Mac] Add an arrow cursor rect for the location image. r44615: Revert r44611 because it may have broken "unit_tests" on "Vist... r44611: Display the SECURITY_WARNING status in the location bar for the r44577: Revert 44572 - [Mac] Update locationbar icon as user types. r44572: [Mac] Update location-bar icon as user types. r44555: GTK: Use correct button mask on reload button. r44545: [Mac] Omnibox text drag drag URL when select-all. r44523: GTK: Prevent inappropriate drag of location bar location icon. r44519: GTK: make the primary selection include the url's scheme when ... r44492: [Mac] Fix search icon in keyword search to be right-side-up. r44415: GTK: Update top padding on icons in the autocomplete popup. r44401: GTK: Tint omnibox icons in GTK mode differently. r44380: GTK: Move reload in gtk mode and fix omnibox popup location. r44282: Fixes crash in autocomplete when typing some URLs. The problem r44273: [Mac] PDF icons for omnibox nits. r44269: Fix build break due to bad merge resolve r44268: Shift omnibox dropdown in and up on Windows, and square off th... r44178: GTK: fix TTS padding. r44177: Round the top left and right edges of the toolbar. r44171: Images only checkin for try server goodness. r44163: GTK: fix padding of autocomplete popup. r44152: [Mac] PDF icons for omnibox. r44145: GTK: Theme the icons in the location bar and use GTK colors fo... r44140: Strips http from the omnibox r44131: Fixes bugs in new tab strip animations where they weren't doin... r44116: Change the default theme colors. r44117: Add newline to EOF to fix CrOS builder. r44115: Make the bottom edges of the opaque frame rounded. r44091: [Mac] No star icon or page actions in omnibox on popups. r44087: Don't allow drag or click on location icon when editing in omn... r44021: [GTK] Add TTS lens graphic to linux TTS box. r44008: [Mac] Tweak location icon spacing in omnibox. r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca... r43972: Make the firstrun bubble point at a better spot now that the l... r43971: [Mac] Location icon in omnibox as drag source. r43970: Make the star and page action icons not appear on popup windows. r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip: r43787: Allow location icon to be dragged & dropped. This also fixes ... r43759: Changes end cap of tab-to-search images. r43740: Change bookmark bar toggle to ctrl-shift-b. r43723: Show Page Info dialog on mouse up, not mouse down. r43677: Fix Mac build failure. r43676: Replace omnibox icons with new set that are all the same size ... r43596: Fix browser test TestStarButtonAccObj. r43593: Disables TestStarButtonAccObj. r43582: Changes tab strip to use BoundsAnimator for tab strip animatio... r43563: GTK: don't show reload button for popup/app windows. r43562: Star/reload shuffle, Windows version. r43540: [Mac] Magnifying glass in keyword-search bubble. r43482: Adds images needed for new tab animation. I'm separating this ... r43422: Add reload mask resource. r43392: GTK: make the location icon a drag source. r43376: [Mac] Move star button into page-actions area of omnibox. r43357: [Mac] Line up omnibox popup under field. r43290: gtk: fix display of icons in omnibox popup r43269: GTK: fix reload button. r43249: [Mac] Rearrange SSL status icon/label in omnibox. r43248: BrowserThemePack: Adds persistant ids for the reload endcaps. r43241: GTK: more location bar updates. r43191: Fix memory leak in BrowserThemePack. r43154: GTK: set the new star button's ID r43151: Fix bad conflict resolution for r43146. r43146: GTK: toolbar reload/star shuffle. r43025: Show the location bar icon (almost) all the time, and have its... r43023: Add new images for new reload button. No code change. r42782: Remove this icon, now that it's no longer used (due to my secu... r42502: Omnibox M5 work, part 1: Security changes r42245: Check in new icons for omnibox security changes alone, so that... BUG=none TEST=Eyjafjallajokull R=pkasting@chromium.org,beng@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45267 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/animation')
-rw-r--r--views/animation/bounds_animator.cc56
-rw-r--r--views/animation/bounds_animator.h24
-rw-r--r--views/animation/bounds_animator_unittest.cc178
3 files changed, 34 insertions, 224 deletions
diff --git a/views/animation/bounds_animator.cc b/views/animation/bounds_animator.cc
index aee3675..e723504 100644
--- a/views/animation/bounds_animator.cc
+++ b/views/animation/bounds_animator.cc
@@ -28,7 +28,7 @@ BoundsAnimator::~BoundsAnimator() {
// Delete all the animations, but don't remove any child views. We assume the
// view owns us and is going to be deleted anyway.
for (ViewToDataMap::iterator i = data_.begin(); i != data_.end(); ++i)
- CleanupData(false, &(i->second), i->first);
+ CleanupData(&(i->second));
}
void BoundsAnimator::AnimateViewTo(View* view,
@@ -36,21 +36,21 @@ void BoundsAnimator::AnimateViewTo(View* view,
bool delete_when_done) {
DCHECK_EQ(view->GetParent(), parent_);
- Data existing_data;
-
- if (data_.count(view) > 0) {
- // Don't immediatly delete the animation, that might trigger a callback from
- // the animationcontainer.
- existing_data = data_[view];
-
- RemoveFromMaps(view);
+ scoped_ptr<Animation> current_animation;
+
+ if (data_.find(view) != data_.end()) {
+ // Currently animating this view, blow away the current animation and
+ // we'll create another animation below.
+ // We delay deleting the view until the end so that we don't prematurely
+ // send out notification that we're done.
+ current_animation.reset(ResetAnimationForView(view));
+ } else if (target == view->bounds()) {
+ // View is already at the target location, delete it if necessary.
+ if (delete_when_done)
+ delete view;
+ return;
}
- // NOTE: we don't check if the view is already at the target location. Doing
- // so leads to odd cases where no animations may be present after invoking
- // AnimateViewTo. AnimationProgressed does nothing when the bounds of the
- // view don't change.
-
Data& data = data_[view];
data.start_bounds = view->bounds();
data.target_bounds = target;
@@ -60,8 +60,6 @@ void BoundsAnimator::AnimateViewTo(View* view,
animation_to_view_[data.animation] = view;
data.animation->Show();
-
- CleanupData(true, &existing_data, NULL);
}
void BoundsAnimator::SetAnimationForView(View* view,
@@ -128,25 +126,22 @@ SlideAnimation* BoundsAnimator::CreateAnimation() {
return animation;
}
-void BoundsAnimator::RemoveFromMaps(View* view) {
+void BoundsAnimator::RemoveFromMapsAndDelete(View* view) {
DCHECK(data_.count(view) > 0);
- animation_to_view_.erase(data_[view].animation);
+ Data& data = data_[view];
+ animation_to_view_.erase(data.animation);
+ if (data.delete_when_done)
+ delete view;
data_.erase(view);
}
-void BoundsAnimator::CleanupData(bool send_cancel, Data* data, View* view) {
- if (send_cancel && data->delegate)
- data->delegate->AnimationCanceled(data->animation);
-
+void BoundsAnimator::CleanupData(Data* data) {
if (data->delete_delegate_when_done) {
delete static_cast<OwnedAnimationDelegate*>(data->delegate);
data->delegate = NULL;
}
- if (data->delete_when_done)
- delete view;
-
delete data->animation;
data->animation = NULL;
}
@@ -195,12 +190,12 @@ void BoundsAnimator::AnimationEnded(const Animation* animation) {
// Make a copy of the data as Remove empties out the maps.
Data data = data_[view];
- RemoveFromMaps(view);
+ RemoveFromMapsAndDelete(view);
if (delegate)
delegate->AnimationEnded(animation);
- CleanupData(false, &data, view);
+ CleanupData(&data);
}
void BoundsAnimator::AnimationCanceled(const Animation* animation) {
@@ -210,20 +205,17 @@ void BoundsAnimator::AnimationCanceled(const Animation* animation) {
// Make a copy of the data as Remove empties out the maps.
Data data = data_[view];
- RemoveFromMaps(view);
+ RemoveFromMapsAndDelete(view);
if (delegate)
delegate->AnimationCanceled(animation);
- CleanupData(false, &data, view);
+ CleanupData(&data);
}
void BoundsAnimator::AnimationContainerProgressed(
AnimationContainer* container) {
if (!repaint_bounds_.IsEmpty()) {
- // Adjust for rtl.
- repaint_bounds_.set_x(parent_->MirroredXWithWidthInsideView(
- repaint_bounds_.x(), repaint_bounds_.width()));
parent_->SchedulePaint(repaint_bounds_, false);
repaint_bounds_.SetRect(0, 0, 0, 0);
}
diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h
index 606c05f..ab2fde9 100644
--- a/views/animation/bounds_animator.h
+++ b/views/animation/bounds_animator.h
@@ -50,9 +50,7 @@ class BoundsAnimator : public AnimationDelegate,
// Starts animating |view| from its current bounds to |target|. If
// |delete_when_done| is true the view is deleted when the animation
// completes. If there is already an animation running for the view it's
- // stopped and a new one started. If an AnimationDelegate has been set for
- // |view| it is removed (after being notified that the animation was
- // canceled).
+ // stopped and a new one started.
void AnimateViewTo(View* view,
const gfx::Rect& target,
bool delete_when_done);
@@ -66,7 +64,7 @@ class BoundsAnimator : public AnimationDelegate,
const SlideAnimation* GetAnimationForView(View* view);
// Stops animating the specified view. If the view was scheduled for deletion
- // it is deleted. This does nothing if |view| is not currently animating.
+ // it is deleted.
void StopAnimatingView(View* view);
// Sets the delegate for the animation created for the specified view. If
@@ -90,10 +88,6 @@ class BoundsAnimator : public AnimationDelegate,
observer_ = observer;
}
- protected:
- // Creates the animation to use for animating views.
- virtual SlideAnimation* CreateAnimation();
-
private:
// Tracks data about the view being animated.
struct Data {
@@ -126,13 +120,15 @@ class BoundsAnimator : public AnimationDelegate,
typedef std::map<const Animation*, View*> AnimationToViewMap;
- // Removes references to |view| and its animation. This does NOT delete the
- // animation or delegate.
- void RemoveFromMaps(View* view);
+ // Creates the animation to use for animating views.
+ SlideAnimation* CreateAnimation();
+
+ // Removes references to |view| and its animation as well as deleting |view|
+ // (if necessary). This does NOT delete the animation or delegate.
+ void RemoveFromMapsAndDelete(View* view);
- // Does the necessary cleanup for |data|. If |send_cancel| is true and a
- // delegate has been installed on |data| AnimationCanceled is invoked on it.
- void CleanupData(bool send_cancel, Data* data, View* view);
+ // Does the necessary cleanup for |data|.
+ void CleanupData(Data* data);
// Used when changing the animation for a view. This resets the maps for
// the animation used by view and returns the current animation. Ownership
diff --git a/views/animation/bounds_animator_unittest.cc b/views/animation/bounds_animator_unittest.cc
deleted file mode 100644
index 74ea5f2..0000000
--- a/views/animation/bounds_animator_unittest.cc
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "app/slide_animation.h"
-#include "app/test_animation_delegate.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "views/animation/bounds_animator.h"
-#include "views/view.h"
-
-using views::BoundsAnimator;
-
-namespace {
-
-class TestBoundsAnimator : public BoundsAnimator {
- public:
- explicit TestBoundsAnimator(views::View* view) : BoundsAnimator(view) {
- }
-
- protected:
- SlideAnimation* CreateAnimation() {
- SlideAnimation* animation = BoundsAnimator::CreateAnimation();
- animation->SetSlideDuration(10);
- return animation;
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestBoundsAnimator);
-};
-
-class OwnedDelegate : public BoundsAnimator::OwnedAnimationDelegate {
- public:
- OwnedDelegate() {
- deleted_ = false;
- canceled_ = false;
- }
-
- ~OwnedDelegate() {
- deleted_ = true;
- }
-
- static bool get_and_clear_deleted() {
- bool value = deleted_;
- deleted_ = false;
- return value;
- }
-
- static bool get_and_clear_canceled() {
- bool value = canceled_;
- canceled_ = false;
- return value;
- }
-
- // AnimationDelegate:
- virtual void AnimationCanceled(const Animation* animation) {
- canceled_ = true;
- }
-
- private:
- static bool deleted_;
- static bool canceled_;
-
- DISALLOW_COPY_AND_ASSIGN(OwnedDelegate);
-};
-
-// static
-bool OwnedDelegate::deleted_ = false;
-
-// static
-bool OwnedDelegate::canceled_ = false;
-
-class TestView : public views::View {
- public:
- TestView() {}
- virtual void SchedulePaint(const gfx::Rect& r, bool urgent) {
- if (dirty_rect_.IsEmpty())
- dirty_rect_ = r;
- else
- dirty_rect_ = dirty_rect_.Union(r);
- }
-
- const gfx::Rect& dirty_rect() const { return dirty_rect_; }
-
- private:
- gfx::Rect dirty_rect_;
-
- DISALLOW_COPY_AND_ASSIGN(TestView);
-};
-
-} // namespace
-
-class BoundsAnimatorTest : public testing::Test {
- public:
- BoundsAnimatorTest() : child_(new TestView()), animator_(&parent_) {
- parent_.AddChildView(child_);
- }
-
- TestView* parent() { return &parent_; }
- TestView* child() { return child_; }
- TestBoundsAnimator* animator() { return &animator_; }
-
- private:
- MessageLoopForUI message_loop_;
- TestView parent_;
- TestView* child_; // Owned by |parent_|.
- TestBoundsAnimator animator_;
-
- DISALLOW_COPY_AND_ASSIGN(BoundsAnimatorTest);
-};
-
-// Checks animate view to.
-TEST_F(BoundsAnimatorTest, AnimateViewTo) {
- TestAnimationDelegate delegate;
- gfx::Rect initial_bounds(0, 0, 10, 10);
- child()->SetBounds(initial_bounds);
- gfx::Rect target_bounds(10, 10, 20, 20);
- animator()->AnimateViewTo(child(), target_bounds, false);
- animator()->SetAnimationDelegate(child(), &delegate, false);
-
- // The animator should be animating now.
- EXPECT_TRUE(animator()->IsAnimating());
-
- // Run the message loop; the delegate exits the loop when the animation is
- // done.
- MessageLoop::current()->Run();
-
- // Make sure the bounds match of the view that was animated match.
- EXPECT_EQ(target_bounds, child()->bounds());
-
- // The parent should have been told to repaint as the animation progressed.
- // The resulting rect is the union of the original and target bounds.
- EXPECT_EQ(target_bounds.Union(initial_bounds), parent()->dirty_rect());
-}
-
-// Make sure an AnimationDelegate is deleted when canceled.
-TEST_F(BoundsAnimatorTest, DeleteDelegateOnCancel) {
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
- animator()->SetAnimationDelegate(child(), new OwnedDelegate(), true);
-
- animator()->Cancel();
-
- // The animator should no longer be animating.
- EXPECT_FALSE(animator()->IsAnimating());
-
- // The cancel should both cancel the delegate and delete it.
- EXPECT_TRUE(OwnedDelegate::get_and_clear_canceled());
- EXPECT_TRUE(OwnedDelegate::get_and_clear_deleted());
-}
-
-// Make sure an AnimationDelegate is deleted when another animation is
-// scheduled.
-TEST_F(BoundsAnimatorTest, DeleteDelegateOnNewAnimate) {
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
- animator()->SetAnimationDelegate(child(), new OwnedDelegate(), true);
-
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
-
- // Starting a new animation should both cancel the delegate and delete it.
- EXPECT_TRUE(OwnedDelegate::get_and_clear_deleted());
- EXPECT_TRUE(OwnedDelegate::get_and_clear_canceled());
-}
-
-// Makes sure StopAnimating works.
-TEST_F(BoundsAnimatorTest, StopAnimating) {
- scoped_ptr<OwnedDelegate> delegate(new OwnedDelegate());
-
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
- animator()->SetAnimationDelegate(child(), new OwnedDelegate(), true);
-
- animator()->StopAnimatingView(child());
-
- // Shouldn't be animating now.
- EXPECT_FALSE(animator()->IsAnimating());
-
- // Stopping should both cancel the delegate and delete it.
- EXPECT_TRUE(OwnedDelegate::get_and_clear_deleted());
- EXPECT_TRUE(OwnedDelegate::get_and_clear_canceled());
-}