Move HiDPI-related Pepper interfaces to stable

ppapi/cpp/view.cc

Index: ppapi/cpp/view.cc
diff --git a/ppapi/cpp/view.cc b/ppapi/cpp/view.cc
index 68c6e311f20d957b51460acff4dfab0efe677d51..16962909e44c70c026b455993d6be2a22639e88e 100644
--- a/ppapi/cpp/view.cc
+++ b/ppapi/cpp/view.cc
@@ -15,6 +15,10 @@ template <> const char* interface_name<PPB_View_1_0>() {
   return PPB_VIEW_INTERFACE_1_0;
 }
 
+template <> const char* interface_name<PPB_View_1_1>() {
+  return PPB_VIEW_INTERFACE_1_1;
+}
+
 }  // namespace
 
 View::View() : Resource() {
@@ -24,40 +28,71 @@ View::View(PP_Resource view_resource) : Resource(view_resource) {
 }
 
 Rect View::GetRect() const {
-  if (!has_interface<PPB_View_1_0>())
-    return Rect();
   PP_Rect out;
-  if (PP_ToBool(get_interface<PPB_View_1_0>()->GetRect(pp_resource(), &out)))
-    return Rect(out);
+  if (has_interface<PPB_View_1_1>()) {
+    if (PP_ToBool(get_interface<PPB_View_1_1>()->GetRect(pp_resource(), &out)))
+      return Rect(out);
+  } else if (has_interface<PPB_View_1_0>()) {
+    if (PP_ToBool(get_interface<PPB_View_1_0>()->GetRect(pp_resource(), &out)))
+      return Rect(out);
+  }
   return Rect();
 }
 
 bool View::IsFullscreen() const {
-  if (!has_interface<PPB_View_1_0>())
-    return false;
-  return PP_ToBool(get_interface<PPB_View_1_0>()->IsFullscreen(pp_resource()));
+  if (has_interface<PPB_View_1_1>()) {
+    return PP_ToBool(get_interface<PPB_View_1_1>()->IsFullscreen(
+        pp_resource()));
+  } else if (has_interface<PPB_View_1_0>()) {
+    return PP_ToBool(get_interface<PPB_View_1_0>()->IsFullscreen(
+        pp_resource()));
+  }
+  return false;
 }
 
 bool View::IsVisible() const {
-  if (!has_interface<PPB_View_1_0>())
-    return false;
-  return PP_ToBool(get_interface<PPB_View_1_0>()->IsVisible(pp_resource()));
+  if (has_interface<PPB_View_1_1>())
+    return PP_ToBool(get_interface<PPB_View_1_1>()->IsVisible(pp_resource()));
+  else if (has_interface<PPB_View_1_0>())
+    return PP_ToBool(get_interface<PPB_View_1_0>()->IsVisible(pp_resource()));
+  return false;
 }
 
 bool View::IsPageVisible() const {
-  if (!has_interface<PPB_View_1_0>())
-    return true;
-  return PP_ToBool(get_interface<PPB_View_1_0>()->IsPageVisible(pp_resource()));
+  if (!has_interface<PPB_View_1_1>()) {

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

^^^ I think you don't want the "!" here and 65

[Josh Horwich, 2013/04/08 21:37:49]

Done.  Argh, sorry about that.

+    return PP_ToBool(get_interface<PPB_View_1_1>()->IsPageVisible(
+        pp_resource()));
+  } else if (!has_interface<PPB_View_1_0>()) {
+    return PP_ToBool(get_interface<PPB_View_1_0>()->IsPageVisible(
+        pp_resource()));
+  }
+  return true;
 }
 
 Rect View::GetClipRect() const {
-  if (!has_interface<PPB_View_1_0>())
-    return Rect();
   PP_Rect out;
-  if (PP_ToBool(get_interface<PPB_View_1_0>()->GetClipRect(pp_resource(),
-                                                           &out)))
-    return Rect(out);
+  if (has_interface<PPB_View_1_1>()) {
+    if (PP_ToBool(get_interface<PPB_View_1_1>()->GetClipRect(pp_resource(),
+                                                             &out)))
+      return Rect(out);
+  } else if (has_interface<PPB_View_1_0>()) {
+    if (PP_ToBool(get_interface<PPB_View_1_0>()->GetClipRect(pp_resource(),
+                                                             &out)))
+      return Rect(out);
+  }
   return Rect();
 }
 
+float View::GetDeviceScale() const {
+  if (has_interface<PPB_View_1_1>())
+    return get_interface<PPB_View_1_1>()->GetDeviceScale(pp_resource());
+  return 1.0f;
+}
+
+float View::GetCSSScale() const {
+  if (has_interface<PPB_View_1_1>())
+    return get_interface<PPB_View_1_1>()->GetCSSScale(pp_resource());
+  return 1.0f;
+}
+
 }  // namespace pp