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

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

Issue 613503002: Move paint code for RenderScrollbar and RenderScrollbarPart into ScrollbarPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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/core.gypi ('k') | Source/core/paint/ScrollbarPainter.h » ('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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 #include "core/inspector/InspectorTraceEvents.h" 48 #include "core/inspector/InspectorTraceEvents.h"
49 #include "core/loader/FrameLoader.h" 49 #include "core/loader/FrameLoader.h"
50 #include "core/loader/FrameLoaderClient.h" 50 #include "core/loader/FrameLoaderClient.h"
51 #include "core/page/Chrome.h" 51 #include "core/page/Chrome.h"
52 #include "core/page/ChromeClient.h" 52 #include "core/page/ChromeClient.h"
53 #include "core/page/EventHandler.h" 53 #include "core/page/EventHandler.h"
54 #include "core/page/FocusController.h" 54 #include "core/page/FocusController.h"
55 #include "core/page/FrameTree.h" 55 #include "core/page/FrameTree.h"
56 #include "core/page/Page.h" 56 #include "core/page/Page.h"
57 #include "core/page/scrolling/ScrollingCoordinator.h" 57 #include "core/page/scrolling/ScrollingCoordinator.h"
58 #include "core/paint/ScrollbarPainter.h"
58 #include "core/rendering/RenderCounter.h" 59 #include "core/rendering/RenderCounter.h"
59 #include "core/rendering/RenderEmbeddedObject.h" 60 #include "core/rendering/RenderEmbeddedObject.h"
60 #include "core/rendering/RenderLayer.h" 61 #include "core/rendering/RenderLayer.h"
61 #include "core/rendering/RenderListBox.h" 62 #include "core/rendering/RenderListBox.h"
62 #include "core/rendering/RenderPart.h" 63 #include "core/rendering/RenderPart.h"
63 #include "core/rendering/RenderScrollbar.h" 64 #include "core/rendering/RenderScrollbar.h"
64 #include "core/rendering/RenderScrollbarPart.h" 65 #include "core/rendering/RenderScrollbarPart.h"
65 #include "core/rendering/RenderTheme.h" 66 #include "core/rendering/RenderTheme.h"
66 #include "core/rendering/RenderView.h" 67 #include "core/rendering/RenderView.h"
67 #include "core/rendering/RenderWidget.h" 68 #include "core/rendering/RenderWidget.h"
(...skipping 2223 matching lines...) Expand 10 before | Expand all | Expand 10 after
2291 2292
2292 ScrollView::updateScrollCorner(); 2293 ScrollView::updateScrollCorner();
2293 } 2294 }
2294 2295
2295 void FrameView::paintScrollCorner(GraphicsContext* context, const IntRect& corne rRect) 2296 void FrameView::paintScrollCorner(GraphicsContext* context, const IntRect& corne rRect)
2296 { 2297 {
2297 if (m_scrollCorner) { 2298 if (m_scrollCorner) {
2298 bool needsBackgorund = m_frame->isMainFrame(); 2299 bool needsBackgorund = m_frame->isMainFrame();
2299 if (needsBackgorund) 2300 if (needsBackgorund)
2300 context->fillRect(cornerRect, baseBackgroundColor()); 2301 context->fillRect(cornerRect, baseBackgroundColor());
2301 m_scrollCorner->paintIntoRect(context, cornerRect.location(), cornerRect ); 2302 ScrollbarPainter::paintIntoRect(m_scrollCorner, context, cornerRect.loca tion(), cornerRect);
2302 return; 2303 return;
2303 } 2304 }
2304 2305
2305 ScrollView::paintScrollCorner(context, cornerRect); 2306 ScrollView::paintScrollCorner(context, cornerRect);
2306 } 2307 }
2307 2308
2308 void FrameView::paintScrollbar(GraphicsContext* context, Scrollbar* bar, const I ntRect& rect) 2309 void FrameView::paintScrollbar(GraphicsContext* context, Scrollbar* bar, const I ntRect& rect)
2309 { 2310 {
2310 bool needsBackgorund = bar->isCustomScrollbar() && m_frame->isMainFrame(); 2311 bool needsBackgorund = bar->isCustomScrollbar() && m_frame->isMainFrame();
2311 if (needsBackgorund) { 2312 if (needsBackgorund) {
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
3019 IntSize visibleSize = expandedIntSize(visibleContentSizeF); 3020 IntSize visibleSize = expandedIntSize(visibleContentSizeF);
3020 3021
3021 IntPoint maximumOffset( 3022 IntPoint maximumOffset(
3022 contentsWidth() - visibleSize.width() - scrollOrigin().x(), 3023 contentsWidth() - visibleSize.width() - scrollOrigin().x(),
3023 contentsHeight() - visibleSize.height() - scrollOrigin().y()); 3024 contentsHeight() - visibleSize.height() - scrollOrigin().y());
3024 maximumOffset.clampNegativeToZero(); 3025 maximumOffset.clampNegativeToZero();
3025 return maximumOffset; 3026 return maximumOffset;
3026 } 3027 }
3027 3028
3028 } // namespace blink 3029 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/paint/ScrollbarPainter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698