diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 21:15:48 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-13 21:15:48 +0000 |
| commit | 56967ecd6eeca05f1267b98ccded1e17ca0ea80a (patch) | |
| tree | 8e85bda96060f644c099eaecbec07234dfc9ae99 /o3d/plugin/mac/plugin_mac.mm | |
| parent | f8f72875acb86d0a307d759269ee005d7327343d (diff) | |
| download | chromium_src-56967ecd6eeca05f1267b98ccded1e17ca0ea80a.zip chromium_src-56967ecd6eeca05f1267b98ccded1e17ca0ea80a.tar.gz chromium_src-56967ecd6eeca05f1267b98ccded1e17ca0ea80a.tar.bz2 | |
Review URL: http://codereview.chromium.org/577038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/mac/plugin_mac.mm')
| -rw-r--r-- | o3d/plugin/mac/plugin_mac.mm | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/o3d/plugin/mac/plugin_mac.mm b/o3d/plugin/mac/plugin_mac.mm index df25d9d..4ab3127 100644 --- a/o3d/plugin/mac/plugin_mac.mm +++ b/o3d/plugin/mac/plugin_mac.mm @@ -40,6 +40,8 @@ #include "plugin/cross/main.h" #include "core/mac/display_window_mac.h" #include "plugin/mac/graphics_utils_mac.h" +#import "plugin/mac/o3d_layer.h" + #if !defined(O3D_INTERNAL_PLUGIN) BreakpadRef gBreakpadRef = NULL; @@ -236,6 +238,15 @@ void RenderTimer::TimerCallback(CFRunLoopTimerRef timer, void* info) { NPP instance = instances_[i]; PluginObject* obj = static_cast<PluginObject*>(instance->pdata); + if (obj->drawing_model_ == NPDrawingModelCoreAnimation) { + O3DLayer* o3dLayer = static_cast<O3DLayer*>(obj->gl_layer_); + if (o3dLayer) { + obj->client()->Tick(); + [o3dLayer setNeedsDisplay]; + } + return; + } + ManageSafariTabSwitching(obj); obj->client()->Tick(); |