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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 } | 372 } |
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 if (isMainFrame()) { |
383 bool textAutosizingEnabled = InspectorInstrumentation::overrideTextAutos
izing(page, page->settings().textAutosizingEnabled()); | 383 Page* page = m_frame->page(); |
384 if (isMainFrame() && textAutosizingEnabled) { | 384 bool textAutosizingEnabled = InspectorInstrumentation::overrideTextA
utosizing(page, page->settings().textAutosizingEnabled()); |
385 TextAutosizer* textAutosizer = m_frame->document()->textAutosizer(); | 385 if (textAutosizingEnabled) { |
386 if (textAutosizer) { | 386 TextAutosizer* textAutosizer = m_frame->document()->textAutosize
r(); |
387 for (Frame* frame = page->mainFrame(); frame; frame = frame->tre
e().traverseNext()) | 387 if (textAutosizer) { |
388 textAutosizer->recalculateMultipliers(); | 388 for (Frame* frame = page->mainFrame(); frame; frame = frame-
>tree().traverseNext()) |
| 389 textAutosizer->recalculateMultipliers(); |
| 390 } |
389 } | 391 } |
390 } | 392 } |
391 } | 393 } |
392 | 394 |
393 ScrollView::setFrameRect(newRect); | 395 ScrollView::setFrameRect(newRect); |
394 | 396 |
395 updateScrollableAreaSet(); | 397 updateScrollableAreaSet(); |
396 | 398 |
397 if (RenderView* renderView = this->renderView()) { | 399 if (RenderView* renderView = this->renderView()) { |
398 if (renderView->usesCompositing()) | 400 if (renderView->usesCompositing()) |
(...skipping 2837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3236 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3238 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3237 { | 3239 { |
3238 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3240 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3239 if (AXObjectCache* cache = axObjectCache()) { | 3241 if (AXObjectCache* cache = axObjectCache()) { |
3240 cache->remove(scrollbar); | 3242 cache->remove(scrollbar); |
3241 cache->handleScrollbarUpdate(this); | 3243 cache->handleScrollbarUpdate(this); |
3242 } | 3244 } |
3243 } | 3245 } |
3244 | 3246 |
3245 } // namespace WebCore | 3247 } // namespace WebCore |
OLD | NEW |