Check for specific PPB interface versions in the C++ wrappers for Graphics2D, *InputEvent, Instance, ImageData, Module, Rect, URLLoader, URLRequestInfo and URLResponseInfo.

BUG=107398

Review URL: https://chromiumcodereview.appspot.com/9700088

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128125 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 142 insertions, 141 deletions

diff --git a/ppapi/cpp/graphics_2d.cc b/ppapi/cpp/graphics_2d.cc
index 1ae976b..69bba9c 100644
--- a/ppapi/cpp/graphics_2d.cc
+++ b/ppapi/cpp/graphics_2d.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -18,8 +18,8 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_Graphics2D>() {
-  return PPB_GRAPHICS_2D_INTERFACE;
+template <> const char* interface_name<PPB_Graphics2D_1_0>() {
+  return PPB_GRAPHICS_2D_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -36,9 +36,9 @@ Graphics2D::Graphics2D(const InstanceHandle& instance,
                        const Size& size,
                        bool is_always_opaque)
     : Resource() {
-  if (!has_interface<PPB_Graphics2D>())
+  if (!has_interface<PPB_Graphics2D_1_0>())
     return;
-  PassRefFromConstructor(get_interface<PPB_Graphics2D>()->Create(
+  PassRefFromConstructor(get_interface<PPB_Graphics2D_1_0>()->Create(
       instance.pp_instance(),
       &size.pp_size(),
       PP_FromBool(is_always_opaque)));
@@ -59,9 +59,9 @@ Graphics2D& Graphics2D::operator=(const Graphics2D& other) {
 
 void Graphics2D::PaintImageData(const ImageData& image,
                                 const Point& top_left) {
-  if (!has_interface<PPB_Graphics2D>())
+  if (!has_interface<PPB_Graphics2D_1_0>())
     return;
-  get_interface<PPB_Graphics2D>()->PaintImageData(pp_resource(),
+  get_interface<PPB_Graphics2D_1_0>()->PaintImageData(pp_resource(),
                                                   image.pp_resource(),
                                                   &top_left.pp_point(),
                                                   NULL);
@@ -70,26 +70,26 @@ void Graphics2D::PaintImageData(const ImageData& image,
 void Graphics2D::PaintImageData(const ImageData& image,
                                 const Point& top_left,
                                 const Rect& src_rect) {
-  if (!has_interface<PPB_Graphics2D>())
+  if (!has_interface<PPB_Graphics2D_1_0>())
     return;
-  get_interface<PPB_Graphics2D>()->PaintImageData(pp_resource(),
+  get_interface<PPB_Graphics2D_1_0>()->PaintImageData(pp_resource(),
                                                   image.pp_resource(),
                                                   &top_left.pp_point(),
                                                   &src_rect.pp_rect());
 }
 
 void Graphics2D::Scroll(const Rect& clip, const Point& amount) {
-  if (!has_interface<PPB_Graphics2D>())
+  if (!has_interface<PPB_Graphics2D_1_0>())
     return;
-  get_interface<PPB_Graphics2D>()->Scroll(pp_resource(),
+  get_interface<PPB_Graphics2D_1_0>()->Scroll(pp_resource(),
                                           &clip.pp_rect(),
                                           &amount.pp_point());
 }
 
 void Graphics2D::ReplaceContents(ImageData* image) {
-  if (!has_interface<PPB_Graphics2D>())
+  if (!has_interface<PPB_Graphics2D_1_0>())
     return;
-  get_interface<PPB_Graphics2D>()->ReplaceContents(pp_resource(),
+  get_interface<PPB_Graphics2D_1_0>()->ReplaceContents(pp_resource(),
                                                    image->pp_resource());
 
   // On success, reset the image data. This is to help prevent people
@@ -98,9 +98,9 @@ void Graphics2D::ReplaceContents(ImageData* image) {
 }
 
 int32_t Graphics2D::Flush(const CompletionCallback& cc) {
-  if (!has_interface<PPB_Graphics2D>())
+  if (!has_interface<PPB_Graphics2D_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_Graphics2D>()->Flush(pp_resource(),
+  return get_interface<PPB_Graphics2D_1_0>()->Flush(pp_resource(),
                                                 cc.pp_completion_callback());
 }
 
diff --git a/ppapi/cpp/image_data.cc b/ppapi/cpp/image_data.cc
index 4ccbaba..371d924 100644
--- a/ppapi/cpp/image_data.cc
+++ b/ppapi/cpp/image_data.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -16,8 +16,8 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_ImageData>() {
-  return PPB_IMAGEDATA_INTERFACE;
+template <> const char* interface_name<PPB_ImageData_1_0>() {
+  return PPB_IMAGEDATA_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -46,10 +46,10 @@ ImageData::ImageData(const InstanceHandle& instance,
     : data_(NULL) {
   memset(&desc_, 0, sizeof(PP_ImageDataDesc));
 
-  if (!has_interface<PPB_ImageData>())
+  if (!has_interface<PPB_ImageData_1_0>())
     return;
 
-  PassRefFromConstructor(get_interface<PPB_ImageData>()->Create(
+  PassRefFromConstructor(get_interface<PPB_ImageData_1_0>()->Create(
       instance.pp_instance(), format, &size.pp_size(),
       PP_FromBool(init_to_zero)));
   InitData();
@@ -76,16 +76,16 @@ uint32_t* ImageData::GetAddr32(const Point& coord) {
 
 // static
 PP_ImageDataFormat ImageData::GetNativeImageDataFormat() {
-  if (!has_interface<PPB_ImageData>())
+  if (!has_interface<PPB_ImageData_1_0>())
     return PP_IMAGEDATAFORMAT_BGRA_PREMUL;  // Default to something on failure.
-  return get_interface<PPB_ImageData>()->GetNativeImageDataFormat();
+  return get_interface<PPB_ImageData_1_0>()->GetNativeImageDataFormat();
 }
 
 void ImageData::InitData() {
-  if (!has_interface<PPB_ImageData>())
+  if (!has_interface<PPB_ImageData_1_0>())
     return;
-  if (!get_interface<PPB_ImageData>()->Describe(pp_resource(), &desc_) ||
-      !(data_ = get_interface<PPB_ImageData>()->Map(pp_resource())))
+  if (!get_interface<PPB_ImageData_1_0>()->Describe(pp_resource(), &desc_) ||
+      !(data_ = get_interface<PPB_ImageData_1_0>()->Map(pp_resource())))
     *this = ImageData();
 }
 
diff --git a/ppapi/cpp/input_event.cc b/ppapi/cpp/input_event.cc
index 94da006..c78095d 100644
--- a/ppapi/cpp/input_event.cc
+++ b/ppapi/cpp/input_event.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -14,20 +14,20 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_InputEvent>() {
-  return PPB_INPUT_EVENT_INTERFACE;
+template <> const char* interface_name<PPB_InputEvent_1_0>() {
+  return PPB_INPUT_EVENT_INTERFACE_1_0;
 }
 
-template <> const char* interface_name<PPB_KeyboardInputEvent>() {
-  return PPB_KEYBOARD_INPUT_EVENT_INTERFACE;
+template <> const char* interface_name<PPB_KeyboardInputEvent_1_0>() {
+  return PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_0;
 }
 
-template <> const char* interface_name<PPB_MouseInputEvent>() {
-  return PPB_MOUSE_INPUT_EVENT_INTERFACE;
+template <> const char* interface_name<PPB_MouseInputEvent_1_1>() {
+  return PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1;
 }
 
-template <> const char* interface_name<PPB_WheelInputEvent>() {
-  return PPB_WHEEL_INPUT_EVENT_INTERFACE;
+template <> const char* interface_name<PPB_WheelInputEvent_1_0>() {
+  return PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -39,9 +39,9 @@ InputEvent::InputEvent() : Resource() {
 
 InputEvent::InputEvent(PP_Resource input_event_resource) : Resource() {
   // Type check the input event before setting it.
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return;
-  if (get_interface<PPB_InputEvent>()->IsInputEvent(input_event_resource)) {
+  if (get_interface<PPB_InputEvent_1_0>()->IsInputEvent(input_event_resource)) {
     Module::Get()->core()->AddRefResource(input_event_resource);
     PassRefFromConstructor(input_event_resource);
   }
@@ -51,21 +51,21 @@ InputEvent::~InputEvent() {
 }
 
 PP_InputEvent_Type InputEvent::GetType() const {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return PP_INPUTEVENT_TYPE_UNDEFINED;
-  return get_interface<PPB_InputEvent>()->GetType(pp_resource());
+  return get_interface<PPB_InputEvent_1_0>()->GetType(pp_resource());
 }
 
 PP_TimeTicks InputEvent::GetTimeStamp() const {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return 0.0f;
-  return get_interface<PPB_InputEvent>()->GetTimeStamp(pp_resource());
+  return get_interface<PPB_InputEvent_1_0>()->GetTimeStamp(pp_resource());
 }
 
 uint32_t InputEvent::GetModifiers() const {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return 0;
-  return get_interface<PPB_InputEvent>()->GetModifiers(pp_resource());
+  return get_interface<PPB_InputEvent_1_0>()->GetModifiers(pp_resource());
 }
 
 // MouseInputEvent -------------------------------------------------------------
@@ -75,9 +75,9 @@ MouseInputEvent::MouseInputEvent() : InputEvent() {
 
 MouseInputEvent::MouseInputEvent(const InputEvent& event) : InputEvent() {
   // Type check the input event before setting it.
-  if (!has_interface<PPB_MouseInputEvent>())
+  if (!has_interface<PPB_MouseInputEvent_1_1>())
     return;
-  if (get_interface<PPB_MouseInputEvent>()->IsMouseInputEvent(
+  if (get_interface<PPB_MouseInputEvent_1_1>()->IsMouseInputEvent(
           event.pp_resource())) {
     Module::Get()->core()->AddRefResource(event.pp_resource());
     PassRefFromConstructor(event.pp_resource());
@@ -93,35 +93,35 @@ MouseInputEvent::MouseInputEvent(const InstanceHandle& instance,
                                  int32_t click_count,
                                  const Point& mouse_movement) {
   // Type check the input event before setting it.
-  if (!has_interface<PPB_MouseInputEvent>())
+  if (!has_interface<PPB_MouseInputEvent_1_1>())
     return;
-  PassRefFromConstructor(get_interface<PPB_MouseInputEvent>()->Create(
+  PassRefFromConstructor(get_interface<PPB_MouseInputEvent_1_1>()->Create(
       instance.pp_instance(), type, time_stamp, modifiers, mouse_button,
       &mouse_position.pp_point(), click_count, &mouse_movement.pp_point()));
 }
 
 PP_InputEvent_MouseButton MouseInputEvent::GetButton() const {
-  if (!has_interface<PPB_MouseInputEvent>())
+  if (!has_interface<PPB_MouseInputEvent_1_1>())
     return PP_INPUTEVENT_MOUSEBUTTON_NONE;
-  return get_interface<PPB_MouseInputEvent>()->GetButton(pp_resource());
+  return get_interface<PPB_MouseInputEvent_1_1>()->GetButton(pp_resource());
 }
 
 Point MouseInputEvent::GetPosition() const {
-  if (!has_interface<PPB_MouseInputEvent>())
+  if (!has_interface<PPB_MouseInputEvent_1_1>())
     return Point();
-  return get_interface<PPB_MouseInputEvent>()->GetPosition(pp_resource());
+  return get_interface<PPB_MouseInputEvent_1_1>()->GetPosition(pp_resource());
 }
 
 int32_t MouseInputEvent::GetClickCount() const {
-  if (!has_interface<PPB_MouseInputEvent>())
+  if (!has_interface<PPB_MouseInputEvent_1_1>())
     return 0;
-  return get_interface<PPB_MouseInputEvent>()->GetClickCount(pp_resource());
+  return get_interface<PPB_MouseInputEvent_1_1>()->GetClickCount(pp_resource());
 }
 
 Point MouseInputEvent::GetMovement() const {
-  if (!has_interface<PPB_MouseInputEvent>())
+  if (!has_interface<PPB_MouseInputEvent_1_1>())
     return Point();
-  return get_interface<PPB_MouseInputEvent>()->GetMovement(pp_resource());
+  return get_interface<PPB_MouseInputEvent_1_1>()->GetMovement(pp_resource());
 }
 
 // WheelInputEvent -------------------------------------------------------------
@@ -131,9 +131,9 @@ WheelInputEvent::WheelInputEvent() : InputEvent() {
 
 WheelInputEvent::WheelInputEvent(const InputEvent& event) : InputEvent() {
   // Type check the input event before setting it.
-  if (!has_interface<PPB_WheelInputEvent>())
+  if (!has_interface<PPB_WheelInputEvent_1_0>())
     return;
-  if (get_interface<PPB_WheelInputEvent>()->IsWheelInputEvent(
+  if (get_interface<PPB_WheelInputEvent_1_0>()->IsWheelInputEvent(
           event.pp_resource())) {
     Module::Get()->core()->AddRefResource(event.pp_resource());
     PassRefFromConstructor(event.pp_resource());
@@ -147,31 +147,31 @@ WheelInputEvent::WheelInputEvent(const InstanceHandle& instance,
                                  const FloatPoint& wheel_ticks,
                                  bool scroll_by_page) {
   // Type check the input event before setting it.
-  if (!has_interface<PPB_WheelInputEvent>())
+  if (!has_interface<PPB_WheelInputEvent_1_0>())
     return;
-  PassRefFromConstructor(get_interface<PPB_WheelInputEvent>()->Create(
+  PassRefFromConstructor(get_interface<PPB_WheelInputEvent_1_0>()->Create(
       instance.pp_instance(), time_stamp, modifiers,
       &wheel_delta.pp_float_point(), &wheel_ticks.pp_float_point(),
       PP_FromBool(scroll_by_page)));
 }
 
 FloatPoint WheelInputEvent::GetDelta() const {
-  if (!has_interface<PPB_WheelInputEvent>())
+  if (!has_interface<PPB_WheelInputEvent_1_0>())
     return FloatPoint();
-  return get_interface<PPB_WheelInputEvent>()->GetDelta(pp_resource());
+  return get_interface<PPB_WheelInputEvent_1_0>()->GetDelta(pp_resource());
 }
 
 FloatPoint WheelInputEvent::GetTicks() const {
-  if (!has_interface<PPB_WheelInputEvent>())
+  if (!has_interface<PPB_WheelInputEvent_1_0>())
     return FloatPoint();
-  return get_interface<PPB_WheelInputEvent>()->GetTicks(pp_resource());
+  return get_interface<PPB_WheelInputEvent_1_0>()->GetTicks(pp_resource());
 }
 
 bool WheelInputEvent::GetScrollByPage() const {
-  if (!has_interface<PPB_WheelInputEvent>())
+  if (!has_interface<PPB_WheelInputEvent_1_0>())
     return false;
   return PP_ToBool(
-      get_interface<PPB_WheelInputEvent>()->GetScrollByPage(pp_resource()));
+      get_interface<PPB_WheelInputEvent_1_0>()->GetScrollByPage(pp_resource()));
 }
 
 // KeyboardInputEvent ----------------------------------------------------------
@@ -181,9 +181,9 @@ KeyboardInputEvent::KeyboardInputEvent() : InputEvent() {
 
 KeyboardInputEvent::KeyboardInputEvent(const InputEvent& event) : InputEvent() {
   // Type check the input event before setting it.
-  if (!has_interface<PPB_KeyboardInputEvent>())
+  if (!has_interface<PPB_KeyboardInputEvent_1_0>())
     return;
-  if (get_interface<PPB_KeyboardInputEvent>()->IsKeyboardInputEvent(
+  if (get_interface<PPB_KeyboardInputEvent_1_0>()->IsKeyboardInputEvent(
           event.pp_resource())) {
     Module::Get()->core()->AddRefResource(event.pp_resource());
     PassRefFromConstructor(event.pp_resource());
@@ -197,24 +197,24 @@ KeyboardInputEvent::KeyboardInputEvent(const InstanceHandle& instance,
                                        uint32_t key_code,
                                        const Var& character_text) {
   // Type check the input event before setting it.
-  if (!has_interface<PPB_KeyboardInputEvent>())
+  if (!has_interface<PPB_KeyboardInputEvent_1_0>())
     return;
-  PassRefFromConstructor(get_interface<PPB_KeyboardInputEvent>()->Create(
+  PassRefFromConstructor(get_interface<PPB_KeyboardInputEvent_1_0>()->Create(
       instance.pp_instance(), type, time_stamp, modifiers, key_code,
       character_text.pp_var()));
 }
 
 uint32_t KeyboardInputEvent::GetKeyCode() const {
-  if (!has_interface<PPB_KeyboardInputEvent>())
+  if (!has_interface<PPB_KeyboardInputEvent_1_0>())
     return 0;
-  return get_interface<PPB_KeyboardInputEvent>()->GetKeyCode(pp_resource());
+  return get_interface<PPB_KeyboardInputEvent_1_0>()->GetKeyCode(pp_resource());
 }
 
 Var KeyboardInputEvent::GetCharacterText() const {
-  if (!has_interface<PPB_KeyboardInputEvent>())
+  if (!has_interface<PPB_KeyboardInputEvent_1_0>())
     return Var();
   return Var(PASS_REF,
-             get_interface<PPB_KeyboardInputEvent>()->GetCharacterText(
+             get_interface<PPB_KeyboardInputEvent_1_0>()->GetCharacterText(
                  pp_resource()));
 }
 
diff --git a/ppapi/cpp/instance.cc b/ppapi/cpp/instance.cc
index f2a181a..e000f9c 100644
--- a/ppapi/cpp/instance.cc
+++ b/ppapi/cpp/instance.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -24,16 +24,16 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_InputEvent>() {
-  return PPB_INPUT_EVENT_INTERFACE;
+template <> const char* interface_name<PPB_InputEvent_1_0>() {
+  return PPB_INPUT_EVENT_INTERFACE_1_0;
 }
 
-template <> const char* interface_name<PPB_Instance>() {
-  return PPB_INSTANCE_INTERFACE;
+template <> const char* interface_name<PPB_Instance_1_0>() {
+  return PPB_INSTANCE_INTERFACE_1_0;
 }
 
-template <> const char* interface_name<PPB_Messaging>() {
-  return PPB_MESSAGING_INTERFACE;
+template <> const char* interface_name<PPB_Messaging_1_0>() {
+  return PPB_MESSAGING_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -75,50 +75,51 @@ void Instance::HandleMessage(const Var& /*message*/) {
 }
 
 bool Instance::BindGraphics(const Graphics2D& graphics) {
-  if (!has_interface<PPB_Instance>())
+  if (!has_interface<PPB_Instance_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_Instance>()->BindGraphics(
+  return PP_ToBool(get_interface<PPB_Instance_1_0>()->BindGraphics(
       pp_instance(), graphics.pp_resource()));
 }
 
 bool Instance::BindGraphics(const Graphics3D& graphics) {
-  if (!has_interface<PPB_Instance>())
+  if (!has_interface<PPB_Instance_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_Instance>()->BindGraphics(
+  return PP_ToBool(get_interface<PPB_Instance_1_0>()->BindGraphics(
       pp_instance(), graphics.pp_resource()));
 }
 
 bool Instance::IsFullFrame() {
-  if (!has_interface<PPB_Instance>())
+  if (!has_interface<PPB_Instance_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_Instance>()->IsFullFrame(pp_instance()));
+  return PP_ToBool(get_interface<PPB_Instance_1_0>()->IsFullFrame(
+      pp_instance()));
 }
 
 int32_t Instance::RequestInputEvents(uint32_t event_classes) {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return PP_ERROR_NOINTERFACE;
-  return get_interface<PPB_InputEvent>()->RequestInputEvents(pp_instance(),
-                                                             event_classes);
+  return get_interface<PPB_InputEvent_1_0>()->RequestInputEvents(pp_instance(),
+                                                                 event_classes);
 }
 
 int32_t Instance::RequestFilteringInputEvents(uint32_t event_classes) {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return PP_ERROR_NOINTERFACE;
-  return get_interface<PPB_InputEvent>()->RequestFilteringInputEvents(
+  return get_interface<PPB_InputEvent_1_0>()->RequestFilteringInputEvents(
       pp_instance(), event_classes);
 }
 
 void Instance::ClearInputEventRequest(uint32_t event_classes) {
-  if (!has_interface<PPB_InputEvent>())
+  if (!has_interface<PPB_InputEvent_1_0>())
     return;
-  get_interface<PPB_InputEvent>()->ClearInputEventRequest(pp_instance(),
+  get_interface<PPB_InputEvent_1_0>()->ClearInputEventRequest(pp_instance(),
                                                           event_classes);
 }
 
 void Instance::PostMessage(const Var& message) {
-  if (!has_interface<PPB_Messaging>())
+  if (!has_interface<PPB_Messaging_1_0>())
     return;
-  get_interface<PPB_Messaging>()->PostMessage(pp_instance(),
+  get_interface<PPB_Messaging_1_0>()->PostMessage(pp_instance(),
                                               message.pp_var());
 }
 
diff --git a/ppapi/cpp/module.cc b/ppapi/cpp/module.cc
index de92afb..505991d 100644
--- a/ppapi/cpp/module.cc
+++ b/ppapi/cpp/module.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 // Note that the single accessor, Module::Get(), is not actually implemented
 // in this file.  This is an intentional hook that allows users of ppapi's
-// C++ wrapper objects to provide difference semantics for how the singleton
+// C++ wrapper objects to provide different semantics for how the singleton
 // object is accessed.
 //
 // In general, users of ppapi will also link in ppp_entrypoints.cc, which
diff --git a/ppapi/cpp/rect.cc b/ppapi/cpp/rect.cc
index ef347dc..39d8018 100644
--- a/ppapi/cpp/rect.cc
+++ b/ppapi/cpp/rect.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -127,4 +127,4 @@ bool Rect::SharesEdgeWith(const Rect& rect) const {
              (y() == rect.bottom() || bottom() == rect.y()));
 }
 
-}  // namespace gfx
+}  // namespace pp
diff --git a/ppapi/cpp/url_loader.cc b/ppapi/cpp/url_loader.cc
index 73855e9..1be87a7 100644
--- a/ppapi/cpp/url_loader.cc
+++ b/ppapi/cpp/url_loader.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -18,8 +18,8 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_URLLoader>() {
-  return PPB_URLLOADER_INTERFACE;
+template <> const char* interface_name<PPB_URLLoader_1_0>() {
+  return PPB_URLLOADER_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -28,9 +28,9 @@ URLLoader::URLLoader(PP_Resource resource) : Resource(resource) {
 }
 
 URLLoader::URLLoader(const InstanceHandle& instance) {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return;
-  PassRefFromConstructor(get_interface<PPB_URLLoader>()->Create(
+  PassRefFromConstructor(get_interface<PPB_URLLoader_1_0>()->Create(
       instance.pp_instance()));
 }
 
@@ -39,65 +39,65 @@ URLLoader::URLLoader(const URLLoader& other) : Resource(other) {
 
 int32_t URLLoader::Open(const URLRequestInfo& request_info,
                         const CompletionCallback& cc) {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_URLLoader>()->Open(pp_resource(),
+  return get_interface<PPB_URLLoader_1_0>()->Open(pp_resource(),
                                               request_info.pp_resource(),
                                               cc.pp_completion_callback());
 }
 
 int32_t URLLoader::FollowRedirect(const CompletionCallback& cc) {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_URLLoader>()->FollowRedirect(
+  return get_interface<PPB_URLLoader_1_0>()->FollowRedirect(
       pp_resource(), cc.pp_completion_callback());
 }
 
 bool URLLoader::GetUploadProgress(int64_t* bytes_sent,
                                   int64_t* total_bytes_to_be_sent) const {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_URLLoader>()->GetUploadProgress(
+  return PP_ToBool(get_interface<PPB_URLLoader_1_0>()->GetUploadProgress(
       pp_resource(), bytes_sent, total_bytes_to_be_sent));
 }
 
 bool URLLoader::GetDownloadProgress(
     int64_t* bytes_received,
     int64_t* total_bytes_to_be_received) const {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_URLLoader>()->GetDownloadProgress(
+  return PP_ToBool(get_interface<PPB_URLLoader_1_0>()->GetDownloadProgress(
       pp_resource(), bytes_received, total_bytes_to_be_received));
 }
 
 URLResponseInfo URLLoader::GetResponseInfo() const {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return URLResponseInfo();
   return URLResponseInfo(PASS_REF,
-                         get_interface<PPB_URLLoader>()->GetResponseInfo(
+                         get_interface<PPB_URLLoader_1_0>()->GetResponseInfo(
                              pp_resource()));
 }
 
 int32_t URLLoader::ReadResponseBody(void* buffer,
                                     int32_t bytes_to_read,
                                     const CompletionCallback& cc) {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_URLLoader>()->ReadResponseBody(
+  return get_interface<PPB_URLLoader_1_0>()->ReadResponseBody(
       pp_resource(), buffer, bytes_to_read, cc.pp_completion_callback());
 }
 
 int32_t URLLoader::FinishStreamingToFile(const CompletionCallback& cc) {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_URLLoader>()->FinishStreamingToFile(
+  return get_interface<PPB_URLLoader_1_0>()->FinishStreamingToFile(
       pp_resource(), cc.pp_completion_callback());
 }
 
 void URLLoader::Close() {
-  if (!has_interface<PPB_URLLoader>())
+  if (!has_interface<PPB_URLLoader_1_0>())
     return;
-  get_interface<PPB_URLLoader>()->Close(pp_resource());
+  get_interface<PPB_URLLoader_1_0>()->Close(pp_resource());
 }
 
 }  // namespace pp
diff --git a/ppapi/cpp/url_request_info.cc b/ppapi/cpp/url_request_info.cc
index c7cd22e..f6053f9 100644
--- a/ppapi/cpp/url_request_info.cc
+++ b/ppapi/cpp/url_request_info.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,17 +13,17 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_URLRequestInfo>() {
-  return PPB_URLREQUESTINFO_INTERFACE;
+template <> const char* interface_name<PPB_URLRequestInfo_1_0>() {
+  return PPB_URLREQUESTINFO_INTERFACE_1_0;
 }
 
 }  // namespace
 
 URLRequestInfo::URLRequestInfo(const InstanceHandle& instance) {
-  if (!has_interface<PPB_URLRequestInfo>())
+  if (!has_interface<PPB_URLRequestInfo_1_0>())
     return;
   PassRefFromConstructor(
-      get_interface<PPB_URLRequestInfo>()->Create(instance.pp_instance()));
+      get_interface<PPB_URLRequestInfo_1_0>()->Create(instance.pp_instance()));
 }
 
 URLRequestInfo::URLRequestInfo(const URLRequestInfo& other)
@@ -32,25 +32,25 @@ URLRequestInfo::URLRequestInfo(const URLRequestInfo& other)
 
 bool URLRequestInfo::SetProperty(PP_URLRequestProperty property,
                                  const Var& value) {
-  if (!has_interface<PPB_URLRequestInfo>())
+  if (!has_interface<PPB_URLRequestInfo_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_URLRequestInfo>()->SetProperty(
+  return PP_ToBool(get_interface<PPB_URLRequestInfo_1_0>()->SetProperty(
       pp_resource(), property, value.pp_var()));
 }
 
 bool URLRequestInfo::AppendDataToBody(const void* data, uint32_t len) {
-  if (!has_interface<PPB_URLRequestInfo>())
+  if (!has_interface<PPB_URLRequestInfo_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_URLRequestInfo>()->AppendDataToBody(
+  return PP_ToBool(get_interface<PPB_URLRequestInfo_1_0>()->AppendDataToBody(
       pp_resource(), data, len));
 }
 
 bool URLRequestInfo::AppendFileToBody(const FileRef& file_ref,
                                       PP_Time expected_last_modified_time) {
-  if (!has_interface<PPB_URLRequestInfo>())
+  if (!has_interface<PPB_URLRequestInfo_1_0>())
     return false;
   return PP_ToBool(
-      get_interface<PPB_URLRequestInfo>()->AppendFileToBody(
+      get_interface<PPB_URLRequestInfo_1_0>()->AppendFileToBody(
           pp_resource(),
           file_ref.pp_resource(),
           0,
@@ -63,9 +63,9 @@ bool URLRequestInfo::AppendFileRangeToBody(
     int64_t start_offset,
     int64_t length,
     PP_Time expected_last_modified_time) {
-  if (!has_interface<PPB_URLRequestInfo>())
+  if (!has_interface<PPB_URLRequestInfo_1_0>())
     return false;
-  return PP_ToBool(get_interface<PPB_URLRequestInfo>()->AppendFileToBody(
+  return PP_ToBool(get_interface<PPB_URLRequestInfo_1_0>()->AppendFileToBody(
       pp_resource(),
       file_ref.pp_resource(),
       start_offset,
diff --git a/ppapi/cpp/url_response_info.cc b/ppapi/cpp/url_response_info.cc
index a1e2d3a..032b405 100644
--- a/ppapi/cpp/url_response_info.cc
+++ b/ppapi/cpp/url_response_info.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -12,8 +12,8 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_URLResponseInfo>() {
-  return PPB_URLRESPONSEINFO_INTERFACE;
+template <> const char* interface_name<PPB_URLResponseInfo_1_0>() {
+  return PPB_URLRESPONSEINFO_INTERFACE_1_0;
 }
 
 }  // namespace
@@ -27,19 +27,19 @@ URLResponseInfo::URLResponseInfo(PassRef, PP_Resource resource)
 }
 
 Var URLResponseInfo::GetProperty(PP_URLResponseProperty property) const {
-  if (!has_interface<PPB_URLResponseInfo>())
+  if (!has_interface<PPB_URLResponseInfo_1_0>())
     return Var();
   return Var(PASS_REF,
-             get_interface<PPB_URLResponseInfo>()->GetProperty(pp_resource(),
-                                                               property));
+      get_interface<PPB_URLResponseInfo_1_0>()->GetProperty(pp_resource(),
+                                                            property));
 }
 
 FileRef URLResponseInfo::GetBodyAsFileRef() const {
-  if (!has_interface<PPB_URLResponseInfo>())
+  if (!has_interface<PPB_URLResponseInfo_1_0>())
     return FileRef();
   return FileRef(PASS_REF,
-                 get_interface<PPB_URLResponseInfo>()->GetBodyAsFileRef(
-                     pp_resource()));
+      get_interface<PPB_URLResponseInfo_1_0>()->GetBodyAsFileRef(
+          pp_resource()));
 }
 
 }  // namespace pp