diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 14:04:12 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 14:04:12 +0000 |
| commit | b9b751f2681d39b11a692a655eb16a9e1e4eba97 (patch) | |
| tree | ef152fd04b0a9730f9088aa1b968e6096097127e /content/plugin | |
| parent | 13ffb98bc729794380228ebdc09b18687d2d1d74 (diff) | |
| download | chromium_src-b9b751f2681d39b11a692a655eb16a9e1e4eba97.zip chromium_src-b9b751f2681d39b11a692a655eb16a9e1e4eba97.tar.gz chromium_src-b9b751f2681d39b11a692a655eb16a9e1e4eba97.tar.bz2 | |
Refactor: Move app/surface to ui/gfx/surface.
This is progress towards moving app/gfx/gl to ui/gfx/gl. Currently, surface depends on gl, but gl depends on app_base (which contains surface). This refactor gets rid of this potential cyclic dependency.
surface.gyp is in a separate file (not a .gypi include) because cyclic dependency checking is at the file level (not target level).
BUG=none
TEST=by hand and try bots
Review URL: http://codereview.chromium.org/6718027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/webplugin_accelerated_surface_proxy_mac.cc | 6 | ||||
| -rw-r--r-- | content/plugin/webplugin_proxy.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc index ec4571d..58f27fd 100644 --- a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc +++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -6,9 +6,9 @@ #include "content/plugin/webplugin_accelerated_surface_proxy_mac.h" -#include "app/surface/accelerated_surface_mac.h" -#include "app/surface/transport_dib.h" #include "content/plugin/webplugin_proxy.h" +#include "ui/gfx/surface/accelerated_surface_mac.h" +#include "ui/gfx/surface/transport_dib.h" WebPluginAcceleratedSurfaceProxy::WebPluginAcceleratedSurfaceProxy( WebPluginProxy* plugin_proxy) diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index 8dbfa9e..9f891a2 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -8,10 +8,6 @@ #include <string> -#if defined(USE_X11) -#include "ui/base/x/x11_util.h" -#endif -#include "app/surface/transport_dib.h" #include "base/hash_tables.h" #include "base/ref_counted.h" #if defined(OS_MACOSX) @@ -23,6 +19,10 @@ #include "base/timer.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message.h" +#if defined(USE_X11) +#include "ui/base/x/x11_util.h" +#endif +#include "ui/gfx/surface/transport_dib.h" #include "webkit/plugins/npapi/webplugin.h" class PluginChannel; |