diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 03:11:05 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 03:11:05 +0000 |
| commit | c071375ae93b4bd4f40523171a457c3cefc1e527 (patch) | |
| tree | 187284747ec2cda8f00fef7784793b97ea96f9e1 /ppapi | |
| parent | dea9cee88672af1c3421ebdb7cc862d98fab8141 (diff) | |
| download | chromium_src-c071375ae93b4bd4f40523171a457c3cefc1e527.zip chromium_src-c071375ae93b4bd4f40523171a457c3cefc1e527.tar.gz chromium_src-c071375ae93b4bd4f40523171a457c3cefc1e527.tar.bz2 | |
Use either 0.1 or 1.0 versions of PPBFlashFullscreen.
This allows us to eventually remove the 0.1 version.
BUG=147746
Review URL: https://chromiumcodereview.appspot.com/10985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/cpp/private/flash_fullscreen.cc | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/ppapi/cpp/private/flash_fullscreen.cc b/ppapi/cpp/private/flash_fullscreen.cc index dd17b1a..8d33b5f 100644 --- a/ppapi/cpp/private/flash_fullscreen.cc +++ b/ppapi/cpp/private/flash_fullscreen.cc @@ -32,23 +32,39 @@ FlashFullscreen::~FlashFullscreen() { } bool FlashFullscreen::IsFullscreen() { - return has_interface<PPB_FlashFullscreen_0_1>() && - get_interface<PPB_FlashFullscreen_0_1>()->IsFullscreen( - instance_.pp_instance()); + if (has_interface<PPB_FlashFullscreen_1_0>()) { + return PP_ToBool(get_interface<PPB_FlashFullscreen_1_0>()->IsFullscreen( + instance_.pp_instance())); + } + if (has_interface<PPB_FlashFullscreen_0_1>()) { + return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->IsFullscreen( + instance_.pp_instance())); + } + return false; } bool FlashFullscreen::SetFullscreen(bool fullscreen) { - if (!has_interface<PPB_FlashFullscreen_0_1>()) - return false; - return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->SetFullscreen( - instance_.pp_instance(), PP_FromBool(fullscreen))); + if (has_interface<PPB_FlashFullscreen_1_0>()) { + return PP_ToBool(get_interface<PPB_FlashFullscreen_1_0>()->SetFullscreen( + instance_.pp_instance(), PP_FromBool(fullscreen))); + } + if (has_interface<PPB_FlashFullscreen_0_1>()) { + return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->SetFullscreen( + instance_.pp_instance(), PP_FromBool(fullscreen))); + } + return false; } bool FlashFullscreen::GetScreenSize(Size* size) { - if (!has_interface<PPB_FlashFullscreen_0_1>()) - return false; - return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->GetScreenSize( - instance_.pp_instance(), &size->pp_size())); + if (has_interface<PPB_FlashFullscreen_1_0>()) { + return PP_ToBool(get_interface<PPB_FlashFullscreen_1_0>()->GetScreenSize( + instance_.pp_instance(), &size->pp_size())); + } + if (has_interface<PPB_FlashFullscreen_0_1>()) { + return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->GetScreenSize( + instance_.pp_instance(), &size->pp_size())); + } + return false; } bool FlashFullscreen::MustRecreateContexts() { |