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

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

Issue 2880273002: Remove Range::TextQuads() and instead use ComputeTextQuads. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « third_party/WebKit/Source/core/dom/RangeTest.cpp ('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. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2009 Google Inc. All rights reserved.
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 23 matching lines...) Expand all
34 #include "core/animation/ElementAnimations.h" 34 #include "core/animation/ElementAnimations.h"
35 #include "core/css/resolver/StyleResolver.h" 35 #include "core/css/resolver/StyleResolver.h"
36 #include "core/dom/AXObjectCache.h" 36 #include "core/dom/AXObjectCache.h"
37 #include "core/dom/ElementTraversal.h" 37 #include "core/dom/ElementTraversal.h"
38 #include "core/dom/StyleChangeReason.h" 38 #include "core/dom/StyleChangeReason.h"
39 #include "core/dom/StyleEngine.h" 39 #include "core/dom/StyleEngine.h"
40 #include "core/dom/shadow/ShadowRoot.h" 40 #include "core/dom/shadow/ShadowRoot.h"
41 #include "core/editing/EditingUtilities.h" 41 #include "core/editing/EditingUtilities.h"
42 #include "core/editing/FrameSelection.h" 42 #include "core/editing/FrameSelection.h"
43 #include "core/editing/TextAffinity.h" 43 #include "core/editing/TextAffinity.h"
44 #include "core/editing/VisibleUnits.h"
44 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h" 45 #include "core/frame/DeprecatedScheduleStyleRecalcDuringLayout.h"
45 #include "core/frame/EventHandlerRegistry.h" 46 #include "core/frame/EventHandlerRegistry.h"
46 #include "core/frame/FrameView.h" 47 #include "core/frame/FrameView.h"
47 #include "core/frame/LocalFrame.h" 48 #include "core/frame/LocalFrame.h"
48 #include "core/frame/Settings.h" 49 #include "core/frame/Settings.h"
49 #include "core/html/HTMLElement.h" 50 #include "core/html/HTMLElement.h"
50 #include "core/html/HTMLHtmlElement.h" 51 #include "core/html/HTMLHtmlElement.h"
51 #include "core/html/HTMLTableCellElement.h" 52 #include "core/html/HTMLTableCellElement.h"
52 #include "core/html/HTMLTableElement.h" 53 #include "core/html/HTMLTableElement.h"
53 #include "core/input/EventHandler.h" 54 #include "core/input/EventHandler.h"
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 .EnclosingBoundingBox(); 994 .EnclosingBoundingBox();
994 } 995 }
995 996
996 FloatRect LayoutObject::AbsoluteBoundingBoxRectForRange(const Range* range) { 997 FloatRect LayoutObject::AbsoluteBoundingBoxRectForRange(const Range* range) {
997 if (!range || !range->startContainer()) 998 if (!range || !range->startContainer())
998 return FloatRect(); 999 return FloatRect();
999 1000
1000 range->OwnerDocument().UpdateStyleAndLayout(); 1001 range->OwnerDocument().UpdateStyleAndLayout();
1001 1002
1002 Vector<FloatQuad> quads; 1003 Vector<FloatQuad> quads;
1003 range->TextQuads(quads); 1004 quads.AppendVector(ComputeTextQuads(EphemeralRange(range)));
1004 1005
1005 FloatRect result; 1006 FloatRect result;
1006 for (size_t i = 0; i < quads.size(); ++i) 1007 for (size_t i = 0; i < quads.size(); ++i)
1007 result.Unite(quads[i].BoundingBox()); 1008 result.Unite(quads[i].BoundingBox());
1008 1009
1009 return result; 1010 return result;
1010 } 1011 }
1011 1012
1012 void LayoutObject::AddAbsoluteRectForLayer(IntRect& result) { 1013 void LayoutObject::AddAbsoluteRectForLayer(IntRect& result) {
1013 if (HasLayer()) 1014 if (HasLayer())
(...skipping 2634 matching lines...) Expand 10 before | Expand all | Expand 10 after
3648 const blink::LayoutObject* root = object1; 3649 const blink::LayoutObject* root = object1;
3649 while (root->Parent()) 3650 while (root->Parent())
3650 root = root->Parent(); 3651 root = root->Parent();
3651 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0); 3652 root->ShowLayoutTreeAndMark(object1, "*", object2, "-", 0);
3652 } else { 3653 } else {
3653 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3654 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3654 } 3655 }
3655 } 3656 }
3656 3657
3657 #endif 3658 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/RangeTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698