summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-05-23 16:17:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-23 16:17:09 -0700
commit2f7dd35491b3ac2609b72503a0522f5128849156 (patch)
treec61922b82dc5ee3888362e6106f1737e97c1ff1d
parent712ed50fe05a3a450c7cba5c2904621e02213631 (diff)
parent49fd7191e899fca66e2b63b8b3055efad4a47ad8 (diff)
downloadexternal_webkit-2f7dd35491b3ac2609b72503a0522f5128849156.zip
external_webkit-2f7dd35491b3ac2609b72503a0522f5128849156.tar.gz
external_webkit-2f7dd35491b3ac2609b72503a0522f5128849156.tar.bz2
am 49fd7191: am e17c8aee: DO NOT MERGE: The clip should be effective even if it is empty.
* commit '49fd7191e899fca66e2b63b8b3055efad4a47ad8': DO NOT MERGE: The clip should be effective even if it is empty.
-rw-r--r--WebCore/platform/graphics/android/ShaderProgram.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/ShaderProgram.cpp b/WebCore/platform/graphics/android/ShaderProgram.cpp
index 9e0a4ab..558c118 100644
--- a/WebCore/platform/graphics/android/ShaderProgram.cpp
+++ b/WebCore/platform/graphics/android/ShaderProgram.cpp
@@ -332,9 +332,6 @@ void ShaderProgram::clip(const FloatRect& clip)
if (clip == m_clipRect)
return;
- if (clip.width() == 0 && clip.height() == 0)
- return;
-
// we should only call glScissor in this function, so that we can easily
// track the current clipping rect.