diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-02-24 05:27:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-24 05:27:47 -0800 |
| commit | ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca (patch) | |
| tree | 9b09533becaca8a2ab72c9f50b1062148f95944b /WebKit/android/nav/WebView.cpp | |
| parent | 52df3a88ee4d2299c8e84771a803e75dbadc2e8e (diff) | |
| parent | b33016812afef21c69df5ab3d5b85eab5fef7c5c (diff) | |
| download | external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.zip external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.tar.gz external_webkit-ae9f5f699fd7ae6cac2e90a646fa4bfa1e1412ca.tar.bz2 | |
Merge "Skia Merge (revision 808)"
Diffstat (limited to 'WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 96ded71..03263ef 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -210,7 +210,7 @@ WebView(JNIEnv* env, jobject javaWebView, int viewImpl) : #endif delete m_frameCacheUI; delete m_navPictureUI; - m_baseLayer->safeUnref(); + SkSafeUnref(m_baseLayer); delete m_glDrawFunctor; } @@ -686,7 +686,7 @@ CachedRoot* getFrameCache(FrameCachePermission allowNewer) } m_viewImpl->gFrameCacheMutex.lock(); delete m_frameCacheUI; - m_navPictureUI->safeUnref(); + SkSafeUnref(m_navPictureUI); m_viewImpl->m_updatedFrameCache = false; m_frameCacheUI = m_viewImpl->m_frameCacheKit; m_navPictureUI = m_viewImpl->m_navPictureKit; @@ -1394,7 +1394,7 @@ void setBaseLayer(BaseLayerAndroid* layer, WebCore::IntRect& rect, bool showVisu copyScrollPositionRecursive(compositeRoot(), newCompositeRoot); } #endif - m_baseLayer->safeUnref(); + SkSafeUnref(m_baseLayer); m_baseLayer = layer; CachedRoot* root = getFrameCache(DontAllowNewer); if (!root) |