|
|
Created:
4 years, 2 months ago by eae Modified:
4 years, 2 months ago Reviewers:
pdr. CC:
blink-reviews, blink-reviews-layout_chromium.org, chromium-reviews, krit, eae+blinkwatch, f(malita), fs, gyuyoung2, jchaffraix+rendering, kouhei+svg_chromium.org, leviw+renderwatch, pdr+renderingwatchlist_chromium.org, pdr+svgwatchlist_chromium.org, rwlbuis, Stephen Chennney, szager+layoutwatch_chromium.org, zoltan1 Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionReformat comments in core/layout/svg/line
BUG=563793
R=pdr@chromium.org
Committed: https://crrev.com/a729edf941b224161ce6d9510dfdf272c0132518
Cr-Commit-Position: refs/heads/master@{#423670}
Patch Set 1 #
Total comments: 1
Patch Set 2 : Rebase w/HEAD #
Messages
Total messages: 19 (9 generated)
The CQ bit was checked by eae@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
LGTM https://codereview.chromium.org/2391693004/diff/1/third_party/WebKit/Source/c... File third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp (right): https://codereview.chromium.org/2391693004/diff/1/third_party/WebKit/Source/c... third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp:179: // FIXME: This should not be necessary but can occur if we layout during I will be fixing this in https://codereview.chromium.org/2390233004 but go ahead and land this.
Awesome, I was going to ask about that! :)
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)
The CQ bit was checked by eae@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp: While running git apply --index -3 -p1; error: patch failed: third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp:175 Falling back to three-way merge... Applied patch to 'third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp' with conflicts. U third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp Patch: third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp Index: third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp diff --git a/third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp b/third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp index 3a8fd042b940d86f6e1127148d54e0e258a0f0d6..c580232666fef220b39dbdb56da24acf93137290 100644 --- a/third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp +++ b/third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2007 Rob Buis <buis@kde.org> * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> * Copyright (C) Research In Motion Limited 2010. All rights reserved. @@ -47,19 +47,20 @@ SVGInlineTextBox::SVGInlineTextBox(LineLayoutItem item, void SVGInlineTextBox::dirtyLineBoxes() { InlineTextBox::dirtyLineBoxes(); - // Clear the now stale text fragments + // Clear the now stale text fragments. clearTextFragments(); - // And clear any following text fragments as the text on which they - // depend may now no longer exist, or glyph positions may be wrong + // And clear any following text fragments as the text on which they depend may + // now no longer exist, or glyph positions may be wrong. InlineTextBox* nextBox = nextTextBox(); if (nextBox) nextBox->dirtyLineBoxes(); } int SVGInlineTextBox::offsetForPosition(LayoutUnit, bool) const { - // SVG doesn't use the standard offset <-> position selection system, as it's not suitable for SVGs complex needs. - // vertical text selection, inline boxes spanning multiple lines (contrary to HTML, etc.) + // SVG doesn't use the standard offset <-> position selection system, as it's + // not suitable for SVGs complex needs. Vertical text selection, inline boxes + // spanning multiple lines (contrary to HTML, etc.) ASSERT_NOT_REACHED(); return 0; } @@ -175,21 +176,19 @@ TextRun SVGInlineTextBox::constructTextRun( const SVGTextFragment& fragment) const { LineLayoutText text = getLineLayoutItem(); - // FIXME(crbug.com/264211): This should not be necessary but can occur if we - // layout during layout. Remove this when 264211 is fixed. + // FIXME: This should not be necessary but can occur if we layout during + // layout. Remove this when crbug.com/264211 is fixed. RELEASE_ASSERT(!text.needsLayout()); TextRun run( - static_cast<const LChar*>( - nullptr) // characters, will be set below if non-zero. - , - 0 // length, will be set below if non-zero. - , - 0 // xPos, only relevant with allowTabs=true - , - 0 // padding, only relevant for justified text, not relevant for SVG - , - TextRun::AllowTrailingExpansion, direction(), + // Characters, will be set below if non-zero. + static_cast<const LChar*>(nullptr), + // Length, will be set below if non-zero. + 0, + // xPos, only relevant with allowTabs=true. + 0, + // Padding, only relevant for justified text, not relevant for SVG. + 0, TextRun::AllowTrailingExpansion, direction(), dirOverride() || style.rtlOrdering() == VisualOrder /* directionalOverride */); @@ -205,7 +204,8 @@ TextRun SVGInlineTextBox::constructTextRun( // We handle letter & word spacing ourselves. run.disableSpacing(); - // Propagate the maximum length of the characters buffer to the TextRun, even when we're only processing a substring. + // Propagate the maximum length of the characters buffer to the TextRun, even + // when we're only processing a substring. run.setCharactersLength(text.textLength() - fragment.characterOffset); ASSERT(run.charactersLength() >= run.length()); return run; @@ -235,7 +235,8 @@ void SVGInlineTextBox::paintDocumentMarker(GraphicsContext&, const ComputedStyle&, const Font&, bool) const { - // SVG does not have support for generic document markers (e.g., spellchecking, etc). + // SVG does not have support for generic document markers (e.g., + // spellchecking, etc). } void SVGInlineTextBox::paintTextMatchMarkerForeground(
The CQ bit was checked by eae@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from pdr@chromium.org Link to the patchset: https://codereview.chromium.org/2391693004/#ps20001 (title: "Rebase w/HEAD")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...
Description was changed from ========== Reformat comments in core/layout/svg/line BUG=563793 TBR=pdr@chromium.org ========== to ========== Reformat comments in core/layout/svg/line BUG=563793 R=pdr@chromium.org ==========
Message was sent while issue was closed.
Description was changed from ========== Reformat comments in core/layout/svg/line BUG=563793 R=pdr@chromium.org ========== to ========== Reformat comments in core/layout/svg/line BUG=563793 R=pdr@chromium.org ==========
Message was sent while issue was closed.
Committed patchset #2 (id:20001)
Message was sent while issue was closed.
Description was changed from ========== Reformat comments in core/layout/svg/line BUG=563793 R=pdr@chromium.org ========== to ========== Reformat comments in core/layout/svg/line BUG=563793 R=pdr@chromium.org Committed: https://crrev.com/a729edf941b224161ce6d9510dfdf272c0132518 Cr-Commit-Position: refs/heads/master@{#423670} ==========
Message was sent while issue was closed.
Patchset 2 (id:??) landed as https://crrev.com/a729edf941b224161ce6d9510dfdf272c0132518 Cr-Commit-Position: refs/heads/master@{#423670} |