Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)

New snapshot with more Windows build fixes

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
index dbb07a004..3e1f58135 100644
--- a/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
@@ -213,7 +213,7 @@ void CCVideoLayerImpl::appendQuads(CCQuadCuller& quadList, const CCSharedQuadSta
         FloatRect uvRect(0, 0, 1, 1);
 #if defined(OS_CHROMEOS) && defined(__ARMEL__)
         bool flipped = true; // Under the covers, implemented by OpenMAX IL.
-#elif defined(OS_WINDOWS)
+#elif OS(WINDOWS)
         bool flipped = true; // Under the covers, implemented by DXVA.
 #else
         bool flipped = false; // LibVA (cros/intel), MacOS.
@@ -288,7 +288,7 @@ bool CCVideoLayerImpl::FramePlane::allocateData(CCGraphicsContext* context)
     if (textureId)
         return true;
 
-    GraphicsContext3D* context3D = context->context3D();
+    WebKit::WebGraphicsContext3D* context3D = context->context3D();
     if (!context3D)
         return false;
 
@@ -301,7 +301,7 @@ bool CCVideoLayerImpl::FramePlane::allocateData(CCGraphicsContext* context)
     GLC(context3D, context3D->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE));
     GLC(context3D, context3D->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE));
 
-    GLC(context3D, context3D->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, format, size.width(), size.height(), 0, format, GraphicsContext3D::UNSIGNED_BYTE));
+    GLC(context3D, context3D->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, format, size.width(), size.height(), 0, format, GraphicsContext3D::UNSIGNED_BYTE, 0));
 
     return textureId;
 }
@@ -311,7 +311,7 @@ void CCVideoLayerImpl::FramePlane::freeData(CCGraphicsContext* context)
     if (!textureId)
         return;
 
-    GraphicsContext3D* context3D = context->context3D();
+    WebKit::WebGraphicsContext3D* context3D = context->context3D();
     if (!context3D)
         return;
 
@@ -351,7 +351,7 @@ bool CCVideoLayerImpl::copyPlaneData(CCRenderer* layerRenderer, CCGraphicsContex
     if (!softwarePlaneCount)
         return true;
 
-    GraphicsContext3D* context3d = context->context3D();
+    WebKit::WebGraphicsContext3D* context3d = context->context3D();
     if (!context3d) {
         // FIXME: Implement this path for software compositing.
         return false;