diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 12:16:34 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 12:16:34 +0000 |
| commit | 9af1a09e3782c31f70b89cc2fdcb2ad7128d6b97 (patch) | |
| tree | d0f18fc31fc4ff29312bad2fe2db83e4b506d2bc /webkit/plugins | |
| parent | 729a1261d350d27e74eab59ef1271c05db28c2c9 (diff) | |
| download | chromium_src-9af1a09e3782c31f70b89cc2fdcb2ad7128d6b97.zip chromium_src-9af1a09e3782c31f70b89cc2fdcb2ad7128d6b97.tar.gz chromium_src-9af1a09e3782c31f70b89cc2fdcb2ad7128d6b97.tar.bz2 | |
Move compositor bindings implementations out of WebKit::, fix style
This moves the implementation of compositor binding classes in webkit/compositor_bindings/
out of namespace WebKit and into namespace webkit. This is important since several of
the chromium clang style plugin checks key off of the namespace to avoid WebKit API
and thus weren't running on these classes.
Also makes these files cpplint.py clean.
R=enne@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12496013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/npapi/webplugin_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc index b3c277e..1b4615b 100644 --- a/webkit/plugins/npapi/webplugin_impl.cc +++ b/webkit/plugins/npapi/webplugin_impl.cc @@ -783,7 +783,7 @@ void WebPluginImpl::AcceleratedPluginSwappedIOSurface() { if (next_io_surface_id_) { if (!io_surface_layer_.get()) { io_surface_layer_ = cc::IOSurfaceLayer::Create(); - web_layer_.reset(new WebKit::WebLayerImpl(io_surface_layer_)); + web_layer_.reset(new webkit::WebLayerImpl(io_surface_layer_)); container_->setWebLayer(web_layer_.get()); } io_surface_layer_->SetIOSurfaceProperties( diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index a333593..efc6d43 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1717,7 +1717,7 @@ void PluginInstance::UpdateLayer() { if (want_layer) { DCHECK(bound_graphics_3d_.get()); texture_layer_ = cc::TextureLayer::Create(this); - web_layer_.reset(new WebKit::WebLayerImpl(texture_layer_)); + web_layer_.reset(new webkit::WebLayerImpl(texture_layer_)); if (fullscreen_container_) fullscreen_container_->SetLayer(web_layer_.get()); else |