Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1445)

Side by Side Diff: Source/core/frame/FrameView.cpp

Issue 197313003: Fix TextAutosizer recalculate multipliers on rotate. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fixed some layout Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 } 366 }
367 367
368 void FrameView::setFrameRect(const IntRect& newRect) 368 void FrameView::setFrameRect(const IntRect& newRect)
369 { 369 {
370 IntRect oldRect = frameRect(); 370 IntRect oldRect = frameRect();
371 if (newRect == oldRect) 371 if (newRect == oldRect)
372 return; 372 return;
373 373
374 // Autosized font sizes depend on the width of the viewing area. 374 // Autosized font sizes depend on the width of the viewing area.
375 if (newRect.width() != oldRect.width()) { 375 if (newRect.width() != oldRect.width()) {
376 if (isMainFrame()) { 376 if (isMainFrame() && m_frame->settings()->textAutosizingEnabled()) {
377 Page* page = m_frame->page(); 377 for (LocalFrame* frame = m_frame.get(); frame; frame = frame->tree() .traverseNext()) {
378 bool textAutosizingEnabled = m_frame->settings()->textAutosizingEnab led(); 378 if (TextAutosizer* textAutosizer = frame->document()->textAutosi zer())
379 if (textAutosizingEnabled) { 379 textAutosizer->recalculateMultipliers();
380 TextAutosizer* textAutosizer = m_frame->document()->textAutosize r();
381 if (textAutosizer) {
382 for (LocalFrame* frame = page->mainFrame(); frame; frame = f rame->tree().traverseNext())
383 textAutosizer->recalculateMultipliers();
384 }
385 } 380 }
386 } 381 }
387 } 382 }
388 383
389 ScrollView::setFrameRect(newRect); 384 ScrollView::setFrameRect(newRect);
390 385
391 updateScrollableAreaSet(); 386 updateScrollableAreaSet();
392 387
393 if (RenderView* renderView = this->renderView()) { 388 if (RenderView* renderView = this->renderView()) {
394 if (renderView->usesCompositing()) 389 if (renderView->usesCompositing())
(...skipping 2819 matching lines...) Expand 10 before | Expand all | Expand 10 after
3214 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3209 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3215 { 3210 {
3216 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3211 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3217 if (AXObjectCache* cache = axObjectCache()) { 3212 if (AXObjectCache* cache = axObjectCache()) {
3218 cache->remove(scrollbar); 3213 cache->remove(scrollbar);
3219 cache->handleScrollbarUpdate(this); 3214 cache->handleScrollbarUpdate(this);
3220 } 3215 }
3221 } 3216 }
3222 3217
3223 } // namespace WebCore 3218 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698