diff options
author | Chris Craik <ccraik@google.com> | 2012-01-11 13:57:13 -0800 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2012-01-11 15:51:14 -0800 |
commit | 8e70c70bd71f58f8092043ce74512c4b53710eee (patch) | |
tree | 49515fdc525c4eef17297dcb1ed698e79bac1573 | |
parent | dd6c3b2bf081a084d44a33b59dddea1ca9eef03e (diff) | |
parent | 9cb81f0f8da25a16b61bdd8241ee7170608ab9e8 (diff) | |
download | external_webkit-8e70c70bd71f58f8092043ce74512c4b53710eee.zip external_webkit-8e70c70bd71f58f8092043ce74512c4b53710eee.tar.gz external_webkit-8e70c70bd71f58f8092043ce74512c4b53710eee.tar.bz2 |
resolved conflicts for merge of 9cb81f0f to master
Change-Id: I48fe99559230a14d29821d40369ad762d79ba04a
-rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index e5ef154..d387551 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -661,10 +661,20 @@ void WebViewCore::recordPictureSet(PictureSet* content) content->clear(); #if USE(ACCELERATED_COMPOSITING) - // Detects if the content size has changed - bool contentSizeChanged = false; - if (content->width() != width || content->height() != height) - contentSizeChanged = true; + // The invals are not always correct when the content size has changed. For + // now, let's just reset the inval so that it invalidates the entire content + // -- the pictureset will be fully repainted, tiles will be marked dirty and + // will have to be repainted. + + // FIXME: the webkit invals ought to have been enough... + if (content->width() != width || content->height() != height) { + SkIRect r; + r.fLeft = 0; + r.fTop = 0; + r.fRight = width; + r.fBottom = height; + m_addInval.setRect(r); + } #endif content->setDimensions(width, height, &m_addInval); @@ -689,22 +699,6 @@ void WebViewCore::recordPictureSet(PictureSet* content) // Rebuild the pictureset (webkit repaint) rebuildPictureSet(content); -#if USE(ACCELERATED_COMPOSITING) - // We repainted the pictureset, but the invals are not always correct when - // the content size did change. For now, let's just reset the - // inval we will pass to the UI so that it invalidates the entire - // content -- tiles will be marked dirty and will have to be repainted. - // FIXME: the webkit invals ought to have been enough... - if (contentSizeChanged) { - SkIRect r; - r.fLeft = 0; - r.fTop = 0; - r.fRight = width; - r.fBottom = height; - m_addInval.setRect(r); - } -#endif - WebCore::Node* oldFocusNode = currentFocus(); m_frameCacheOutOfDate = true; WebCore::IntRect oldBounds; |