| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 | 244 |
| 245 void ScrollView::setUseFixedLayout(bool enable) | 245 void ScrollView::setUseFixedLayout(bool enable) |
| 246 { | 246 { |
| 247 if (useFixedLayout() == enable) | 247 if (useFixedLayout() == enable) |
| 248 return; | 248 return; |
| 249 m_useFixedLayout = enable; | 249 m_useFixedLayout = enable; |
| 250 updateScrollbars(scrollOffset()); | 250 updateScrollbars(scrollOffset()); |
| 251 contentsResized(); | 251 contentsResized(); |
| 252 } | 252 } |
| 253 | 253 |
| 254 IntSize ScrollView::mediaSize() const |
| 255 { |
| 256 return m_fixedLayoutSize.isEmpty() || !m_useFixedLayout ? unscaledVisibleCon
tentSize(IncludeScrollbars) : m_fixedLayoutSize; |
| 257 } |
| 258 |
| 254 IntSize ScrollView::contentsSize() const | 259 IntSize ScrollView::contentsSize() const |
| 255 { | 260 { |
| 256 return m_contentsSize; | 261 return m_contentsSize; |
| 257 } | 262 } |
| 258 | 263 |
| 259 void ScrollView::setContentsSize(const IntSize& newSize) | 264 void ScrollView::setContentsSize(const IntSize& newSize) |
| 260 { | 265 { |
| 261 if (contentsSize() == newSize) | 266 if (contentsSize() == newSize) |
| 262 return; | 267 return; |
| 263 m_contentsSize = newSize; | 268 m_contentsSize = newSize; |
| (...skipping 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1271 { | 1276 { |
| 1272 } | 1277 } |
| 1273 | 1278 |
| 1274 bool ScrollView::platformIsOffscreen() const | 1279 bool ScrollView::platformIsOffscreen() const |
| 1275 { | 1280 { |
| 1276 return false; | 1281 return false; |
| 1277 } | 1282 } |
| 1278 | 1283 |
| 1279 | 1284 |
| 1280 } | 1285 } |
| OLD | NEW |