| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "CachedPage.h" | 27 #include "CachedPage.h" |
| 28 | 28 |
| 29 #include "AnimationController.h" | 29 #include "AnimationController.h" |
| 30 #include "CachedFramePlatformData.h" | 30 #include "CachedFramePlatformData.h" |
| 31 #include "Chrome.h" |
| 32 #include "ChromeClient.h" |
| 31 #include "DOMWindow.h" | 33 #include "DOMWindow.h" |
| 32 #include "Document.h" | 34 #include "Document.h" |
| 33 #include "DocumentLoader.h" | 35 #include "DocumentLoader.h" |
| 34 #include "EventHandler.h" | 36 #include "EventHandler.h" |
| 35 #include "EventNames.h" | 37 #include "EventNames.h" |
| 36 #include "ExceptionCode.h" | 38 #include "ExceptionCode.h" |
| 37 #include "FocusController.h" | 39 #include "FocusController.h" |
| 38 #include "Frame.h" | 40 #include "Frame.h" |
| 39 #include "FrameLoader.h" | 41 #include "FrameLoader.h" |
| 40 #include "FrameLoaderClient.h" | 42 #include "FrameLoaderClient.h" |
| 41 #include "FrameView.h" | 43 #include "FrameView.h" |
| 42 #include "HistoryItem.h" | 44 #include "HistoryItem.h" |
| 43 #include "Logging.h" | 45 #include "Logging.h" |
| 44 #include "Page.h" | 46 #include "Page.h" |
| 45 #include "PageCache.h" | 47 #include "PageCache.h" |
| 46 #include "PageTransitionEvent.h" | 48 #include "PageTransitionEvent.h" |
| 47 #include "ScriptController.h" | 49 #include "ScriptController.h" |
| 48 #include "SerializedScriptValue.h" | 50 #include "SerializedScriptValue.h" |
| 49 #include <wtf/RefCountedLeakCounter.h> | 51 #include <wtf/RefCountedLeakCounter.h> |
| 50 #include <wtf/text/CString.h> | 52 #include <wtf/text/CString.h> |
| 51 | 53 |
| 52 #if ENABLE(SVG) | 54 #if ENABLE(SVG) |
| 53 #include "SVGDocumentExtensions.h" | 55 #include "SVGDocumentExtensions.h" |
| 54 #endif | 56 #endif |
| 55 | 57 |
| 56 #if ENABLE(TOUCH_EVENTS) | |
| 57 #include "Chrome.h" | |
| 58 #include "ChromeClient.h" | |
| 59 #endif | |
| 60 | |
| 61 | |
| 62 namespace WebCore { | 58 namespace WebCore { |
| 63 | 59 |
| 64 #ifndef NDEBUG | 60 #ifndef NDEBUG |
| 65 static WTF::RefCountedLeakCounter& cachedFrameCounter() | 61 static WTF::RefCountedLeakCounter& cachedFrameCounter() |
| 66 { | 62 { |
| 67 DEFINE_STATIC_LOCAL(WTF::RefCountedLeakCounter, counter, ("CachedFrame")); | 63 DEFINE_STATIC_LOCAL(WTF::RefCountedLeakCounter, counter, ("CachedFrame")); |
| 68 return counter; | 64 return counter; |
| 69 } | 65 } |
| 70 #endif | 66 #endif |
| 71 | 67 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 | 115 |
| 120 // Open the child CachedFrames in their respective FrameLoaders. | 116 // Open the child CachedFrames in their respective FrameLoaders. |
| 121 for (unsigned i = 0; i < m_childFrames.size(); ++i) | 117 for (unsigned i = 0; i < m_childFrames.size(); ++i) |
| 122 m_childFrames[i]->open(); | 118 m_childFrames[i]->open(); |
| 123 | 119 |
| 124 m_document->enqueuePageshowEvent(PageshowEventPersisted); | 120 m_document->enqueuePageshowEvent(PageshowEventPersisted); |
| 125 | 121 |
| 126 HistoryItem* historyItem = frame->loader()->history()->currentItem(); | 122 HistoryItem* historyItem = frame->loader()->history()->currentItem(); |
| 127 m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ?
historyItem->stateObject() : SerializedScriptValue::nullValue()); | 123 m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ?
historyItem->stateObject() : SerializedScriptValue::nullValue()); |
| 128 | 124 |
| 129 #if ENABLE(TOUCH_EVENTS) | |
| 130 if (m_document->hasTouchEventHandlers()) | 125 if (m_document->hasTouchEventHandlers()) |
| 131 m_document->page()->chrome()->client()->needTouchEvents(true); | 126 m_document->page()->chrome()->client()->needTouchEvents(true); |
| 132 #endif | |
| 133 | 127 |
| 134 m_document->documentDidResumeFromPageCache(); | 128 m_document->documentDidResumeFromPageCache(); |
| 135 } | 129 } |
| 136 | 130 |
| 137 CachedFrame::CachedFrame(Frame* frame) | 131 CachedFrame::CachedFrame(Frame* frame) |
| 138 : CachedFrameBase(frame) | 132 : CachedFrameBase(frame) |
| 139 { | 133 { |
| 140 #ifndef NDEBUG | 134 #ifndef NDEBUG |
| 141 cachedFrameCounter().increment(); | 135 cachedFrameCounter().increment(); |
| 142 #endif | 136 #endif |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 int CachedFrame::descendantFrameCount() const | 268 int CachedFrame::descendantFrameCount() const |
| 275 { | 269 { |
| 276 int count = m_childFrames.size(); | 270 int count = m_childFrames.size(); |
| 277 for (size_t i = 0; i < m_childFrames.size(); ++i) | 271 for (size_t i = 0; i < m_childFrames.size(); ++i) |
| 278 count += m_childFrames[i]->descendantFrameCount(); | 272 count += m_childFrames[i]->descendantFrameCount(); |
| 279 | 273 |
| 280 return count; | 274 return count; |
| 281 } | 275 } |
| 282 | 276 |
| 283 } // namespace WebCore | 277 } // namespace WebCore |
| OLD | NEW |