Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: Source/core/history/CachedFrame.cpp

Issue 14280004: Revert removal of events (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/TouchList.idl ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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"
33 #include "DOMWindow.h" 31 #include "DOMWindow.h"
34 #include "Document.h" 32 #include "Document.h"
35 #include "DocumentLoader.h" 33 #include "DocumentLoader.h"
36 #include "EventHandler.h" 34 #include "EventHandler.h"
37 #include "EventNames.h" 35 #include "EventNames.h"
38 #include "ExceptionCode.h" 36 #include "ExceptionCode.h"
39 #include "FocusController.h" 37 #include "FocusController.h"
40 #include "Frame.h" 38 #include "Frame.h"
41 #include "FrameLoader.h" 39 #include "FrameLoader.h"
42 #include "FrameLoaderClient.h" 40 #include "FrameLoaderClient.h"
43 #include "FrameView.h" 41 #include "FrameView.h"
44 #include "HistoryItem.h" 42 #include "HistoryItem.h"
45 #include "Logging.h" 43 #include "Logging.h"
46 #include "Page.h" 44 #include "Page.h"
47 #include "PageCache.h" 45 #include "PageCache.h"
48 #include "PageTransitionEvent.h" 46 #include "PageTransitionEvent.h"
49 #include "ScriptController.h" 47 #include "ScriptController.h"
50 #include "SerializedScriptValue.h" 48 #include "SerializedScriptValue.h"
51 #include <wtf/RefCountedLeakCounter.h> 49 #include <wtf/RefCountedLeakCounter.h>
52 #include <wtf/text/CString.h> 50 #include <wtf/text/CString.h>
53 51
54 #if ENABLE(SVG) 52 #if ENABLE(SVG)
55 #include "SVGDocumentExtensions.h" 53 #include "SVGDocumentExtensions.h"
56 #endif 54 #endif
57 55
56 #if ENABLE(TOUCH_EVENTS)
57 #include "Chrome.h"
58 #include "ChromeClient.h"
59 #endif
60
61
58 namespace WebCore { 62 namespace WebCore {
59 63
60 #ifndef NDEBUG 64 #ifndef NDEBUG
61 static WTF::RefCountedLeakCounter& cachedFrameCounter() 65 static WTF::RefCountedLeakCounter& cachedFrameCounter()
62 { 66 {
63 DEFINE_STATIC_LOCAL(WTF::RefCountedLeakCounter, counter, ("CachedFrame")); 67 DEFINE_STATIC_LOCAL(WTF::RefCountedLeakCounter, counter, ("CachedFrame"));
64 return counter; 68 return counter;
65 } 69 }
66 #endif 70 #endif
67 71
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 119
116 // Open the child CachedFrames in their respective FrameLoaders. 120 // Open the child CachedFrames in their respective FrameLoaders.
117 for (unsigned i = 0; i < m_childFrames.size(); ++i) 121 for (unsigned i = 0; i < m_childFrames.size(); ++i)
118 m_childFrames[i]->open(); 122 m_childFrames[i]->open();
119 123
120 m_document->enqueuePageshowEvent(PageshowEventPersisted); 124 m_document->enqueuePageshowEvent(PageshowEventPersisted);
121 125
122 HistoryItem* historyItem = frame->loader()->history()->currentItem(); 126 HistoryItem* historyItem = frame->loader()->history()->currentItem();
123 m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ? historyItem->stateObject() : SerializedScriptValue::nullValue()); 127 m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ? historyItem->stateObject() : SerializedScriptValue::nullValue());
124 128
129 #if ENABLE(TOUCH_EVENTS)
125 if (m_document->hasTouchEventHandlers()) 130 if (m_document->hasTouchEventHandlers())
126 m_document->page()->chrome()->client()->needTouchEvents(true); 131 m_document->page()->chrome()->client()->needTouchEvents(true);
132 #endif
127 133
128 m_document->documentDidResumeFromPageCache(); 134 m_document->documentDidResumeFromPageCache();
129 } 135 }
130 136
131 CachedFrame::CachedFrame(Frame* frame) 137 CachedFrame::CachedFrame(Frame* frame)
132 : CachedFrameBase(frame) 138 : CachedFrameBase(frame)
133 { 139 {
134 #ifndef NDEBUG 140 #ifndef NDEBUG
135 cachedFrameCounter().increment(); 141 cachedFrameCounter().increment();
136 #endif 142 #endif
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 int CachedFrame::descendantFrameCount() const 274 int CachedFrame::descendantFrameCount() const
269 { 275 {
270 int count = m_childFrames.size(); 276 int count = m_childFrames.size();
271 for (size_t i = 0; i < m_childFrames.size(); ++i) 277 for (size_t i = 0; i < m_childFrames.size(); ++i)
272 count += m_childFrames[i]->descendantFrameCount(); 278 count += m_childFrames[i]->descendantFrameCount();
273 279
274 return count; 280 return count;
275 } 281 }
276 282
277 } // namespace WebCore 283 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/TouchList.idl ('k') | Source/core/html/HTMLInputElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698