OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 { | 391 { |
392 IntRect oldRect = frameRect(); | 392 IntRect oldRect = frameRect(); |
393 if (newRect == oldRect) | 393 if (newRect == oldRect) |
394 return; | 394 return; |
395 | 395 |
396 Widget::setFrameRect(newRect); | 396 Widget::setFrameRect(newRect); |
397 | 397 |
398 const bool frameSizeChanged = oldRect.size() != newRect.size(); | 398 const bool frameSizeChanged = oldRect.size() != newRect.size(); |
399 | 399 |
400 m_needsScrollbarsUpdate = frameSizeChanged; | 400 m_needsScrollbarsUpdate = frameSizeChanged; |
401 // If layout is clean then update scrollbars immediately otherwise wait | 401 // TODO(wjmaclean): find out why scrollbars fail to resize for complex |
402 // for layout to ensure content size is correct too. | 402 // subframes after changing the zoom level. For now always calling |
403 if (!needsLayout()) | 403 // updateScrollbarsIfNeeded() here fixes the issue, but it would be good to |
404 updateScrollbarsIfNeeded(); | 404 // discover the deeper cause of this. http://crbug.com/607987. |
| 405 updateScrollbarsIfNeeded(); |
405 | 406 |
406 frameRectsChanged(); | 407 frameRectsChanged(); |
407 | 408 |
408 updateScrollableAreaSet(); | 409 updateScrollableAreaSet(); |
409 | 410 |
410 if (LayoutViewItem layoutView = this->layoutViewItem()) { | 411 if (LayoutViewItem layoutView = this->layoutViewItem()) { |
411 // TODO(majidvp): It seems that this only needs to be called when size | 412 // TODO(majidvp): It seems that this only needs to be called when size |
412 // is updated ignoring any change in the location. | 413 // is updated ignoring any change in the location. |
413 if (layoutView.usesCompositing()) | 414 if (layoutView.usesCompositing()) |
414 layoutView.compositor()->frameViewDidChangeSize(); | 415 layoutView.compositor()->frameViewDidChangeSize(); |
(...skipping 3688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4103 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); | 4104 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); |
4104 } | 4105 } |
4105 | 4106 |
4106 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4107 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
4107 { | 4108 { |
4108 ASSERT(layoutView()); | 4109 ASSERT(layoutView()); |
4109 return *layoutView(); | 4110 return *layoutView(); |
4110 } | 4111 } |
4111 | 4112 |
4112 } // namespace blink | 4113 } // namespace blink |
OLD | NEW |