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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 const LayoutBoxModelObject* container = enclosingLayer()->layoutObject(); 1025 const LayoutBoxModelObject* container = enclosingLayer()->layoutObject();
1026 addElementVisualOverflowRects(rects, LayoutPoint(localToAncestorPoint(FloatP oint(), container))); 1026 addElementVisualOverflowRects(rects, LayoutPoint(localToAncestorPoint(FloatP oint(), container)));
1027 return container->localToAbsoluteQuad(FloatQuad(FloatRect(unionRect(rects))) ).enclosingBoundingBox(); 1027 return container->localToAbsoluteQuad(FloatQuad(FloatRect(unionRect(rects))) ).enclosingBoundingBox();
1028 } 1028 }
1029 1029
1030 FloatRect LayoutObject::absoluteBoundingBoxRectForRange(const Range* range) 1030 FloatRect LayoutObject::absoluteBoundingBoxRectForRange(const Range* range)
1031 { 1031 {
1032 if (!range || !range->startContainer()) 1032 if (!range || !range->startContainer())
1033 return FloatRect(); 1033 return FloatRect();
1034 1034
1035 range->ownerDocument().updateLayout(); 1035 range->ownerDocument().updateStyleAndLayout();
1036 1036
1037 Vector<FloatQuad> quads; 1037 Vector<FloatQuad> quads;
1038 range->textQuads(quads); 1038 range->textQuads(quads);
1039 1039
1040 FloatRect result; 1040 FloatRect result;
1041 for (size_t i = 0; i < quads.size(); ++i) 1041 for (size_t i = 0; i < quads.size(); ++i)
1042 result.unite(quads[i].boundingBox()); 1042 result.unite(quads[i].boundingBox());
1043 1043
1044 return result; 1044 return result;
1045 } 1045 }
(...skipping 2642 matching lines...) Expand 10 before | Expand all | Expand 10 after
3688 const blink::LayoutObject* root = object1; 3688 const blink::LayoutObject* root = object1;
3689 while (root->parent()) 3689 while (root->parent())
3690 root = root->parent(); 3690 root = root->parent();
3691 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3691 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3692 } else { 3692 } else {
3693 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3693 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3694 } 3694 }
3695 } 3695 }
3696 3696
3697 #endif 3697 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698