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

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 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 const LayoutBoxModelObject* container = enclosingLayer()->layoutObject(); 1041 const LayoutBoxModelObject* container = enclosingLayer()->layoutObject();
1042 addElementVisualOverflowRects(rects, LayoutPoint(localToAncestorPoint(FloatP oint(), container))); 1042 addElementVisualOverflowRects(rects, LayoutPoint(localToAncestorPoint(FloatP oint(), container)));
1043 return container->localToAbsoluteQuad(FloatQuad(FloatRect(unionRect(rects))) ).enclosingBoundingBox(); 1043 return container->localToAbsoluteQuad(FloatQuad(FloatRect(unionRect(rects))) ).enclosingBoundingBox();
1044 } 1044 }
1045 1045
1046 FloatRect LayoutObject::absoluteBoundingBoxRectForRange(const Range* range) 1046 FloatRect LayoutObject::absoluteBoundingBoxRectForRange(const Range* range)
1047 { 1047 {
1048 if (!range || !range->startContainer()) 1048 if (!range || !range->startContainer())
1049 return FloatRect(); 1049 return FloatRect();
1050 1050
1051 range->ownerDocument().updateLayout(); 1051 range->ownerDocument().updateStyleAndLayout();
1052 1052
1053 Vector<FloatQuad> quads; 1053 Vector<FloatQuad> quads;
1054 range->textQuads(quads); 1054 range->textQuads(quads);
1055 1055
1056 FloatRect result; 1056 FloatRect result;
1057 for (size_t i = 0; i < quads.size(); ++i) 1057 for (size_t i = 0; i < quads.size(); ++i)
1058 result.unite(quads[i].boundingBox()); 1058 result.unite(quads[i].boundingBox());
1059 1059
1060 return result; 1060 return result;
1061 } 1061 }
(...skipping 2644 matching lines...) Expand 10 before | Expand all | Expand 10 after
3706 const blink::LayoutObject* root = object1; 3706 const blink::LayoutObject* root = object1;
3707 while (root->parent()) 3707 while (root->parent())
3708 root = root->parent(); 3708 root = root->parent();
3709 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3709 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3710 } else { 3710 } else {
3711 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3711 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3712 } 3712 }
3713 } 3713 }
3714 3714
3715 #endif 3715 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698