summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_carbon_interpose_mac.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-25 20:32:56 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-25 20:32:56 +0000
commit9c90deb6ab28f8043574331bb3d2ba6c624f5106 (patch)
tree31b17aa69e5d1d389c489d070d671c9fce886686 /chrome/browser/plugin_carbon_interpose_mac.cc
parent51d772b68710df707c1ab5fff713b8c19e8fe0be (diff)
downloadchromium_src-9c90deb6ab28f8043574331bb3d2ba6c624f5106.zip
chromium_src-9c90deb6ab28f8043574331bb3d2ba6c624f5106.tar.gz
chromium_src-9c90deb6ab28f8043574331bb3d2ba6c624f5106.tar.bz2
Plumb Carbon SetCursor through.
BUG=http://crbug.com/32703 TEST=when hiding cursor (Flash 10.0), cursor hides (but doesn't stay hidden; that gets fixed later) Review URL: http://codereview.chromium.org/552132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_carbon_interpose_mac.cc')
-rw-r--r--chrome/browser/plugin_carbon_interpose_mac.cc10
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc
index def2515..020d9ae 100644
--- a/chrome/browser/plugin_carbon_interpose_mac.cc
+++ b/chrome/browser/plugin_carbon_interpose_mac.cc
@@ -151,6 +151,15 @@ static OSStatus ChromePluginSetThemeCursor(ThemeCursor cursor) {
return SetThemeCursor(cursor);
}
+static void ChromePluginSetCursor(const Cursor* cursor) {
+ WebPluginDelegateImpl* delegate = mac_plugin_interposing::GetActiveDelegate();
+ if (delegate) {
+ mac_plugin_interposing::NotifyPluginOfSetCursor(delegate, cursor);
+ return;
+ }
+ return SetCursor(cursor);
+}
+
#pragma mark -
struct interpose_substitution {
@@ -175,4 +184,5 @@ __attribute__((used)) static const interpose_substitution substitutions[]
INTERPOSE_FUNCTION(DisposeDialog),
INTERPOSE_FUNCTION(FindWindow),
INTERPOSE_FUNCTION(SetThemeCursor),
+ INTERPOSE_FUNCTION(SetCursor),
};