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

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

Issue 2316533004: Don't include headers from the layout API from other headers needlessly. (Closed)
Patch Set: The runway sure is slippery today. Created 4 years, 3 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
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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 Page* FrameView::page() const 441 Page* FrameView::page() const
442 { 442 {
443 return frame().page(); 443 return frame().page();
444 } 444 }
445 445
446 LayoutView* FrameView::layoutView() const 446 LayoutView* FrameView::layoutView() const
447 { 447 {
448 return frame().contentLayoutObject(); 448 return frame().contentLayoutObject();
449 } 449 }
450 450
451 LayoutViewItem FrameView::layoutViewItem() const
452 {
453 return LayoutViewItem(frame().contentLayoutObject());
454 }
455
451 ScrollingCoordinator* FrameView::scrollingCoordinator() const 456 ScrollingCoordinator* FrameView::scrollingCoordinator() const
452 { 457 {
453 Page* p = page(); 458 Page* p = page();
454 return p ? p->scrollingCoordinator() : 0; 459 return p ? p->scrollingCoordinator() : 0;
455 } 460 }
456 461
457 CompositorAnimationTimeline* FrameView::compositorAnimationTimeline() const 462 CompositorAnimationTimeline* FrameView::compositorAnimationTimeline() const
458 { 463 {
459 ScrollingCoordinator* c = scrollingCoordinator(); 464 ScrollingCoordinator* c = scrollingCoordinator();
460 return c ? c->compositorAnimationTimeline() : nullptr; 465 return c ? c->compositorAnimationTimeline() : nullptr;
461 } 466 }
462 467
468 LayoutBox* FrameView::layoutBox() const
469 {
470 return layoutView();
471 }
472
463 void FrameView::setCanHaveScrollbars(bool canHaveScrollbars) 473 void FrameView::setCanHaveScrollbars(bool canHaveScrollbars)
464 { 474 {
465 m_canHaveScrollbars = canHaveScrollbars; 475 m_canHaveScrollbars = canHaveScrollbars;
466 476
467 ScrollbarMode newVerticalMode = m_verticalScrollbarMode; 477 ScrollbarMode newVerticalMode = m_verticalScrollbarMode;
468 if (canHaveScrollbars && m_verticalScrollbarMode == ScrollbarAlwaysOff) 478 if (canHaveScrollbars && m_verticalScrollbarMode == ScrollbarAlwaysOff)
469 newVerticalMode = ScrollbarAuto; 479 newVerticalMode = ScrollbarAuto;
470 else if (!canHaveScrollbars) 480 else if (!canHaveScrollbars)
471 newVerticalMode = ScrollbarAlwaysOff; 481 newVerticalMode = ScrollbarAlwaysOff;
472 482
(...skipping 3863 matching lines...) Expand 10 before | Expand all | Expand 10 after
4336 } 4346 }
4337 4347
4338 bool FrameView::canThrottleRendering() const 4348 bool FrameView::canThrottleRendering() const
4339 { 4349 {
4340 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled()) 4350 if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
4341 return false; 4351 return false;
4342 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling); 4352 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot tling);
4343 } 4353 }
4344 4354
4345 } // namespace blink 4355 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/frame/FrameViewAutoSizeInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698