summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/history/HistoryItem.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-13 16:23:25 +0100
committerBen Murdoch <benm@google.com>2011-05-16 11:35:02 +0100
commit65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch)
treef478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/history/HistoryItem.h
parent47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff)
downloadexternal_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz
external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/history/HistoryItem.h')
-rw-r--r--Source/WebCore/history/HistoryItem.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/history/HistoryItem.h b/Source/WebCore/history/HistoryItem.h
index 19b33ad..a4622c0 100644
--- a/Source/WebCore/history/HistoryItem.h
+++ b/Source/WebCore/history/HistoryItem.h
@@ -123,6 +123,10 @@ public:
const IntPoint& scrollPoint() const;
void setScrollPoint(const IntPoint&);
void clearScrollPoint();
+
+ float pageScaleFactor() const;
+ void setPageScaleFactor(float);
+
const Vector<String>& documentState() const;
void setDocumentState(const Vector<String>&);
void clearDocumentState();
@@ -245,6 +249,7 @@ private:
bool m_lastVisitWasHTTPNonGet;
IntPoint m_scrollPoint;
+ float m_pageScaleFactor;
Vector<String> m_documentState;
HistoryItemVector m_children;