| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2016 Google Inc. | 2  * Copyright 2016 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "SkCanvas.h" | 8 #include "SkCanvas.h" | 
| 9 #include "SkDOM.h" | 9 #include "SkDOM.h" | 
| 10 #include "SkParsePath.h" | 10 #include "SkParsePath.h" | 
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 210 struct AttrParseInfo { | 210 struct AttrParseInfo { | 
| 211     SkSVGAttribute fAttr; | 211     SkSVGAttribute fAttr; | 
| 212     bool (*fSetter)(const sk_sp<SkSVGNode>& node, SkSVGAttribute attr, const cha
     r* stringValue); | 212     bool (*fSetter)(const sk_sp<SkSVGNode>& node, SkSVGAttribute attr, const cha
     r* stringValue); | 
| 213 }; | 213 }; | 
| 214 | 214 | 
| 215 SortedDictionaryEntry<AttrParseInfo> gAttributeParseInfo[] = { | 215 SortedDictionaryEntry<AttrParseInfo> gAttributeParseInfo[] = { | 
| 216     { "d"              , { SkSVGAttribute::kD             , SetPathDataAttribute
       }}, | 216     { "d"              , { SkSVGAttribute::kD             , SetPathDataAttribute
       }}, | 
| 217     { "fill"           , { SkSVGAttribute::kFill          , SetPaintAttribute   
       }}, | 217     { "fill"           , { SkSVGAttribute::kFill          , SetPaintAttribute   
       }}, | 
| 218     { "fill-opacity"   , { SkSVGAttribute::kFillOpacity   , SetNumberAttribute  
       }}, | 218     { "fill-opacity"   , { SkSVGAttribute::kFillOpacity   , SetNumberAttribute  
       }}, | 
| 219     { "height"         , { SkSVGAttribute::kHeight        , SetLengthAttribute  
       }}, | 219     { "height"         , { SkSVGAttribute::kHeight        , SetLengthAttribute  
       }}, | 
|  | 220     { "opacity"        , { SkSVGAttribute::kOpacity       , SetNumberAttribute  
       }}, | 
| 220     { "points"         , { SkSVGAttribute::kPoints        , SetPointsAttribute  
       }}, | 221     { "points"         , { SkSVGAttribute::kPoints        , SetPointsAttribute  
       }}, | 
| 221     { "rx"             , { SkSVGAttribute::kRx            , SetLengthAttribute  
       }}, | 222     { "rx"             , { SkSVGAttribute::kRx            , SetLengthAttribute  
       }}, | 
| 222     { "ry"             , { SkSVGAttribute::kRy            , SetLengthAttribute  
       }}, | 223     { "ry"             , { SkSVGAttribute::kRy            , SetLengthAttribute  
       }}, | 
| 223     { "stroke"         , { SkSVGAttribute::kStroke        , SetPaintAttribute   
       }}, | 224     { "stroke"         , { SkSVGAttribute::kStroke        , SetPaintAttribute   
       }}, | 
| 224     { "stroke-linecap" , { SkSVGAttribute::kStrokeLineCap , SetLineCapAttribute 
       }}, | 225     { "stroke-linecap" , { SkSVGAttribute::kStrokeLineCap , SetLineCapAttribute 
       }}, | 
| 225     { "stroke-linejoin", { SkSVGAttribute::kStrokeLineJoin, SetLineJoinAttribute
       }}, | 226     { "stroke-linejoin", { SkSVGAttribute::kStrokeLineJoin, SetLineJoinAttribute
       }}, | 
| 226     { "stroke-opacity" , { SkSVGAttribute::kStrokeOpacity , SetNumberAttribute  
       }}, | 227     { "stroke-opacity" , { SkSVGAttribute::kStrokeOpacity , SetNumberAttribute  
       }}, | 
| 227     { "stroke-width"   , { SkSVGAttribute::kStrokeWidth   , SetLengthAttribute  
       }}, | 228     { "stroke-width"   , { SkSVGAttribute::kStrokeWidth   , SetLengthAttribute  
       }}, | 
| 228     { "style"          , { SkSVGAttribute::kUnknown       , SetStyleAttributes  
       }}, | 229     { "style"          , { SkSVGAttribute::kUnknown       , SetStyleAttributes  
       }}, | 
| 229     { "transform"      , { SkSVGAttribute::kTransform     , SetTransformAttribut
     e }}, | 230     { "transform"      , { SkSVGAttribute::kTransform     , SetTransformAttribut
     e }}, | 
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 352 } | 353 } | 
| 353 | 354 | 
| 354 void SkSVGDOM::setContainerSize(const SkSize& containerSize) { | 355 void SkSVGDOM::setContainerSize(const SkSize& containerSize) { | 
| 355     // TODO: inval | 356     // TODO: inval | 
| 356     fContainerSize = containerSize; | 357     fContainerSize = containerSize; | 
| 357 } | 358 } | 
| 358 | 359 | 
| 359 void SkSVGDOM::setRoot(sk_sp<SkSVGNode> root) { | 360 void SkSVGDOM::setRoot(sk_sp<SkSVGNode> root) { | 
| 360     fRoot = std::move(root); | 361     fRoot = std::move(root); | 
| 361 } | 362 } | 
| OLD | NEW | 
|---|