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

Side by Side Diff: sky/engine/core/dom/Range.cpp

Issue 711173003: Rename a few functions now that we don't have zooming. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/core/dom/Element.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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Gunnstein Lye (gunnstein@netcom.no) 3 * (C) 2000 Gunnstein Lye (gunnstein@netcom.no)
4 * (C) 2000 Frederik Holljen (frederik.holljen@hig.no) 4 * (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
5 * (C) 2001 Peter Kelly (pmk@post.com) 5 * (C) 2001 Peter Kelly (pmk@post.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
7 * Copyright (C) 2011 Motorola Mobility. All rights reserved. 7 * Copyright (C) 2011 Motorola Mobility. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1484 if (node->isElementNode()) 1484 if (node->isElementNode())
1485 nodeSet.add(node); 1485 nodeSet.add(node);
1486 } 1486 }
1487 1487
1488 for (Node* node = firstNode(); node != stopNode; node = NodeTraversal::next( *node)) { 1488 for (Node* node = firstNode(); node != stopNode; node = NodeTraversal::next( *node)) {
1489 if (node->isElementNode()) { 1489 if (node->isElementNode()) {
1490 if (!nodeSet.contains(node->parentNode())) { 1490 if (!nodeSet.contains(node->parentNode())) {
1491 if (RenderBoxModelObject* renderBoxModelObject = toElement(node) ->renderBoxModelObject()) { 1491 if (RenderBoxModelObject* renderBoxModelObject = toElement(node) ->renderBoxModelObject()) {
1492 Vector<FloatQuad> elementQuads; 1492 Vector<FloatQuad> elementQuads;
1493 renderBoxModelObject->absoluteQuads(elementQuads); 1493 renderBoxModelObject->absoluteQuads(elementQuads);
1494 m_ownerDocument->adjustFloatQuadsForScrollAndAbsoluteZoom(el ementQuads, *renderBoxModelObject); 1494 m_ownerDocument->adjustFloatQuadsForScroll(elementQuads);
1495 1495
1496 quads.appendVector(elementQuads); 1496 quads.appendVector(elementQuads);
1497 } 1497 }
1498 } 1498 }
1499 } else if (node->isTextNode()) { 1499 } else if (node->isTextNode()) {
1500 if (RenderText* renderText = toText(node)->renderer()) { 1500 if (RenderText* renderText = toText(node)->renderer()) {
1501 int startOffset = (node == startContainer) ? m_start.offset() : 0; 1501 int startOffset = (node == startContainer) ? m_start.offset() : 0;
1502 int endOffset = (node == endContainer) ? m_end.offset() : INT_MA X; 1502 int endOffset = (node == endContainer) ? m_end.offset() : INT_MA X;
1503 1503
1504 Vector<FloatQuad> textQuads; 1504 Vector<FloatQuad> textQuads;
1505 renderText->absoluteQuadsForRange(textQuads, startOffset, endOff set); 1505 renderText->absoluteQuadsForRange(textQuads, startOffset, endOff set);
1506 m_ownerDocument->adjustFloatQuadsForScrollAndAbsoluteZoom(textQu ads, *renderText); 1506 m_ownerDocument->adjustFloatQuadsForScroll(textQuads);
1507 1507
1508 quads.appendVector(textQuads); 1508 quads.appendVector(textQuads);
1509 } 1509 }
1510 } 1510 }
1511 } 1511 }
1512 } 1512 }
1513 1513
1514 FloatRect Range::boundingRect() const 1514 FloatRect Range::boundingRect() const
1515 { 1515 {
1516 m_ownerDocument->updateLayoutIgnorePendingStylesheets(); 1516 m_ownerDocument->updateLayoutIgnorePendingStylesheets();
(...skipping 23 matching lines...) Expand all
1540 1540
1541 void showTree(const blink::Range* range) 1541 void showTree(const blink::Range* range)
1542 { 1542 {
1543 if (range && range->boundaryPointsValid()) { 1543 if (range && range->boundaryPointsValid()) {
1544 range->startContainer()->showTreeAndMark(range->startContainer(), "S", r ange->endContainer(), "E"); 1544 range->startContainer()->showTreeAndMark(range->startContainer(), "S", r ange->endContainer(), "E");
1545 fprintf(stderr, "start offset: %d, end offset: %d\n", range->startOffset (), range->endOffset()); 1545 fprintf(stderr, "start offset: %d, end offset: %d\n", range->startOffset (), range->endOffset());
1546 } 1546 }
1547 } 1547 }
1548 1548
1549 #endif 1549 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Element.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698