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

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

Issue 328023002: Layout overflow from transforms should update frame scrollbars (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase & revise Created 6 years, 6 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 | Annotate | Revision Log
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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 631
632 void FrameView::recalcOverflowAfterStyleChange() 632 void FrameView::recalcOverflowAfterStyleChange()
633 { 633 {
634 RenderView* renderView = this->renderView(); 634 RenderView* renderView = this->renderView();
635 ASSERT(renderView); 635 ASSERT(renderView);
636 if (!renderView->needsOverflowRecalcAfterStyleChange()) 636 if (!renderView->needsOverflowRecalcAfterStyleChange())
637 return; 637 return;
638 638
639 renderView->recalcOverflowAfterStyleChange(); 639 renderView->recalcOverflowAfterStyleChange();
640 640
641 // FIXME: We should adjust frame scrollbar here, but that will make many 641 if (needsLayout())
642 // tests flake in debug build. 642 return;
643
644 InUpdateScrollbarsScope inUpdateScrollbarsScope(this);
645
646 bool shouldHaveHorizontalScrollbar = false;
647 bool shouldHaveVerticalScrollbar = false;
648 computeScrollbarExistence(shouldHaveHorizontalScrollbar, shouldHaveVerticalS crollbar);
649
650 bool hasHorizontalScrollbar = horizontalScrollbar();
651 bool hasVerticalScrollbar = verticalScrollbar();
652 if (hasHorizontalScrollbar != shouldHaveHorizontalScrollbar
653 || hasVerticalScrollbar != shouldHaveVerticalScrollbar) {
654 setNeedsLayout();
655 return;
656 }
657
658 adjustViewSize();
659 updateScrollbarGeometry();
643 } 660 }
644 661
645 bool FrameView::usesCompositedScrolling() const 662 bool FrameView::usesCompositedScrolling() const
646 { 663 {
647 RenderView* renderView = this->renderView(); 664 RenderView* renderView = this->renderView();
648 if (!renderView) 665 if (!renderView)
649 return false; 666 return false;
650 if (m_frame->settings() && m_frame->settings()->compositedScrollingForFrames Enabled()) 667 if (m_frame->settings() && m_frame->settings()->compositedScrollingForFrames Enabled())
651 return renderView->compositor()->inCompositingMode(); 668 return renderView->compositor()->inCompositingMode();
652 return false; 669 return false;
(...skipping 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after
3278 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3295 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3279 { 3296 {
3280 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3297 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3281 if (AXObjectCache* cache = axObjectCache()) { 3298 if (AXObjectCache* cache = axObjectCache()) {
3282 cache->remove(scrollbar); 3299 cache->remove(scrollbar);
3283 cache->handleScrollbarUpdate(this); 3300 cache->handleScrollbarUpdate(this);
3284 } 3301 }
3285 } 3302 }
3286 3303
3287 } // namespace WebCore 3304 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/transforms/transform-update-frame-overflow-expected.html ('k') | Source/platform/scroll/ScrollView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698