Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(166)

Unified Diff: ppapi/cpp/private/flash_fullscreen.cc

Issue 10985007: Use either 0.1 or 1.0 versions of PPBFlashFullscreen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add PP_ToBool Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/private/flash_fullscreen.cc
diff --git a/ppapi/cpp/private/flash_fullscreen.cc b/ppapi/cpp/private/flash_fullscreen.cc
index dd17b1a15d452cf174ed769cee4a463607c1d347..8d33b5f0f7f5441f03433712c13c98193ac465bb 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() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698