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

Unified Diff: Source/core/rendering/RenderCombineText.h

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/paint/ViewDisplayListTest.cpp ('k') | Source/core/rendering/RenderCombineText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderCombineText.h
diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/rendering/RenderCombineText.h
deleted file mode 100644
index b41b082327a2e57e9f997c035d4bc6a257e8e7ac..0000000000000000000000000000000000000000
--- a/Source/core/rendering/RenderCombineText.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef RenderCombineText_h
-#define RenderCombineText_h
-
-#include "core/rendering/RenderText.h"
-#include "platform/fonts/Font.h"
-
-namespace blink {
-
-// RenderCombineText uses different coordinate systems for layout and inlineTextBox,
-// because it is treated as 1em-box character in vertical flow for the layout,
-// while its inline box is in horizontal flow.
-class RenderCombineText final : public RenderText {
-public:
- RenderCombineText(Node*, PassRefPtr<StringImpl>);
-
- void updateFont();
- bool isCombined() const { return m_isCombined; }
- float combinedTextWidth(const Font& font) const { return font.fontDescription().computedSize(); }
- const Font& originalFont() const { return parent()->style()->font(); }
- void transformToInlineCoordinates(GraphicsContext&, const FloatRect& boxRect) const;
- void transformLayoutRect(FloatRect& boxRect) const;
- float inlineWidthForLayout() const;
-
-private:
- virtual bool isCombineText() const override { return true; }
- virtual float width(unsigned from, unsigned length, const Font&, float xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const override;
- virtual const char* renderName() const override { return "RenderCombineText"; }
- virtual void styleDidChange(StyleDifference, const LayoutStyle* oldStyle) override;
- virtual void setTextInternal(PassRefPtr<StringImpl>) override;
- void updateIsCombined();
-
- float offsetX(const FloatRect& boxRect) const;
- float offsetXNoScale(const FloatRect& boxRect) const;
- float offsetY() const { return style()->font().fontDescription().computedPixelSize(); }
-
- float m_combinedTextWidth;
- float m_scaleX;
- bool m_isCombined : 1;
- bool m_needsFontUpdate : 1;
-};
-
-DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText());
-
-inline float RenderCombineText::inlineWidthForLayout() const
-{
- ASSERT(!m_needsFontUpdate);
- return m_combinedTextWidth;
-}
-
-inline float RenderCombineText::offsetX(const FloatRect& boxRect) const
-{
- ASSERT(!m_needsFontUpdate);
- return (boxRect.height() - m_combinedTextWidth / m_scaleX) / 2;
-}
-
-inline float RenderCombineText::offsetXNoScale(const FloatRect& boxRect) const
-{
- ASSERT(!m_needsFontUpdate);
- return (boxRect.height() - m_combinedTextWidth) / 2;
-}
-
-
-} // namespace blink
-
-#endif // RenderCombineText_h
« no previous file with comments | « Source/core/paint/ViewDisplayListTest.cpp ('k') | Source/core/rendering/RenderCombineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698