diff options
author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 20:39:20 +0000 |
---|---|---|
committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 20:39:20 +0000 |
commit | 3fd350851a66fa2674ffe570f22975769b402f1f (patch) | |
tree | 09dc72ef247d677b96ab01499458412cabcf9bd5 /ppapi | |
parent | bfa00d17d77105708552ad6446d1c9604f2f094b (diff) | |
download | chromium_src-3fd350851a66fa2674ffe570f22975769b402f1f.zip chromium_src-3fd350851a66fa2674ffe570f22975769b402f1f.tar.gz chromium_src-3fd350851a66fa2674ffe570f22975769b402f1f.tar.bz2 |
Remove ppb_fullscreen_dev interface, as fullscreen has been out
of dev for a while now.
TEST=existing test is for non-dev fullscreen
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10736058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/api/dev/ppb_fullscreen_dev.idl | 47 | ||||
-rw-r--r-- | ppapi/c/dev/ppb_fullscreen_dev.h | 62 | ||||
-rw-r--r-- | ppapi/cpp/dev/fullscreen_dev.cc | 50 | ||||
-rw-r--r-- | ppapi/cpp/dev/fullscreen_dev.h | 30 | ||||
-rw-r--r-- | ppapi/ppapi_sources.gypi | 3 | ||||
-rw-r--r-- | ppapi/proxy/interface_list.cc | 1 | ||||
-rw-r--r-- | ppapi/tests/all_c_includes.h | 1 | ||||
-rw-r--r-- | ppapi/tests/all_cpp_includes.h | 1 | ||||
-rw-r--r-- | ppapi/thunk/ppb_flash_fullscreen_thunk.cc | 2 |
9 files changed, 1 insertions, 196 deletions
diff --git a/ppapi/api/dev/ppb_fullscreen_dev.idl b/ppapi/api/dev/ppb_fullscreen_dev.idl deleted file mode 100644 index 22b44f2..0000000 --- a/ppapi/api/dev/ppb_fullscreen_dev.idl +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright (c) 2012 The Chromium Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - - -/** - * This file defines the <code>PPB_Fullscreen_Dev</code> interface. - */ - -label Chrome { - M16 = 0.5 -}; - -interface PPB_Fullscreen_Dev { - /** - * Checks whether the plugin instance is currently in fullscreen mode. - */ - PP_Bool IsFullscreen( - [in] PP_Instance instance); - - /** - * Switches the plugin instance to/from fullscreen mode. Returns PP_TRUE on - * success, PP_FALSE on failure. - * - * The transition to and from fullscreen is asynchronous. - * During the transition, IsFullscreen will return the original value, and - * no 2D or 3D device can be bound. The transition ends at DidChangeView - * when IsFullscreen returns the new value. You might receive other - * DidChangeView calls while in transition. - * - * The transition to fullscreen can only occur while the browser is - * processing a user gesture, even if PP_TRUE is returned. - */ - PP_Bool SetFullscreen( - [in] PP_Instance instance, - [in] PP_Bool fullscreen); - - /** - * Gets the size of the screen in pixels. When going fullscreen, the instance - * will be resized to that size. - */ - PP_Bool GetScreenSize( - [in] PP_Instance instance, - [out] PP_Size size); -}; - diff --git a/ppapi/c/dev/ppb_fullscreen_dev.h b/ppapi/c/dev/ppb_fullscreen_dev.h deleted file mode 100644 index ac718c3..0000000 --- a/ppapi/c/dev/ppb_fullscreen_dev.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright (c) 2012 The Chromium Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* From dev/ppb_fullscreen_dev.idl modified Fri Oct 14 14:57:50 2011. */ - -#ifndef PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_ -#define PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_ - -#include "ppapi/c/pp_bool.h" -#include "ppapi/c/pp_instance.h" -#include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_size.h" -#include "ppapi/c/pp_stdint.h" - -#define PPB_FULLSCREEN_DEV_INTERFACE_0_5 "PPB_Fullscreen(Dev);0.5" -#define PPB_FULLSCREEN_DEV_INTERFACE PPB_FULLSCREEN_DEV_INTERFACE_0_5 - -/** - * @file - * This file defines the <code>PPB_Fullscreen_Dev</code> interface. - */ - - -/** - * @addtogroup Interfaces - * @{ - */ -struct PPB_Fullscreen_Dev_0_5 { - /** - * Checks whether the plugin instance is currently in fullscreen mode. - */ - PP_Bool (*IsFullscreen)(PP_Instance instance); - /** - * Switches the plugin instance to/from fullscreen mode. Returns PP_TRUE on - * success, PP_FALSE on failure. - * - * The transition to and from fullscreen is asynchronous. - * During the transition, IsFullscreen will return the original value, and - * no 2D or 3D device can be bound. The transition ends at DidChangeView - * when IsFullscreen returns the new value. You might receive other - * DidChangeView calls while in transition. - * - * The transition to fullscreen can only occur while the browser is - * processing a user gesture, even if PP_TRUE is returned. - */ - PP_Bool (*SetFullscreen)(PP_Instance instance, PP_Bool fullscreen); - /** - * Gets the size of the screen in pixels. When going fullscreen, the instance - * will be resized to that size. - */ - PP_Bool (*GetScreenSize)(PP_Instance instance, struct PP_Size* size); -}; - -typedef struct PPB_Fullscreen_Dev_0_5 PPB_Fullscreen_Dev; -/** - * @} - */ - -#endif /* PPAPI_C_DEV_PPB_FULLSCREEN_DEV_H_ */ - diff --git a/ppapi/cpp/dev/fullscreen_dev.cc b/ppapi/cpp/dev/fullscreen_dev.cc deleted file mode 100644 index 9e6a542..0000000 --- a/ppapi/cpp/dev/fullscreen_dev.cc +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ppapi/cpp/dev/fullscreen_dev.h" - -#include "ppapi/c/dev/ppb_fullscreen_dev.h" -#include "ppapi/cpp/instance_handle.h" -#include "ppapi/cpp/module.h" -#include "ppapi/cpp/module_impl.h" -#include "ppapi/cpp/size.h" - -namespace pp { - -namespace { - -template <> const char* interface_name<PPB_Fullscreen_Dev>() { - return PPB_FULLSCREEN_DEV_INTERFACE; -} - -} // namespace - -Fullscreen_Dev::Fullscreen_Dev(const InstanceHandle& instance) - : instance_(instance) { -} - -Fullscreen_Dev::~Fullscreen_Dev() { -} - -bool Fullscreen_Dev::IsFullscreen() { - return has_interface<PPB_Fullscreen_Dev>() && - get_interface<PPB_Fullscreen_Dev>()->IsFullscreen( - instance_.pp_instance()); -} - -bool Fullscreen_Dev::SetFullscreen(bool fullscreen) { - if (!has_interface<PPB_Fullscreen_Dev>()) - return false; - return PP_ToBool(get_interface<PPB_Fullscreen_Dev>()->SetFullscreen( - instance_.pp_instance(), PP_FromBool(fullscreen))); -} - -bool Fullscreen_Dev::GetScreenSize(Size* size) { - if (!has_interface<PPB_Fullscreen_Dev>()) - return false; - return PP_ToBool(get_interface<PPB_Fullscreen_Dev>()->GetScreenSize( - instance_.pp_instance(), &size->pp_size())); -} - -} // namespace pp diff --git a/ppapi/cpp/dev/fullscreen_dev.h b/ppapi/cpp/dev/fullscreen_dev.h deleted file mode 100644 index 96c1ba2..0000000 --- a/ppapi/cpp/dev/fullscreen_dev.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef PPAPI_CPP_DEV_FULLSCREEN_DEV_H_ -#define PPAPI_CPP_DEV_FULLSCREEN_DEV_H_ - -#include "ppapi/cpp/instance_handle.h" - -namespace pp { - -class Size; - -class Fullscreen_Dev { - public: - Fullscreen_Dev(const InstanceHandle& instance); - virtual ~Fullscreen_Dev(); - - // PPB_Fullscreen_Dev methods. - bool IsFullscreen(); - bool SetFullscreen(bool fullscreen); - bool GetScreenSize(Size* size); - - private: - InstanceHandle instance_; -}; - -} // namespace pp - -#endif // PPAPI_CPP_DEV_FULLSCREEN_DEV_H_ diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index c5ee4a4..cc9d566 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -67,7 +67,6 @@ 'c/dev/ppb_file_chooser_dev.h', 'c/dev/ppb_find_dev.h', 'c/dev/ppb_font_dev.h', - 'c/dev/ppb_fullscreen_dev.h', 'c/dev/ppb_ime_input_event_dev.h', 'c/dev/ppb_memory_dev.h', 'c/dev/ppb_message_loop_dev.h', @@ -211,8 +210,6 @@ 'cpp/dev/find_dev.h', 'cpp/dev/font_dev.cc', 'cpp/dev/font_dev.h', - 'cpp/dev/fullscreen_dev.cc', - 'cpp/dev/fullscreen_dev.h', 'cpp/dev/graphics_2d_dev.cc', 'cpp/dev/graphics_2d_dev.h', 'cpp/dev/ime_input_event_dev.cc', diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 72a99b3..292e260 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -13,7 +13,6 @@ #include "ppapi/c/dev/ppb_cursor_control_dev.h" #include "ppapi/c/dev/ppb_device_ref_dev.h" #include "ppapi/c/dev/ppb_font_dev.h" -#include "ppapi/c/dev/ppb_fullscreen_dev.h" #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h" #include "ppapi/c/dev/ppb_graphics_2d_dev.h" #include "ppapi/c/dev/ppb_ime_input_event_dev.h" diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h index 8dfa6cd..4a170f4 100644 --- a/ppapi/tests/all_c_includes.h +++ b/ppapi/tests/all_c_includes.h @@ -21,7 +21,6 @@ #include "ppapi/c/dev/ppb_file_chooser_dev.h" #include "ppapi/c/dev/ppb_find_dev.h" #include "ppapi/c/dev/ppb_font_dev.h" -#include "ppapi/c/dev/ppb_fullscreen_dev.h" #include "ppapi/c/dev/ppb_graphics_2d_dev.h" #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_layer_compositor_dev.h" diff --git a/ppapi/tests/all_cpp_includes.h b/ppapi/tests/all_cpp_includes.h index a85fa03..08700cc 100644 --- a/ppapi/tests/all_cpp_includes.h +++ b/ppapi/tests/all_cpp_includes.h @@ -19,7 +19,6 @@ #include "ppapi/cpp/dev/file_chooser_dev.h" #include "ppapi/cpp/dev/find_dev.h" #include "ppapi/cpp/dev/font_dev.h" -#include "ppapi/cpp/dev/fullscreen_dev.h" #include "ppapi/cpp/dev/graphics_2d_dev.h" #include "ppapi/cpp/dev/ime_input_event_dev.h" #include "ppapi/cpp/dev/memory_dev.h" diff --git a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc index aa9e224..4b2d1ec 100644 --- a/ppapi/thunk/ppb_flash_fullscreen_thunk.cc +++ b/ppapi/thunk/ppb_flash_fullscreen_thunk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/c/dev/ppb_fullscreen_dev.h" +#include "ppapi/c/ppb_fullscreen.h" #include "ppapi/c/private/ppb_flash_fullscreen.h" #include "ppapi/thunk/thunk.h" #include "ppapi/thunk/enter.h" |