summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2010-05-03 14:55:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-03 14:55:26 -0700
commitce99ade669370938eb363705f1ee543f40035c6d (patch)
tree380c36e47acbb033b27f7595452e04f6aa2a542e /WebKit
parent29189dc45bb2dde89f388b2fb8fbd2e996c92cd1 (diff)
parent6452300d47d77d78e874862c5f7908746b04c1f8 (diff)
downloadexternal_webkit-ce99ade669370938eb363705f1ee543f40035c6d.zip
external_webkit-ce99ade669370938eb363705f1ee543f40035c6d.tar.gz
external_webkit-ce99ade669370938eb363705f1ee543f40035c6d.tar.bz2
am 6452300d: am d294ab99: Update plugin\'s dirtyRect to match the dirtyRect returned when locking a surface.
Merge commit '6452300d47d77d78e874862c5f7908746b04c1f8' into kraken * commit '6452300d47d77d78e874862c5f7908746b04c1f8': Update plugin's dirtyRect to match the dirtyRect returned when locking a surface.
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/plugins/ANPSurfaceInterface.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/WebKit/android/plugins/ANPSurfaceInterface.cpp b/WebKit/android/plugins/ANPSurfaceInterface.cpp
index c78fe32..4b99b31 100644
--- a/WebKit/android/plugins/ANPSurfaceInterface.cpp
+++ b/WebKit/android/plugins/ANPSurfaceInterface.cpp
@@ -118,6 +118,16 @@ static bool anp_lock(JNIEnv* env, jobject surfaceView, ANPBitmap* bitmap, ANPRec
return false;
}
+ // the surface may have expanded the dirty region so we must to pass that
+ // information back to the plugin.
+ if (dirtyRect) {
+ Rect dirtyBounds = dirtyRegion.getBounds();
+ dirtyRect->left = dirtyBounds.left;
+ dirtyRect->right = dirtyBounds.right;
+ dirtyRect->top = dirtyBounds.top;
+ dirtyRect->bottom = dirtyBounds.bottom;
+ }
+
ssize_t bpr = info.s * bytesPerPixel(info.format);
bitmap->format = convertPixelFormat(info.format);