Merge "Fix repaint when we toggle the inverted mode - add a boolean return in WebView::nativeSetProperty() - add an inverted flag in BaseTileTexture"

1 files changed, 14 insertions, 4 deletions

diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index c54977d..53d32f7 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -573,11 +573,21 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect,
     SkSafeRef(compositedRoot);
     SkSafeUnref(m_previouslyUsedRoot);
     m_previouslyUsedRoot = compositedRoot;
+
+    ret |= TilesManager::instance()->invertedScreenSwitch();
+
     if (ret) {
-        if (m_frameworkInval.isEmpty()) {
-            // ret==true && empty inval region means we've inval'd everything,
-            // but don't have new content. Keep redrawing full view (0,0,0,0)
-            // until tile generation catches up and we swap pages.
+        // ret==true && empty inval region means we've inval'd everything,
+        // but don't have new content. Keep redrawing full view (0,0,0,0)
+        // until tile generation catches up and we swap pages.
+        bool fullScreenInval = m_frameworkInval.isEmpty();
+
+        if (TilesManager::instance()->invertedScreenSwitch()) {
+            fullScreenInval = true;
+            TilesManager::instance()->setInvertedScreenSwitch(false);
+        }
+
+        if (fullScreenInval) {
             invalRect->setX(0);
             invalRect->setY(0);
             invalRect->setWidth(0);