diff options
5 files changed, 1 insertions, 27 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseTileTexture.h b/Source/WebCore/platform/graphics/android/BaseTileTexture.h index 321ca31..d8737b3 100644 --- a/Source/WebCore/platform/graphics/android/BaseTileTexture.h +++ b/Source/WebCore/platform/graphics/android/BaseTileTexture.h @@ -59,9 +59,6 @@ public: const SkSize& getSize() const { return m_size; } - bool readyFor(BaseTile* baseTile); - float scale(); - // OpenGL ID of backing texture, 0 when not allocated GLuint m_ownTextureId; // these are used for dynamically (de)allocating backing graphics memory diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 663addb..730081b 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -525,7 +525,6 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, // Clean up GL textures for video layer. tilesManager->videoLayerManager()->deleteUnusedTextures(); - ret |= tilesManager->invertedScreenSwitch(); if (ret) { // ret==true && empty inval region means we've inval'd everything, @@ -533,11 +532,6 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, // until tile generation catches up and we swap pages. bool fullScreenInval = m_frameworkInval.isEmpty(); - if (tilesManager->invertedScreenSwitch()) { - fullScreenInval = true; - tilesManager->setInvertedScreenSwitch(false); - } - if (!fullScreenInval) { FloatRect frameworkInval = tilesManager->shader()->rectInInvScreenCoord( m_frameworkInval); diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp index 37a7301..5112e5b 100644 --- a/Source/WebCore/platform/graphics/android/TilesManager.cpp +++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp @@ -86,7 +86,6 @@ TilesManager::TilesManager() , m_generatorReady(false) , m_showVisualIndicator(false) , m_invertedScreen(false) - , m_invertedScreenSwitch(false) , m_useMinimalMemory(true) , m_useDoubleBuffering(true) , m_contentUpdates(0) diff --git a/Source/WebCore/platform/graphics/android/TilesManager.h b/Source/WebCore/platform/graphics/android/TilesManager.h index aafdfb6..01d2b3e 100644 --- a/Source/WebCore/platform/graphics/android/TilesManager.h +++ b/Source/WebCore/platform/graphics/android/TilesManager.h @@ -138,23 +138,11 @@ public: return m_invertedScreen; } - bool invertedScreenSwitch() - { - return m_invertedScreenSwitch; - } - void setInvertedScreen(bool invert) { - if (m_invertedScreen != invert) - m_invertedScreenSwitch = true; m_invertedScreen = invert; } - void setInvertedScreenSwitch(bool invertedSwitch) - { - m_invertedScreenSwitch = invertedSwitch; - } - void setInvertedScreenContrast(float contrast) { m_shader.setContrast(contrast); @@ -222,7 +210,6 @@ private: bool m_showVisualIndicator; bool m_invertedScreen; - bool m_invertedScreenSwitch; bool m_useMinimalMemory; diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 0b2eaf6..b475c5f 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -981,6 +981,7 @@ static void dumpToFile(const char text[], void* file) { } #endif +// Return true to view invalidate WebView static bool nativeSetProperty(JNIEnv *env, jobject obj, jstring jkey, jstring jvalue) { WTF::String key = jstringToWtfString(env, jkey); @@ -998,19 +999,15 @@ static bool nativeSetProperty(JNIEnv *env, jobject obj, jstring jkey, jstring jv else if (key == "enable_cpu_upload_path") { TilesManager::instance()->transferQueue()->setTextureUploadType( value == "true" ? CpuUpload : GpuUpload); - return true; } else if (key == "use_minimal_memory") { TilesManager::instance()->setUseMinimalMemory(value == "true"); - return true; } else if (key == "use_double_buffering") { TilesManager::instance()->setUseDoubleBuffering(value == "true"); - return true; } else if (key == "tree_updates") { TilesManager::instance()->clearContentUpdates(); - return true; } return false; } |