am 632717e6: Merge "Add missing null check"

* commit '632717e60990b900e6d20dddd3935a57dd6a8fa6':
  Add missing null check
This commit is contained in:
John Reck
2014-03-25 10:29:28 -07:00
committed by Android Git Automerger

View File

@@ -99,9 +99,11 @@ void RenderNode::updateProperties() {
mProperties = mStagingProperties;
}
for (size_t i = 0; i < mDisplayListData->children.size(); i++) {
RenderNode* childNode = mDisplayListData->children[i]->mDisplayList;
childNode->updateProperties();
if (mDisplayListData) {
for (size_t i = 0; i < mDisplayListData->children.size(); i++) {
RenderNode* childNode = mDisplayListData->children[i]->mDisplayList;
childNode->updateProperties();
}
}
}