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

Side by Side Diff: sky/engine/core/rendering/RenderBox.h

Issue 1200233002: Use the baseline information exposed by C++ to pipe baseline data through RenderBox. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 5 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
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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights 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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 updateLogicalHeight(); 422 updateLogicalHeight();
423 return true; 423 return true;
424 } 424 }
425 425
426 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override; 426 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override;
427 427
428 void removeFloatingOrPositionedChildFromBlockLists(); 428 void removeFloatingOrPositionedChildFromBlockLists();
429 429
430 RenderLayer* enclosingFloatPaintingLayer() const; 430 RenderLayer* enclosingFloatPaintingLayer() const;
431 431
432 virtual int firstLineBoxBaseline() const { return -1; } 432 // if autoBaseline is true, baselineType is ignored and determined from the context
eseidel 2015/06/24 23:20:35 Why not just make it a separate method? firstLine
433 virtual int firstLineBoxBaseline(bool autoBaseline = true, FontBaseline base lineType = AlphabeticBaseline) const { return -1; }
433 virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // R eturns -1 if we should skip this box when computing the baseline of an inline-bl ock. 434 virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // R eturns -1 if we should skip this box when computing the baseline of an inline-bl ock.
434 435
435 bool isFlexItem() const { return !isInline() && !isFloatingOrOutOfFlowPositi oned() && parent() && parent()->isFlexibleBox(); } 436 bool isFlexItem() const { return !isInline() && !isFloatingOrOutOfFlowPositi oned() && parent() && parent()->isFlexibleBox(); }
436 437
437 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override; 438 virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositio nMode = PositionOnContainingLine) const override;
438 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override; 439 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override;
439 440
440 virtual LayoutUnit offsetLeft() const override; 441 virtual LayoutUnit offsetLeft() const override;
441 virtual LayoutUnit offsetTop() const override; 442 virtual LayoutUnit offsetTop() const override;
442 443
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 if (UNLIKELY(inlineBoxWrapper() != 0)) 617 if (UNLIKELY(inlineBoxWrapper() != 0))
617 deleteLineBoxWrapper(); 618 deleteLineBoxWrapper();
618 } 619 }
619 620
620 ensureRareData().m_inlineBoxWrapper = boxWrapper; 621 ensureRareData().m_inlineBoxWrapper = boxWrapper;
621 } 622 }
622 623
623 } // namespace blink 624 } // namespace blink
624 625
625 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_ 626 #endif // SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698