diff options
| author | Chris Craik <ccraik@google.com> | 2012-03-09 16:17:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-09 16:17:27 -0800 |
| commit | 1b54fe32a2615bc9df11de78e35f5adb730d0824 (patch) | |
| tree | 41876d98cda8140ceac21f896b0edd3de73c00fb /Source/WebKit | |
| parent | d7119ab05effda975f4a88110559b808b76d7b8c (diff) | |
| parent | f7ad77dc2a981834d664fd24022c3dfade69c8aa (diff) | |
| download | external_webkit-1b54fe32a2615bc9df11de78e35f5adb730d0824.zip external_webkit-1b54fe32a2615bc9df11de78e35f5adb730d0824.tar.gz external_webkit-1b54fe32a2615bc9df11de78e35f5adb730d0824.tar.bz2 | |
Merge "Replace picture count with the SurfaceCollection count"
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/ViewStateSerializer.cpp | 1 | ||||
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebKit/android/jni/ViewStateSerializer.cpp b/Source/WebKit/android/jni/ViewStateSerializer.cpp index a96b6b4..dc9c72d 100644 --- a/Source/WebKit/android/jni/ViewStateSerializer.cpp +++ b/Source/WebKit/android/jni/ViewStateSerializer.cpp @@ -473,7 +473,6 @@ LayerAndroid* deserializeLayer(int version, SkStream* stream) if (childLayer) layer->addChild(childLayer); } - layer->needsRepaint(); XLOG("Created layer with id %d", layer->uniqueId()); return layer; } diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 8b7acc5..fadf1f0 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -258,7 +258,6 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, DrawExtra* extra = getDrawExtra((DrawExtras) extras); - unsigned int pic = m_glWebViewState->currentPictureCounter(); m_glWebViewState->glExtras()->setDrawExtra(extra); // Make sure we have valid coordinates. We might not have valid coords @@ -280,7 +279,7 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, checkException(env); } } - if (ret || m_glWebViewState->currentPictureCounter() != pic) + if (ret) return !m_isDrawingPaused; #endif return false; |