summaryrefslogtreecommitdiffstats
path: root/ppapi/thunk
diff options
context:
space:
mode:
authorraymes@google.com <raymes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 00:39:47 +0000
committerraymes@google.com <raymes@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 00:39:47 +0000
commitbd51beb3940f2b5a0523f6aab95a83a1e3e1d8cc (patch)
treeeabfa32c5fb347cade36fd0ddd288db49022761b /ppapi/thunk
parent5b8a865c45fd7758e2b82af4f8e3f75e57686eac (diff)
downloadchromium_src-bd51beb3940f2b5a0523f6aab95a83a1e3e1d8cc.zip
chromium_src-bd51beb3940f2b5a0523f6aab95a83a1e3e1d8cc.tar.gz
chromium_src-bd51beb3940f2b5a0523f6aab95a83a1e3e1d8cc.tar.bz2
Remove unused PPB_Graphics2D_Dev interface
This may be revived later to implement fast PDF scrolling but that's too far out so get rid of it for the time being. BUG=303491 R=jschuh@chromium.org, piman@chromium.org, teravest@chromium.org Review URL: https://codereview.chromium.org/216213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
-rw-r--r--ppapi/thunk/interfaces_ppb_public_dev.h2
-rw-r--r--ppapi/thunk/ppb_graphics_2d_api.h5
-rw-r--r--ppapi/thunk/ppb_graphics_2d_dev_thunk.cc78
3 files changed, 0 insertions, 85 deletions
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index 39855b9..6821b3a 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -38,8 +38,6 @@ PROXIED_IFACE(PPB_CRYPTO_DEV_INTERFACE_0_1, PPB_Crypto_Dev_0_1)
PROXIED_IFACE(PPB_DEVICEREF_DEV_INTERFACE_0_1, PPB_DeviceRef_Dev_0_1)
PROXIED_IFACE(PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE_0_1,
PPB_GLESChromiumTextureMapping_Dev_0_1)
-PROXIED_IFACE(PPB_GRAPHICS2D_DEV_INTERFACE_0_1, PPB_Graphics2D_Dev_0_1)
-PROXIED_IFACE(PPB_GRAPHICS2D_DEV_INTERFACE_0_2, PPB_Graphics2D_Dev_0_2)
PROXIED_IFACE(PPB_IME_INPUT_EVENT_DEV_INTERFACE_0_1, PPB_IMEInputEvent_Dev_0_1)
PROXIED_IFACE(PPB_SCROLLBAR_DEV_INTERFACE_0_5, PPB_Scrollbar_Dev_0_5)
PROXIED_IFACE(PPB_TEXTINPUT_DEV_INTERFACE_0_1, PPB_TextInput_Dev_0_1)
diff --git a/ppapi/thunk/ppb_graphics_2d_api.h b/ppapi/thunk/ppb_graphics_2d_api.h
index 0709a50..cdb07cc 100644
--- a/ppapi/thunk/ppb_graphics_2d_api.h
+++ b/ppapi/thunk/ppb_graphics_2d_api.h
@@ -6,7 +6,6 @@
#define PPAPI_THUNK_PPB_GRAPHICS_2D_API_H_
#include "base/memory/ref_counted.h"
-#include "ppapi/c/dev/ppb_graphics_2d_dev.h"
#include "ppapi/c/pp_bool.h"
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_point.h"
@@ -33,12 +32,8 @@ class PPAPI_THUNK_EXPORT PPB_Graphics2D_API {
const PP_Point* amount) = 0;
virtual void ReplaceContents(PP_Resource image_data) = 0;
virtual int32_t Flush(scoped_refptr<TrackedCallback> callback) = 0;
-
- // Dev interface.
virtual PP_Bool SetScale(float scale) = 0;
virtual float GetScale() = 0;
- virtual void SetOffset(const PP_Point* offset) = 0;
- virtual void SetResizeMode(PP_Graphics2D_Dev_ResizeMode resize_mode) = 0;
// Test only
virtual bool ReadImageData(PP_Resource image, const PP_Point* top_left) = 0;
diff --git a/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc b/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc
deleted file mode 100644
index 8e9a07c..0000000
--- a/ppapi/thunk/ppb_graphics_2d_dev_thunk.cc
+++ /dev/null
@@ -1,78 +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_graphics_2d_dev.idl modified Mon Nov 25 11:02:23 2013.
-
-#include "ppapi/c/dev/ppb_graphics_2d_dev.h"
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppapi_thunk_export.h"
-#include "ppapi/thunk/ppb_graphics_2d_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-PP_Bool SetScale(PP_Resource resource, float scale) {
- VLOG(4) << "PPB_Graphics2D_Dev::SetScale()";
- EnterResource<PPB_Graphics2D_API> enter(resource, true);
- if (enter.failed())
- return PP_FALSE;
- return enter.object()->SetScale(scale);
-}
-
-float GetScale(PP_Resource resource) {
- VLOG(4) << "PPB_Graphics2D_Dev::GetScale()";
- EnterResource<PPB_Graphics2D_API> enter(resource, true);
- if (enter.failed())
- return 0.0f;
- return enter.object()->GetScale();
-}
-
-void SetOffset(PP_Resource resource, const struct PP_Point* offset) {
- VLOG(4) << "PPB_Graphics2D_Dev::SetOffset()";
- EnterResource<PPB_Graphics2D_API> enter(resource, true);
- if (enter.failed())
- return;
- enter.object()->SetOffset(offset);
-}
-
-void SetResizeMode(PP_Resource resource,
- PP_Graphics2D_Dev_ResizeMode resize_mode) {
- VLOG(4) << "PPB_Graphics2D_Dev::SetResizeMode()";
- EnterResource<PPB_Graphics2D_API> enter(resource, true);
- if (enter.failed())
- return;
- enter.object()->SetResizeMode(resize_mode);
-}
-
-const PPB_Graphics2D_Dev_0_1 g_ppb_graphics2d_dev_thunk_0_1 = {
- &SetScale,
- &GetScale,
- &SetResizeMode
-};
-
-const PPB_Graphics2D_Dev_0_2 g_ppb_graphics2d_dev_thunk_0_2 = {
- &SetScale,
- &GetScale,
- &SetOffset,
- &SetResizeMode
-};
-
-} // namespace
-
-PPAPI_THUNK_EXPORT const PPB_Graphics2D_Dev_0_1*
- GetPPB_Graphics2D_Dev_0_1_Thunk() {
- return &g_ppb_graphics2d_dev_thunk_0_1;
-}
-
-PPAPI_THUNK_EXPORT const PPB_Graphics2D_Dev_0_2*
- GetPPB_Graphics2D_Dev_0_2_Thunk() {
- return &g_ppb_graphics2d_dev_thunk_0_2;
-}
-
-} // namespace thunk
-} // namespace ppapi