Move HiDPI-related Pepper interfaces to stable

ppapi/cpp/graphics_2d.cc

 // 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.
 
 #include "ppapi/cpp/graphics_2d.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 #include "ppapi/cpp/point.h"
 #include "ppapi/cpp/rect.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_Graphics2D_1_0>() {
   return PPB_GRAPHICS_2D_INTERFACE_1_0;
 }
 
+template <> const char* interface_name<PPB_Graphics2D_1_1>() {
+  return PPB_GRAPHICS_2D_INTERFACE_1_1;
+}
+
 }  // namespace
 
 Graphics2D::Graphics2D() : Resource() {
 }
 
 Graphics2D::Graphics2D(const Graphics2D& other)
     : Resource(other),
       size_(other.size_) {
 }
 
 Graphics2D::Graphics2D(const InstanceHandle& instance,
                        const Size& size,
                        bool is_always_opaque)
     : Resource() {
   if (!has_interface<PPB_Graphics2D_1_0>())
     return;
   PassRefFromConstructor(get_interface<PPB_Graphics2D_1_0>()->Create(

[dmichael (off chromium), 2013/04/04 17:16:00]

Based on our other discussion here:
https://groups.google.com/a/chromium.org/forum/?fromgroups=#!topic/pepper-dev...
I think we do need fallback code for all these methods.

[Josh Horwich, 2013/04/08 21:08:15]

Done.

I changed this glue (and view.cc) to try 1_1 interfaces first, then try 1_0
next, for all the existing methods that go through the interface.

Tested using my example plugin running with newest Chrome (which has the 1_1
interfaces available), and with older Chrome that only exposes 1_0.

I did not use any macros to reduce boilerplate however, please let me know if
this is ok.

[dmichael (off chromium), 2013/04/08 21:29:36]

I was kind of anti-macro in that thread, but got misinterpreted :-). If we come
up with some brilliant way to do it cleanly, we can fix it later. This is good
for now.

       instance.pp_instance(),
       &size.pp_size(),
       PP_FromBool(is_always_opaque)));
   if (!is_null()) {
     // Only save the size if allocation succeeded.
     size_ = size;
   }
 }
 
 Graphics2D::~Graphics2D() {
@@ skipping 45 matching lines @@
   *image = ImageData();
 }
 
 int32_t Graphics2D::Flush(const CompletionCallback& cc) {
   if (!has_interface<PPB_Graphics2D_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
   return get_interface<PPB_Graphics2D_1_0>()->Flush(
       pp_resource(), cc.pp_completion_callback());
 }
 
+bool Graphics2D::SetScale(float scale) {
+  if (!has_interface<PPB_Graphics2D_1_1>())
+    return false;
+  return PP_ToBool(get_interface<PPB_Graphics2D_1_1>()->SetScale(pp_resource(),
+                                                                 scale));
+}
+
+float Graphics2D::GetScale() {
+  if (!has_interface<PPB_Graphics2D_1_1>())
+    return 1.0f;
+  return get_interface<PPB_Graphics2D_1_1>()->GetScale(pp_resource());
+}
+
 }  // namespace pp