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

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

Issue 215843002: Dispel the myth that enclosingLayer can return zero (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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
« no previous file with comments | « Source/core/events/MouseRelatedEvent.cpp ('k') | Source/core/page/EventHandler.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 1049 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 1060
1061 } else { 1061 } else {
1062 didFullRepaint = renderer->repaintAfterLayoutIfNeeded(renderer->cont ainerForRepaint(), 1062 didFullRepaint = renderer->repaintAfterLayoutIfNeeded(renderer->cont ainerForRepaint(),
1063 renderer->shouldDoFullRepaintAfterLayout(), oldRepaintRect, &new RepaintRect); 1063 renderer->shouldDoFullRepaintAfterLayout(), oldRepaintRect, &new RepaintRect);
1064 } 1064 }
1065 1065
1066 if (!didFullRepaint) 1066 if (!didFullRepaint)
1067 renderer->repaintOverflowIfNeeded(); 1067 renderer->repaintOverflowIfNeeded();
1068 1068
1069 // Repaint any scrollbars if there is a scrollable area for this rendere r. 1069 // Repaint any scrollbars if there is a scrollable area for this rendere r.
1070 if (renderer->enclosingLayer()) { 1070 if (RenderLayerScrollableArea* area = renderer->enclosingLayer()->scroll ableArea()) {
1071 if (RenderLayerScrollableArea* area = renderer->enclosingLayer()->sc rollableArea()) { 1071 if (area->hasVerticalBarDamage())
1072 if (area->hasVerticalBarDamage()) 1072 renderer->repaintRectangle(area->verticalBarDamage());
1073 renderer->repaintRectangle(area->verticalBarDamage()); 1073 if (area->hasHorizontalBarDamage())
1074 if (area->hasHorizontalBarDamage()) 1074 renderer->repaintRectangle(area->horizontalBarDamage());
1075 renderer->repaintRectangle(area->horizontalBarDamage()); 1075 area->resetScrollbarDamage();
1076 area->resetScrollbarDamage();
1077 }
1078 } 1076 }
1077
1079 // The list box has a verticalScrollbar we may need to repaint. 1078 // The list box has a verticalScrollbar we may need to repaint.
1080 if (renderer->isListBox()) { 1079 if (renderer->isListBox()) {
1081 RenderListBox* listBox = static_cast<RenderListBox*>(renderer); 1080 RenderListBox* listBox = static_cast<RenderListBox*>(renderer);
1082 listBox->repaintScrollbarIfNeeded(); 1081 listBox->repaintScrollbarIfNeeded();
1083 } 1082 }
1084 1083
1085 renderer->clearRepaintState(); 1084 renderer->clearRepaintState();
1086 } 1085 }
1087 1086
1088 // Repaint the frameviews scrollbars if needed 1087 // Repaint the frameviews scrollbars if needed
(...skipping 2158 matching lines...) Expand 10 before | Expand all | Expand 10 after
3247 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3246 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3248 { 3247 {
3249 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3248 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3250 if (AXObjectCache* cache = axObjectCache()) { 3249 if (AXObjectCache* cache = axObjectCache()) {
3251 cache->remove(scrollbar); 3250 cache->remove(scrollbar);
3252 cache->handleScrollbarUpdate(this); 3251 cache->handleScrollbarUpdate(this);
3253 } 3252 }
3254 } 3253 }
3255 3254
3256 } // namespace WebCore 3255 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/events/MouseRelatedEvent.cpp ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698