diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 15:16:05 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 15:16:05 +0000 |
commit | 707f16c93256191e15c451fdde7b42ea1514a9dd (patch) | |
tree | be4fd0e1bd10bf02221b98432b23f3b4376389e6 /webkit/plugins | |
parent | 2b7b8932211f5d037598df42e19aceab3b002a94 (diff) | |
download | chromium_src-707f16c93256191e15c451fdde7b42ea1514a9dd.zip chromium_src-707f16c93256191e15c451fdde7b42ea1514a9dd.tar.gz chromium_src-707f16c93256191e15c451fdde7b42ea1514a9dd.tar.bz2 |
Remove message_loop_helpers.h and update the includes to point to the new location.
Note: This was a TODO for akalin@.
This patch was generated by:
$ find . -name '*.h' -o -name '*.cc' -o -name '*.mm' | xargs sed -i -e "s/base\/message_loop_helpers.h/base\/sequenced_task_runner_helpers.h/g"
R=akalin@chromium.org
TBR=willchan@chromium.org,ben@chromium.org,jam@chromium.org,tony@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10578026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
-rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl.h | 4 | ||||
-rw-r--r-- | webkit/plugins/ppapi/gfx_conversion.h | 96 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppapi_webplugin_impl.h | 2 | ||||
-rw-r--r-- | webkit/plugins/webview_plugin.h | 6 |
4 files changed, 54 insertions, 54 deletions
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index 2e5e333..c916775 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -10,15 +10,15 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "base/time.h" #include "base/timer.h" #include "build/build_config.h" #include "third_party/npapi/bindings/npapi.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" -#include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/glue/webcursor.h" +#include "webkit/plugins/npapi/webplugin_delegate.h" #include "webkit/plugins/webkit_plugins_export.h" #if defined(OS_WIN) && !defined(USE_AURA) diff --git a/webkit/plugins/ppapi/gfx_conversion.h b/webkit/plugins/ppapi/gfx_conversion.h index ad4006b..80df6f5 100644 --- a/webkit/plugins/ppapi/gfx_conversion.h +++ b/webkit/plugins/ppapi/gfx_conversion.h @@ -1,48 +1,48 @@ -// 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.
-
-#ifndef WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_
-#define WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_
-
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_size.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
-
-// Conversions for graphics types between our gfx library and PPAPI.
-// The style of naming is to match the PP_Bool conversions.
-
-namespace webkit {
-namespace ppapi {
-
-inline gfx::Point PP_ToGfxPoint(const PP_Point& p) {
- return gfx::Point(p.x, p.y);
-}
-
-inline PP_Point PP_FromGfxPoint(const gfx::Point& p) {
- return PP_MakePoint(p.x(), p.y());
-}
-
-inline gfx::Rect PP_ToGfxRect(const PP_Rect& r) {
- return gfx::Rect(r.point.x, r.point.y, r.size.width, r.size.height);
-}
-
-inline PP_Rect PP_FromGfxRect(const gfx::Rect& r) {
- return PP_MakeRectFromXYWH(r.x(), r.y(), r.width(), r.height());
-}
-
-inline gfx::Size PP_ToGfxSize(const PP_Size& s) {
- return gfx::Size(s.width, s.height);
-}
-
-inline PP_Size PP_FromGfxSize(const gfx::Size& s) {
- return PP_MakeSize(s.width(), s.height());
-}
-
-} // namespace ppapi
-} // namespace webkit
-
-#endif // WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_
+// 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. + +#ifndef WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_ +#define WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_ + +#include "ppapi/c/pp_point.h" +#include "ppapi/c/pp_rect.h" +#include "ppapi/c/pp_size.h" +#include "ui/gfx/point.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" + +// Conversions for graphics types between our gfx library and PPAPI. +// The style of naming is to match the PP_Bool conversions. + +namespace webkit { +namespace ppapi { + +inline gfx::Point PP_ToGfxPoint(const PP_Point& p) { + return gfx::Point(p.x, p.y); +} + +inline PP_Point PP_FromGfxPoint(const gfx::Point& p) { + return PP_MakePoint(p.x(), p.y()); +} + +inline gfx::Rect PP_ToGfxRect(const PP_Rect& r) { + return gfx::Rect(r.point.x, r.point.y, r.size.width, r.size.height); +} + +inline PP_Rect PP_FromGfxRect(const gfx::Rect& r) { + return PP_MakeRectFromXYWH(r.x(), r.y(), r.width(), r.height()); +} + +inline gfx::Size PP_ToGfxSize(const PP_Size& s) { + return gfx::Size(s.width, s.height); +} + +inline PP_Size PP_FromGfxSize(const gfx::Size& s) { + return PP_MakeSize(s.width(), s.height()); +} + +} // namespace ppapi +} // namespace webkit + +#endif // WEBKIT_PLUGINS_PPAPI_GFX_CONVERSION_H_ diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h index 502a3c0..0ea0080 100644 --- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h +++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" #include "ppapi/c/pp_var.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" #include "ui/gfx/rect.h" diff --git a/webkit/plugins/webview_plugin.h b/webkit/plugins/webview_plugin.h index 14ab44e..6377eb0 100644 --- a/webkit/plugins/webview_plugin.h +++ b/webkit/plugins/webview_plugin.h @@ -8,12 +8,12 @@ #include <list> #include "base/memory/scoped_ptr.h" -#include "base/message_loop_helpers.h" +#include "base/sequenced_task_runner_helpers.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h" #include "webkit/plugins/webkit_plugins_export.h" |