diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-14 23:30:59 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-14 23:30:59 +0000 |
commit | e0fc2f1f81f13440af3bb4cf5e56a031f91fc163 (patch) | |
tree | c84d3625eac633ea78d68688ecd74e2d0a158334 /webkit/glue | |
parent | 98af9aca7168f061bfaae5cd4f4eb3f7de4e70e7 (diff) | |
download | chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.zip chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.tar.gz chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.tar.bz2 |
Move base/gfx contents to gfx/
TBR=darin
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/dom_operations.h | 2 | ||||
-rw-r--r-- | webkit/glue/image_decoder.h | 2 | ||||
-rw-r--r-- | webkit/glue/image_resource_fetcher.cc | 2 | ||||
-rw-r--r-- | webkit/glue/media/video_renderer_impl.h | 10 | ||||
-rw-r--r-- | webkit/glue/plugins/plugin_instance.h | 4 | ||||
-rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl.h | 2 | ||||
-rw-r--r-- | webkit/glue/webcursor.h | 4 | ||||
-rw-r--r-- | webkit/glue/webmediaplayer_impl.h | 4 | ||||
-rw-r--r-- | webkit/glue/webplugin.h | 2 | ||||
-rw-r--r-- | webkit/glue/webplugin_impl.cc | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/webkit/glue/dom_operations.h b/webkit/glue/dom_operations.h index 2156b31..62222c6 100644 --- a/webkit/glue/dom_operations.h +++ b/webkit/glue/dom_operations.h @@ -9,7 +9,7 @@ #include <map> #include <vector> -#include "base/gfx/size.h" +#include "gfx/size.h" #include "googleurl/src/gurl.h" #include "webkit/glue/password_form_dom_manager.h" diff --git a/webkit/glue/image_decoder.h b/webkit/glue/image_decoder.h index b2f9b0d..330ea90 100644 --- a/webkit/glue/image_decoder.h +++ b/webkit/glue/image_decoder.h @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "base/gfx/size.h" +#include "gfx/size.h" class SkBitmap; diff --git a/webkit/glue/image_resource_fetcher.cc b/webkit/glue/image_resource_fetcher.cc index ae16c03..6185834 100644 --- a/webkit/glue/image_resource_fetcher.cc +++ b/webkit/glue/image_resource_fetcher.cc @@ -5,7 +5,7 @@ #include "webkit/glue/image_resource_fetcher.h" #include "base/callback.h" -#include "base/gfx/size.h" +#include "gfx/size.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h" #include "webkit/glue/image_decoder.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h index 4bc7210..b2018e9 100644 --- a/webkit/glue/media/video_renderer_impl.h +++ b/webkit/glue/media/video_renderer_impl.h @@ -1,6 +1,6 @@ -// Copyright (c) 2009 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. +// Copyright (c) 2010 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. // // The video renderer implementation to be use by the media pipeline. It lives // inside video renderer thread and also WebKit's main thread. We need to be @@ -10,8 +10,8 @@ #ifndef WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_ #define WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_ -#include "base/gfx/rect.h" -#include "base/gfx/size.h" +#include "gfx/rect.h" +#include "gfx/size.h" #include "media/base/buffers.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" diff --git a/webkit/glue/plugins/plugin_instance.h b/webkit/glue/plugins/plugin_instance.h index d3f0374..3e689c4 100644 --- a/webkit/glue/plugins/plugin_instance.h +++ b/webkit/glue/plugins/plugin_instance.h @@ -17,10 +17,10 @@ #include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/file_path.h" -#include "base/gfx/point.h" -#include "base/gfx/rect.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" +#include "gfx/point.h" +#include "gfx/rect.h" #include "googleurl/src/gurl.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/nphostapi.h" diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h index 81e6874..e4913f0 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl.h +++ b/webkit/glue/plugins/webplugin_delegate_impl.h @@ -13,10 +13,10 @@ #include "app/gfx/native_widget_types.h" #include "base/file_path.h" -#include "base/gfx/rect.h" #include "base/ref_counted.h" #include "base/task.h" #include "base/timer.h" +#include "gfx/rect.h" #include "third_party/npapi/bindings/npapi.h" #include "webkit/glue/webcursor.h" #include "webkit/glue/webplugin_delegate.h" diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h index e7cc413..293bd74 100644 --- a/webkit/glue/webcursor.h +++ b/webkit/glue/webcursor.h @@ -6,8 +6,8 @@ #define WEBKIT_GLUE_WEBCURSOR_H_ #include "base/basictypes.h" -#include "base/gfx/point.h" -#include "base/gfx/size.h" +#include "gfx/point.h" +#include "gfx/size.h" #include <vector> diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h index 3315119e..3e42793 100644 --- a/webkit/glue/webmediaplayer_impl.h +++ b/webkit/glue/webmediaplayer_impl.h @@ -55,11 +55,11 @@ #include <vector> -#include "base/gfx/rect.h" -#include "base/gfx/size.h" #include "base/lock.h" #include "base/message_loop.h" #include "base/ref_counted.h" +#include "gfx/rect.h" +#include "gfx/size.h" #include "media/base/filters.h" #include "media/base/pipeline_impl.h" #include "skia/ext/platform_canvas.h" diff --git a/webkit/glue/webplugin.h b/webkit/glue/webplugin.h index 3f9c7e5..1bd6c61 100644 --- a/webkit/glue/webplugin.h +++ b/webkit/glue/webplugin.h @@ -10,7 +10,7 @@ #include "app/gfx/native_widget_types.h" #include "base/basictypes.h" -#include "base/gfx/rect.h" +#include "gfx/rect.h" // TODO(port): this typedef is obviously incorrect on non-Windows // platforms, but now a lot of code now accidentally depends on them diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index e797676..34b8261 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/gfx/rect.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "gfx/rect.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "skia/ext/platform_canvas.h" |