Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

2 files changed, 14 insertions, 10 deletions

diff --git a/Source/WebCore/history/CachedFrame.cpp b/Source/WebCore/history/CachedFrame.cpp
index 0059691..558a191 100644
--- a/Source/WebCore/history/CachedFrame.cpp
+++ b/Source/WebCore/history/CachedFrame.cpp
@@ -82,7 +82,9 @@ CachedFrameBase::~CachedFrameBase()
 void CachedFrameBase::restore()
 {
     ASSERT(m_document->view() == m_view);
-    
+
+    m_view->setIsRestoringFromBackForward(true);
+
     Frame* frame = m_view->frame();
     m_cachedFrameScriptData->restore(frame);
 
@@ -94,6 +96,7 @@ void CachedFrameBase::restore()
     frame->animation()->resumeAnimationsForDocument(m_document.get());
     frame->eventHandler()->setMousePressNode(m_mousePressNode.get());
     m_document->resumeActiveDOMObjects();
+    m_document->resumeScriptedAnimationControllerCallbacks();
 
     // It is necessary to update any platform script objects after restoring the
     // cached page.
@@ -152,6 +155,7 @@ CachedFrame::CachedFrame(Frame* frame)
     // Suspending must also happen after we've recursed over child frames, in case
     // those create more objects.
     // FIXME: It's still possible to have objects created after suspending in some cases, see http://webkit.org/b/53733 for more details.
+    m_document->suspendScriptedAnimationControllerCallbacks();
     m_document->suspendActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive);
     m_cachedFrameScriptData = adoptPtr(new ScriptCachedFrameData(frame));
 
diff --git a/Source/WebCore/history/HistoryItem.cpp b/Source/WebCore/history/HistoryItem.cpp
index c698db3..c31aa86 100644
--- a/Source/WebCore/history/HistoryItem.cpp
+++ b/Source/WebCore/history/HistoryItem.cpp
@@ -85,7 +85,7 @@ HistoryItem::HistoryItem(const String& urlString, const String& title, double ti
     , m_next(0)
     , m_prev(0)
 {    
-    iconDatabase()->retainIconForPageURL(m_urlString);
+    iconDatabase().retainIconForPageURL(m_urlString);
 }
 
 HistoryItem::HistoryItem(const String& urlString, const String& title, const String& alternateTitle, double time)
@@ -104,7 +104,7 @@ HistoryItem::HistoryItem(const String& urlString, const String& title, const Str
     , m_next(0)
     , m_prev(0)
 {
-    iconDatabase()->retainIconForPageURL(m_urlString);
+    iconDatabase().retainIconForPageURL(m_urlString);
 }
 
 HistoryItem::HistoryItem(const KURL& url, const String& target, const String& parent, const String& title)
@@ -124,13 +124,13 @@ HistoryItem::HistoryItem(const KURL& url, const String& target, const String& pa
     , m_next(0)
     , m_prev(0)
 {    
-    iconDatabase()->retainIconForPageURL(m_urlString);
+    iconDatabase().retainIconForPageURL(m_urlString);
 }
 
 HistoryItem::~HistoryItem()
 {
     ASSERT(!m_cachedPage);
-    iconDatabase()->releaseIconForPageURL(m_urlString);
+    iconDatabase().releaseIconForPageURL(m_urlString);
 #if PLATFORM(ANDROID)
     if (m_bridge)
         m_bridge->detachHistoryItem();
@@ -178,7 +178,7 @@ PassRefPtr<HistoryItem> HistoryItem::copy() const
 
 void HistoryItem::reset()
 {
-    iconDatabase()->releaseIconForPageURL(m_urlString);
+    iconDatabase().releaseIconForPageURL(m_urlString);
 
     m_urlString = String();
     m_originalURLString = String();
@@ -232,8 +232,8 @@ const String& HistoryItem::alternateTitle() const
 
 Image* HistoryItem::icon() const
 {
-    Image* result = iconDatabase()->iconForPageURL(m_urlString, IntSize(16, 16));
-    return result ? result : iconDatabase()->defaultIcon(IntSize(16, 16));
+    Image* result = iconDatabase().iconForPageURL(m_urlString, IntSize(16, 16));
+    return result ? result : iconDatabase().defaultIcon(IntSize(16, 16));
 }
 
 double HistoryItem::lastVisitedTime() const
@@ -275,9 +275,9 @@ void HistoryItem::setAlternateTitle(const String& alternateTitle)
 void HistoryItem::setURLString(const String& urlString)
 {
     if (m_urlString != urlString) {
-        iconDatabase()->releaseIconForPageURL(m_urlString);
+        iconDatabase().releaseIconForPageURL(m_urlString);
         m_urlString = urlString;
-        iconDatabase()->retainIconForPageURL(m_urlString);
+        iconDatabase().retainIconForPageURL(m_urlString);
     }
     
     notifyHistoryItemChanged(this);