Skip to content

GitLab

T
tangled
Commit 767add2f authored by thestig@chromium.org's avatar thestig@chromium.org
Browse files
Options

Cleanup: Remove unneeded includes in webkit::ppapi:PluginInstance. 

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8772071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113940 0039d316-1c4b-4281-b951-d872f2087c98
parent 6ead1b93
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 31 deletions
webkit/plugins/ppapi/ppapi_plugin_instance.cc
View file @ 767add2f
...@@ -8,42 +8,35 @@ ...@@ -8,42 +8,35 @@
#include "base/debug/trace_event.h" #include "base/debug/trace_event.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/linked_ptr.h" #include "base/memory/linked_ptr.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "base/utf_offset_string_conversions.h" #include "base/utf_offset_string_conversions.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "ppapi/c/dev/ppb_console_dev.h" #include "ppapi/c/dev/ppb_console_dev.h"
#include "ppapi/c/dev/ppb_find_dev.h" #include "ppapi/c/dev/ppb_find_dev.h"
#include "ppapi/c/dev/ppb_memory_dev.h"
#include "ppapi/c/dev/ppb_zoom_dev.h" #include "ppapi/c/dev/ppb_zoom_dev.h"
#include "ppapi/c/dev/ppp_find_dev.h" #include "ppapi/c/dev/ppp_find_dev.h"
#include "ppapi/c/dev/ppp_selection_dev.h" #include "ppapi/c/dev/ppp_selection_dev.h"
#include "ppapi/c/dev/ppp_zoom_dev.h" #include "ppapi/c/dev/ppp_zoom_dev.h"
#include "ppapi/c/pp_input_event.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_rect.h"
#include "ppapi/c/pp_resource.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb_core.h" #include "ppapi/c/ppb_core.h"
#include "ppapi/c/ppb_instance.h"
#include "ppapi/c/ppp_input_event.h" #include "ppapi/c/ppp_input_event.h"
#include "ppapi/c/ppp_instance.h" #include "ppapi/c/ppp_instance.h"
#include "ppapi/c/ppp_messaging.h" #include "ppapi/c/ppp_messaging.h"
#include "ppapi/c/ppp_mouse_lock.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/c/private/ppp_instance_private.h"
#include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/ppb_input_event_shared.h"
#include "ppapi/shared_impl/ppb_url_util_shared.h" #include "ppapi/shared_impl/ppb_url_util_shared.h"
#include "ppapi/shared_impl/resource.h" #include "ppapi/shared_impl/ppp_instance_combined.h"
#include "ppapi/shared_impl/time_conversion.h" #include "ppapi/shared_impl/time_conversion.h"
#include "ppapi/shared_impl/var.h" #include "ppapi/shared_impl/var.h"
#include "ppapi/thunk/enter.h" #include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_buffer_api.h" #include "ppapi/thunk/ppb_buffer_api.h"
#include "printing/units.h" #include "printing/units.h"
#include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.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/WebCursorInfo.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
...@@ -51,21 +44,17 @@ ...@@ -51,21 +44,17 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/skia_util.h"
#include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/common.h"
#include "webkit/plugins/ppapi/event_conversion.h" #include "webkit/plugins/ppapi/event_conversion.h"
#include "webkit/plugins/ppapi/fullscreen_container.h" #include "webkit/plugins/ppapi/fullscreen_container.h"
#include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/host_globals.h"
#include "webkit/plugins/ppapi/message_channel.h" #include "webkit/plugins/ppapi/message_channel.h"
#include "webkit/plugins/ppapi/npapi_glue.h" #include "webkit/plugins/ppapi/npapi_glue.h"
#include "webkit/plugins/ppapi/plugin_delegate.h"
#include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/plugin_module.h"
#include "webkit/plugins/ppapi/plugin_object.h" #include "webkit/plugins/ppapi/plugin_object.h"
#include "webkit/plugins/ppapi/ppb_buffer_impl.h" #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
...@@ -75,30 +64,29 @@ ...@@ -75,30 +64,29 @@
#include "webkit/plugins/ppapi/ppb_url_loader_impl.h" #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
#include "webkit/plugins/ppapi/ppb_url_request_info_impl.h" #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
#include "webkit/plugins/ppapi/ppp_pdf.h" #include "webkit/plugins/ppapi/ppp_pdf.h"
#include "webkit/plugins/ppapi/string.h"
#include "webkit/plugins/sad_plugin.h" #include "webkit/plugins/sad_plugin.h"
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#include "printing/metafile_impl.h"
#if !defined(USE_SKIA)
#include "base/mac/mac_util.h" #include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_cftyperef.h"
#include "printing/metafile_impl.h" #endif // !defined(USE_SKIA)
#endif #endif // defined(OS_MACOSX)
#if defined(USE_SKIA) #if defined(USE_SKIA)
#include "printing/metafile.h" #include "printing/metafile.h"
#include "printing/metafile_skia_wrapper.h" #include "printing/metafile_skia_wrapper.h"
#include "skia/ext/platform_device.h"
#endif #endif
#if defined(OS_WIN) #if defined(OS_WIN)
#include "skia/ext/vector_platform_device_emf_win.h" #include "base/metrics/histogram.h"
#include "skia/ext/platform_canvas.h"
#include "ui/gfx/codec/jpeg_codec.h" #include "ui/gfx/codec/jpeg_codec.h"
#include "ui/gfx/gdi_util.h" #include "ui/gfx/gdi_util.h"
#endif #endif
#if defined(OS_MACOSX) && defined(USE_SKIA)
#include "skia/ext/skia_utils_mac.h"
#endif
using base::StringPrintf; using base::StringPrintf;
using ppapi::InputEventData; using ppapi::InputEventData;
using ppapi::PPB_InputEvent_Shared; using ppapi::PPB_InputEvent_Shared;
...@@ -116,8 +104,8 @@ using WebKit::WebCanvas; ...@@ -116,8 +104,8 @@ using WebKit::WebCanvas;
using WebKit::WebConsoleMessage; using WebKit::WebConsoleMessage;
using WebKit::WebCursorInfo; using WebKit::WebCursorInfo;
using WebKit::WebDocument; using WebKit::WebDocument;
using WebKit::WebFrame;
using WebKit::WebElement; using WebKit::WebElement;
using WebKit::WebFrame;
using WebKit::WebInputEvent; using WebKit::WebInputEvent;
using WebKit::WebPluginContainer; using WebKit::WebPluginContainer;
using WebKit::WebString; using WebKit::WebString;
...@@ -587,7 +575,7 @@ bool PluginInstance::SendCompositionEventWithUnderlineInformationToPlugin( ...@@ -587,7 +575,7 @@ bool PluginInstance::SendCompositionEventWithUnderlineInformationToPlugin(
if (filtered_input_event_mask_ & event_class) if (filtered_input_event_mask_ & event_class)
event.is_filtered = true; event.is_filtered = true;
else else
handled = true; // Unfiltered events are assumed to be handled. handled = true; // Unfiltered events are assumed to be handled.
scoped_refptr<PPB_InputEvent_Shared> event_resource( scoped_refptr<PPB_InputEvent_Shared> event_resource(
new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(),
pp_instance(), event)); pp_instance(), event));
......
webkit/plugins/ppapi/ppapi_plugin_instance.h
View file @ 767add2f
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
#define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_ #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
#include <map>
#include <set> #include <set>
#include <string> #include <string>
#include <vector> #include <vector>
...@@ -23,13 +22,9 @@ ...@@ -23,13 +22,9 @@
#include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_resource.h"
#include "ppapi/c/pp_var.h" #include "ppapi/c/pp_var.h"
#include "ppapi/c/ppb_input_event.h" #include "ppapi/c/ppb_input_event.h"
#include "ppapi/c/ppp_graphics_3d.h"
#include "ppapi/c/ppp_instance.h"
#include "ppapi/shared_impl/function_group_base.h" #include "ppapi/shared_impl/function_group_base.h"
#include "ppapi/shared_impl/ppb_instance_shared.h" #include "ppapi/shared_impl/ppb_instance_shared.h"
#include "ppapi/shared_impl/ppp_instance_combined.h"
#include "ppapi/thunk/ppb_instance_api.h" #include "ppapi/thunk/ppb_instance_api.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkRefCnt.h" #include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
...@@ -38,8 +33,9 @@ ...@@ -38,8 +33,9 @@
#include "webkit/plugins/ppapi/plugin_delegate.h" #include "webkit/plugins/ppapi/plugin_delegate.h"
#include "webkit/plugins/webkit_plugins_export.h" #include "webkit/plugins/webkit_plugins_export.h"
struct PP_Var; struct PP_Point;
struct PPP_Find_Dev; struct PPP_Find_Dev;
struct PPP_Graphics3D;
struct PPP_InputEvent; struct PPP_InputEvent;
struct PPP_Instance_Private; struct PPP_Instance_Private;
struct PPP_Messaging; struct PPP_Messaging;
......
webkit/plugins/ppapi/ppb_graphics_3d_impl.cc
View file @ 767add2f
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/client/gles2_implementation.h"
#include "ppapi/c/ppp_graphics_3d.h"
#include "webkit/plugins/ppapi/plugin_module.h" #include "webkit/plugins/ppapi/plugin_module.h"
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
#include "webkit/plugins/ppapi/resource_helper.h" #include "webkit/plugins/ppapi/resource_helper.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment