| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 Google Inc. | 2 * Copyright 2011 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 #include "SampleApp.h" | 7 #include "SampleApp.h" |
| 8 | 8 |
| 9 #include "SkData.h" | 9 #include "SkData.h" |
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 421 // registers GMs as Samples | 421 // registers GMs as Samples |
| 422 // This can't be performed during static initialization because it could be | 422 // This can't be performed during static initialization because it could be |
| 423 // run before GMRegistry has been fully built. | 423 // run before GMRegistry has been fully built. |
| 424 static void SkGMRegistyToSampleRegistry() { | 424 static void SkGMRegistyToSampleRegistry() { |
| 425 static bool gOnce; | 425 static bool gOnce; |
| 426 static AutoUnrefArray fRegisters; | 426 static AutoUnrefArray fRegisters; |
| 427 | 427 |
| 428 if (!gOnce) { | 428 if (!gOnce) { |
| 429 const skiagm::GMRegistry* gmreg = skiagm::GMRegistry::Head(); | 429 const skiagm::GMRegistry* gmreg = skiagm::GMRegistry::Head(); |
| 430 while (gmreg) { | 430 while (gmreg) { |
| 431 fRegisters.push_back() = new SkViewRegister(gmreg->factory()); | 431 fRegisters.push_back() = new SkViewRegister(gmreg->data()); |
| 432 gmreg = gmreg->next(); | 432 gmreg = gmreg->next(); |
| 433 } | 433 } |
| 434 gOnce = true; | 434 gOnce = true; |
| 435 } | 435 } |
| 436 } | 436 } |
| 437 | 437 |
| 438 #if 0 | 438 #if 0 |
| 439 #include <CoreFoundation/CoreFoundation.h> | 439 #include <CoreFoundation/CoreFoundation.h> |
| 440 #include <CoreFoundation/CFURLAccess.h> | 440 #include <CoreFoundation/CFURLAccess.h> |
| 441 | 441 |
| (...skipping 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2545 SkGraphics::Init(); | 2545 SkGraphics::Init(); |
| 2546 SkEvent::Init(); | 2546 SkEvent::Init(); |
| 2547 } | 2547 } |
| 2548 | 2548 |
| 2549 // FIXME: this should be in a header | 2549 // FIXME: this should be in a header |
| 2550 void application_term(); | 2550 void application_term(); |
| 2551 void application_term() { | 2551 void application_term() { |
| 2552 SkEvent::Term(); | 2552 SkEvent::Term(); |
| 2553 SkGraphics::Term(); | 2553 SkGraphics::Term(); |
| 2554 } | 2554 } |
| OLD | NEW |