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

Side by Side Diff: Source/core/page/TouchAdjustment.cpp

Issue 926193003: Move rendering/RenderBox to layout/LayoutBox. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies) 2 * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 11 matching lines...) Expand all
22 #include "core/page/TouchAdjustment.h" 22 #include "core/page/TouchAdjustment.h"
23 23
24 #include "core/dom/ContainerNode.h" 24 #include "core/dom/ContainerNode.h"
25 #include "core/dom/Node.h" 25 #include "core/dom/Node.h"
26 #include "core/dom/NodeLayoutStyle.h" 26 #include "core/dom/NodeLayoutStyle.h"
27 #include "core/dom/Text.h" 27 #include "core/dom/Text.h"
28 #include "core/editing/Editor.h" 28 #include "core/editing/Editor.h"
29 #include "core/frame/FrameView.h" 29 #include "core/frame/FrameView.h"
30 #include "core/frame/LocalFrame.h" 30 #include "core/frame/LocalFrame.h"
31 #include "core/html/HTMLFrameOwnerElement.h" 31 #include "core/html/HTMLFrameOwnerElement.h"
32 #include "core/layout/LayoutBox.h"
32 #include "core/layout/LayoutObject.h" 33 #include "core/layout/LayoutObject.h"
33 #include "core/layout/style/LayoutStyle.h" 34 #include "core/layout/style/LayoutStyle.h"
34 #include "core/rendering/RenderBox.h"
35 #include "core/rendering/RenderText.h" 35 #include "core/rendering/RenderText.h"
36 #include "platform/geometry/FloatPoint.h" 36 #include "platform/geometry/FloatPoint.h"
37 #include "platform/geometry/FloatQuad.h" 37 #include "platform/geometry/FloatQuad.h"
38 #include "platform/geometry/IntSize.h" 38 #include "platform/geometry/IntSize.h"
39 #include "platform/text/TextBreakIterator.h" 39 #include "platform/text/TextBreakIterator.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 namespace TouchAdjustment { 43 namespace TouchAdjustment {
44 44
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 return; 210 return;
211 } 211 }
212 Vector<FloatQuad> quads; 212 Vector<FloatQuad> quads;
213 textRenderer->absoluteQuadsForRange(quads, startPos, endPos); 213 textRenderer->absoluteQuadsForRange(quads, startPos, endPos);
214 appendQuadsToSubtargetList(quads, textNode, subtargets); 214 appendQuadsToSubtargetList(quads, textNode, subtargets);
215 } 215 }
216 } 216 }
217 217
218 static inline void appendZoomableSubtargets(Node* node, SubtargetGeometryList& s ubtargets) 218 static inline void appendZoomableSubtargets(Node* node, SubtargetGeometryList& s ubtargets)
219 { 219 {
220 RenderBox* renderer = toRenderBox(node->renderer()); 220 LayoutBox* renderer = toLayoutBox(node->renderer());
221 ASSERT(renderer); 221 ASSERT(renderer);
222 222
223 Vector<FloatQuad> quads; 223 Vector<FloatQuad> quads;
224 FloatRect borderBoxRect = renderer->borderBoxRect(); 224 FloatRect borderBoxRect = renderer->borderBoxRect();
225 FloatRect contentBoxRect = renderer->contentBoxRect(); 225 FloatRect contentBoxRect = renderer->contentBoxRect();
226 quads.append(renderer->localToAbsoluteQuad(borderBoxRect)); 226 quads.append(renderer->localToAbsoluteQuad(borderBoxRect));
227 if (borderBoxRect != contentBoxRect) 227 if (borderBoxRect != contentBoxRect)
228 quads.append(renderer->localToAbsoluteQuad(contentBoxRect)); 228 quads.append(renderer->localToAbsoluteQuad(contentBoxRect));
229 // FIXME: For RenderBlocks, add column boxes and content boxes cleared for f loats. 229 // FIXME: For RenderBlocks, add column boxes and content boxes cleared for f loats.
230 230
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 507
508 bool findBestZoomableArea(Node*& targetNode, IntRect& targetArea, const IntPoint & touchHotspot, const IntRect& touchArea, const WillBeHeapVector<RefPtrWillBeMem ber<Node>>& nodes) 508 bool findBestZoomableArea(Node*& targetNode, IntRect& targetArea, const IntPoint & touchHotspot, const IntRect& touchArea, const WillBeHeapVector<RefPtrWillBeMem ber<Node>>& nodes)
509 { 509 {
510 IntPoint targetPoint; 510 IntPoint targetPoint;
511 TouchAdjustment::SubtargetGeometryList subtargets; 511 TouchAdjustment::SubtargetGeometryList subtargets;
512 TouchAdjustment::compileZoomableSubtargets(nodes, subtargets); 512 TouchAdjustment::compileZoomableSubtargets(nodes, subtargets);
513 return TouchAdjustment::findNodeWithLowestDistanceMetric(targetNode, targetP oint, targetArea, touchHotspot, touchArea, subtargets, TouchAdjustment::zoomable IntersectionQuotient); 513 return TouchAdjustment::findNodeWithLowestDistanceMetric(targetNode, targetP oint, targetArea, touchHotspot, touchArea, subtargets, TouchAdjustment::zoomable IntersectionQuotient);
514 } 514 }
515 515
516 } // namespace blink 516 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/SpatialNavigation.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698