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

Side by Side Diff: Source/core/rendering/InlineTextBox.cpp

Issue 23509003: Address regression bug report, revert the PaintInfo rect member function. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Including revision in cl. Created 7 years, 3 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 | « Source/core/rendering/InlineFlowBox.cpp ('k') | Source/core/rendering/PaintInfo.h » ('j') | 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 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 m_truncation == cFullTruncation || paintInfo.phase == PaintPhaseOutline || !m_len) 478 m_truncation == cFullTruncation || paintInfo.phase == PaintPhaseOutline || !m_len)
479 return; 479 return;
480 480
481 ASSERT(paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintP haseChildOutlines); 481 ASSERT(paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintP haseChildOutlines);
482 482
483 LayoutUnit logicalLeftSide = logicalLeftVisualOverflow(); 483 LayoutUnit logicalLeftSide = logicalLeftVisualOverflow();
484 LayoutUnit logicalRightSide = logicalRightVisualOverflow(); 484 LayoutUnit logicalRightSide = logicalRightVisualOverflow();
485 LayoutUnit logicalStart = logicalLeftSide + (isHorizontal() ? paintOffset.x( ) : paintOffset.y()); 485 LayoutUnit logicalStart = logicalLeftSide + (isHorizontal() ? paintOffset.x( ) : paintOffset.y());
486 LayoutUnit logicalExtent = logicalRightSide - logicalLeftSide; 486 LayoutUnit logicalExtent = logicalRightSide - logicalLeftSide;
487 487
488 LayoutUnit paintEnd = isHorizontal() ? paintInfo.rect().maxX() : paintInfo.r ect().maxY(); 488 LayoutUnit paintEnd = isHorizontal() ? paintInfo.rect.maxX() : paintInfo.rec t.maxY();
489 LayoutUnit paintStart = isHorizontal() ? paintInfo.rect().x() : paintInfo.re ct().y(); 489 LayoutUnit paintStart = isHorizontal() ? paintInfo.rect.x() : paintInfo.rect .y();
490 490
491 LayoutPoint adjustedPaintOffset = roundedIntPoint(paintOffset); 491 LayoutPoint adjustedPaintOffset = roundedIntPoint(paintOffset);
492 492
493 if (logicalStart >= paintEnd || logicalStart + logicalExtent <= paintStart) 493 if (logicalStart >= paintEnd || logicalStart + logicalExtent <= paintStart)
494 return; 494 return;
495 495
496 bool isPrinting = textRenderer()->document()->printing(); 496 bool isPrinting = textRenderer()->document()->printing();
497 497
498 // Determine whether or not we're selected. 498 // Determine whether or not we're selected.
499 bool haveSelection = !isPrinting && paintInfo.phase != PaintPhaseTextClip && selectionState() != RenderObject::SelectionNone; 499 bool haveSelection = !isPrinting && paintInfo.phase != PaintPhaseTextClip && selectionState() != RenderObject::SelectionNone;
(...skipping 1059 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 printedCharacters = fprintf(stderr, "\t%s %p", obj->renderName(), obj); 1559 printedCharacters = fprintf(stderr, "\t%s %p", obj->renderName(), obj);
1560 const int rendererCharacterOffset = 24; 1560 const int rendererCharacterOffset = 24;
1561 for (; printedCharacters < rendererCharacterOffset; printedCharacters++) 1561 for (; printedCharacters < rendererCharacterOffset; printedCharacters++)
1562 fputc(' ', stderr); 1562 fputc(' ', stderr);
1563 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata()); 1563 fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().d ata());
1564 } 1564 }
1565 1565
1566 #endif 1566 #endif
1567 1567
1568 } // namespace WebCore 1568 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/InlineFlowBox.cpp ('k') | Source/core/rendering/PaintInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698