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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 | 373 |
374 void FrameView::setFrameRect(const IntRect& newRect) | 374 void FrameView::setFrameRect(const IntRect& newRect) |
375 { | 375 { |
376 IntRect oldRect = frameRect(); | 376 IntRect oldRect = frameRect(); |
377 if (newRect == oldRect) | 377 if (newRect == oldRect) |
378 return; | 378 return; |
379 | 379 |
380 // Autosized font sizes depend on the width of the viewing area. | 380 // Autosized font sizes depend on the width of the viewing area. |
381 if (newRect.width() != oldRect.width()) { | 381 if (newRect.width() != oldRect.width()) { |
382 Page* page = m_frame->page(); | 382 Page* page = m_frame->page(); |
383 if (isMainFrame() && page->settings().textAutosizingEnabled()) { | 383 bool textAutosizingEnabled = InspectorInstrumentation::overrideTextAutos
izing(page, page->settings().textAutosizingEnabled()); |
| 384 if (isMainFrame() && textAutosizingEnabled) { |
384 TextAutosizer* textAutosizer = m_frame->document()->textAutosizer(); | 385 TextAutosizer* textAutosizer = m_frame->document()->textAutosizer(); |
385 if (textAutosizer) { | 386 if (textAutosizer) { |
386 for (Frame* frame = page->mainFrame(); frame; frame = frame->tre
e().traverseNext()) | 387 for (Frame* frame = page->mainFrame(); frame; frame = frame->tre
e().traverseNext()) |
387 textAutosizer->recalculateMultipliers(); | 388 textAutosizer->recalculateMultipliers(); |
388 } | 389 } |
389 } | 390 } |
390 } | 391 } |
391 | 392 |
392 ScrollView::setFrameRect(newRect); | 393 ScrollView::setFrameRect(newRect); |
393 | 394 |
(...skipping 2852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3246 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3247 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3247 { | 3248 { |
3248 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3249 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3249 if (AXObjectCache* cache = axObjectCache()) { | 3250 if (AXObjectCache* cache = axObjectCache()) { |
3250 cache->remove(scrollbar); | 3251 cache->remove(scrollbar); |
3251 cache->handleScrollbarUpdate(this); | 3252 cache->handleScrollbarUpdate(this); |
3252 } | 3253 } |
3253 } | 3254 } |
3254 | 3255 |
3255 } // namespace WebCore | 3256 } // namespace WebCore |
OLD | NEW |