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

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

Issue 184023003: Make InlineBox::renderer() and related subclass methods return reference. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: No reference reassignment. Created 6 years, 9 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/rendering/RenderObject.h ('k') | Source/core/rendering/RenderReplaced.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 /* 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 3194 matching lines...) Expand 10 before | Expand all | Expand 10 after
3205 if (position.isNotNull()) 3205 if (position.isNotNull())
3206 return PositionWithAffinity(position); 3206 return PositionWithAffinity(position);
3207 3207
3208 ASSERT(!node()); 3208 ASSERT(!node());
3209 return createPositionWithAffinity(0, DOWNSTREAM); 3209 return createPositionWithAffinity(0, DOWNSTREAM);
3210 } 3210 }
3211 3211
3212 ETextAlign RenderObject::simplifiedTextAlign(const ETextAlign& textAlign, const RootInlineBox* rootInlineBox) const 3212 ETextAlign RenderObject::simplifiedTextAlign(const ETextAlign& textAlign, const RootInlineBox* rootInlineBox) const
3213 { 3213 {
3214 TextDirection direction; 3214 TextDirection direction;
3215 if (rootInlineBox && rootInlineBox->renderer()->style()->unicodeBidi() == Pl aintext) 3215 if (rootInlineBox && rootInlineBox->renderer().style()->unicodeBidi() == Pla intext)
3216 direction = rootInlineBox->direction(); 3216 direction = rootInlineBox->direction();
3217 else 3217 else
3218 direction = style()->direction(); 3218 direction = style()->direction();
3219 3219
3220 bool isLTR = isLeftToRightDirection(direction); 3220 bool isLTR = isLeftToRightDirection(direction);
3221 3221
3222 switch (textAlign) { 3222 switch (textAlign) {
3223 case LEFT: 3223 case LEFT:
3224 case WEBKIT_LEFT: 3224 case WEBKIT_LEFT:
3225 return LEFT; 3225 return LEFT;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
3339 { 3339 {
3340 if (object1) { 3340 if (object1) {
3341 const WebCore::RenderObject* root = object1; 3341 const WebCore::RenderObject* root = object1;
3342 while (root->parent()) 3342 while (root->parent())
3343 root = root->parent(); 3343 root = root->parent();
3344 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3344 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3345 } 3345 }
3346 } 3346 }
3347 3347
3348 #endif 3348 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698