Merge "When in singlesurfacemode, resist switching out - DO NOT MERGE" into ics-mr1

diff --cc Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index 262d270,2cc2d85..3bcda9a
--- 1/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
--- 2/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@@ -130,9 -130,9 +130,10 @@@ void GLWebViewState::setBaseLayer(BaseL
  {
      if (!layer || isPictureAfterFirstLayout) {
          // TODO: move this into TreeManager
 +        m_zoomManager.swapPages(); // reset zoom state
          m_tiledPageA->discardTextures();
          m_tiledPageB->discardTextures();
+         m_layersRenderingMode = kAllTextures;
      }
      if (layer) {
          XLOG("new base layer %p, (inval region empty %d) with child %p", layer, inval.isEmpty(), layer->getChild(0));