Index: content/renderer/pepper/pepper_plugin_instance_impl.cc |
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
index ff753fe7806b30e0b16cfff3492d62c68cbfbf0b..cf85a1eafab3bcd6a4e4bd48035b0f4fa0628847 100644 |
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc |
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc |
@@ -109,6 +109,7 @@ |
#include "third_party/WebKit/public/web/WebSecurityOrigin.h" |
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h" |
#include "third_party/WebKit/public/web/WebView.h" |
+#include "third_party/khronos/GLES2/gl2.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "third_party/skia/include/core/SkRect.h" |
#include "ui/gfx/image/image_skia.h" |
@@ -1859,7 +1860,7 @@ bool PepperPluginInstanceImpl::PrintPDFOutput(PP_Resource print_output, |
#endif |
} |
-static void IgnoreCallback(unsigned, bool) {} |
+static void IgnoreCallback(uint32, bool) {} |
void PepperPluginInstanceImpl::UpdateLayer() { |
if (!container_) |
@@ -1897,7 +1898,7 @@ void PepperPluginInstanceImpl::UpdateLayer() { |
texture_layer_ = cc::TextureLayer::CreateForMailbox(NULL); |
opaque = bound_graphics_3d_->IsOpaque(); |
texture_layer_->SetTextureMailbox( |
- cc::TextureMailbox(mailbox, 0), |
+ cc::TextureMailbox(mailbox, GL_TEXTURE_2D, 0), |
cc::SingleReleaseCallback::Create(base::Bind(&IgnoreCallback))); |
plugin_layer = texture_layer_; |
} else { |