reenable draw extras when GL is turned on

This captures the drawing in the UI thread, then passes
the drawing to the tile imaging thread.

The draw extras interface now takes an additional rectangle,
and each draw extra fills in the inval area formed as that
part is drawn.

The old extra implementation in GLWebViewState has been
removed. The inval portion of the setBaseLayer call has been split
out so it can be called directly.

bug:3161294
Change-Id: I28d3e6879059770b973e7c0f7c0796909f7359aa

1 files changed, 4 insertions, 6 deletions

diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h
index cc1834d..e50c5f4 100644
--- a/WebCore/platform/graphics/android/GLWebViewState.h
+++ b/WebCore/platform/graphics/android/GLWebViewState.h
@@ -167,10 +167,8 @@ public:
     void resetTransitionTime() { m_transitionTime = -1; }
 
     unsigned int paintBaseLayerContent(SkCanvas* canvas);
-    void setBaseLayer(BaseLayerAndroid* layer, IntRect& rect);
-    void setExtra(android::DrawExtra* extra, LayerAndroid* navLayer);
-    void resetExtra(bool repaint);
-
+    void setBaseLayer(BaseLayerAndroid* layer, const IntRect& rect);
+    void setExtra(BaseLayerAndroid* , SkPicture& , const IntRect& );
     void scheduleUpdate(const double& currentTime, float scale);
 
     TiledPage* frontPage();
@@ -194,6 +192,7 @@ public:
     bool hasContent();
 
 private:
+    void inval(const IntRect& rect); // caller must hold m_baseLayerLock
 
     // Delay between scheduling a new page when the scale
     // factor changes (i.e. zooming in or out)
@@ -221,8 +220,7 @@ private:
     bool m_usePageA;
     TiledPage* m_tiledPageA;
     TiledPage* m_tiledPageB;
-    android::DrawExtra* m_extra;
-    LayerAndroid* m_navLayer;
+    SkIRect m_lastInval;
 };
 
 } // namespace WebCore