diff options
| author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 19:55:34 +0000 |
|---|---|---|
| committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 19:55:34 +0000 |
| commit | e9cf2cac00113e12b14584533594b82dfe5701a6 (patch) | |
| tree | 6eca083e1bcfbb1c1b9f92cfa4986a6f8a289531 /o3d/plugin | |
| parent | 9eaa021d46dc016c20e43ed2bcae536922fd979d (diff) | |
| download | chromium_src-e9cf2cac00113e12b14584533594b82dfe5701a6.zip chromium_src-e9cf2cac00113e12b14584533594b82dfe5701a6.tar.gz chromium_src-e9cf2cac00113e12b14584533594b82dfe5701a6.tar.bz2 | |
Build fixes for case when fullscreen message is disabled, for IMC code
path, and for effect.js docs.
BUG=none
TEST=none (built O3D on Mac)
Review URL: http://codereview.chromium.org/1512029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/mac/plugin_mac.mm | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/o3d/plugin/mac/plugin_mac.mm b/o3d/plugin/mac/plugin_mac.mm index 96669ef..b7361db 100644 --- a/o3d/plugin/mac/plugin_mac.mm +++ b/o3d/plugin/mac/plugin_mac.mm @@ -359,6 +359,18 @@ char* CreatePosixFilePathFromHFSFilePath(const char* hfsPath) { +// Convenience function for fetching SInt32 parameters from Carbon EventRefs. +static SInt32 GetIntEventParam(EventRef inEvent, EventParamName inName) { + SInt32 value = 0; + return (GetEventParameter(inEvent, inName, typeSInt32, NULL, sizeof(value), + NULL, &value) == noErr) ? value : 0; +} + + +#pragma mark ____OVERLAY_WINDOW + +#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG + // A little wrapper for ATSUSetAttributes to make calling it with one attribute // less annoying. static void MySetAttribute(ATSUStyle style, @@ -387,20 +399,6 @@ static void MySetLayoutControl(ATSUTextLayout layout, ATSUSetLayoutControls(layout, 1, tags, sizes, values); } - - -// Convenience function for fetching SInt32 parameters from Carbon EventRefs. -static SInt32 GetIntEventParam(EventRef inEvent, EventParamName inName) { - SInt32 value = 0; - return (GetEventParameter(inEvent, inName, typeSInt32, NULL, sizeof(value), - NULL, &value) == noErr) ? value : 0; -} - - -#pragma mark ____OVERLAY_WINDOW - -#ifdef O3D_PLUGIN_ENABLE_FULLSCREEN_MSG - // Returns the unicode 16 chars that we need to display as the fullscreen // message. Should be disposed with free() after use. static UniChar * GetFullscreenDisplayText(int *returned_length) { |