summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-10-06 18:50:02 -0700
committerNicolas Roard <nicolasroard@google.com>2011-10-06 19:16:54 -0700
commitd30f6301a4ea49037d31781bb238a4230c4c1389 (patch)
tree0a97e24a4aff40a6c693a60f5d4a0be31deec08e /Source/WebCore/platform/graphics/android/GLWebViewState.cpp
parent7baf9c5d380cd891e4e6488c09a08d0e9c7e1e4f (diff)
downloadexternal_webkit-d30f6301a4ea49037d31781bb238a4230c4c1389.zip
external_webkit-d30f6301a4ea49037d31781bb238a4230c4c1389.tar.gz
external_webkit-d30f6301a4ea49037d31781bb238a4230c4c1389.tar.bz2
Fix inverted mode rendering
The GPU texture upload workaround broke it, as we are not using the Shaders when doing the copy. Adding some code to instead use a final shader that can be either normal or inverted, on demand. bug:5424589 Change-Id: If845233e12c65738925fbc81b21f1dc0fd38546e
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index 09c647b..c273c5c 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -515,8 +515,6 @@ double GLWebViewState::setupDrawing(IntRect& viewRect, SkRect& visibleRect,
XLOG("Reinit shader");
shader->init();
}
- glUseProgram(shader->program());
- glUniform1i(shader->textureSampler(), 0);
shader->setViewRect(viewRect);
shader->setViewport(visibleRect);
shader->setWebViewRect(webViewRect);