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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 310483002: Use localToContainerPoint when checking mapToContainer result (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/rendering/RenderObject.h ('k') | no next file » | 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) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 2305 matching lines...) Expand 10 before | Expand all | Expand 10 after
2316 updateImage(oldShapeValue ? oldShapeValue->image() : 0, newShapeValue ? newShapeValue->image() : 0); 2316 updateImage(oldShapeValue ? oldShapeValue->image() : 0, newShapeValue ? newShapeValue->image() : 0);
2317 } 2317 }
2318 2318
2319 LayoutRect RenderObject::viewRect() const 2319 LayoutRect RenderObject::viewRect() const
2320 { 2320 {
2321 return view()->viewRect(); 2321 return view()->viewRect();
2322 } 2322 }
2323 2323
2324 FloatPoint RenderObject::localToAbsolute(const FloatPoint& localPoint, MapCoordi natesFlags mode) const 2324 FloatPoint RenderObject::localToAbsolute(const FloatPoint& localPoint, MapCoordi natesFlags mode) const
2325 { 2325 {
2326 return localToAbsolute(0, localPoint, mode);
2327 }
2328
2329 FloatPoint RenderObject::localToAbsolute(const RenderLayerModelObject* repaintCo ntainer, const FloatPoint& localPoint, MapCoordinatesFlags mode) const
2330 {
2326 TransformState transformState(TransformState::ApplyTransformDirection, local Point); 2331 TransformState transformState(TransformState::ApplyTransformDirection, local Point);
2327 mapLocalToContainer(0, transformState, mode | ApplyContainerFlip); 2332 mapLocalToContainer(repaintContainer, transformState, mode | ApplyContainerF lip);
leviw_travelin_and_unemployed 2014/05/30 17:17:50 I don't think you actually want this. mapLocalToAb
2328 transformState.flatten(); 2333 transformState.flatten();
2329 2334
2330 return transformState.lastPlanarPoint(); 2335 return transformState.lastPlanarPoint();
2331 } 2336 }
2332 2337
2333 FloatPoint RenderObject::absoluteToLocal(const FloatPoint& containerPoint, MapCo ordinatesFlags mode) const 2338 FloatPoint RenderObject::absoluteToLocal(const FloatPoint& containerPoint, MapCo ordinatesFlags mode) const
2334 { 2339 {
2335 TransformState transformState(TransformState::UnapplyInverseTransformDirecti on, containerPoint); 2340 TransformState transformState(TransformState::UnapplyInverseTransformDirecti on, containerPoint);
2336 mapAbsoluteToLocalPoint(mode, transformState); 2341 mapAbsoluteToLocalPoint(mode, transformState);
2337 transformState.flatten(); 2342 transformState.flatten();
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
3475 { 3480 {
3476 if (object1) { 3481 if (object1) {
3477 const WebCore::RenderObject* root = object1; 3482 const WebCore::RenderObject* root = object1;
3478 while (root->parent()) 3483 while (root->parent())
3479 root = root->parent(); 3484 root = root->parent();
3480 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3485 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3481 } 3486 }
3482 } 3487 }
3483 3488
3484 #endif 3489 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698