diff options
author | Nicolas Roard <nicolas@android.com> | 2010-11-04 10:46:00 -0700 |
---|---|---|
committer | Nicolas Roard <nicolas@android.com> | 2010-11-04 20:16:02 -0700 |
commit | 78fba6ce7c5f203a64307ceb5a1dc4d2286c2e4b (patch) | |
tree | c0f702536c7b1c816d72d5f90bb8659355cbd45c | |
parent | 24444f09c590a8f243a78e9f0beec8668da6940f (diff) | |
download | external_webkit-78fba6ce7c5f203a64307ceb5a1dc4d2286c2e4b.zip external_webkit-78fba6ce7c5f203a64307ceb5a1dc4d2286c2e4b.tar.gz external_webkit-78fba6ce7c5f203a64307ceb5a1dc4d2286c2e4b.tar.bz2 |
Remove extras from GLWebViewState for now
Change-Id: Ic4d4866302645edb6c0a457ef6d0bd1d8f9cf484
-rw-r--r-- | WebKit/android/nav/WebView.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 06b5422..3d374d9 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -416,7 +416,9 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras) if (!m_baseLayer) return false; +#if 0 m_glWebViewState.resetExtra(false); +#endif CachedRoot* root = getFrameCache(AllowNewer); if (!root) { DBG_NAV_LOG("!root"); @@ -444,12 +446,14 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras) } unsigned int pic = m_glWebViewState.currentPictureCounter(); +#if 0 if (extra) { LayerAndroid* mainPicture = new LayerAndroid(m_navPictureUI); m_glWebViewState.setExtra(extra, mainPicture); } else { m_glWebViewState.resetExtra(true); } +#endif SkRect visibleRect; calcOurContentVisibleRect(&visibleRect); |