diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 22:47:36 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 22:47:36 +0000 |
| commit | 1c89c290fcfb818a7ee3b544bb2d534e002df8a6 (patch) | |
| tree | 3cecc42eabe4fdd0a1119b00e4400a649d37666c /chrome/browser/external_tab_container_win.cc | |
| parent | aa1026c6b91c006370b0c8dda03064c9b19f765e (diff) | |
| download | chromium_src-1c89c290fcfb818a7ee3b544bb2d534e002df8a6.zip chromium_src-1c89c290fcfb818a7ee3b544bb2d534e002df8a6.tar.gz chromium_src-1c89c290fcfb818a7ee3b544bb2d534e002df8a6.tar.bz2 | |
Fix DCHECK() in infobar animation.
The core of the problem here is that painting does not always happen synchronously with layout, and the old code was not always forcing re-layout to occur if the animation progressed in the meantime. This change forces re-layout to occur any time the animation progresses or the target height is changed, and makes that the one time when the tab and bar heights are recalculated -- all other places then use the calculated values.
This also tweaks which functions are in the cross-platform versus platform-specific code as well as making a few other small cleanups.
Finally, this re-enables a test on Mac that seems to be passing now.
BUG=60990, 75451
TEST=none
Review URL: http://codereview.chromium.org/6788014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container_win.cc')
| -rw-r--r-- | chrome/browser/external_tab_container_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 33d1fc1..b2f3ade 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -939,7 +939,7 @@ void ExternalTabContainer::SetEnableExtensionAutomation( } } -void ExternalTabContainer::InfoBarContainerSizeChanged(bool is_animating) { +void ExternalTabContainer::InfoBarContainerHeightChanged(bool is_animating) { if (external_tab_view_) external_tab_view_->Layout(); } |