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

Side by Side Diff: sky/engine/core/rendering/RenderImage.cpp

Issue 924273003: Remove HitTestAction. (Closed) Base URL: git@github.com:domokit/mojo.git@hittestfilter
Patch Set: Created 5 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
« no previous file with comments | « sky/engine/core/rendering/RenderImage.h ('k') | sky/engine/core/rendering/RenderInline.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2006 Allan Sandfeld Jensen (kde@carewolf.com)
6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 6 * (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
8 * Copyright (C) 2010 Google Inc. All rights reserved. 8 * Copyright (C) 2010 Google Inc. All rights reserved.
9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 9 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
10 * 10 *
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 context->setImageInterpolationQuality(InterpolationLow); 199 context->setImageInterpolationQuality(InterpolationLow);
200 context->drawImage(image, alignedRect, CompositeSourceOver, shouldRespectIma geOrientation()); 200 context->drawImage(image, alignedRect, CompositeSourceOver, shouldRespectIma geOrientation());
201 context->setImageInterpolationQuality(previousInterpolationQuality); 201 context->setImageInterpolationQuality(previousInterpolationQuality);
202 } 202 }
203 203
204 LayoutUnit RenderImage::minimumReplacedHeight() const 204 LayoutUnit RenderImage::minimumReplacedHeight() const
205 { 205 {
206 return m_imageResource->errorOccurred() ? intrinsicSize().height() : LayoutU nit(); 206 return m_imageResource->errorOccurred() ? intrinsicSize().height() : LayoutU nit();
207 } 207 }
208 208
209 bool RenderImage::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu lt, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOf fset, HitTestAction hitTestAction) 209 bool RenderImage::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu lt, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOf fset)
210 { 210 {
211 HitTestResult tempResult(result.hitTestLocation()); 211 HitTestResult tempResult(result.hitTestLocation());
212 bool inside = RenderReplaced::nodeAtPoint(request, tempResult, locationInCon tainer, accumulatedOffset, hitTestAction); 212 bool inside = RenderReplaced::nodeAtPoint(request, tempResult, locationInCon tainer, accumulatedOffset);
213 213
214 if (!inside && result.isRectBasedTest()) 214 if (!inside && result.isRectBasedTest())
215 result.append(tempResult); 215 result.append(tempResult);
216 if (inside) 216 if (inside)
217 result = tempResult; 217 result = tempResult;
218 return inside; 218 return inside;
219 } 219 }
220 220
221 void RenderImage::layout() 221 void RenderImage::layout()
222 { 222 {
(...skipping 24 matching lines...) Expand all
247 return; 247 return;
248 } 248 }
249 } 249 }
250 250
251 bool RenderImage::needsPreferredWidthsRecalculation() const 251 bool RenderImage::needsPreferredWidthsRecalculation() const
252 { 252 {
253 return RenderReplaced::needsPreferredWidthsRecalculation(); 253 return RenderReplaced::needsPreferredWidthsRecalculation();
254 } 254 }
255 255
256 } // namespace blink 256 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderImage.h ('k') | sky/engine/core/rendering/RenderInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698