diff options
Diffstat (limited to 'Source/WebCore/page/History.h')
| -rw-r--r-- | Source/WebCore/page/History.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/Source/WebCore/page/History.h b/Source/WebCore/page/History.h index ae37fc387..1e8568594 100644 --- a/Source/WebCore/page/History.h +++ b/Source/WebCore/page/History.h @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -38,12 +38,11 @@ namespace WebCore { class Frame; class ScriptExecutionContext; -struct ExceptionCodeWithMessage; typedef int ExceptionCode; class History : public ScriptWrappable, public RefCounted<History>, public DOMWindowProperty { public: - static Ref<History> create(Frame* frame) { return adoptRef(*new History(frame)); } + static PassRefPtr<History> create(Frame* frame) { return adoptRef(new History(frame)); } unsigned length() const; PassRefPtr<SerializedScriptValue> state(); @@ -62,7 +61,7 @@ public: Push, Replace }; - void stateObjectAdded(PassRefPtr<SerializedScriptValue>, const String& title, const String& url, StateObjectType, ExceptionCodeWithMessage&); + void stateObjectAdded(PassRefPtr<SerializedScriptValue>, const String& title, const String& url, StateObjectType, ExceptionCode&); private: explicit History(Frame*); @@ -72,16 +71,6 @@ private: PassRefPtr<SerializedScriptValue> stateInternal() const; RefPtr<SerializedScriptValue> m_lastStateObjectRequested; - - unsigned m_nonUserGestureObjectsAdded { 0 }; - unsigned m_currentUserGestureObjectsAdded { 0 }; - double m_currentUserGestureTimestamp { 0 }; - - // For the main frame's History object to keep track of all state object usage. - uint64_t m_totalStateObjectUsage { 0 }; - - // For each individual History object to keep track of the most recent state object added. - uint64_t m_mostRecentStateObjectUsage { 0 }; }; } // namespace WebCore |