diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/history | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/history')
| -rw-r--r-- | WebCore/history/CachedFrame.cpp | 4 | ||||
| -rw-r--r-- | WebCore/history/HistoryItem.cpp | 2 | ||||
| -rw-r--r-- | WebCore/history/qt/HistoryItemQt.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp index a7261dd..8881066 100644 --- a/WebCore/history/CachedFrame.cpp +++ b/WebCore/history/CachedFrame.cpp @@ -27,7 +27,6 @@ #include "CachedPage.h" #include "CachedFramePlatformData.h" -#include "CString.h" #include "DocumentLoader.h" #include "ExceptionCode.h" #include "EventNames.h" @@ -36,6 +35,7 @@ #include "FrameView.h" #include "Logging.h" #include "PageTransitionEvent.h" +#include <wtf/text/CString.h> #include <wtf/RefCountedLeakCounter.h> #if ENABLE(SVG) @@ -105,7 +105,7 @@ void CachedFrameBase::restore() for (unsigned i = 0; i < m_childFrames.size(); ++i) m_childFrames[i]->open(); - m_document->dispatchWindowEvent(PageTransitionEvent::create(eventNames().pageshowEvent, true), m_document); + m_document->enqueuePageshowEvent(PageshowEventPersisted); #if ENABLE(TOUCH_EVENTS) if (m_document->hasListenerType(Document::TOUCH_LISTENER)) m_document->page()->chrome()->client()->needTouchEvents(true); diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp index d641d4e..03aa450 100644 --- a/WebCore/history/HistoryItem.cpp +++ b/WebCore/history/HistoryItem.cpp @@ -26,13 +26,13 @@ #include "config.h" #include "HistoryItem.h" -#include "CString.h" #include "CachedPage.h" #include "Document.h" #include "IconDatabase.h" #include "PageCache.h" #include "ResourceRequest.h" #include <stdio.h> +#include <wtf/text/CString.h> #include <wtf/CurrentTime.h> namespace WebCore { diff --git a/WebCore/history/qt/HistoryItemQt.cpp b/WebCore/history/qt/HistoryItemQt.cpp index c5fb069..beb842c 100644 --- a/WebCore/history/qt/HistoryItemQt.cpp +++ b/WebCore/history/qt/HistoryItemQt.cpp @@ -20,8 +20,8 @@ #include "config.h" #include "HistoryItem.h" -#include "CString.h" #include "FormData.h" +#include <wtf/text/CString.h> bool WebCore::HistoryItem::restoreState(QDataStream& in, int version) { |