diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 23:47:20 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 23:47:20 +0000 |
| commit | c34b1c6fa5f948b8bb056288f1d20a3f4a0a3530 (patch) | |
| tree | de449ef465129f3239cb740d6a2a6cdc7066f939 /chrome | |
| parent | a3fb905bdf260db20dbaaad854a75c5b59cc2568 (diff) | |
| download | chromium_src-c34b1c6fa5f948b8bb056288f1d20a3f4a0a3530.zip chromium_src-c34b1c6fa5f948b8bb056288f1d20a3f4a0a3530.tar.gz chromium_src-c34b1c6fa5f948b8bb056288f1d20a3f4a0a3530.tar.bz2 | |
Prevent accelerated Mac plugin frame changes from being animated
BUG=42093
TEST=Open a Core Animation plugin in one tab, and the NTP (with floating bookmark bar) in another. Change back and forth. The plugin should not animate to the correct location.
Review URL: http://codereview.chromium.org/1729002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host_view_mac.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 5acfc4f..18ffb5f 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <QuartzCore/CAOpenGLLayer.h> +#include <QuartzCore/QuartzCore.h> #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" @@ -95,10 +95,14 @@ const size_t kMaxTooltipLength = 1024; // it and just match the superlayer's size. See the email thread referenced in // ensureAcceleratedPluginLayer for an explanation of why the superlayer // isn't trustworthy. + [CATransaction begin]; + [CATransaction setValue:[NSNumber numberWithInt:0] + forKey:kCATransactionAnimationDuration]; if ([self superlayer]) [super setFrame:[[self superlayer] bounds]]; else [super setFrame:rect]; + [CATransaction commit]; } @end |