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

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

Issue 663923002: Rename hasTransform() to hasTransformRelatedProperty, since the meaning is the latter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed 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/rendering/RenderObject.h ('k') | Source/core/rendering/RenderTableRow.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) 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 2079 matching lines...) Expand 10 before | Expand all | Expand 10 after
2090 LayoutSize RenderObject::offsetFromAncestorContainer(const RenderObject* contain er) const 2090 LayoutSize RenderObject::offsetFromAncestorContainer(const RenderObject* contain er) const
2091 { 2091 {
2092 LayoutSize offset; 2092 LayoutSize offset;
2093 LayoutPoint referencePoint; 2093 LayoutPoint referencePoint;
2094 const RenderObject* currContainer = this; 2094 const RenderObject* currContainer = this;
2095 do { 2095 do {
2096 const RenderObject* nextContainer = currContainer->container(); 2096 const RenderObject* nextContainer = currContainer->container();
2097 ASSERT(nextContainer); // This means we reached the top without finding container. 2097 ASSERT(nextContainer); // This means we reached the top without finding container.
2098 if (!nextContainer) 2098 if (!nextContainer)
2099 break; 2099 break;
2100 ASSERT(!currContainer->hasTransform()); 2100 ASSERT(!currContainer->hasTransformRelatedProperty());
2101 LayoutSize currentOffset = currContainer->offsetFromContainer(nextContai ner, referencePoint); 2101 LayoutSize currentOffset = currContainer->offsetFromContainer(nextContai ner, referencePoint);
2102 offset += currentOffset; 2102 offset += currentOffset;
2103 referencePoint.move(currentOffset); 2103 referencePoint.move(currentOffset);
2104 currContainer = nextContainer; 2104 currContainer = nextContainer;
2105 } while (currContainer != container); 2105 } while (currContainer != container);
2106 2106
2107 return offset; 2107 return offset;
2108 } 2108 }
2109 2109
2110 LayoutRect RenderObject::localCaretRect(InlineBox*, int, LayoutUnit* extraWidthT oEndOfLine) 2110 LayoutRect RenderObject::localCaretRect(InlineBox*, int, LayoutUnit* extraWidthT oEndOfLine)
(...skipping 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
3140 { 3140 {
3141 if (object1) { 3141 if (object1) {
3142 const blink::RenderObject* root = object1; 3142 const blink::RenderObject* root = object1;
3143 while (root->parent()) 3143 while (root->parent())
3144 root = root->parent(); 3144 root = root->parent();
3145 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3145 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3146 } 3146 }
3147 } 3147 }
3148 3148
3149 #endif 3149 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderTableRow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698