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 "SkDOM.h" | 10 #include "SkDOM.h" |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 SkDOMParser parser(&fAlloc); | 359 SkDOMParser parser(&fAlloc); |
360 | 360 |
361 walk_dom(dom, node, &parser); | 361 walk_dom(dom, node, &parser); |
362 | 362 |
363 fRoot = parser.getRoot(); | 363 fRoot = parser.getRoot(); |
364 return fRoot; | 364 return fRoot; |
365 } | 365 } |
366 | 366 |
367 SkXMLParser* SkDOM::beginParsing() { | 367 SkXMLParser* SkDOM::beginParsing() { |
368 SkASSERT(!fParser); | 368 SkASSERT(!fParser); |
369 fParser.reset(SkNEW_ARGS(SkDOMParser, (&fAlloc))); | 369 fParser.reset(new SkDOMParser(&fAlloc)); |
370 | 370 |
371 return fParser.get(); | 371 return fParser.get(); |
372 } | 372 } |
373 | 373 |
374 const SkDOM::Node* SkDOM::finishParsing() { | 374 const SkDOM::Node* SkDOM::finishParsing() { |
375 SkASSERT(fParser); | 375 SkASSERT(fParser); |
376 fRoot = fParser->getRoot(); | 376 fRoot = fParser->getRoot(); |
377 fParser.free(); | 377 fParser.free(); |
378 | 378 |
379 return fRoot; | 379 return fRoot; |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 SkASSERT(v == NULL); | 506 SkASSERT(v == NULL); |
507 | 507 |
508 SkASSERT(dom.getFirstChild(root, "elem1")); | 508 SkASSERT(dom.getFirstChild(root, "elem1")); |
509 SkASSERT(!dom.getFirstChild(root, "subelem1")); | 509 SkASSERT(!dom.getFirstChild(root, "subelem1")); |
510 | 510 |
511 dom.dump(); | 511 dom.dump(); |
512 #endif | 512 #endif |
513 } | 513 } |
514 | 514 |
515 #endif | 515 #endif |
OLD | NEW |