Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix locking for skip draw" into jb-dev

Browse Source
This commit is contained in:
Chris Craik
2012-05-09 15:37:03 -07:00
committed by Android (Google) Code Review
parent 0fa152912e 55c68f14e1
commit a76f823c7f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/webkit/WebViewCore.java
View File

@@ -2176,11 +2176,12 @@ public final class WebViewCore {
DrawData mLastDrawData = null;
private Boolean m_skipDrawFlag = false;
private Object m_skipDrawFlagLock = new Object();
private boolean m_skipDrawFlag = false;
private boolean m_drawWasSkipped = false;
void pauseWebKitDraw() {
synchronized (m_skipDrawFlag) {
synchronized (m_skipDrawFlagLock) {
if (!m_skipDrawFlag) {
m_skipDrawFlag = true;
}
@@ -2188,7 +2189,7 @@ public final class WebViewCore {
}
void resumeWebKitDraw() {
synchronized (m_skipDrawFlag) {
synchronized (m_skipDrawFlagLock) {
if (m_skipDrawFlag && m_drawWasSkipped) {
// a draw was dropped, send a retry
m_drawWasSkipped = false;
@@ -2199,7 +2200,7 @@ public final class WebViewCore {
}
private void webkitDraw() {
synchronized (m_skipDrawFlag) {
synchronized (m_skipDrawFlagLock) {
if (m_skipDrawFlag) {
m_drawWasSkipped = true;
return;