summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2013-02-15 14:44:58 -0800
committerMathias Agopian <mathias@google.com>2013-02-15 14:44:58 -0800
commit50dbebbe7b246a0756c750ff18d5b77d6e4a2a68 (patch)
tree1ef8ec4e535a0a67a5c8cf198ce7ec64f6b9ce7a
parent4533237f156ff61f2486d0e6d748eafa8ce4d3d3 (diff)
downloadwebkit-50dbebbe7b246a0756c750ff18d5b77d6e4a2a68.tar.gz
fix build: SurfaceTextureClient to Surface rename
Change-Id: I47f20c1df5c6427c37b0b276f86ba3cca1cb0caa
-rw-r--r--Source/WebCore/platform/graphics/android/layers/CanvasTexture.cpp4
-rw-r--r--Source/WebCore/platform/graphics/android/layers/CanvasTexture.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/CanvasTexture.cpp b/Source/WebCore/platform/graphics/android/layers/CanvasTexture.cpp
index 66a4e1edc..ccab4436a 100644
--- a/Source/WebCore/platform/graphics/android/layers/CanvasTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/CanvasTexture.cpp
@@ -98,7 +98,7 @@ void CanvasTexture::setSize(const IntSize& size)
}
}
-Surface* CanvasTexture::nativeWindow()
+android::Surface* CanvasTexture::nativeWindow()
{
android::Mutex::Autolock lock(m_surfaceLock);
if (m_ANW.get())
@@ -127,7 +127,7 @@ Surface* CanvasTexture::nativeWindow()
bool CanvasTexture::uploadImageBuffer(ImageBuffer* imageBuffer)
{
m_hasValidTexture = false;
- Surface* anw = nativeWindow();
+ android::Surface* anw = nativeWindow();
if (!anw)
return false;
// Size mismatch, early abort (will fall back to software)
diff --git a/Source/WebCore/platform/graphics/android/layers/CanvasTexture.h b/Source/WebCore/platform/graphics/android/layers/CanvasTexture.h
index 15f075ecb..156143419 100644
--- a/Source/WebCore/platform/graphics/android/layers/CanvasTexture.h
+++ b/Source/WebCore/platform/graphics/android/layers/CanvasTexture.h
@@ -53,7 +53,7 @@ public:
* Called by WebKit thread
********************************************/
void setSize(const IntSize& size);
- Surface* nativeWindow();
+ android::Surface* nativeWindow();
bool uploadImageBuffer(ImageBuffer* imageBuffer);
bool hasValidTexture() { return m_hasValidTexture; }