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

Side by Side Diff: ppapi/cpp/dev/zoom_dev.cc

Issue 9381010: Convert resources to take an instance key instead of an Instance*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: USELESS PATCH TITLE Created 8 years, 9 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 | « ppapi/cpp/dev/zoom_dev.h ('k') | ppapi/cpp/file_io.h » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/dev/zoom_dev.h" 5 #include "ppapi/cpp/dev/zoom_dev.h"
6 6
7 #include "ppapi/c/dev/ppb_zoom_dev.h" 7 #include "ppapi/c/dev/ppb_zoom_dev.h"
8 #include "ppapi/cpp/instance.h" 8 #include "ppapi/cpp/instance.h"
9 #include "ppapi/cpp/instance_handle.h"
9 #include "ppapi/cpp/module.h" 10 #include "ppapi/cpp/module.h"
10 #include "ppapi/cpp/module_impl.h" 11 #include "ppapi/cpp/module_impl.h"
11 12
12 namespace pp { 13 namespace pp {
13 14
14 namespace { 15 namespace {
15 16
16 static const char kPPPZoomInterface[] = PPP_ZOOM_DEV_INTERFACE; 17 static const char kPPPZoomInterface[] = PPP_ZOOM_DEV_INTERFACE;
17 18
18 void Zoom(PP_Instance instance, 19 void Zoom(PP_Instance instance,
19 double factor, 20 double factor,
20 PP_Bool text_only) { 21 PP_Bool text_only) {
21 void* object = 22 void* object = Instance::GetPerInstanceObject(instance, kPPPZoomInterface);
22 pp::Instance::GetPerInstanceObject(instance, kPPPZoomInterface);
23 if (!object) 23 if (!object)
24 return; 24 return;
25 static_cast<Zoom_Dev*>(object)->Zoom(factor, PP_ToBool(text_only)); 25 static_cast<Zoom_Dev*>(object)->Zoom(factor, PP_ToBool(text_only));
26 } 26 }
27 27
28 const PPP_Zoom_Dev ppp_zoom = { 28 const PPP_Zoom_Dev ppp_zoom = {
29 &Zoom 29 &Zoom
30 }; 30 };
31 31
32 template <> const char* interface_name<PPB_Zoom_Dev>() { 32 template <> const char* interface_name<PPB_Zoom_Dev>() {
33 return PPB_ZOOM_DEV_INTERFACE; 33 return PPB_ZOOM_DEV_INTERFACE;
34 } 34 }
35 35
36 } // namespace 36 } // namespace
37 37
38 Zoom_Dev::Zoom_Dev(Instance* instance) : associated_instance_(instance) { 38 Zoom_Dev::Zoom_Dev(const InstanceHandle& instance)
39 pp::Module::Get()->AddPluginInterface(kPPPZoomInterface, &ppp_zoom); 39 : associated_instance_(instance) {
40 associated_instance_->AddPerInstanceObject(kPPPZoomInterface, this); 40 Module::Get()->AddPluginInterface(kPPPZoomInterface, &ppp_zoom);
41 Instance::AddPerInstanceObject(instance, kPPPZoomInterface, this);
41 } 42 }
42 43
43 Zoom_Dev::~Zoom_Dev() { 44 Zoom_Dev::~Zoom_Dev() {
44 associated_instance_->RemovePerInstanceObject(kPPPZoomInterface, this); 45 Instance::RemovePerInstanceObject(associated_instance_,
46 kPPPZoomInterface, this);
45 } 47 }
46 48
47 void Zoom_Dev::ZoomChanged(double factor) { 49 void Zoom_Dev::ZoomChanged(double factor) {
48 if (has_interface<PPB_Zoom_Dev>()) 50 if (has_interface<PPB_Zoom_Dev>())
49 get_interface<PPB_Zoom_Dev>()->ZoomChanged( 51 get_interface<PPB_Zoom_Dev>()->ZoomChanged(
50 associated_instance_->pp_instance(), factor); 52 associated_instance_.pp_instance(), factor);
51 } 53 }
52 54
53 void Zoom_Dev::ZoomLimitsChanged(double minimum_factor, 55 void Zoom_Dev::ZoomLimitsChanged(double minimum_factor,
54 double maximium_factor) { 56 double maximium_factor) {
55 if (!has_interface<PPB_Zoom_Dev>()) 57 if (!has_interface<PPB_Zoom_Dev>())
56 return; 58 return;
57 get_interface<PPB_Zoom_Dev>()->ZoomLimitsChanged( 59 get_interface<PPB_Zoom_Dev>()->ZoomLimitsChanged(
58 associated_instance_->pp_instance(), minimum_factor, maximium_factor); 60 associated_instance_.pp_instance(), minimum_factor, maximium_factor);
59 } 61 }
60 62
61 } // namespace pp 63 } // namespace pp
OLDNEW
« no previous file with comments | « ppapi/cpp/dev/zoom_dev.h ('k') | ppapi/cpp/file_io.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698