diff options
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLUtils.cpp | 11 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/android/VideoLayerAndroid.cpp | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLUtils.cpp b/Source/WebCore/platform/graphics/android/GLUtils.cpp index a7ddbbd..29608cf 100644 --- a/Source/WebCore/platform/graphics/android/GLUtils.cpp +++ b/Source/WebCore/platform/graphics/android/GLUtils.cpp @@ -418,14 +418,11 @@ void GLUtils::updateSurfaceTextureWithBitmap(TextureInfo* texture, int x, int y, bitmap.lockPixels(); uint8_t* bitmapOrigin = static_cast<uint8_t*>(bitmap.getPixels()); - - // Copied pixel by pixel since we need to handle the offsets and stride. + // Copied line by line since we need to handle the offsets and stride. for (row = 0 ; row < bitmap.height(); row ++) { - for (col = 0 ; col < bitmap.width(); col ++) { - uint8_t* dst = &(img[(buf->getStride() * (row + x) + (col + y)) * bpp]); - uint8_t* src = &(bitmapOrigin[(bitmap.width() * row + col) * bpp]); - memcpy(dst, src, bpp); - } + uint8_t* dst = &(img[(buf->getStride() * (row + x) + y) * bpp]); + uint8_t* src = &(bitmapOrigin[bitmap.width() * row * bpp]); + memcpy(dst, src, bpp * bitmap.width()); } bitmap.unlockPixels(); } diff --git a/Source/WebCore/platform/graphics/android/VideoLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/VideoLayerAndroid.cpp index aee5ae0..0f34c97 100644 --- a/Source/WebCore/platform/graphics/android/VideoLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/VideoLayerAndroid.cpp @@ -168,7 +168,7 @@ bool VideoLayerAndroid::drawGL(GLWebViewState* glWebViewState, SkMatrix& matrix) // Show the progressing animation, with two rotating circles TilesManager::instance()->shader()->drawLayerQuad(drawTransform(), rect, m_backgroundTextureId, - 0.5, true); + 1, true); TransformationMatrix addReverseRotation; TransformationMatrix addRotation = drawTransform(); @@ -217,7 +217,7 @@ bool VideoLayerAndroid::drawGL(GLWebViewState* glWebViewState, SkMatrix& matrix) // Show the static poster b/c there is no screen shot available. TilesManager::instance()->shader()->drawLayerQuad(drawTransform(), rect, m_backgroundTextureId, - 0.5, true); + 1, true); TilesManager::instance()->shader()->drawLayerQuad(drawTransform(), innerRect, m_posterTextureId, 1, true); |