diff options
| author | John Reck <jreck@google.com> | 2012-02-21 15:43:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-21 15:43:33 -0800 |
| commit | cb3b415105a884d70ac845b228f6bb87807f9f34 (patch) | |
| tree | 3508667aabf4933b9fe275ee62287a63e55033de /Source/WebCore | |
| parent | e9e5137f0a4c0744c94b10eeb67162ede3339975 (diff) | |
| parent | fba5bad67c2589216f05da70a7f2fbd537637672 (diff) | |
| download | external_webkit-cb3b415105a884d70ac845b228f6bb87807f9f34.zip external_webkit-cb3b415105a884d70ac845b228f6bb87807f9f34.tar.gz external_webkit-cb3b415105a884d70ac845b228f6bb87807f9f34.tar.bz2 | |
Merge "Add two missing null checks"
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 2d2867c..7208380 100644 --- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -320,6 +320,8 @@ void BaseLayerAndroid::drawBasePictureInGL() void BaseLayerAndroid::updateLayerPositions(SkRect& visibleRect) { LayerAndroid* compositedRoot = static_cast<LayerAndroid*>(getChild(0)); + if (!compositedRoot) + return; TransformationMatrix ident; compositedRoot->updateFixedLayersPositions(visibleRect); FloatRect clip(0, 0, content()->width(), content()->height()); |