| OLD | NEW | 
|---|
| 1 | 1 | 
| 2 /* | 2 /* | 
| 3  * Copyright 2006 The Android Open Source Project | 3  * Copyright 2006 The Android Open Source Project | 
| 4  * | 4  * | 
| 5  * Use of this source code is governed by a BSD-style license that can be | 5  * Use of this source code is governed by a BSD-style license that can be | 
| 6  * found in the LICENSE file. | 6  * found in the LICENSE file. | 
| 7  */ | 7  */ | 
| 8 | 8 | 
| 9 | 9 | 
| 10 #include "SkDrawSaveLayer.h" | 10 #include "SkDrawSaveLayer.h" | 
| 11 #include "SkAnimateMaker.h" | 11 #include "SkAnimateMaker.h" | 
| 12 #include "SkCanvas.h" | 12 #include "SkCanvas.h" | 
| 13 #include "SkDrawPaint.h" | 13 #include "SkDrawPaint.h" | 
| 14 #include "SkDrawRectangle.h" | 14 #include "SkDrawRectangle.h" | 
| 15 | 15 | 
| 16 #if SK_USE_CONDENSED_INFO == 0 | 16 #if SK_USE_CONDENSED_INFO == 0 | 
| 17 | 17 | 
| 18 const SkMemberInfo SkSaveLayer::fInfo[] = { | 18 const SkMemberInfo SkSaveLayer::fInfo[] = { | 
| 19     SK_MEMBER(bounds, Rect), | 19     SK_MEMBER(bounds, Rect), | 
| 20     SK_MEMBER(paint, Paint) | 20     SK_MEMBER(paint, Paint) | 
| 21 }; | 21 }; | 
| 22 | 22 | 
| 23 #endif | 23 #endif | 
| 24 | 24 | 
| 25 DEFINE_GET_MEMBER(SkSaveLayer); | 25 DEFINE_GET_MEMBER(SkSaveLayer); | 
| 26 | 26 | 
| 27 SkSaveLayer::SkSaveLayer() : paint(NULL), bounds(NULL) { | 27 SkSaveLayer::SkSaveLayer() : paint(nullptr), bounds(nullptr) { | 
| 28 } | 28 } | 
| 29 | 29 | 
| 30 SkSaveLayer::~SkSaveLayer(){ | 30 SkSaveLayer::~SkSaveLayer(){ | 
| 31 } | 31 } | 
| 32 | 32 | 
| 33 bool SkSaveLayer::draw(SkAnimateMaker& maker) | 33 bool SkSaveLayer::draw(SkAnimateMaker& maker) | 
| 34 { | 34 { | 
| 35     if (!bounds) { | 35     if (!bounds) { | 
| 36         return false; | 36         return false; | 
| 37     } | 37     } | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
| 67     dumpDrawables(maker); | 67     dumpDrawables(maker); | 
| 68 } | 68 } | 
| 69 #endif | 69 #endif | 
| 70 | 70 | 
| 71 void SkSaveLayer::onEndElement(SkAnimateMaker& maker) | 71 void SkSaveLayer::onEndElement(SkAnimateMaker& maker) | 
| 72 { | 72 { | 
| 73     if (!bounds) | 73     if (!bounds) | 
| 74         maker.setErrorCode(SkDisplayXMLParserError::kSaveLayerNeedsBounds); | 74         maker.setErrorCode(SkDisplayXMLParserError::kSaveLayerNeedsBounds); | 
| 75     INHERITED::onEndElement(maker); | 75     INHERITED::onEndElement(maker); | 
| 76 } | 76 } | 
| OLD | NEW | 
|---|