Rename LayoutStyle to papayawhip

Source/core/layout/TextRunConstructor.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/layout/TextRunConstructor.h"
 
 #include "core/layout/LayoutText.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 #include "platform/text/BidiTextRun.h"
 
 namespace blink {
 
 template <typename CharacterType>
-static inline TextRun constructTextRunInternal(LayoutObject* context, const Font& font, const CharacterType* characters, int length, const LayoutStyle& style, TextDirection direction)
+static inline TextRun constructTextRunInternal(LayoutObject* context, const Font& font, const CharacterType* characters, int length, const ComputedStyle& style, TextDirection direction)
 {
     TextRun::ExpansionBehavior expansion = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion;
     bool directionalOverride = style.rtlOrdering() == VisualOrder;
     TextRun run(characters, length, 0, 0, expansion, direction, directionalOverride);
     return run;
 }
 
 template <typename CharacterType>
-static inline TextRun constructTextRunInternal(LayoutObject* context, const Font& font, const CharacterType* characters, int length, const LayoutStyle& style, TextDirection direction, TextRunFlags flags)
+static inline TextRun constructTextRunInternal(LayoutObject* context, const Font& font, const CharacterType* characters, int length, const ComputedStyle& style, TextDirection direction, TextRunFlags flags)
 {
     TextDirection textDirection = direction;
     bool directionalOverride = style.rtlOrdering() == VisualOrder;
     if (flags != DefaultTextRunFlags) {
         if (flags & RespectDirection)
             textDirection = style.direction();
         if (flags & RespectDirectionOverride)
             directionalOverride |= isOverride(style.unicodeBidi());
     }
 
     TextRun::ExpansionBehavior expansion = TextRun::AllowTrailingExpansion | TextRun::ForbidLeadingExpansion;
     TextRun run(characters, length, 0, 0, expansion, textDirection, directionalOverride);
     return run;
 }
 
-TextRun constructTextRun(LayoutObject* context, const Font& font, const LChar* characters, int length, const LayoutStyle& style, TextDirection direction)
+TextRun constructTextRun(LayoutObject* context, const Font& font, const LChar* characters, int length, const ComputedStyle& style, TextDirection direction)
 {
     return constructTextRunInternal(context, font, characters, length, style, direction);
 }
 
-TextRun constructTextRun(LayoutObject* context, const Font& font, const UChar* characters, int length, const LayoutStyle& style, TextDirection direction)
+TextRun constructTextRun(LayoutObject* context, const Font& font, const UChar* characters, int length, const ComputedStyle& style, TextDirection direction)
 {
     return constructTextRunInternal(context, font, characters, length, style, direction);
 }
 
-TextRun constructTextRun(LayoutObject* context, const Font& font, const LayoutText* text, const LayoutStyle& style, TextDirection direction)
+TextRun constructTextRun(LayoutObject* context, const Font& font, const LayoutText* text, const ComputedStyle& style, TextDirection direction)
 {
     if (text->hasEmptyText())
         return constructTextRunInternal(context, font, static_cast<const LChar*>(nullptr), 0, style, direction);
     if (text->is8Bit())
         return constructTextRunInternal(context, font, text->characters8(), text->textLength(), style, direction);
     return constructTextRunInternal(context, font, text->characters16(), text->textLength(), style, direction);
 }
 
-TextRun constructTextRun(LayoutObject* context, const Font& font, const LayoutText* text, unsigned offset, unsigned length, const LayoutStyle& style, TextDirection direction)
+TextRun constructTextRun(LayoutObject* context, const Font& font, const LayoutText* text, unsigned offset, unsigned length, const ComputedStyle& style, TextDirection direction)
 {
     ASSERT(offset + length <= text->textLength());
     if (text->hasEmptyText())
         return constructTextRunInternal(context, font, static_cast<const LChar*>(nullptr), 0, style, direction);
     if (text->is8Bit())
         return constructTextRunInternal(context, font, text->characters8() + offset, length, style, direction);
     return constructTextRunInternal(context, font, text->characters16() + offset, length, style, direction);
 }
 
-TextRun constructTextRun(LayoutObject* context, const Font& font, const String& string, const LayoutStyle& style, TextDirection direction, TextRunFlags flags)
+TextRun constructTextRun(LayoutObject* context, const Font& font, const String& string, const ComputedStyle& style, TextDirection direction, TextRunFlags flags)
 {
     unsigned length = string.length();
     if (!length)
         return constructTextRunInternal(context, font, static_cast<const LChar*>(0), length, style, direction, flags);
     if (string.is8Bit())
         return constructTextRunInternal(context, font, string.characters8(), length, style, direction, flags);
     return constructTextRunInternal(context, font, string.characters16(), length, style, direction, flags);
 }
 
-TextRun constructTextRun(LayoutObject* context, const Font& font, const String& string, const LayoutStyle& style, TextRunFlags flags)
+TextRun constructTextRun(LayoutObject* context, const Font& font, const String& string, const ComputedStyle& style, TextRunFlags flags)
 {
     return constructTextRun(context, font, string, style, string.isEmpty() || string.is8Bit() ? LTR : determineDirectionality(string), flags);
 }
 
-TextRun constructTextRun(LayoutObject* context, const Font& font, const LayoutText* text, unsigned offset, unsigned length, const LayoutStyle& style)
+TextRun constructTextRun(LayoutObject* context, const Font& font, const LayoutText* text, unsigned offset, unsigned length, const ComputedStyle& style)
 {
     ASSERT(offset + length <= text->textLength());
     if (text->hasEmptyText())
         return constructTextRunInternal(context, font, static_cast<const LChar*>(nullptr), 0, style, LTR);
     if (text->is8Bit())
         return constructTextRunInternal(context, font, text->characters8() + offset, length, style, LTR);
 
     TextRun run = constructTextRunInternal(context, font, text->characters16() + offset, length, style, LTR);
     run.setDirection(directionForRun(run));
     return run;
 }
 
 } // namespace blink