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

Side by Side Diff: Source/core/paint/ScrollableAreaPainter.cpp

Issue 1334703002: NOT FOR LANDING Pass URL to Image::draw (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « Source/core/paint/SVGImagePainter.cpp ('k') | Source/core/paint/ThemePainterDefault.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/ScrollableAreaPainter.h" 6 #include "core/paint/ScrollableAreaPainter.h"
7 7
8 #include "core/layout/LayoutView.h" 8 #include "core/layout/LayoutView.h"
9 #include "core/page/Page.h" 9 #include "core/page/Page.h"
10 #include "core/paint/DeprecatedPaintLayer.h" 10 #include "core/paint/DeprecatedPaintLayer.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } else { 72 } else {
73 DEFINE_STATIC_REF(Image, resizeCornerImageLoRes, (Image::loadPlatformRes ource("textAreaResizeCorner"))); 73 DEFINE_STATIC_REF(Image, resizeCornerImageLoRes, (Image::loadPlatformRes ource("textAreaResizeCorner")));
74 resizeCornerImage = resizeCornerImageLoRes; 74 resizeCornerImage = resizeCornerImageLoRes;
75 cornerResizerSize = resizeCornerImage->size(); 75 cornerResizerSize = resizeCornerImage->size();
76 } 76 }
77 77
78 if (scrollableArea().box().style()->shouldPlaceBlockDirectionScrollbarOnLogi calLeft()) { 78 if (scrollableArea().box().style()->shouldPlaceBlockDirectionScrollbarOnLogi calLeft()) {
79 context->save(); 79 context->save();
80 context->translate(resizerCornerRect.x() + cornerResizerSize.width(), re sizerCornerRect.y() + resizerCornerRect.height() - cornerResizerSize.height()); 80 context->translate(resizerCornerRect.x() + cornerResizerSize.width(), re sizerCornerRect.y() + resizerCornerRect.height() - cornerResizerSize.height());
81 context->scale(-1.0, 1.0); 81 context->scale(-1.0, 1.0);
82 context->drawImage(resizeCornerImage.get(), IntRect(IntPoint(), cornerRe sizerSize)); 82 context->drawImage(resizeCornerImage.get(), IntRect(IntPoint(), cornerRe sizerSize), KURL()); // TODO(davve): empty url
83 context->restore(); 83 context->restore();
84 return; 84 return;
85 } 85 }
86 IntRect imageRect(resizerCornerRect.maxXMaxYCorner() - cornerResizerSize, co rnerResizerSize); 86 IntRect imageRect(resizerCornerRect.maxXMaxYCorner() - cornerResizerSize, co rnerResizerSize);
87 context->drawImage(resizeCornerImage.get(), imageRect); 87 context->drawImage(resizeCornerImage.get(), imageRect, KURL()); // TODO(davv e): empty url
88 } 88 }
89 89
90 void ScrollableAreaPainter::paintOverflowControls(GraphicsContext* context, cons t IntPoint& paintOffset, const IntRect& damageRect, bool paintingOverlayControls ) 90 void ScrollableAreaPainter::paintOverflowControls(GraphicsContext* context, cons t IntPoint& paintOffset, const IntRect& damageRect, bool paintingOverlayControls )
91 { 91 {
92 // Don't do anything if we have no overflow. 92 // Don't do anything if we have no overflow.
93 if (!scrollableArea().box().hasOverflowClip()) 93 if (!scrollableArea().box().hasOverflowClip())
94 return; 94 return;
95 95
96 IntPoint adjustedPaintOffset = paintOffset; 96 IntPoint adjustedPaintOffset = paintOffset;
97 if (paintingOverlayControls) 97 if (paintingOverlayControls)
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 LayoutObjectDrawingRecorder recorder(*context, scrollableArea().box(), Displ ayItem::ScrollbarCorner, absRect, paintOffset); 198 LayoutObjectDrawingRecorder recorder(*context, scrollableArea().box(), Displ ayItem::ScrollbarCorner, absRect, paintOffset);
199 context->fillRect(absRect, Color::white); 199 context->fillRect(absRect, Color::white);
200 } 200 }
201 201
202 DeprecatedPaintLayerScrollableArea& ScrollableAreaPainter::scrollableArea() cons t 202 DeprecatedPaintLayerScrollableArea& ScrollableAreaPainter::scrollableArea() cons t
203 { 203 {
204 return *m_scrollableArea; 204 return *m_scrollableArea;
205 } 205 }
206 206
207 } // namespace blink 207 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/SVGImagePainter.cpp ('k') | Source/core/paint/ThemePainterDefault.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698