diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 00:41:08 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-10 00:41:08 +0000 |
| commit | f90ef342b3dcacd675f630caa63626573cfe032a (patch) | |
| tree | 724d4466908a72d5bee0abd8ec0bb437acd26810 /o3d/plugin/mac/main_mac.mm | |
| parent | 07f25e82ef962a56a791d115720f57957d84d782 (diff) | |
| download | chromium_src-f90ef342b3dcacd675f630caa63626573cfe032a.zip chromium_src-f90ef342b3dcacd675f630caa63626573cfe032a.tar.gz chromium_src-f90ef342b3dcacd675f630caa63626573cfe032a.tar.bz2 | |
Switched from NPObject shared memory wrapper to Chrome shared memory in preparation for moving from NPAPI to Chrome IPC for synchronous messages.
Started work on an O3D configuration that will use Pepper 3D to connect to a remote GPU plugin. This is not building yet.
Updated to latest NPAPI from nixysa.
Review URL: http://codereview.chromium.org/371074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/mac/main_mac.mm')
| -rw-r--r-- | o3d/plugin/mac/main_mac.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/o3d/plugin/mac/main_mac.mm b/o3d/plugin/mac/main_mac.mm index 3f09e698..e34e6c8 100644 --- a/o3d/plugin/mac/main_mac.mm +++ b/o3d/plugin/mac/main_mac.mm @@ -155,7 +155,7 @@ void DispatchKeyboardEvent(PluginObject* obj, break; case keyUp: type = Event::TYPE_KEYUP; - break; + break; default: return; break; @@ -477,6 +477,8 @@ bool HandleCocoaEvent(NPP instance, NPCocoaEvent* the_event) { } break; + case NPCocoaEventTextInput: + break; } return handled; @@ -651,7 +653,7 @@ NPError OSCALL NP_Initialize(NPNetscapeFuncs* browserFuncs) { #if !defined(O3D_INTERNAL_PLUGIN) // Wrapper that discards the return value to match the expected type of -// NPP_ShutdownUPP. +// NPP_ShutdownProcPtr. void NPP_ShutdownWrapper() { NP_Shutdown(); } @@ -661,7 +663,7 @@ void NPP_ShutdownWrapper() { // to be a main() to call to do basic setup. int main(NPNetscapeFuncs* browserFuncs, NPPluginFuncs* pluginFuncs, - NPP_ShutdownUPP* shutdownProc) { + NPP_ShutdownProcPtr* shutdownProc) { HANDLE_CRASHES; NPError error = NP_Initialize(browserFuncs); if (error == NPERR_NO_ERROR) @@ -881,7 +883,7 @@ NPError NPP_SetWindow(NPP instance, NPWindow* window) { NSWindow * ns_window = reinterpret_cast<NSWindow*>(np_cg->window); new_window = reinterpret_cast<WindowRef>([ns_window windowRef]); } else { - new_window = np_cg->window; + new_window = static_cast<OpaqueWindowPtr*>(np_cg->window); } obj->mac_2d_context_ = np_cg->context; } |