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

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

Issue 11635024: Merge 137939 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 8 years 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
« no previous file with comments | « Source/WebCore/dom/Node.cpp ('k') | Source/WebCore/html/HTMLInputElement.cpp » ('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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // Open the child CachedFrames in their respective FrameLoaders. 127 // Open the child CachedFrames in their respective FrameLoaders.
128 for (unsigned i = 0; i < m_childFrames.size(); ++i) 128 for (unsigned i = 0; i < m_childFrames.size(); ++i)
129 m_childFrames[i]->open(); 129 m_childFrames[i]->open();
130 130
131 m_document->enqueuePageshowEvent(PageshowEventPersisted); 131 m_document->enqueuePageshowEvent(PageshowEventPersisted);
132 132
133 HistoryItem* historyItem = frame->loader()->history()->currentItem(); 133 HistoryItem* historyItem = frame->loader()->history()->currentItem();
134 m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ? historyItem->stateObject() : SerializedScriptValue::nullValue()); 134 m_document->enqueuePopstateEvent(historyItem && historyItem->stateObject() ? historyItem->stateObject() : SerializedScriptValue::nullValue());
135 135
136 #if ENABLE(TOUCH_EVENTS) 136 #if ENABLE(TOUCH_EVENTS)
137 if (m_document->touchEventHandlerCount()) 137 if (m_document->hasTouchEventHandlers())
138 m_document->page()->chrome()->client()->needTouchEvents(true); 138 m_document->page()->chrome()->client()->needTouchEvents(true);
139 #endif 139 #endif
140 140
141 m_document->documentDidResumeFromPageCache(); 141 m_document->documentDidResumeFromPageCache();
142 } 142 }
143 143
144 CachedFrame::CachedFrame(Frame* frame) 144 CachedFrame::CachedFrame(Frame* frame)
145 : CachedFrameBase(frame) 145 : CachedFrameBase(frame)
146 { 146 {
147 #ifndef NDEBUG 147 #ifndef NDEBUG
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 int CachedFrame::descendantFrameCount() const 290 int CachedFrame::descendantFrameCount() const
291 { 291 {
292 int count = m_childFrames.size(); 292 int count = m_childFrames.size();
293 for (size_t i = 0; i < m_childFrames.size(); ++i) 293 for (size_t i = 0; i < m_childFrames.size(); ++i)
294 count += m_childFrames[i]->descendantFrameCount(); 294 count += m_childFrames[i]->descendantFrameCount();
295 295
296 return count; 296 return count;
297 } 297 }
298 298
299 } // namespace WebCore 299 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Node.cpp ('k') | Source/WebCore/html/HTMLInputElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698