diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 00:31:18 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 00:31:18 +0000 |
| commit | 15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b (patch) | |
| tree | a23d185ce3e56305ba9333e2d37a00cf6ca6d48c /content/renderer/pepper/pepper_graphics_2d_host.h | |
| parent | 5a3045130a5152f87f1107402ec20ca707fde7ea (diff) | |
| download | chromium_src-15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b.zip chromium_src-15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b.tar.gz chromium_src-15ba07264a04a6c68a9d36b1f522e1b2dbc1c70b.tar.bz2 | |
Revert 199560 "Move the plugins sources out of the webkit glue t..."
> Move the plugins sources out of the webkit glue target into a new target 'plugins' which creates a static lib/dll
> depending on the component build flag.
>
> This target is specified by the added webkit_plugins.gypi file in the webkit\plugins folder. This is included
> by webkit_support.gyp.
>
> This is continuation of the ongoing work for bug https://code.google.com/p/chromium/issues/detail?can=2&q=237249
> which is splitting chrome.dll into a browser and renderer component due to build issues on Windows.
>
> The motivation for moving the plugins out to an independent target is to enable the chrome browser code to
> link to the plugins lib without depending on glue.
>
> We also have a plugins_common target in webkit_plugins.gypi which builds a static lib and contains common plugin
> functionality like plugin_utils, webplugininfo, etc.
>
> Next step is to move the plugin list sources to this common target as we want to avoid browser depending Webkit
> through plugins. That would need some code change which I wanted to avoid in this CL.
>
> Will also move the common plugin files to the newly added webkit common folder in an upcoming CL.
>
> BUG=237249
> TBR=cpu@chromium.org, darin@chromium.org, jamesr@chromium.org
>
> Review URL: https://codereview.chromium.org/15020011
TBR=ananta@chromium.org
Review URL: https://codereview.chromium.org/14646038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper/pepper_graphics_2d_host.h')
| -rw-r--r-- | content/renderer/pepper/pepper_graphics_2d_host.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.h b/content/renderer/pepper/pepper_graphics_2d_host.h index 369ddd2..30f5f0d 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.h +++ b/content/renderer/pepper/pepper_graphics_2d_host.h @@ -37,8 +37,7 @@ class RendererPpapiHost; class CONTENT_EXPORT PepperGraphics2DHost : public ppapi::host::ResourceHost, - public NON_EXPORTED_BASE( - webkit::ppapi::PluginDelegate::PlatformGraphics2D), + public webkit::ppapi::PluginDelegate::PlatformGraphics2D, public base::SupportsWeakPtr<PepperGraphics2DHost> { public: static PepperGraphics2DHost* Create(RendererPpapiHost* host, |