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

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

Issue 181693003: Have Document::markers() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/editing/TextCheckingHelper.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 2283 matching lines...) Expand 10 before | Expand all | Expand 10 after
2294 m_horizontalBarDamage = dirtyRect; 2294 m_horizontalBarDamage = dirtyRect;
2295 m_hasHorizontalBarDamage = true; 2295 m_hasHorizontalBarDamage = true;
2296 } 2296 }
2297 } else { 2297 } else {
2298 invalidateRect(dirtyRect); 2298 invalidateRect(dirtyRect);
2299 } 2299 }
2300 } 2300 }
2301 2301
2302 void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const 2302 void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const
2303 { 2303 {
2304 tickmarks = frame().document()->markers()->renderedRectsForMarkers(DocumentM arker::TextMatch); 2304 tickmarks = frame().document()->markers().renderedRectsForMarkers(DocumentMa rker::TextMatch);
2305 } 2305 }
2306 2306
2307 IntRect FrameView::windowResizerRect() const 2307 IntRect FrameView::windowResizerRect() const
2308 { 2308 {
2309 Page* page = frame().page(); 2309 Page* page = frame().page();
2310 if (!page) 2310 if (!page)
2311 return IntRect(); 2311 return IntRect();
2312 return page->chrome().windowResizerRect(); 2312 return page->chrome().windowResizerRect();
2313 } 2313 }
2314 2314
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
2661 FontCachePurgePreventer fontCachePurgePreventer; 2661 FontCachePurgePreventer fontCachePurgePreventer;
2662 2662
2663 PaintBehavior oldPaintBehavior = m_paintBehavior; 2663 PaintBehavior oldPaintBehavior = m_paintBehavior;
2664 2664
2665 if (FrameView* parentView = parentFrameView()) { 2665 if (FrameView* parentView = parentFrameView()) {
2666 if (parentView->paintBehavior() & PaintBehaviorFlattenCompositingLayers) 2666 if (parentView->paintBehavior() & PaintBehaviorFlattenCompositingLayers)
2667 m_paintBehavior |= PaintBehaviorFlattenCompositingLayers; 2667 m_paintBehavior |= PaintBehaviorFlattenCompositingLayers;
2668 } 2668 }
2669 2669
2670 if (m_paintBehavior == PaintBehaviorNormal) 2670 if (m_paintBehavior == PaintBehaviorNormal)
2671 document->markers()->invalidateRenderedRectsForMarkersInRect(rect); 2671 document->markers().invalidateRenderedRectsForMarkersInRect(rect);
2672 2672
2673 if (document->printing()) 2673 if (document->printing())
2674 m_paintBehavior |= PaintBehaviorFlattenCompositingLayers; 2674 m_paintBehavior |= PaintBehaviorFlattenCompositingLayers;
2675 2675
2676 ASSERT(!m_isPainting); 2676 ASSERT(!m_isPainting);
2677 m_isPainting = true; 2677 m_isPainting = true;
2678 2678
2679 // m_nodeToDraw is used to draw only one element (and its descendants) 2679 // m_nodeToDraw is used to draw only one element (and its descendants)
2680 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0; 2680 RenderObject* eltRenderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
2681 RenderLayer* rootLayer = renderView->layer(); 2681 RenderLayer* rootLayer = renderView->layer();
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
3181 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation) 3181 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o rientation)
3182 { 3182 {
3183 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); 3183 ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
3184 if (AXObjectCache* cache = axObjectCache()) { 3184 if (AXObjectCache* cache = axObjectCache()) {
3185 cache->remove(scrollbar); 3185 cache->remove(scrollbar);
3186 cache->handleScrollbarUpdate(this); 3186 cache->handleScrollbarUpdate(this);
3187 } 3187 }
3188 } 3188 }
3189 3189
3190 } // namespace WebCore 3190 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/TextCheckingHelper.cpp ('k') | Source/core/page/EventHandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698