Revert PPAPI change due to Linux compile failures.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64751 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Nov 2, 2010 · 572b77f · 572b77f
1 parent 27c6115
commit 572b77f
Show file tree

Hide file tree

Showing 85 changed files with 226 additions and 221 deletions.
diff --git a/DEPS b/DEPS
@@ -174,6 +174,9 @@ 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
@@ -20,7 +20,6 @@
         '../jingle/jingle.gyp:*',
         '../media/media.gyp:*',
         '../net/net.gyp:*',
-        '../ppapi/ppapi.gyp:*',
         '../printing/printing.gyp:*',
         '../sdch/sdch.gyp:*',
         '../skia/skia.gyp:*',
@@ -41,6 +40,7 @@
         '../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
@@ -1621,7 +1621,6 @@
             '../ipc/ipc.gyp:*',
             '../media/media.gyp:*',
             '../net/net.gyp:*',
-            '../ppapi/ppapi.gyp:*',
             '../printing/printing.gyp:*',
             '../sdch/sdch.gyp:*',
             '../skia/skia.gyp:*',
@@ -1639,6 +1638,7 @@
             '../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
@@ -458,7 +458,7 @@
         # run time dependencies
         'chrome_mesa',
         'default_plugin/default_plugin.gyp:default_plugin',
-        '../ppapi/ppapi.gyp:ppapi_tests',
+        '../third_party/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
@@ -7,7 +7,6 @@ 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
@@ -25,7 +25,7 @@
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "grit/locale_settings.h"
-#include "ppapi/c/dev/pp_video_dev.h"
+#include "third_party/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
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/weak_ptr.h"
-#include "ppapi/c/pp_errors.h"
+#include "third_party/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
@@ -57,6 +57,7 @@ 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
@@ -127,12 +127,12 @@
       'type': 'static_library',
       'dependencies': [
         'gpu_demo_framework',
-        '../../ppapi/ppapi.gyp:ppapi_cpp',
-        '../../ppapi/ppapi.gyp:ppapi_cpp_objects'
+        '../../third_party/ppapi/ppapi.gyp:ppapi_cpp',
+        '../../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects'
       ],
       'include_dirs': [
         '../..',
-        '../../ppapi',
+        '../../third_party/ppapi',
         '../../third_party/gles2_book/Common/Include',
       ],
       'sources': [
@@ -148,7 +148,7 @@
         'include_dirs': [
           '../../third_party',
           '../../third_party/gles2_book/Common/Include',
-          '../../ppapi',
+          '../../third_party/ppapi',
           '../..'
         ],
         'run_as': {

diff --git a/ppapi/codereview.settings b/ppapi/codereview.settings
@@ -0,0 +1,5 @@
+# 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
@@ -30,10 +30,7 @@
       'type': 'none',
       'all_dependent_settings': {
         'include_dirs': [
-           # HOLEY (*#@$@ing #&$^@*&$^. ChromeOS depends on having
-           # "third_party" in the include path which the old version of this
-           # project did. This is a temporary hack to keep the build going.
-           '../third_party',
+           '..',
         ],
       },
       'sources': [

diff --git a/remoting/DEPS b/remoting/DEPS
@@ -5,7 +5,6 @@ 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
@@ -10,9 +10,6 @@
 #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"
@@ -23,6 +20,9 @@
 #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
@@ -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
@@ -4,10 +4,11 @@
 
 #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
@@ -41,8 +41,8 @@
 #include <string>
 #include <vector>
 
-#include "ppapi/cpp/dev/scriptable_object_deprecated.h"
-#include "ppapi/cpp/var.h"
+#include "third_party/ppapi/cpp/dev/scriptable_object_deprecated.h"
+#include "third_party/ppapi/cpp/var.h"
 
 namespace remoting {
 

diff --git 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
@@ -5,8 +5,8 @@
 #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_ENTRYPOINTS_
 #define REMOTING_CLIENT_PLUGIN_PEPPER_ENTRYPOINTS_
 
-#include "ppapi/c/pp_module.h"
-#include "ppapi/c/ppb.h"
+#include "third_party/ppapi/c/pp_module.h"
+#include "third_party/ppapi/c/ppb.h"
 
 namespace remoting {
 

diff --git 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 "ppapi/c/pp_input_event.h"
+#include "third_party/ppapi/c/pp_input_event.h"
 
 namespace remoting {
 

diff --git 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 "ppapi/c/pp_completion_callback.h"
-#include "ppapi/cpp/module.h"
+#include "third_party/ppapi/c/pp_completion_callback.h"
+#include "third_party/ppapi/cpp/module.h"
 
 namespace remoting {
 

diff --git a/remoting/client/plugin/pepper_util.h b/remoting/client/plugin/pepper_util.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 
-#include "ppapi/cpp/completion_callback.h"
+#include "third_party/ppapi/cpp/completion_callback.h"
 
 class Task;
 

diff --git 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
@@ -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
@@ -73,7 +73,7 @@
         'chromoting_base',
         'chromoting_client',
         'chromoting_jingle_glue',
-        '../ppapi/ppapi.gyp:ppapi_cpp_objects',
+        '../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects',
       ],
       'sources': [
         'client/plugin/chromoting_instance.cc',

diff --git 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
@@ -5,8 +5,8 @@
 #include "webkit/glue/plugins/pepper_audio.h"
 
 #include "base/logging.h"
-#include "ppapi/c/dev/ppb_audio_dev.h"
-#include "ppapi/c/dev/ppb_audio_trusted_dev.h"
+#include "third_party/ppapi/c/dev/ppb_audio_dev.h"
+#include "third_party/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
@@ -7,9 +7,9 @@
 #include "base/shared_memory.h"
 #include "base/simple_thread.h"
 #include "base/sync_socket.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 "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 "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
@@ -8,10 +8,10 @@
 
 #include "base/logging.h"
 #include "base/scoped_ptr.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 "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 "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
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 
 #include "base/i18n/icu_string_conversions.h"
-#include "ppapi/c/dev/ppb_char_set_dev.h"
+#include "third_party/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
@@ -6,10 +6,10 @@
 
 #include "base/logging.h"
 #include "base/ref_counted.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 "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 "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
@@ -5,9 +5,9 @@
 #include "webkit/glue/plugins/pepper_directory_reader.h"
 
 #include "base/logging.h"
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/dev/ppb_directory_reader_dev.h"
-#include "ppapi/c/pp_errors.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 "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
@@ -4,7 +4,7 @@
 
 #include "webkit/glue/plugins/pepper_error_util.h"
 
-#include "ppapi/c/pp_errors.h"
+#include "third_party/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
@@ -10,7 +10,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/utf_string_conversion_utils.h"
-#include "ppapi/c/pp_input_event.h"
+#include "third_party/ppapi/c/pp_input_event.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 
 using WebKit::WebInputEvent;