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

Side by Side 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: fix indent Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/cpp/private/flash_fullscreen.h" 5 #include "ppapi/cpp/private/flash_fullscreen.h"
6 6
7 #include "ppapi/c/private/ppb_flash_fullscreen.h" 7 #include "ppapi/c/private/ppb_flash_fullscreen.h"
8 #include "ppapi/cpp/instance.h" 8 #include "ppapi/cpp/instance.h"
9 #include "ppapi/cpp/module.h" 9 #include "ppapi/cpp/module.h"
10 #include "ppapi/cpp/module_impl.h" 10 #include "ppapi/cpp/module_impl.h"
(...skipping 14 matching lines...) Expand all
25 } // namespace 25 } // namespace
26 26
27 FlashFullscreen::FlashFullscreen(const InstanceHandle& instance) 27 FlashFullscreen::FlashFullscreen(const InstanceHandle& instance)
28 : instance_(instance) { 28 : instance_(instance) {
29 } 29 }
30 30
31 FlashFullscreen::~FlashFullscreen() { 31 FlashFullscreen::~FlashFullscreen() {
32 } 32 }
33 33
34 bool FlashFullscreen::IsFullscreen() { 34 bool FlashFullscreen::IsFullscreen() {
35 return has_interface<PPB_FlashFullscreen_0_1>() && 35 if (has_interface<PPB_FlashFullscreen_1_0>())
36 get_interface<PPB_FlashFullscreen_0_1>()->IsFullscreen( 36 return get_interface<PPB_FlashFullscreen_1_0>()->IsFullscreen(
viettrungluu 2012/09/24 23:06:25 Nit: since this spans > 1 line, you're supposed to
37 instance_.pp_instance()); 37 instance_.pp_instance());
38 if (has_interface<PPB_FlashFullscreen_0_1>())
39 return get_interface<PPB_FlashFullscreen_0_1>()->IsFullscreen(
viettrungluu 2012/09/24 23:06:25 " etc.
40 instance_.pp_instance());
41 return false;
38 } 42 }
39 43
40 bool FlashFullscreen::SetFullscreen(bool fullscreen) { 44 bool FlashFullscreen::SetFullscreen(bool fullscreen) {
41 if (!has_interface<PPB_FlashFullscreen_0_1>()) 45 if (has_interface<PPB_FlashFullscreen_1_0>())
42 return false; 46 return PP_ToBool(get_interface<PPB_FlashFullscreen_1_0>()->SetFullscreen(
43 return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->SetFullscreen( 47 instance_.pp_instance(), PP_FromBool(fullscreen)));
44 instance_.pp_instance(), PP_FromBool(fullscreen))); 48 if (has_interface<PPB_FlashFullscreen_0_1>())
49 return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->SetFullscreen(
50 instance_.pp_instance(), PP_FromBool(fullscreen)));
51 return false;
45 } 52 }
46 53
47 bool FlashFullscreen::GetScreenSize(Size* size) { 54 bool FlashFullscreen::GetScreenSize(Size* size) {
48 if (!has_interface<PPB_FlashFullscreen_0_1>()) 55 if (has_interface<PPB_FlashFullscreen_1_0>())
49 return false; 56 return PP_ToBool(get_interface<PPB_FlashFullscreen_1_0>()->GetScreenSize(
50 return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->GetScreenSize( 57 instance_.pp_instance(), &size->pp_size()));
51 instance_.pp_instance(), &size->pp_size())); 58 if (has_interface<PPB_FlashFullscreen_0_1>())
59 return PP_ToBool(get_interface<PPB_FlashFullscreen_0_1>()->GetScreenSize(
60 instance_.pp_instance(), &size->pp_size()));
61 return false;
52 } 62 }
53 63
54 bool FlashFullscreen::MustRecreateContexts() { 64 bool FlashFullscreen::MustRecreateContexts() {
55 return !get_interface<PPB_FlashFullscreen_1_0>(); 65 return !get_interface<PPB_FlashFullscreen_1_0>();
56 } 66 }
57 67
58 } // namespace pp 68 } // namespace pp
OLDNEW
« 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