| Index: content/renderer/compositor_bindings/web_external_texture_layer_impl.cc
|
| diff --git a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc b/content/renderer/compositor_bindings/web_external_texture_layer_impl.cc
|
| similarity index 85%
|
| rename from webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc
|
| rename to content/renderer/compositor_bindings/web_external_texture_layer_impl.cc
|
| index 320aa2297f2fa7efe653bfcf80ad8978fd9597d0..7b428c9c65d4a0f42bcb2add2affeb859acd4463 100644
|
| --- a/webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc
|
| +++ b/content/renderer/compositor_bindings/web_external_texture_layer_impl.cc
|
| @@ -2,25 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h"
|
| +#include "content/renderer/compositor_bindings/web_external_texture_layer_impl.h"
|
|
|
| #include "cc/layers/texture_layer.h"
|
| #include "cc/resources/resource_update_queue.h"
|
| #include "cc/resources/single_release_callback.h"
|
| #include "cc/resources/texture_mailbox.h"
|
| +#include "content/renderer/compositor_bindings/web_external_bitmap_impl.h"
|
| +#include "content/renderer/compositor_bindings/web_layer_impl.h"
|
| #include "third_party/WebKit/public/platform/WebExternalTextureLayerClient.h"
|
| #include "third_party/WebKit/public/platform/WebExternalTextureMailbox.h"
|
| #include "third_party/WebKit/public/platform/WebFloatRect.h"
|
| #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
|
| #include "third_party/WebKit/public/platform/WebSize.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| -#include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h"
|
| -#include "webkit/renderer/compositor_bindings/web_layer_impl.h"
|
|
|
| using cc::TextureLayer;
|
| using cc::ResourceUpdateQueue;
|
|
|
| -namespace webkit {
|
| +namespace content {
|
|
|
| WebExternalTextureLayerImpl::WebExternalTextureLayerImpl(
|
| blink::WebExternalTextureLayerClient* client)
|
| @@ -35,10 +35,12 @@ WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl() {
|
| static_cast<TextureLayer*>(layer_->layer())->ClearClient();
|
| }
|
|
|
| -blink::WebLayer* WebExternalTextureLayerImpl::layer() { return layer_.get(); }
|
| +blink::WebLayer* WebExternalTextureLayerImpl::layer() {
|
| + return layer_.get();
|
| +}
|
|
|
| void WebExternalTextureLayerImpl::clearTexture() {
|
| - TextureLayer *layer = static_cast<TextureLayer*>(layer_->layer());
|
| + TextureLayer* layer = static_cast<TextureLayer*>(layer_->layer());
|
| layer->ClearTexture();
|
| }
|
|
|
| @@ -85,11 +87,11 @@ bool WebExternalTextureLayerImpl::PrepareTextureMailbox(
|
| mailbox->set_allow_overlay(client_mailbox.allowOverlay);
|
|
|
| if (mailbox->IsValid()) {
|
| - *release_callback = cc::SingleReleaseCallback::Create(base::Bind(
|
| - &WebExternalTextureLayerImpl::DidReleaseMailbox,
|
| - this->AsWeakPtr(),
|
| - client_mailbox,
|
| - bitmap));
|
| + *release_callback = cc::SingleReleaseCallback::Create(
|
| + base::Bind(&WebExternalTextureLayerImpl::DidReleaseMailbox,
|
| + this->AsWeakPtr(),
|
| + client_mailbox,
|
| + bitmap));
|
| }
|
|
|
| return true;
|
| @@ -124,4 +126,5 @@ void WebExternalTextureLayerImpl::DidReleaseMailbox(
|
| layer->client_->mailboxReleased(available_mailbox);
|
| }
|
|
|
| -} // namespace webkit
|
| +} // namespace content
|
| +
|
|
|