| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> | 2 * Copyright (C) 2006 Eric Seidel <eric@webkit.org> |
| 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. |
| 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 SVGImage::SVGImage(ImageObserver* observer) | 59 SVGImage::SVGImage(ImageObserver* observer) |
| 60 : Image(observer) | 60 : Image(observer) |
| 61 { | 61 { |
| 62 } | 62 } |
| 63 | 63 |
| 64 SVGImage::~SVGImage() | 64 SVGImage::~SVGImage() |
| 65 { | 65 { |
| 66 if (m_page) { | 66 if (m_page) { |
| 67 // Store m_page in a local variable, clearing m_page, so that SVGImageCh
romeClient knows we're destructed. | 67 // Store m_page in a local variable, clearing m_page, so that SVGImageCh
romeClient knows we're destructed. |
| 68 OwnPtrWillBeRawPtr<Page> currentPage = m_page.release(); | 68 OwnPtrWillBeRawPtr<Page> currentPage = m_page.release(); |
| 69 toLocalFrame(currentPage->mainFrame())->loader().frameDetached(); // Bre
ak both the loader and view references to the frame | 69 // Break both the loader and view references to the frame |
| 70 currentPage->willBeDestroyed(); | 70 currentPage->willBeDestroyed(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 // Verify that page teardown destroyed the Chrome | 73 // Verify that page teardown destroyed the Chrome |
| 74 ASSERT(!m_chromeClient || !m_chromeClient->image()); | 74 ASSERT(!m_chromeClient || !m_chromeClient->image()); |
| 75 } | 75 } |
| 76 | 76 |
| 77 bool SVGImage::isInSVGImage(const Node* node) | 77 bool SVGImage::isInSVGImage(const Node* node) |
| 78 { | 78 { |
| 79 ASSERT(node); | 79 ASSERT(node); |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 | 425 |
| 426 return m_page; | 426 return m_page; |
| 427 } | 427 } |
| 428 | 428 |
| 429 String SVGImage::filenameExtension() const | 429 String SVGImage::filenameExtension() const |
| 430 { | 430 { |
| 431 return "svg"; | 431 return "svg"; |
| 432 } | 432 } |
| 433 | 433 |
| 434 } | 434 } |
| OLD | NEW |