Merge 140748

Source/WebCore/page/History.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 37 matching lines @@
 
 unsigned History::length() const
 {
     if (!m_frame)
         return 0;
     if (!m_frame->page())
         return 0;
     return m_frame->page()->backForward()->count();
 }
 
-SerializedScriptValue* History::state()
+PassRefPtr<SerializedScriptValue> History::state()
 {
     m_lastStateObjectRequested = stateInternal();
     return m_lastStateObjectRequested;
 }
 
-SerializedScriptValue* History::stateInternal() const
+PassRefPtr<SerializedScriptValue> History::stateInternal() const
 {
     if (!m_frame)
         return 0;
 
     if (HistoryItem* historyItem = m_frame->loader()->history()->currentItem())
         return historyItem->stateObject();
 
     return 0;
 }
 
@@ skipping 79 matching lines @@
     if (!urlString.isEmpty())
         m_frame->document()->updateURLForPushOrReplaceState(fullURL);
 
     if (stateObjectType == StateObjectPush)
         m_frame->loader()->client()->dispatchDidPushStateWithinPage();
     else if (stateObjectType == StateObjectReplace)
         m_frame->loader()->client()->dispatchDidReplaceStateWithinPage();
 }
 
 } // namespace WebCore