diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 04:27:31 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-04 04:27:31 +0000 |
commit | 83c63468031ed3bd321904c57781904e5f22132b (patch) | |
tree | d6d240ab634fcc2b0927fbc0a0bb3d2498f38cb8 /ppapi/examples | |
parent | 60398ccd46e3f31d5d4541c0b6de0edde7f98504 (diff) | |
download | chromium_src-83c63468031ed3bd321904c57781904e5f22132b.zip chromium_src-83c63468031ed3bd321904c57781904e5f22132b.tar.gz chromium_src-83c63468031ed3bd321904c57781904e5f22132b.tar.bz2 |
Move paint aggregator and the completion callback factory.
Move paint aggregator and the completion callback factory to the ppapi/helpers directory since they're not strictly wrappers.
Review URL: http://codereview.chromium.org/9030001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/examples')
-rw-r--r-- | ppapi/examples/2d/paint_manager_example.cc | 2 | ||||
-rw-r--r-- | ppapi/examples/2d/scroll.cc | 4 | ||||
-rw-r--r-- | ppapi/examples/audio_input/audio_input.cc | 2 | ||||
-rw-r--r-- | ppapi/examples/file_chooser/file_chooser.cc | 1 | ||||
-rw-r--r-- | ppapi/examples/gles2/gles2.cc | 1 | ||||
-rw-r--r-- | ppapi/examples/mouse_lock/mouse_lock.cc | 2 | ||||
-rw-r--r-- | ppapi/examples/url_loader/streaming.cc | 2 | ||||
-rw-r--r-- | ppapi/examples/video_capture/video_capture.cc | 1 |
8 files changed, 9 insertions, 6 deletions
diff --git a/ppapi/examples/2d/paint_manager_example.cc b/ppapi/examples/2d/paint_manager_example.cc index fdf5a8b..d3530cb 100644 --- a/ppapi/examples/2d/paint_manager_example.cc +++ b/ppapi/examples/2d/paint_manager_example.cc @@ -8,8 +8,8 @@ #include "ppapi/cpp/input_event.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" -#include "ppapi/cpp/paint_manager.h" #include "ppapi/cpp/size.h" +#include "ppapi/utility/graphics/paint_manager.h" // Number of pixels to each side of the center of the square that we draw. static const int kSquareRadius = 2; diff --git a/ppapi/examples/2d/scroll.cc b/ppapi/examples/2d/scroll.cc index f8c365a..5dffa57 100644 --- a/ppapi/examples/2d/scroll.cc +++ b/ppapi/examples/2d/scroll.cc @@ -4,14 +4,14 @@ #include <math.h> -#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" -#include "ppapi/cpp/paint_manager.h" #include "ppapi/cpp/rect.h" #include "ppapi/cpp/var.h" +#include "ppapi/utility/completion_callback_factory.h" +#include "ppapi/utility/graphics/paint_manager.h" static const int kSquareSpacing = 98; static const int kSquareSize = 5; diff --git a/ppapi/examples/audio_input/audio_input.cc b/ppapi/examples/audio_input/audio_input.cc index 13b1237..74bc08e 100644 --- a/ppapi/examples/audio_input/audio_input.cc +++ b/ppapi/examples/audio_input/audio_input.cc @@ -8,7 +8,6 @@ #include <limits> #include "ppapi/cpp/audio_config.h" -#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/dev/audio_input_dev.h" #include "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/image_data.h" @@ -17,6 +16,7 @@ #include "ppapi/cpp/module.h" #include "ppapi/cpp/rect.h" #include "ppapi/cpp/size.h" +#include "ppapi/utility/completion_callback_factory.h" class MyInstance : public pp::Instance { public: diff --git a/ppapi/examples/file_chooser/file_chooser.cc b/ppapi/examples/file_chooser/file_chooser.cc index 8c2e675..136ff31 100644 --- a/ppapi/examples/file_chooser/file_chooser.cc +++ b/ppapi/examples/file_chooser/file_chooser.cc @@ -11,6 +11,7 @@ #include "ppapi/cpp/module.h" #include "ppapi/cpp/private/instance_private.h" #include "ppapi/cpp/private/var_private.h" +#include "ppapi/utility/completion_callback_factory.h" class MyInstance : public pp::InstancePrivate { public: diff --git a/ppapi/examples/gles2/gles2.cc b/ppapi/examples/gles2/gles2.cc index 220a6f4..0de2eda 100644 --- a/ppapi/examples/gles2/gles2.cc +++ b/ppapi/examples/gles2/gles2.cc @@ -24,6 +24,7 @@ #include "ppapi/cpp/var.h" #include "ppapi/examples/gles2/testdata.h" #include "ppapi/lib/gl/include/GLES2/gl2.h" +#include "ppapi/utility/completion_callback_factory.h" // Use assert as a poor-man's CHECK, even in non-debug mode. // Since <assert.h> redefines assert on every inclusion (it doesn't use diff --git a/ppapi/examples/mouse_lock/mouse_lock.cc b/ppapi/examples/mouse_lock/mouse_lock.cc index 68aa4ac..6a934ba 100644 --- a/ppapi/examples/mouse_lock/mouse_lock.cc +++ b/ppapi/examples/mouse_lock/mouse_lock.cc @@ -8,7 +8,6 @@ #include "ppapi/c/dev/ppb_console_dev.h" #include "ppapi/c/ppb_input_event.h" -#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/graphics_2d.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/input_event.h" @@ -18,6 +17,7 @@ #include "ppapi/cpp/mouse_lock.h" #include "ppapi/cpp/rect.h" #include "ppapi/cpp/var.h" +#include "ppapi/utility/completion_callback_factory.h" class MyInstance : public pp::Instance, public pp::MouseLock { public: diff --git a/ppapi/examples/url_loader/streaming.cc b/ppapi/examples/url_loader/streaming.cc index b6df6cb..b7186ae 100644 --- a/ppapi/examples/url_loader/streaming.cc +++ b/ppapi/examples/url_loader/streaming.cc @@ -11,12 +11,12 @@ // URLLoader.FinishSthreamingToFile once the "Open" callback is complete, and // then call URLResponseInfo.GetBodyAsFileRef once the file stream is complete. -#include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h" #include "ppapi/cpp/url_loader.h" #include "ppapi/cpp/url_request_info.h" #include "ppapi/cpp/url_response_info.h" +#include "ppapi/utility/completion_callback_factory.h" // Buffer size for reading network data. const int kBufSize = 1024; diff --git a/ppapi/examples/video_capture/video_capture.cc b/ppapi/examples/video_capture/video_capture.cc index 5d474bd..63e2cb8 100644 --- a/ppapi/examples/video_capture/video_capture.cc +++ b/ppapi/examples/video_capture/video_capture.cc @@ -20,6 +20,7 @@ #include "ppapi/cpp/module.h" #include "ppapi/cpp/rect.h" #include "ppapi/lib/gl/include/GLES2/gl2.h" +#include "ppapi/utility/completion_callback_factory.h" // Assert |context_| isn't holding any GL Errors. Done as a macro instead of a // function to preserve line number information in the failure message. |