Revert 113290 - Rename the shared_impl resource files to give them more regular names.

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2011 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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 16 matching lines @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
 #include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/c/private/ppp_instance_private.h"
-#include "ppapi/shared_impl/ppb_input_event_shared.h"
-#include "ppapi/shared_impl/ppb_url_util_shared.h"
+#include "ppapi/shared_impl/input_event_impl.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/time_conversion.h"
+#include "ppapi/shared_impl/url_util_impl.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
 #include "printing/units.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
@@ skipping 43 matching lines @@
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/gdi_util.h"
 #endif
 
 #if defined(OS_MACOSX) && defined(USE_SKIA)
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 using base::StringPrintf;
 using ppapi::InputEventData;
-using ppapi::PPB_InputEvent_Shared;
+using ppapi::InputEventImpl;
 using ppapi::PpapiGlobals;
 using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
 using ppapi::thunk::PPB_Graphics2D_API;
 using ppapi::thunk::PPB_Graphics3D_API;
 using ppapi::thunk::PPB_ImageData_API;
 using ppapi::thunk::PPB_Instance_FunctionAPI;
 using ppapi::Var;
 using WebKit::WebBindings;
@@ skipping 466 matching lines @@
       }
     }
   }
 
   // Send the event.
   bool handled = false;
   if (filtered_input_event_mask_ & event_class)
     event.is_filtered = true;
   else
     handled = true; // Unfiltered events are assumed to be handled.
-  scoped_refptr<PPB_InputEvent_Shared> event_resource(
-      new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(),
-                                pp_instance(), event));
+  scoped_refptr<InputEventImpl> event_resource(
+      new InputEventImpl(InputEventImpl::InitAsImpl(),
+                         pp_instance(), event));
   handled |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent(
       pp_instance(), event_resource->pp_resource()));
   return handled;
 }
 
 bool PluginInstance::HandleCompositionStart(const string16& text) {
   return SendCompositionEventToPlugin(PP_INPUTEVENT_TYPE_IME_COMPOSITION_START,
                                       text);
 }
 
@@ skipping 76 matching lines @@
       // Actually send the event.
       std::vector< ::ppapi::InputEventData > events;
       CreateInputEventData(event, &events);
 
       // Each input event may generate more than one PP_InputEvent.
       for (size_t i = 0; i < events.size(); i++) {
         if (filtered_input_event_mask_ & event_class)
           events[i].is_filtered = true;
         else
           rv = true;  // Unfiltered events are assumed to be handled.
-        scoped_refptr<PPB_InputEvent_Shared> event_resource(
-            new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(),
-                                      pp_instance(), events[i]));
+        scoped_refptr<InputEventImpl> event_resource(
+            new InputEventImpl(InputEventImpl::InitAsImpl(),
+                               pp_instance(), events[i]));
 
         rv |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent(
             pp_instance(), event_resource->pp_resource()));
       }
     }
   }
 
   if (cursor_.get())
     *cursor_info = *cursor_;
   return rv;
@@ skipping 1185 matching lines @@
 PP_Var PluginInstance::ResolveRelativeToDocument(
     PP_Instance instance,
     PP_Var relative,
     PP_URLComponents_Dev* components) {
   StringVar* relative_string = StringVar::FromPPVar(relative);
   if (!relative_string)
     return PP_MakeNull();
 
   WebElement plugin_element = container()->element();
   GURL document_url = plugin_element.document().baseURL();
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(
+  return ::ppapi::URLUtilImpl::GenerateURLReturn(
       module()->pp_module(),
       document_url.Resolve(relative_string->value()),
       components);
 }
 
 PP_Bool PluginInstance::DocumentCanRequest(PP_Instance instance, PP_Var url) {
   StringVar* url_string = StringVar::FromPPVar(url);
   if (!url_string)
     return PP_FALSE;
 
@@ skipping 17 matching lines @@
   WebKit::WebSecurityOrigin target_origin;
   if (!SecurityOriginForInstance(instance, &target_origin))
     return PP_FALSE;
 
   return BoolToPPBool(our_origin.canAccess(target_origin));
 }
 
 PP_Var PluginInstance::GetDocumentURL(PP_Instance instance,
                                       PP_URLComponents_Dev* components) {
   WebKit::WebDocument document = container()->element().document();
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(
-      module()->pp_module(), document.url(), components);
+  return ::ppapi::URLUtilImpl::GenerateURLReturn(module()->pp_module(),
+                                                 document.url(), components);
 }
 
 PP_Var PluginInstance::GetPluginInstanceURL(
     PP_Instance instance,
     PP_URLComponents_Dev* components) {
-  return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(module()->pp_module(),
-                                                        plugin_url_,
-                                                        components);
+  return ::ppapi::URLUtilImpl::GenerateURLReturn(module()->pp_module(),
+                                                 plugin_url_, components);
 }
 
 void PluginInstance::DoSetCursor(WebCursorInfo* cursor) {
   cursor_.reset(cursor);
   if (fullscreen_container_) {
     fullscreen_container_->DidChangeCursor(*cursor);
   } else {
     delegate()->DidChangeCursor(this, *cursor);
   }
 }
@@ skipping 59 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit