diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:35:17 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 01:35:17 +0000 |
| commit | 474b2ab8c3b32c07692480aa234f3b2921fe5dd6 (patch) | |
| tree | 2b636c7cad4069fafc3d190bb6a009b754939374 /o3d | |
| parent | 3ab834ce7c14df921503be2fd51774857824e6bd (diff) | |
| download | chromium_src-474b2ab8c3b32c07692480aa234f3b2921fe5dd6.zip chromium_src-474b2ab8c3b32c07692480aa234f3b2921fe5dd6.tar.gz chromium_src-474b2ab8c3b32c07692480aa234f3b2921fe5dd6.tar.bz2 | |
Update DEPS to pull in missing Nixysa, and add code to use new Nixysa threading support needed for Safari on 10.6.
Review URL: http://codereview.chromium.org/1622023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/DEPS | 2 | ||||
| -rw-r--r-- | o3d/plugin/cross/main_thread_task_poster.cc | 6 | ||||
| -rw-r--r-- | o3d/plugin/mac/o3d_layer.h | 13 |
3 files changed, 10 insertions, 11 deletions
@@ -1,6 +1,6 @@ vars = { "chromium_trunk": "http://src.chromium.org/svn/trunk", - "nixysa_rev": "68", + "nixysa_rev": "69", # When updating the chromium rev, you must also update the nss and sqlite # revs to match the version pulled-in by Chromium's own DEPS in the new rev. "chromium_rev": "37758", diff --git a/o3d/plugin/cross/main_thread_task_poster.cc b/o3d/plugin/cross/main_thread_task_poster.cc index 24a42e2..89adf7c 100644 --- a/o3d/plugin/cross/main_thread_task_poster.cc +++ b/o3d/plugin/cross/main_thread_task_poster.cc @@ -31,6 +31,7 @@ #include <npapi.h> +#include "npn_api.h" #include "plugin/cross/main_thread_task_poster.h" namespace o3d { @@ -45,10 +46,7 @@ MainThreadTaskPoster::~MainThreadTaskPoster() { } bool MainThreadTaskPoster::IsSupported() { - int plugin_major, plugin_minor, browser_major, browser_minor; - NPN_Version(&plugin_major, &plugin_minor, &browser_major, &browser_minor); - return browser_major > 0 || - browser_minor >= NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL; + return IsPluginThreadAsyncCallSupported(); } void MainThreadTaskPoster::PostTask(Task* task) { diff --git a/o3d/plugin/mac/o3d_layer.h b/o3d/plugin/mac/o3d_layer.h index fc6872c..7d8cc69 100644 --- a/o3d/plugin/mac/o3d_layer.h +++ b/o3d/plugin/mac/o3d_layer.h @@ -37,7 +37,6 @@ using glue::_o3d::PluginObject; - @interface O3DLayer : CAOpenGLLayer { CGLContextObj glContext_; PluginObject *obj_; @@ -47,15 +46,17 @@ using glue::_o3d::PluginObject; int height_; } -- (CGLContextObj) glContext; +- (CGLContextObj)glContext; -- (void)drawInCGLContext:(CGLContextObj)ctx pixelFormat:(CGLPixelFormatObj)pf - forLayerTime:(CFTimeInterval)t displayTime:(const CVTimeStamp *)ts; +- (void)drawInCGLContext:(CGLContextObj)ctx + pixelFormat:(CGLPixelFormatObj)pf + forLayerTime:(CFTimeInterval)t + displayTime:(const CVTimeStamp *)ts; - (void)setPluginObject:(PluginObject *)obj; -- (void)setWidth:(int)width height:(int)height; - +- (void)setWidth:(int)width + height:(int)height; @end |