diff options
85 files changed, 217 insertions, 230 deletions
@@ -174,9 +174,6 @@ deps = { "/trunk/deps/third_party/libvpx/lib@" + Var("libvpx_revision"), - "src/third_party/ppapi": - (Var("googlecode_url") % "ppapi") + "/trunk@304", - "src/third_party/libjingle/source": (Var("googlecode_url") % "libjingle") + "/trunk@" + Var("libjingle_revision"), diff --git a/build/all.gyp b/build/all.gyp index 6497e35..a861b7b 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -20,6 +20,7 @@ '../jingle/jingle.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', + '../ppapi/ppapi.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -40,7 +41,6 @@ '../third_party/mesa/mesa.gyp:*', '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', - '../third_party/ppapi/ppapi.gyp:*', '../third_party/ots/ots.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 453138e..f4c9e7e 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1620,6 +1620,7 @@ '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', + '../ppapi/ppapi.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -1637,7 +1638,6 @@ '../third_party/lzma_sdk/lzma_sdk.gyp:*', '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', - '../third_party/ppapi/ppapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/support/webkit_support.gyp:*', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0556402..e165f41 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -458,7 +458,7 @@ # run time dependencies 'chrome_mesa', 'default_plugin/default_plugin.gyp:default_plugin', - '../third_party/ppapi/ppapi.gyp:ppapi_tests', + '../ppapi/ppapi.gyp:ppapi_tests', '../webkit/support/webkit_support.gyp:copy_npapi_layout_test_plugin', ], 'include_dirs': [ diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index b7bf978..99df536 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -7,6 +7,7 @@ include_rules = [ "+media/ffmpeg", "+media/filters", "+media/video", + "+ppapi/c", "+sandbox/src", "+skia/include", "+webkit/extensions", diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc index ecaf0e4..b8ab08d 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.cc +++ b/chrome/renderer/pepper_plugin_delegate_impl.cc @@ -25,7 +25,7 @@ #include "chrome/renderer/render_view.h" #include "chrome/renderer/webplugin_delegate_proxy.h" #include "grit/locale_settings.h" -#include "third_party/ppapi/c/dev/pp_video_dev.h" +#include "ppapi/c/dev/pp_video_dev.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h" #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" diff --git a/chrome/renderer/pepper_plugin_delegate_impl.h b/chrome/renderer/pepper_plugin_delegate_impl.h index a1fb6a0..90c659a 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.h +++ b/chrome/renderer/pepper_plugin_delegate_impl.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/id_map.h" #include "base/weak_ptr.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 195c5e0..36eeab8 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -57,7 +57,6 @@ class PPAPITest : public UITest { void RunTest(const std::string& test_case) { FilePath test_path; PathService::Get(base::DIR_SOURCE_ROOT, &test_path); - test_path = test_path.Append(FILE_PATH_LITERAL("third_party")); test_path = test_path.Append(FILE_PATH_LITERAL("ppapi")); test_path = test_path.Append(FILE_PATH_LITERAL("tests")); test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html")); diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 901ec7c..d205eea 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -127,12 +127,12 @@ 'type': 'static_library', 'dependencies': [ 'gpu_demo_framework', - '../../third_party/ppapi/ppapi.gyp:ppapi_cpp', - '../../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects' + '../../ppapi/ppapi.gyp:ppapi_cpp', + '../../ppapi/ppapi.gyp:ppapi_cpp_objects' ], 'include_dirs': [ '../..', - '../../third_party/ppapi', + '../../ppapi', '../../third_party/gles2_book/Common/Include', ], 'sources': [ @@ -148,7 +148,7 @@ 'include_dirs': [ '../../third_party', '../../third_party/gles2_book/Common/Include', - '../../third_party/ppapi', + '../../ppapi', '../..' ], 'run_as': { diff --git a/ppapi/codereview.settings b/ppapi/codereview.settings deleted file mode 100644 index 427abb4..0000000 --- a/ppapi/codereview.settings +++ /dev/null @@ -1,5 +0,0 @@ -# This file is used by gcl to get repository specific information. -CODE_REVIEW_SERVER: codereview.chromium.org -CC_LIST: chromium-reviews@chromium.org -VIEW_VC: http://code.google.com/p/ppapi/source/detail?r= - diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index 13b1dd6..2213034 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -28,11 +28,6 @@ { 'target_name': 'ppapi_c', 'type': 'none', - 'all_dependent_settings': { - 'include_dirs': [ - '..', - ], - }, 'sources': [ 'c/pp_completion_callback.h', 'c/pp_errors.h', diff --git a/remoting/DEPS b/remoting/DEPS index d929d84..fbdd04d 100644 --- a/remoting/DEPS +++ b/remoting/DEPS @@ -5,6 +5,7 @@ include_rules = [ "+media/base", "+net", "+jingle", + "+ppapi", "+talk", "+third_party/npapi" "+third_party/protobuf2", diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 3a5f2fa..67979c0 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -10,6 +10,9 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/thread.h" +#include "ppapi/c/pp_input_event.h" +#include "ppapi/cpp/completion_callback.h" +#include "ppapi/cpp/rect.h" #include "remoting/client/client_config.h" #include "remoting/client/client_util.h" #include "remoting/client/chromoting_client.h" @@ -20,9 +23,6 @@ #include "remoting/client/plugin/pepper_input_handler.h" #include "remoting/client/plugin/pepper_view.h" #include "remoting/jingle_glue/jingle_thread.h" -#include "third_party/ppapi/c/pp_input_event.h" -#include "third_party/ppapi/cpp/completion_callback.h" -#include "third_party/ppapi/cpp/rect.h" namespace remoting { diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index df1db9f..f706478 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -12,14 +12,14 @@ #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_rect.h" +#include "ppapi/c/pp_resource.h" +#include "ppapi/cpp/instance.h" +#include "ppapi/cpp/var.h" #include "remoting/client/client_context.h" #include "remoting/client/host_connection.h" #include "remoting/client/plugin/chromoting_scriptable_object.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_rect.h" -#include "third_party/ppapi/c/pp_resource.h" -#include "third_party/ppapi/cpp/instance.h" -#include "third_party/ppapi/cpp/var.h" class MessageLoop; struct PP_InputEvent; diff --git a/remoting/client/plugin/chromoting_scriptable_object.cc b/remoting/client/plugin/chromoting_scriptable_object.cc index 1fc04e4..4b19c3c 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.cc +++ b/remoting/client/plugin/chromoting_scriptable_object.cc @@ -4,11 +4,10 @@ #include "remoting/client/plugin/chromoting_scriptable_object.h" +#include "ppapi/cpp/var.h" #include "remoting/client/client_config.h" #include "remoting/client/plugin/chromoting_instance.h" -#include "third_party/ppapi/cpp/var.h" - using pp::Var; namespace remoting { diff --git a/remoting/client/plugin/chromoting_scriptable_object.h b/remoting/client/plugin/chromoting_scriptable_object.h index c317f57..6940721 100644 --- a/remoting/client/plugin/chromoting_scriptable_object.h +++ b/remoting/client/plugin/chromoting_scriptable_object.h @@ -41,8 +41,8 @@ #include <string> #include <vector> -#include "third_party/ppapi/cpp/dev/scriptable_object_deprecated.h" -#include "third_party/ppapi/cpp/var.h" +#include "ppapi/cpp/dev/scriptable_object_deprecated.h" +#include "ppapi/cpp/var.h" namespace remoting { diff --git a/remoting/client/plugin/pepper_entrypoints.cc b/remoting/client/plugin/pepper_entrypoints.cc index 77307b3..a5e6142 100644 --- a/remoting/client/plugin/pepper_entrypoints.cc +++ b/remoting/client/plugin/pepper_entrypoints.cc @@ -5,13 +5,13 @@ #include "remoting/client/plugin/pepper_entrypoints.h" #include "base/message_loop.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/ppb_instance.h" +#include "ppapi/cpp/instance.h" +#include "ppapi/cpp/module.h" #include "remoting/client/plugin/chromoting_instance.h" -#include "third_party/ppapi/c/pp_errors.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/ppb_instance.h" -#include "third_party/ppapi/cpp/instance.h" -#include "third_party/ppapi/cpp/module.h" static pp::Module* g_module_singleton = NULL; diff --git a/remoting/client/plugin/pepper_entrypoints.h b/remoting/client/plugin/pepper_entrypoints.h index ab6de20..a9ec138 100644 --- a/remoting/client/plugin/pepper_entrypoints.h +++ b/remoting/client/plugin/pepper_entrypoints.h @@ -5,8 +5,8 @@ #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_ENTRYPOINTS_ #define REMOTING_CLIENT_PLUGIN_PEPPER_ENTRYPOINTS_ -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/ppb.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/ppb.h" namespace remoting { diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc index c2e2099..5599655 100644 --- a/remoting/client/plugin/pepper_input_handler.cc +++ b/remoting/client/plugin/pepper_input_handler.cc @@ -4,7 +4,7 @@ #include "remoting/client/plugin/pepper_input_handler.h" -#include "third_party/ppapi/c/pp_input_event.h" +#include "ppapi/c/pp_input_event.h" namespace remoting { diff --git a/remoting/client/plugin/pepper_util.cc b/remoting/client/plugin/pepper_util.cc index 7c91233..ff0c0f5 100644 --- a/remoting/client/plugin/pepper_util.cc +++ b/remoting/client/plugin/pepper_util.cc @@ -5,8 +5,8 @@ #include "remoting/client/plugin/pepper_util.h" #include "base/task.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/cpp/module.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/cpp/module.h" namespace remoting { diff --git a/remoting/client/plugin/pepper_util.h b/remoting/client/plugin/pepper_util.h index 6c6cfb0..1201689 100644 --- a/remoting/client/plugin/pepper_util.h +++ b/remoting/client/plugin/pepper_util.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" -#include "third_party/ppapi/cpp/completion_callback.h" +#include "ppapi/cpp/completion_callback.h" class Task; diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc index f941b08..26d128b 100644 --- a/remoting/client/plugin/pepper_view.cc +++ b/remoting/client/plugin/pepper_view.cc @@ -5,14 +5,14 @@ #include "remoting/client/plugin/pepper_view.h" #include "base/message_loop.h" +#include "ppapi/cpp/graphics_2d.h" +#include "ppapi/cpp/image_data.h" +#include "ppapi/cpp/point.h" +#include "ppapi/cpp/size.h" #include "remoting/base/tracer.h" #include "remoting/client/client_context.h" #include "remoting/client/plugin/chromoting_instance.h" #include "remoting/client/plugin/pepper_util.h" -#include "third_party/ppapi/cpp/graphics_2d.h" -#include "third_party/ppapi/cpp/image_data.h" -#include "third_party/ppapi/cpp/point.h" -#include "third_party/ppapi/cpp/size.h" namespace remoting { diff --git a/remoting/client/plugin/pepper_view.h b/remoting/client/plugin/pepper_view.h index 80ce1ae..1213533 100644 --- a/remoting/client/plugin/pepper_view.h +++ b/remoting/client/plugin/pepper_view.h @@ -17,10 +17,10 @@ #include "base/scoped_ptr.h" #include "base/task.h" #include "media/base/video_frame.h" +#include "ppapi/cpp/graphics_2d.h" #include "remoting/client/chromoting_view.h" #include "remoting/client/frame_consumer.h" #include "remoting/client/rectangle_update_decoder.h" -#include "third_party/ppapi/cpp/graphics_2d.h" namespace remoting { diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 8661eb3..dc72d8b 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -73,7 +73,7 @@ 'chromoting_base', 'chromoting_client', 'chromoting_jingle_glue', - '../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects', + '../ppapi/ppapi.gyp:ppapi_cpp_objects', ], 'sources': [ 'client/plugin/chromoting_instance.cc', diff --git a/webkit/glue/plugins/DEPS b/webkit/glue/plugins/DEPS index 4ac8845..cfee702 100644 --- a/webkit/glue/plugins/DEPS +++ b/webkit/glue/plugins/DEPS @@ -1,4 +1,4 @@ include_rules = [ + "+ppapi", "+printing", - "+third_party/ppapi/c", ] diff --git a/webkit/glue/plugins/pepper_audio.cc b/webkit/glue/plugins/pepper_audio.cc index 5a76670..e5babec 100644 --- a/webkit/glue/plugins/pepper_audio.cc +++ b/webkit/glue/plugins/pepper_audio.cc @@ -5,8 +5,8 @@ #include "webkit/glue/plugins/pepper_audio.h" #include "base/logging.h" -#include "third_party/ppapi/c/dev/ppb_audio_dev.h" -#include "third_party/ppapi/c/dev/ppb_audio_trusted_dev.h" +#include "ppapi/c/dev/ppb_audio_dev.h" +#include "ppapi/c/dev/ppb_audio_trusted_dev.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_audio.h b/webkit/glue/plugins/pepper_audio.h index 196eac4..705192c 100644 --- a/webkit/glue/plugins/pepper_audio.h +++ b/webkit/glue/plugins/pepper_audio.h @@ -7,9 +7,9 @@ #include "base/shared_memory.h" #include "base/simple_thread.h" #include "base/sync_socket.h" -#include "third_party/ppapi/c/dev/ppb_audio_dev.h" -#include "third_party/ppapi/c/dev/ppb_audio_config_dev.h" -#include "third_party/ppapi/c/dev/ppb_audio_trusted_dev.h" +#include "ppapi/c/dev/ppb_audio_dev.h" +#include "ppapi/c/dev/ppb_audio_config_dev.h" +#include "ppapi/c/dev/ppb_audio_trusted_dev.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_plugin_module.h" diff --git a/webkit/glue/plugins/pepper_buffer.cc b/webkit/glue/plugins/pepper_buffer.cc index 1b9097d..7b52e69 100644 --- a/webkit/glue/plugins/pepper_buffer.cc +++ b/webkit/glue/plugins/pepper_buffer.cc @@ -8,10 +8,10 @@ #include "base/logging.h" #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/dev/ppb_buffer_dev.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/pp_resource.h" +#include "ppapi/c/dev/ppb_buffer_dev.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_resource.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_plugin_module.h" diff --git a/webkit/glue/plugins/pepper_char_set.cc b/webkit/glue/plugins/pepper_char_set.cc index 043de41..1411d59 100644 --- a/webkit/glue/plugins/pepper_char_set.cc +++ b/webkit/glue/plugins/pepper_char_set.cc @@ -7,7 +7,7 @@ #include <stdlib.h> #include "base/i18n/icu_string_conversions.h" -#include "third_party/ppapi/c/dev/ppb_char_set_dev.h" +#include "ppapi/c/dev/ppb_char_set_dev.h" #include "unicode/ucnv.h" #include "unicode/ucnv_cb.h" #include "unicode/ucnv_err.h" diff --git a/webkit/glue/plugins/pepper_cursor_control.cc b/webkit/glue/plugins/pepper_cursor_control.cc index 687aa76..f515deb 100644 --- a/webkit/glue/plugins/pepper_cursor_control.cc +++ b/webkit/glue/plugins/pepper_cursor_control.cc @@ -6,10 +6,10 @@ #include "base/logging.h" #include "base/ref_counted.h" -#include "third_party/ppapi/c/dev/pp_cursor_type_dev.h" -#include "third_party/ppapi/c/dev/ppb_cursor_control_dev.h" -#include "third_party/ppapi/c/pp_point.h" -#include "third_party/ppapi/c/pp_resource.h" +#include "ppapi/c/dev/pp_cursor_type_dev.h" +#include "ppapi/c/dev/ppb_cursor_control_dev.h" +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_resource.h" #include "webkit/glue/plugins/pepper_image_data.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_directory_reader.cc b/webkit/glue/plugins/pepper_directory_reader.cc index bcf2533..a40ef1d 100644 --- a/webkit/glue/plugins/pepper_directory_reader.cc +++ b/webkit/glue/plugins/pepper_directory_reader.cc @@ -5,9 +5,9 @@ #include "webkit/glue/plugins/pepper_directory_reader.h" #include "base/logging.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/dev/ppb_directory_reader_dev.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/dev/ppb_directory_reader_dev.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_file_ref.h" #include "webkit/glue/plugins/pepper_resource_tracker.h" diff --git a/webkit/glue/plugins/pepper_error_util.cc b/webkit/glue/plugins/pepper_error_util.cc index 895626a..7472d4a 100644 --- a/webkit/glue/plugins/pepper_error_util.cc +++ b/webkit/glue/plugins/pepper_error_util.cc @@ -4,7 +4,7 @@ #include "webkit/glue/plugins/pepper_error_util.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/pp_errors.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_event_conversion.cc b/webkit/glue/plugins/pepper_event_conversion.cc index 5375f67..bc60af2 100644 --- a/webkit/glue/plugins/pepper_event_conversion.cc +++ b/webkit/glue/plugins/pepper_event_conversion.cc @@ -10,7 +10,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/utf_string_conversion_utils.h" -#include "third_party/ppapi/c/pp_input_event.h" +#include "ppapi/c/pp_input_event.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" using WebKit::WebInputEvent; diff --git a/webkit/glue/plugins/pepper_file_callbacks.cc b/webkit/glue/plugins/pepper_file_callbacks.cc index d0d417d..e07b2b5 100644 --- a/webkit/glue/plugins/pepper_file_callbacks.cc +++ b/webkit/glue/plugins/pepper_file_callbacks.cc @@ -6,9 +6,9 @@ #include "base/file_path.h" #include "base/logging.h" -#include "third_party/ppapi/c/dev/ppb_file_system_dev.h" -#include "third_party/ppapi/c/dev/pp_file_info_dev.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/dev/ppb_file_system_dev.h" +#include "ppapi/c/dev/pp_file_info_dev.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_error_util.h" #include "webkit/glue/plugins/pepper_file_system.h" #include "webkit/fileapi/file_system_types.h" diff --git a/webkit/glue/plugins/pepper_file_callbacks.h b/webkit/glue/plugins/pepper_file_callbacks.h index 203a59a..41f0b8f 100644 --- a/webkit/glue/plugins/pepper_file_callbacks.h +++ b/webkit/glue/plugins/pepper_file_callbacks.h @@ -7,7 +7,7 @@ #include "base/platform_file.h" #include "base/weak_ptr.h" -#include "third_party/ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_completion_callback.h" #include "webkit/fileapi/file_system_callback_dispatcher.h" struct PP_FileInfo_Dev; diff --git a/webkit/glue/plugins/pepper_file_chooser.cc b/webkit/glue/plugins/pepper_file_chooser.cc index 07524e9..098d60d 100644 --- a/webkit/glue/plugins/pepper_file_chooser.cc +++ b/webkit/glue/plugins/pepper_file_chooser.cc @@ -8,8 +8,8 @@ #include <vector> #include "base/logging.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" #include "third_party/WebKit/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h" diff --git a/webkit/glue/plugins/pepper_file_chooser.h b/webkit/glue/plugins/pepper_file_chooser.h index eafdd0e..664f934 100644 --- a/webkit/glue/plugins/pepper_file_chooser.h +++ b/webkit/glue/plugins/pepper_file_chooser.h @@ -9,8 +9,8 @@ #include <vector> #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/dev/ppb_file_chooser_dev.h" -#include "third_party/ppapi/c/pp_completion_callback.h" +#include "ppapi/c/dev/ppb_file_chooser_dev.h" +#include "ppapi/c/pp_completion_callback.h" #include "webkit/glue/plugins/pepper_resource.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_file_io.cc b/webkit/glue/plugins/pepper_file_io.cc index b979ac2..41ce5b6 100644 --- a/webkit/glue/plugins/pepper_file_io.cc +++ b/webkit/glue/plugins/pepper_file_io.cc @@ -11,10 +11,10 @@ #include "base/platform_file.h" #include "base/logging.h" #include "base/time.h" -#include "third_party/ppapi/c/dev/ppb_file_io_dev.h" -#include "third_party/ppapi/c/dev/ppb_file_io_trusted_dev.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/dev/ppb_file_io_dev.h" +#include "ppapi/c/dev/ppb_file_io_trusted_dev.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_file_ref.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_plugin_module.h" diff --git a/webkit/glue/plugins/pepper_file_io.h b/webkit/glue/plugins/pepper_file_io.h index 9fa24ba..6fee92d 100644 --- a/webkit/glue/plugins/pepper_file_io.h +++ b/webkit/glue/plugins/pepper_file_io.h @@ -9,9 +9,9 @@ #include "base/platform_file.h" #include "base/scoped_callback_factory.h" #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/dev/pp_file_info_dev.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/pp_time.h" +#include "ppapi/c/dev/pp_file_info_dev.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_time.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_file_ref.cc b/webkit/glue/plugins/pepper_file_ref.cc index 21fa061..8fb685b 100644 --- a/webkit/glue/plugins/pepper_file_ref.cc +++ b/webkit/glue/plugins/pepper_file_ref.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_file_callbacks.h" #include "webkit/glue/plugins/pepper_file_system.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" diff --git a/webkit/glue/plugins/pepper_file_ref.h b/webkit/glue/plugins/pepper_file_ref.h index 4dd8826..88020c1 100644 --- a/webkit/glue/plugins/pepper_file_ref.h +++ b/webkit/glue/plugins/pepper_file_ref.h @@ -8,7 +8,7 @@ #include <string> #include "base/file_path.h" -#include "third_party/ppapi/c/dev/ppb_file_ref_dev.h" +#include "ppapi/c/dev/ppb_file_ref_dev.h" #include "webkit/glue/plugins/pepper_resource.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_file_system.cc b/webkit/glue/plugins/pepper_file_system.cc index 21321a5..b2e17d5 100644 --- a/webkit/glue/plugins/pepper_file_system.cc +++ b/webkit/glue/plugins/pepper_file_system.cc @@ -5,8 +5,8 @@ #include "webkit/glue/plugins/pepper_file_system.h" #include "base/ref_counted.h" -#include "third_party/ppapi/c/dev/ppb_file_system_dev.h" -#include "third_party/ppapi/c/pp_completion_callback.h" +#include "ppapi/c/dev/ppb_file_system_dev.h" +#include "ppapi/c/pp_completion_callback.h" #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" diff --git a/webkit/glue/plugins/pepper_file_system.h b/webkit/glue/plugins/pepper_file_system.h index f883299..97f1c7d 100644 --- a/webkit/glue/plugins/pepper_file_system.h +++ b/webkit/glue/plugins/pepper_file_system.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "third_party/ppapi/c/dev/pp_file_info_dev.h" +#include "ppapi/c/dev/pp_file_info_dev.h" #include "webkit/glue/plugins/pepper_resource.h" struct PPB_FileSystem_Dev; diff --git a/webkit/glue/plugins/pepper_font.cc b/webkit/glue/plugins/pepper_font.cc index cad39f5..340e076 100644 --- a/webkit/glue/plugins/pepper_font.cc +++ b/webkit/glue/plugins/pepper_font.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "third_party/ppapi/c/dev/ppb_font_dev.h" -#include "third_party/ppapi/c/pp_rect.h" +#include "ppapi/c/dev/ppb_font_dev.h" +#include "ppapi/c/pp_rect.h" #include "third_party/WebKit/WebKit/chromium/public/WebFont.h" #include "third_party/WebKit/WebKit/chromium/public/WebFontDescription.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" diff --git a/webkit/glue/plugins/pepper_font.h b/webkit/glue/plugins/pepper_font.h index 34fe521..3cc001c 100644 --- a/webkit/glue/plugins/pepper_font.h +++ b/webkit/glue/plugins/pepper_font.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_PLUGINS_PEPPER_FONT_H_ #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/dev/ppb_font_dev.h" +#include "ppapi/c/dev/ppb_font_dev.h" #include "webkit/glue/plugins/pepper_resource.h" namespace WebKit { diff --git a/webkit/glue/plugins/pepper_graphics_2d.cc b/webkit/glue/plugins/pepper_graphics_2d.cc index a75da85..af6bc57 100644 --- a/webkit/glue/plugins/pepper_graphics_2d.cc +++ b/webkit/glue/plugins/pepper_graphics_2d.cc @@ -13,11 +13,11 @@ #include "gfx/point.h" #include "gfx/rect.h" #include "skia/ext/platform_canvas.h" -#include "third_party/ppapi/c/pp_errors.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/pp_rect.h" -#include "third_party/ppapi/c/pp_resource.h" -#include "third_party/ppapi/c/ppb_graphics_2d.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_rect.h" +#include "ppapi/c/pp_resource.h" +#include "ppapi/c/ppb_graphics_2d.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/plugins/pepper_image_data.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" diff --git a/webkit/glue/plugins/pepper_graphics_2d.h b/webkit/glue/plugins/pepper_graphics_2d.h index ff4cd16..6caac83 100644 --- a/webkit/glue/plugins/pepper_graphics_2d.h +++ b/webkit/glue/plugins/pepper_graphics_2d.h @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/ppb_graphics_2d.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/ppb_graphics_2d.h" #include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_graphics_3d.cc b/webkit/glue/plugins/pepper_graphics_3d.cc index 1ebc3ea..47b587e 100644 --- a/webkit/glue/plugins/pepper_graphics_3d.cc +++ b/webkit/glue/plugins/pepper_graphics_3d.cc @@ -7,7 +7,7 @@ #include "gpu/command_buffer/common/command_buffer.h" #include "base/singleton.h" #include "base/thread_local.h" -#include "third_party/ppapi/c/dev/ppb_graphics_3d_dev.h" +#include "ppapi/c/dev/ppb_graphics_3d_dev.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_graphics_3d.h b/webkit/glue/plugins/pepper_graphics_3d.h index 16258ed..96c7b80 100644 --- a/webkit/glue/plugins/pepper_graphics_3d.h +++ b/webkit/glue/plugins/pepper_graphics_3d.h @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/client/gles2_implementation.h" -#include "third_party/ppapi/c/pp_instance.h" +#include "ppapi/c/pp_instance.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_graphics_3d_gl.cc b/webkit/glue/plugins/pepper_graphics_3d_gl.cc index 897e459..2ce8de0 100644 --- a/webkit/glue/plugins/pepper_graphics_3d_gl.cc +++ b/webkit/glue/plugins/pepper_graphics_3d_gl.cc @@ -7,7 +7,7 @@ #include "webkit/glue/plugins/pepper_graphics_3d.h" #include "gpu/command_buffer/client/gles2_implementation.h" -#include "third_party/ppapi/c/dev/ppb_opengles_dev.h" +#include "ppapi/c/dev/ppb_opengles_dev.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_image_data.cc b/webkit/glue/plugins/pepper_image_data.cc index 2ee8b21..6dc9be5 100644 --- a/webkit/glue/plugins/pepper_image_data.cc +++ b/webkit/glue/plugins/pepper_image_data.cc @@ -10,11 +10,11 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "skia/ext/platform_canvas.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/pp_resource.h" -#include "third_party/ppapi/c/ppb_image_data.h" -#include "third_party/ppapi/c/trusted/ppb_image_data_trusted.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_resource.h" +#include "ppapi/c/ppb_image_data.h" +#include "ppapi/c/trusted/ppb_image_data_trusted.h" #include "third_party/skia/include/core/SkColorPriv.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_plugin_module.h" diff --git a/webkit/glue/plugins/pepper_image_data.h b/webkit/glue/plugins/pepper_image_data.h index f8c713a..b657173 100644 --- a/webkit/glue/plugins/pepper_image_data.h +++ b/webkit/glue/plugins/pepper_image_data.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/ppb_image_data.h" +#include "ppapi/c/ppb_image_data.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_plugin_delegate.h b/webkit/glue/plugins/pepper_plugin_delegate.h index 7738fbf..897b16f 100644 --- a/webkit/glue/plugins/pepper_plugin_delegate.h +++ b/webkit/glue/plugins/pepper_plugin_delegate.h @@ -14,9 +14,9 @@ #include "base/sync_socket.h" #include "base/task.h" #include "googleurl/src/gurl.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/pp_errors.h" -#include "third_party/ppapi/c/pp_stdint.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/pp_stdint.h" #include "webkit/fileapi/file_system_types.h" #include "webkit/glue/plugins/pepper_dir_contents.h" diff --git a/webkit/glue/plugins/pepper_plugin_instance.cc b/webkit/glue/plugins/pepper_plugin_instance.cc index 416c0cc..9267e81 100644 --- a/webkit/glue/plugins/pepper_plugin_instance.cc +++ b/webkit/glue/plugins/pepper_plugin_instance.cc @@ -18,24 +18,24 @@ #include "gfx/gdi_util.h" #endif #include "gfx/skia_util.h" +#include "ppapi/c/dev/ppb_find_dev.h" +#include "ppapi/c/dev/ppb_fullscreen_dev.h" +#include "ppapi/c/dev/ppb_zoom_dev.h" +#include "ppapi/c/dev/ppp_find_dev.h" +#include "ppapi/c/dev/ppp_selection_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_resource.h" +#include "ppapi/c/pp_var.h" +#include "ppapi/c/ppb_core.h" +#include "ppapi/c/ppb_instance.h" +#include "ppapi/c/ppp_instance.h" #include "printing/native_metafile.h" #include "printing/units.h" #include "skia/ext/vector_platform_device.h" #include "skia/ext/platform_canvas.h" -#include "third_party/ppapi/c/dev/ppb_find_dev.h" -#include "third_party/ppapi/c/dev/ppb_fullscreen_dev.h" -#include "third_party/ppapi/c/dev/ppb_zoom_dev.h" -#include "third_party/ppapi/c/dev/ppp_find_dev.h" -#include "third_party/ppapi/c/dev/ppp_selection_dev.h" -#include "third_party/ppapi/c/dev/ppp_zoom_dev.h" -#include "third_party/ppapi/c/pp_input_event.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_rect.h" -#include "third_party/ppapi/c/pp_resource.h" -#include "third_party/ppapi/c/pp_var.h" -#include "third_party/ppapi/c/ppb_core.h" -#include "third_party/ppapi/c/ppb_instance.h" -#include "third_party/ppapi/c/ppp_instance.h" #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" diff --git a/webkit/glue/plugins/pepper_plugin_instance.h b/webkit/glue/plugins/pepper_plugin_instance.h index 2a92ddd..fd0bbde 100644 --- a/webkit/glue/plugins/pepper_plugin_instance.h +++ b/webkit/glue/plugins/pepper_plugin_instance.h @@ -13,11 +13,11 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "gfx/rect.h" -#include "third_party/ppapi/c/dev/pp_cursor_type_dev.h" -#include "third_party/ppapi/c/dev/ppp_graphics_3d_dev.h" -#include "third_party/ppapi/c/dev/ppp_printing_dev.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_resource.h" +#include "ppapi/c/dev/pp_cursor_type_dev.h" +#include "ppapi/c/dev/ppp_graphics_3d_dev.h" +#include "ppapi/c/dev/ppp_printing_dev.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_resource.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h" diff --git a/webkit/glue/plugins/pepper_plugin_module.cc b/webkit/glue/plugins/pepper_plugin_module.cc index 52a8916..a639f71 100644 --- a/webkit/glue/plugins/pepper_plugin_module.cc +++ b/webkit/glue/plugins/pepper_plugin_module.cc @@ -12,41 +12,41 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "third_party/ppapi/c/dev/ppb_buffer_dev.h" -#include "third_party/ppapi/c/dev/ppb_char_set_dev.h" -#include "third_party/ppapi/c/dev/ppb_cursor_control_dev.h" -#include "third_party/ppapi/c/dev/ppb_directory_reader_dev.h" -#include "third_party/ppapi/c/dev/ppb_file_io_dev.h" -#include "third_party/ppapi/c/dev/ppb_file_io_trusted_dev.h" -#include "third_party/ppapi/c/dev/ppb_file_system_dev.h" -#include "third_party/ppapi/c/dev/ppb_find_dev.h" -#include "third_party/ppapi/c/dev/ppb_font_dev.h" -#include "third_party/ppapi/c/dev/ppb_fullscreen_dev.h" -#include "third_party/ppapi/c/dev/ppb_graphics_3d_dev.h" -#include "third_party/ppapi/c/dev/ppb_opengles_dev.h" -#include "third_party/ppapi/c/dev/ppb_scrollbar_dev.h" -#include "third_party/ppapi/c/dev/ppb_testing_dev.h" -#include "third_party/ppapi/c/dev/ppb_transport_dev.h" -#include "third_party/ppapi/c/dev/ppb_url_loader_dev.h" -#include "third_party/ppapi/c/dev/ppb_url_loader_trusted_dev.h" -#include "third_party/ppapi/c/dev/ppb_url_request_info_dev.h" -#include "third_party/ppapi/c/dev/ppb_url_response_info_dev.h" -#include "third_party/ppapi/c/dev/ppb_url_util_dev.h" -#include "third_party/ppapi/c/dev/ppb_var_deprecated.h" -#include "third_party/ppapi/c/dev/ppb_video_decoder_dev.h" -#include "third_party/ppapi/c/dev/ppb_widget_dev.h" -#include "third_party/ppapi/c/dev/ppb_zoom_dev.h" -#include "third_party/ppapi/c/trusted/ppb_image_data_trusted.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/pp_resource.h" -#include "third_party/ppapi/c/pp_var.h" -#include "third_party/ppapi/c/ppb_core.h" -#include "third_party/ppapi/c/ppb_graphics_2d.h" -#include "third_party/ppapi/c/ppb_image_data.h" -#include "third_party/ppapi/c/ppb_instance.h" -#include "third_party/ppapi/c/ppb_var.h" -#include "third_party/ppapi/c/ppp.h" -#include "third_party/ppapi/c/ppp_instance.h" +#include "ppapi/c/dev/ppb_buffer_dev.h" +#include "ppapi/c/dev/ppb_char_set_dev.h" +#include "ppapi/c/dev/ppb_cursor_control_dev.h" +#include "ppapi/c/dev/ppb_directory_reader_dev.h" +#include "ppapi/c/dev/ppb_file_io_dev.h" +#include "ppapi/c/dev/ppb_file_io_trusted_dev.h" +#include "ppapi/c/dev/ppb_file_system_dev.h" +#include "ppapi/c/dev/ppb_find_dev.h" +#include "ppapi/c/dev/ppb_font_dev.h" +#include "ppapi/c/dev/ppb_fullscreen_dev.h" +#include "ppapi/c/dev/ppb_graphics_3d_dev.h" +#include "ppapi/c/dev/ppb_opengles_dev.h" +#include "ppapi/c/dev/ppb_scrollbar_dev.h" +#include "ppapi/c/dev/ppb_testing_dev.h" +#include "ppapi/c/dev/ppb_transport_dev.h" +#include "ppapi/c/dev/ppb_url_loader_dev.h" +#include "ppapi/c/dev/ppb_url_loader_trusted_dev.h" +#include "ppapi/c/dev/ppb_url_request_info_dev.h" +#include "ppapi/c/dev/ppb_url_response_info_dev.h" +#include "ppapi/c/dev/ppb_url_util_dev.h" +#include "ppapi/c/dev/ppb_var_deprecated.h" +#include "ppapi/c/dev/ppb_video_decoder_dev.h" +#include "ppapi/c/dev/ppb_widget_dev.h" +#include "ppapi/c/dev/ppb_zoom_dev.h" +#include "ppapi/c/trusted/ppb_image_data_trusted.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_resource.h" +#include "ppapi/c/pp_var.h" +#include "ppapi/c/ppb_core.h" +#include "ppapi/c/ppb_graphics_2d.h" +#include "ppapi/c/ppb_image_data.h" +#include "ppapi/c/ppb_instance.h" +#include "ppapi/c/ppb_var.h" +#include "ppapi/c/ppp.h" +#include "ppapi/c/ppp_instance.h" #include "webkit/glue/plugins/pepper_audio.h" #include "webkit/glue/plugins/pepper_buffer.h" #include "webkit/glue/plugins/pepper_char_set.h" diff --git a/webkit/glue/plugins/pepper_plugin_module.h b/webkit/glue/plugins/pepper_plugin_module.h index 4ac13c3..cf7defb 100644 --- a/webkit/glue/plugins/pepper_plugin_module.h +++ b/webkit/glue/plugins/pepper_plugin_module.h @@ -12,8 +12,8 @@ #include "base/native_library.h" #include "base/ref_counted.h" #include "base/weak_ptr.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/ppb.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/ppb.h" class FilePath; typedef struct NPObject NPObject; diff --git a/webkit/glue/plugins/pepper_plugin_object.cc b/webkit/glue/plugins/pepper_plugin_object.cc index b655f83..c9e04ff 100644 --- a/webkit/glue/plugins/pepper_plugin_object.cc +++ b/webkit/glue/plugins/pepper_plugin_object.cc @@ -10,9 +10,9 @@ #include "base/string_util.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" -#include "third_party/ppapi/c/dev/ppb_var_deprecated.h" -#include "third_party/ppapi/c/dev/ppp_class_deprecated.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/dev/ppb_var_deprecated.h" +#include "ppapi/c/dev/ppp_class_deprecated.h" +#include "ppapi/c/pp_var.h" #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/pepper_plugin_module.h" #include "webkit/glue/plugins/pepper_string.h" diff --git a/webkit/glue/plugins/pepper_private.cc b/webkit/glue/plugins/pepper_private.cc index dd77abd..bd1c77b 100644 --- a/webkit/glue/plugins/pepper_private.cc +++ b/webkit/glue/plugins/pepper_private.cc @@ -14,7 +14,7 @@ #include "grit/webkit_resources.h" #include "grit/webkit_strings.h" #include "skia/ext/platform_canvas.h" -#include "third_party/ppapi/c/pp_resource.h" +#include "ppapi/c/pp_resource.h" #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/plugins/pepper_image_data.h" diff --git a/webkit/glue/plugins/pepper_private2.cc b/webkit/glue/plugins/pepper_private2.cc index e0a7a4a..8492b65 100644 --- a/webkit/glue/plugins/pepper_private2.cc +++ b/webkit/glue/plugins/pepper_private2.cc @@ -10,8 +10,8 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "third_party/ppapi/c/dev/pp_file_info_dev.h" -#include "third_party/ppapi/c/dev/ppb_file_io_dev.h" +#include "ppapi/c/dev/pp_file_info_dev.h" +#include "ppapi/c/dev/ppb_file_io_dev.h" #include "webkit/glue/plugins/pepper_error_util.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" diff --git a/webkit/glue/plugins/pepper_private2.h b/webkit/glue/plugins/pepper_private2.h index a8a4b6e..64a766f 100644 --- a/webkit/glue/plugins/pepper_private2.h +++ b/webkit/glue/plugins/pepper_private2.h @@ -6,8 +6,8 @@ #define WEBKIT_GLUE_PLUGINS_PEPPER_PRIVATE2_H_ #include "build/build_config.h" -#include "third_party/ppapi/c/pp_point.h" -#include "third_party/ppapi/c/pp_rect.h" +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_rect.h" #include "webkit/glue/plugins/pepper_resource.h" struct PP_FontDescription_Dev; diff --git a/webkit/glue/plugins/pepper_private2_linux.cc b/webkit/glue/plugins/pepper_private2_linux.cc index 4beb6b6..ed2c04a 100644 --- a/webkit/glue/plugins/pepper_private2_linux.cc +++ b/webkit/glue/plugins/pepper_private2_linux.cc @@ -5,9 +5,9 @@ #include "webkit/glue/plugins/pepper_private2.h" #include "skia/ext/platform_canvas.h" -#include "third_party/ppapi/c/pp_point.h" -#include "third_party/ppapi/c/pp_rect.h" -#include "third_party/ppapi/c/dev/ppb_font_dev.h" +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_rect.h" +#include "ppapi/c/dev/ppb_font_dev.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkMatrix.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/webkit/glue/plugins/pepper_resource.h b/webkit/glue/plugins/pepper_resource.h index 32dbf0b..3ba2eb8 100644 --- a/webkit/glue/plugins/pepper_resource.h +++ b/webkit/glue/plugins/pepper_resource.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "third_party/ppapi/c/pp_resource.h" +#include "ppapi/c/pp_resource.h" #include "webkit/glue/plugins/pepper_resource_tracker.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_resource_tracker.cc b/webkit/glue/plugins/pepper_resource_tracker.cc index 2e18cd8..90a5ece 100644 --- a/webkit/glue/plugins/pepper_resource_tracker.cc +++ b/webkit/glue/plugins/pepper_resource_tracker.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/rand_util.h" -#include "third_party/ppapi/c/pp_resource.h" +#include "ppapi/c/pp_resource.h" #include "webkit/glue/plugins/pepper_resource.h" namespace pepper { diff --git a/webkit/glue/plugins/pepper_resource_tracker.h b/webkit/glue/plugins/pepper_resource_tracker.h index 5c27ebd..553132c 100644 --- a/webkit/glue/plugins/pepper_resource_tracker.h +++ b/webkit/glue/plugins/pepper_resource_tracker.h @@ -12,9 +12,9 @@ #include "base/hash_tables.h" #include "base/ref_counted.h" #include "base/singleton.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/pp_resource.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_resource.h" typedef struct NPObject NPObject; diff --git a/webkit/glue/plugins/pepper_scrollbar.cc b/webkit/glue/plugins/pepper_scrollbar.cc index 88a3f9b..624f114 100644 --- a/webkit/glue/plugins/pepper_scrollbar.cc +++ b/webkit/glue/plugins/pepper_scrollbar.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/message_loop.h" +#include "ppapi/c/dev/ppp_scrollbar_dev.h" #include "skia/ext/platform_canvas.h" -#include "third_party/ppapi/c/dev/ppp_scrollbar_dev.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebScrollbar.h" diff --git a/webkit/glue/plugins/pepper_scrollbar.h b/webkit/glue/plugins/pepper_scrollbar.h index e8ac480..c444bb3 100644 --- a/webkit/glue/plugins/pepper_scrollbar.h +++ b/webkit/glue/plugins/pepper_scrollbar.h @@ -8,7 +8,7 @@ #include <vector> #include "gfx/rect.h" -#include "third_party/ppapi/c/dev/ppb_scrollbar_dev.h" +#include "ppapi/c/dev/ppb_scrollbar_dev.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebScrollbarClient.h" #include "webkit/glue/plugins/pepper_widget.h" diff --git a/webkit/glue/plugins/pepper_transport.cc b/webkit/glue/plugins/pepper_transport.cc index ed5e05f..3e60a2c 100644 --- a/webkit/glue/plugins/pepper_transport.cc +++ b/webkit/glue/plugins/pepper_transport.cc @@ -6,7 +6,7 @@ #include "base/singleton.h" #include "base/thread_local.h" -#include "third_party/ppapi/c/dev/ppb_transport_dev.h" +#include "ppapi/c/dev/ppb_transport_dev.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_plugin_module.h" diff --git a/webkit/glue/plugins/pepper_transport.h b/webkit/glue/plugins/pepper_transport.h index 1e6e56f..fbba691 100644 --- a/webkit/glue/plugins/pepper_transport.h +++ b/webkit/glue/plugins/pepper_transport.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_PLUGINS_PEPPER_TRANSPORT_H_ #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/pp_instance.h" +#include "ppapi/c/pp_instance.h" #include "webkit/glue/plugins/pepper_plugin_delegate.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_url_loader.cc b/webkit/glue/plugins/pepper_url_loader.cc index e75e8a0..37059d0 100644 --- a/webkit/glue/plugins/pepper_url_loader.cc +++ b/webkit/glue/plugins/pepper_url_loader.cc @@ -5,10 +5,10 @@ #include "webkit/glue/plugins/pepper_url_loader.h" #include "base/logging.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/pp_errors.h" -#include "third_party/ppapi/c/dev/ppb_url_loader_dev.h" -#include "third_party/ppapi/c/dev/ppb_url_loader_trusted_dev.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/dev/ppb_url_loader_dev.h" +#include "ppapi/c/dev/ppb_url_loader_trusted_dev.h" #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" diff --git a/webkit/glue/plugins/pepper_url_loader.h b/webkit/glue/plugins/pepper_url_loader.h index e613475..2b4ebd4 100644 --- a/webkit/glue/plugins/pepper_url_loader.h +++ b/webkit/glue/plugins/pepper_url_loader.h @@ -8,7 +8,7 @@ #include <deque> #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_completion_callback.h" #include "third_party/WebKit/WebKit/chromium/public/WebURLLoader.h" #include "third_party/WebKit/WebKit/chromium/public/WebURLLoaderClient.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_url_request_info.cc b/webkit/glue/plugins/pepper_url_request_info.cc index dd8f7a6..5ffdc67 100644 --- a/webkit/glue/plugins/pepper_url_request_info.cc +++ b/webkit/glue/plugins/pepper_url_request_info.cc @@ -8,7 +8,7 @@ #include "base/string_util.h" #include "googleurl/src/gurl.h" #include "net/http/http_util.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/pp_var.h" #include "third_party/WebKit/WebKit/chromium/public/WebData.h" #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" diff --git a/webkit/glue/plugins/pepper_url_request_info.h b/webkit/glue/plugins/pepper_url_request_info.h index 2d394d5..1effa1f 100644 --- a/webkit/glue/plugins/pepper_url_request_info.h +++ b/webkit/glue/plugins/pepper_url_request_info.h @@ -9,7 +9,7 @@ #include <vector> #include "base/ref_counted.h" -#include "third_party/ppapi/c/dev/ppb_url_request_info_dev.h" +#include "ppapi/c/dev/ppb_url_request_info_dev.h" #include "webkit/glue/plugins/pepper_file_ref.h" #include "webkit/glue/plugins/pepper_resource.h" diff --git a/webkit/glue/plugins/pepper_url_response_info.cc b/webkit/glue/plugins/pepper_url_response_info.cc index 8af3385..bcb54ef 100644 --- a/webkit/glue/plugins/pepper_url_response_info.cc +++ b/webkit/glue/plugins/pepper_url_response_info.cc @@ -5,7 +5,7 @@ #include "webkit/glue/plugins/pepper_url_response_info.h" #include "base/logging.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/pp_var.h" #include "third_party/WebKit/WebKit/chromium/public/WebHTTPHeaderVisitor.h" #include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" diff --git a/webkit/glue/plugins/pepper_url_response_info.h b/webkit/glue/plugins/pepper_url_response_info.h index d8e1321..b73ec67 100644 --- a/webkit/glue/plugins/pepper_url_response_info.h +++ b/webkit/glue/plugins/pepper_url_response_info.h @@ -7,7 +7,7 @@ #include <string> -#include "third_party/ppapi/c/dev/ppb_url_response_info_dev.h" +#include "ppapi/c/dev/ppb_url_response_info_dev.h" #include "webkit/glue/plugins/pepper_resource.h" namespace WebKit { diff --git a/webkit/glue/plugins/pepper_url_util.cc b/webkit/glue/plugins/pepper_url_util.cc index a182b92..c6ea5f8 100644 --- a/webkit/glue/plugins/pepper_url_util.cc +++ b/webkit/glue/plugins/pepper_url_util.cc @@ -5,7 +5,7 @@ #include "webkit/glue/plugins/pepper_url_util.h" #include "googleurl/src/gurl.h" -#include "third_party/ppapi/c/dev/ppb_url_util_dev.h" +#include "ppapi/c/dev/ppb_url_util_dev.h" #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/WebKit/chromium/public/WebElement.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" diff --git a/webkit/glue/plugins/pepper_var.cc b/webkit/glue/plugins/pepper_var.cc index b9d019d..9a1f6cb 100644 --- a/webkit/glue/plugins/pepper_var.cc +++ b/webkit/glue/plugins/pepper_var.cc @@ -9,9 +9,9 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "third_party/ppapi/c/dev/ppb_var_deprecated.h" -#include "third_party/ppapi/c/ppb_var.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/dev/ppb_var_deprecated.h" +#include "ppapi/c/ppb_var.h" +#include "ppapi/c/pp_var.h" #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_plugin_module.h" diff --git a/webkit/glue/plugins/pepper_video_decoder.cc b/webkit/glue/plugins/pepper_video_decoder.cc index 3ca0ab2..b0c1135 100644 --- a/webkit/glue/plugins/pepper_video_decoder.cc +++ b/webkit/glue/plugins/pepper_video_decoder.cc @@ -5,10 +5,10 @@ #include "webkit/glue/plugins/pepper_video_decoder.h" #include "base/logging.h" -#include "third_party/ppapi/c/dev/pp_video_dev.h" -#include "third_party/ppapi/c/dev/ppb_video_decoder_dev.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/dev/pp_video_dev.h" +#include "ppapi/c/dev/ppb_video_decoder_dev.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_file_ref.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_resource_tracker.h" diff --git a/webkit/glue/plugins/pepper_webplugin_impl.cc b/webkit/glue/plugins/pepper_webplugin_impl.cc index 2e8eb3f..0fa6cdb 100644 --- a/webkit/glue/plugins/pepper_webplugin_impl.cc +++ b/webkit/glue/plugins/pepper_webplugin_impl.cc @@ -7,7 +7,7 @@ #include <cmath> #include "base/message_loop.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/pp_var.h" #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h" #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" diff --git a/webkit/glue/plugins/pepper_widget.cc b/webkit/glue/plugins/pepper_widget.cc index 7002576..2418220 100644 --- a/webkit/glue/plugins/pepper_widget.cc +++ b/webkit/glue/plugins/pepper_widget.cc @@ -5,10 +5,10 @@ #include "webkit/glue/plugins/pepper_widget.h" #include "base/logging.h" -#include "third_party/ppapi/c/dev/ppb_widget_dev.h" -#include "third_party/ppapi/c/dev/ppp_widget_dev.h" -#include "third_party/ppapi/c/pp_completion_callback.h" -#include "third_party/ppapi/c/pp_errors.h" +#include "ppapi/c/dev/ppb_widget_dev.h" +#include "ppapi/c/dev/ppp_widget_dev.h" +#include "ppapi/c/pp_completion_callback.h" +#include "ppapi/c/pp_errors.h" #include "webkit/glue/plugins/pepper_image_data.h" #include "webkit/glue/plugins/pepper_plugin_instance.h" #include "webkit/glue/plugins/pepper_plugin_module.h" diff --git a/webkit/glue/plugins/pepper_widget.h b/webkit/glue/plugins/pepper_widget.h index 47826e3..cf937bd 100644 --- a/webkit/glue/plugins/pepper_widget.h +++ b/webkit/glue/plugins/pepper_widget.h @@ -6,7 +6,7 @@ #define WEBKIT_GLUE_PLUGINS_PEPPER_WIDGET_H_ #include "base/scoped_ptr.h" -#include "third_party/ppapi/c/pp_rect.h" +#include "ppapi/c/pp_rect.h" #include "webkit/glue/plugins/pepper_resource.h" struct PPB_Widget_Dev; diff --git a/webkit/glue/plugins/ppb_private.h b/webkit/glue/plugins/ppb_private.h index b922bd5d..0f2c448 100644 --- a/webkit/glue/plugins/ppb_private.h +++ b/webkit/glue/plugins/ppb_private.h @@ -5,11 +5,11 @@ #ifndef WEBKIT_GLUE_PLUGINS_PPB_PRIVATE_H_ #define WEBKIT_GLUE_PLUGINS_PPB_PRIVATE_H_ -#include "third_party/ppapi/c/dev/ppb_font_dev.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/pp_resource.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/dev/ppb_font_dev.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_resource.h" +#include "ppapi/c/pp_var.h" #define PPB_PRIVATE_INTERFACE "PPB_Private;1" diff --git a/webkit/glue/plugins/ppb_private2.h b/webkit/glue/plugins/ppb_private2.h index de9ef79..acf7831 100644 --- a/webkit/glue/plugins/ppb_private2.h +++ b/webkit/glue/plugins/ppb_private2.h @@ -9,13 +9,13 @@ #include <windows.h> #endif -#include "third_party/ppapi/c/pp_errors.h" -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_module.h" -#include "third_party/ppapi/c/pp_point.h" -#include "third_party/ppapi/c/pp_rect.h" -#include "third_party/ppapi/c/pp_resource.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/pp_errors.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_rect.h" +#include "ppapi/c/pp_resource.h" +#include "ppapi/c/pp_var.h" #define PPB_PRIVATE2_INTERFACE "PPB_Private2;4" diff --git a/webkit/glue/plugins/ppp_private.h b/webkit/glue/plugins/ppp_private.h index 4bc3812..7f5921e 100644 --- a/webkit/glue/plugins/ppp_private.h +++ b/webkit/glue/plugins/ppp_private.h @@ -5,9 +5,9 @@ #ifndef WEBKIT_GLUE_PLUGINS_PPP_PRIVATE_H_ #define WEBKIT_GLUE_PLUGINS_PPP_PRIVATE_H_ -#include "third_party/ppapi/c/pp_instance.h" -#include "third_party/ppapi/c/pp_point.h" -#include "third_party/ppapi/c/pp_var.h" +#include "ppapi/c/pp_instance.h" +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_var.h" #define PPP_PRIVATE_INTERFACE "PPP_Private;1" diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 01731d3..9965c41 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -152,7 +152,7 @@ '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', - '<(DEPTH)/third_party/ppapi/ppapi.gyp:ppapi_c', + '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', 'webkit_resources', 'webkit_strings', 'webkit_user_agent', |