diff options
author | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 23:51:21 +0000 |
---|---|---|
committer | raymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 23:51:21 +0000 |
commit | c9246538b8cde698bb7e31c851388521709f2a2a (patch) | |
tree | ccd484b141cc5bf0c1f12b6893326ab8934ad0e4 /webkit | |
parent | abeaebc46b5cdfa8a4fcea6a2e55b207dffd8e7e (diff) | |
download | chromium_src-c9246538b8cde698bb7e31c851388521709f2a2a.zip chromium_src-c9246538b8cde698bb7e31c851388521709f2a2a.tar.gz chromium_src-c9246538b8cde698bb7e31c851388521709f2a2a.tar.bz2 |
This refactors PPB_Flash GetLocalTimeZoneOffset to the new PPAPI resource model. The in process implementation is removed. Associated plugin delegate code is also removed.
BUG=
Review URL: https://chromiumcodereview.appspot.com/11516020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.cc | 4 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.h | 1 | ||||
-rw-r--r-- | webkit/plugins/ppapi/plugin_delegate.h | 2 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppb_flash_impl.cc | 15 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppb_flash_impl.h | 2 |
5 files changed, 0 insertions, 24 deletions
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc index eec48da..8339ac4 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.cc +++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc @@ -371,10 +371,6 @@ void MockPluginDelegate::SetContentRestriction(int restrictions) { void MockPluginDelegate::SaveURLAs(const GURL& url) { } -double MockPluginDelegate::GetLocalTimeZoneOffset(base::Time t) { - return 0.0; -} - base::SharedMemory* MockPluginDelegate::CreateAnonymousSharedMemory( uint32_t size) { return NULL; diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h index f2f3407..fdd8bf2 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.h +++ b/webkit/plugins/ppapi/mock_plugin_delegate.h @@ -170,7 +170,6 @@ class MockPluginDelegate : public PluginDelegate { virtual void DidStopLoading(); virtual void SetContentRestriction(int restrictions); virtual void SaveURLAs(const GURL& url); - virtual double GetLocalTimeZoneOffset(base::Time t); virtual base::SharedMemory* CreateAnonymousSharedMemory(uint32_t size); virtual ::ppapi::Preferences GetPreferences(); virtual bool LockMouse(PluginInstance* instance); diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index 9c22ce9..b228cf3 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -616,8 +616,6 @@ class PluginDelegate { // Tells the browser to bring up SaveAs dialog to save specified URL. virtual void SaveURLAs(const GURL& url) = 0; - virtual double GetLocalTimeZoneOffset(base::Time t) = 0; - // Create an anonymous shared memory segment of size |size| bytes, and return // a pointer to it, or NULL on error. Caller owns the returned pointer. virtual base::SharedMemory* CreateAnonymousSharedMemory(uint32_t size) = 0; diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc index f278473..43e9ba2 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_impl.cc @@ -168,21 +168,6 @@ int32_t PPB_Flash_Impl::Navigate(PP_Instance instance, return instance_->Navigate(data, target, PP_ToBool(from_user_action)); } -double PPB_Flash_Impl::GetLocalTimeZoneOffset(PP_Instance instance, - PP_Time t) { - // Evil hack. The time code handles exact "0" values as special, and produces - // a "null" Time object. This will represent some date hundreds of years ago - // and will give us funny results at 1970 (there are some tests where this - // comes up, but it shouldn't happen in real life). To work around this - // special handling, we just need to give it some nonzero value. - if (t == 0.0) - t = 0.0000000001; - - // We can't do the conversion here because on Linux, the localtime calls - // require filesystem access prohibited by the sandbox. - return instance_->delegate()->GetLocalTimeZoneOffset(PPTimeToTime(t)); -} - PP_Bool PPB_Flash_Impl::IsRectTopmost(PP_Instance instance, const PP_Rect* rect) { return PP_FromBool(instance_->IsRectTopmost( diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h index 68ff0d8..34ed979 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.h +++ b/webkit/plugins/ppapi/ppb_flash_impl.h @@ -44,8 +44,6 @@ class PPB_Flash_Impl : public ::ppapi::thunk::PPB_Flash_API { const ::ppapi::URLRequestInfoData& data, const char* target, PP_Bool from_user_action) OVERRIDE; - virtual double GetLocalTimeZoneOffset(PP_Instance instance, - PP_Time t) OVERRIDE; virtual PP_Bool IsRectTopmost(PP_Instance instance, const PP_Rect* rect) OVERRIDE; virtual PP_Var GetSetting(PP_Instance instance, |