OLD | NEW |
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 2316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2327 m_horizontalBarDamage = dirtyRect; | 2327 m_horizontalBarDamage = dirtyRect; |
2328 m_hasHorizontalBarDamage = true; | 2328 m_hasHorizontalBarDamage = true; |
2329 } | 2329 } |
2330 } else { | 2330 } else { |
2331 invalidateRect(dirtyRect); | 2331 invalidateRect(dirtyRect); |
2332 } | 2332 } |
2333 } | 2333 } |
2334 | 2334 |
2335 void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const | 2335 void FrameView::getTickmarks(Vector<IntRect>& tickmarks) const |
2336 { | 2336 { |
2337 tickmarks = frame().document()->markers().renderedRectsForMarkers(DocumentMa
rker::TextMatch); | 2337 if (!m_tickmarks.isEmpty()) |
| 2338 tickmarks = m_tickmarks; |
| 2339 else |
| 2340 tickmarks = frame().document()->markers().renderedRectsForMarkers(Docume
ntMarker::TextMatch); |
2338 } | 2341 } |
2339 | 2342 |
2340 IntRect FrameView::windowResizerRect() const | 2343 IntRect FrameView::windowResizerRect() const |
2341 { | 2344 { |
2342 Page* page = frame().page(); | 2345 Page* page = frame().page(); |
2343 if (!page) | 2346 if (!page) |
2344 return IntRect(); | 2347 return IntRect(); |
2345 return page->chrome().windowResizerRect(); | 2348 return page->chrome().windowResizerRect(); |
2346 } | 2349 } |
2347 | 2350 |
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3213 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) | 3216 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation o
rientation) |
3214 { | 3217 { |
3215 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); | 3218 ScrollableArea::willRemoveScrollbar(scrollbar, orientation); |
3216 if (AXObjectCache* cache = axObjectCache()) { | 3219 if (AXObjectCache* cache = axObjectCache()) { |
3217 cache->remove(scrollbar); | 3220 cache->remove(scrollbar); |
3218 cache->handleScrollbarUpdate(this); | 3221 cache->handleScrollbarUpdate(this); |
3219 } | 3222 } |
3220 } | 3223 } |
3221 | 3224 |
3222 } // namespace WebCore | 3225 } // namespace WebCore |
OLD | NEW |