diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-01-27 21:01:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 21:01:51 -0800 |
| commit | ed1d43611c94775d963061cc710b601d8b30bf9c (patch) | |
| tree | 33ba13242e4fdf9f07904b6493cf7e6000399b9f /WebCore/platform/graphics/android/ShaderProgram.cpp | |
| parent | f35a48f5582f4c06526cd8455b3a80a542d645e5 (diff) | |
| parent | 0dc1a08b899775a08e6b985a5397340ffd9eeb8f (diff) | |
| download | external_webkit-ed1d43611c94775d963061cc710b601d8b30bf9c.zip external_webkit-ed1d43611c94775d963061cc710b601d8b30bf9c.tar.gz external_webkit-ed1d43611c94775d963061cc710b601d8b30bf9c.tar.bz2 | |
Merge "Add some debugging functions and some cleanup speeding things in Layers." into honeycomb
Diffstat (limited to 'WebCore/platform/graphics/android/ShaderProgram.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/ShaderProgram.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/ShaderProgram.cpp b/WebCore/platform/graphics/android/ShaderProgram.cpp index dc6577c..ed5fe42 100644 --- a/WebCore/platform/graphics/android/ShaderProgram.cpp +++ b/WebCore/platform/graphics/android/ShaderProgram.cpp @@ -231,10 +231,10 @@ void ShaderProgram::clip(const FloatRect& clip) m_clipRect = clip; } -IntRect ShaderProgram::clippedRectWithViewport(const IntRect& rect) +IntRect ShaderProgram::clippedRectWithViewport(const IntRect& rect, int margin) { - IntRect viewport(m_viewport.fLeft, m_viewport.fTop, - m_viewport.width(), m_viewport.height()); + IntRect viewport(m_viewport.fLeft - margin, m_viewport.fTop - margin, + m_viewport.width() + margin, m_viewport.height() + margin); viewport.intersect(rect); return viewport; } |