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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 80 |
81 WebString WebHistoryItem::target() const { | 81 WebString WebHistoryItem::target() const { |
82 return m_private->target(); | 82 return m_private->target(); |
83 } | 83 } |
84 | 84 |
85 void WebHistoryItem::setTarget(const WebString& target) { | 85 void WebHistoryItem::setTarget(const WebString& target) { |
86 m_private->setTarget(target); | 86 m_private->setTarget(target); |
87 } | 87 } |
88 | 88 |
89 WebFloatPoint WebHistoryItem::visualViewportScrollOffset() const { | 89 WebFloatPoint WebHistoryItem::visualViewportScrollOffset() const { |
90 return m_private->visualViewportScrollPoint(); | 90 ScrollOffset offset = m_private->visualViewportScrollOffset(); |
| 91 return WebFloatPoint(offset.width(), offset.height()); |
91 } | 92 } |
92 | 93 |
93 void WebHistoryItem::setVisualViewportScrollOffset( | 94 void WebHistoryItem::setVisualViewportScrollOffset( |
94 const WebFloatPoint& scrollOffset) { | 95 const WebFloatPoint& scrollOffset) { |
95 m_private->setVisualViewportScrollPoint(scrollOffset); | 96 m_private->setVisualViewportScrollOffset(toScrollOffset(scrollOffset)); |
96 } | 97 } |
97 | 98 |
98 WebPoint WebHistoryItem::scrollOffset() const { | 99 WebPoint WebHistoryItem::scrollOffset() const { |
99 return m_private->scrollPoint(); | 100 ScrollOffset offset = m_private->scrollOffset(); |
| 101 return WebPoint(offset.width(), offset.height()); |
100 } | 102 } |
101 | 103 |
102 void WebHistoryItem::setScrollOffset(const WebPoint& scrollOffset) { | 104 void WebHistoryItem::setScrollOffset(const WebPoint& scrollOffset) { |
103 m_private->setScrollPoint(scrollOffset); | 105 m_private->setScrollOffset(ScrollOffset(scrollOffset.x, scrollOffset.y)); |
104 } | 106 } |
105 | 107 |
106 float WebHistoryItem::pageScaleFactor() const { | 108 float WebHistoryItem::pageScaleFactor() const { |
107 return m_private->pageScaleFactor(); | 109 return m_private->pageScaleFactor(); |
108 } | 110 } |
109 | 111 |
110 void WebHistoryItem::setPageScaleFactor(float scale) { | 112 void WebHistoryItem::setPageScaleFactor(float scale) { |
111 m_private->setPageScaleFactor(scale); | 113 m_private->setPageScaleFactor(scale); |
112 } | 114 } |
113 | 115 |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 WebHistoryItem& WebHistoryItem::operator=(HistoryItem* item) { | 203 WebHistoryItem& WebHistoryItem::operator=(HistoryItem* item) { |
202 m_private = item; | 204 m_private = item; |
203 return *this; | 205 return *this; |
204 } | 206 } |
205 | 207 |
206 WebHistoryItem::operator HistoryItem*() const { | 208 WebHistoryItem::operator HistoryItem*() const { |
207 return m_private.get(); | 209 return m_private.get(); |
208 } | 210 } |
209 | 211 |
210 } // namespace blink | 212 } // namespace blink |
OLD | NEW |