diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-17 17:15:31 -0700 |
---|---|---|
committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-17 17:29:29 -0700 |
commit | 3e476ce1b6f3ba7f4ba23f2cd359a104fdf6a734 (patch) | |
tree | 7b202b639790a1fa44ec62f1559e49204d8b55c8 /Source/WebCore/platform/graphics/android/rendering | |
parent | 37df6b06a8481e3608cff1718038d353a8733d6c (diff) | |
download | external_webkit-3e476ce1b6f3ba7f4ba23f2cd359a104fdf6a734.zip external_webkit-3e476ce1b6f3ba7f4ba23f2cd359a104fdf6a734.tar.gz external_webkit-3e476ce1b6f3ba7f4ba23f2cd359a104fdf6a734.tar.bz2 |
Clean up some redundant code
bug:6457191
Change-Id: Ie3ec0315151119b4428fdd97451084894f63db13
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp | 6 | ||||
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp index f3415af..f96feb5 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.cpp @@ -158,16 +158,12 @@ bool SurfaceCollection::isReady() bool SurfaceCollection::isBaseSurfaceReady() { - if (!m_compositedRoot || !m_surfaces[0]) - return false; + // m_surfaces[0] should be the base surface when in single surface mode. return m_surfaces[0]->isReady(); } bool SurfaceCollection::isMissingBackgroundContent() { - if (!m_compositedRoot) - return true; - // return true when the first surface is missing content (indicating the // entire viewport isn't covered) return m_surfaces[0]->isMissingContent(); diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h index b502142..97d5c73 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollection.h @@ -72,7 +72,7 @@ public: private: void updateLayerPositions(const SkRect& visibleContentRect); - BaseLayerAndroid* m_compositedRoot; + BaseLayerAndroid* const m_compositedRoot; WTF::Vector<Surface*> m_surfaces; }; |