OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 17 matching lines...) Expand all Loading... |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "public/web/WebHistoryItem.h" | 32 #include "public/web/WebHistoryItem.h" |
33 | 33 |
34 #include "bindings/v8/SerializedScriptValue.h" | 34 #include "bindings/v8/SerializedScriptValue.h" |
35 #include "core/loader/HistoryItem.h" | 35 #include "core/loader/HistoryItem.h" |
36 #include "platform/network/FormData.h" | 36 #include "platform/network/FormData.h" |
37 #include "platform/weborigin/KURL.h" | 37 #include "platform/weborigin/KURL.h" |
| 38 #include "public/platform/WebFloatPoint.h" |
38 #include "public/platform/WebHTTPBody.h" | 39 #include "public/platform/WebHTTPBody.h" |
39 #include "public/platform/WebPoint.h" | 40 #include "public/platform/WebPoint.h" |
40 #include "public/platform/WebString.h" | 41 #include "public/platform/WebString.h" |
41 #include "public/platform/WebVector.h" | 42 #include "public/platform/WebVector.h" |
42 #include "public/web/WebSerializedScriptValue.h" | 43 #include "public/web/WebSerializedScriptValue.h" |
43 #include "wtf/text/StringHash.h" | 44 #include "wtf/text/StringHash.h" |
44 | 45 |
45 using namespace WebCore; | 46 using namespace WebCore; |
46 | 47 |
47 namespace blink { | 48 namespace blink { |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 WebString WebHistoryItem::target() const | 113 WebString WebHistoryItem::target() const |
113 { | 114 { |
114 return m_private->target(); | 115 return m_private->target(); |
115 } | 116 } |
116 | 117 |
117 void WebHistoryItem::setTarget(const WebString& target) | 118 void WebHistoryItem::setTarget(const WebString& target) |
118 { | 119 { |
119 m_private->setTarget(target); | 120 m_private->setTarget(target); |
120 } | 121 } |
121 | 122 |
| 123 WebFloatPoint WebHistoryItem::pinchViewportScrollOffset() const |
| 124 { |
| 125 return m_private->pinchViewportScrollPoint(); |
| 126 } |
| 127 |
| 128 void WebHistoryItem::setPinchViewportScrollOffset(const WebFloatPoint& scrollOff
set) |
| 129 { |
| 130 m_private->setPinchViewportScrollPoint(scrollOffset); |
| 131 } |
| 132 |
122 WebPoint WebHistoryItem::scrollOffset() const | 133 WebPoint WebHistoryItem::scrollOffset() const |
123 { | 134 { |
124 return m_private->scrollPoint(); | 135 return m_private->scrollPoint(); |
125 } | 136 } |
126 | 137 |
127 void WebHistoryItem::setScrollOffset(const WebPoint& scrollOffset) | 138 void WebHistoryItem::setScrollOffset(const WebPoint& scrollOffset) |
128 { | 139 { |
129 m_private->setScrollPoint(scrollOffset); | 140 m_private->setScrollPoint(scrollOffset); |
130 } | 141 } |
131 | 142 |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 m_private = item; | 251 m_private = item; |
241 return *this; | 252 return *this; |
242 } | 253 } |
243 | 254 |
244 WebHistoryItem::operator PassRefPtr<HistoryItem>() const | 255 WebHistoryItem::operator PassRefPtr<HistoryItem>() const |
245 { | 256 { |
246 return m_private.get(); | 257 return m_private.get(); |
247 } | 258 } |
248 | 259 |
249 } // namespace blink | 260 } // namespace blink |
OLD | NEW |