Remove ComplexTextController dependency on core

Source/core/platform/graphics/mac/ComplexTextController.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, 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/platform/graphics/mac/ComplexTextController.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include "core/platform/graphics/Font.h"
-#include "core/rendering/RenderBlockFlow.h"
-#include "core/rendering/RenderText.h"
 #include "platform/geometry/FloatSize.h"
 #include "platform/graphics/TextRun.h"
 #include "platform/text/TextBreakIterator.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/unicode/CharacterNames.h"
 
 using namespace std;
 
 namespace WebCore {
 
 class TextLayout {
 public:
-    static bool isNeeded(RenderText* text, const Font& font)
+    static bool isNeeded(const TextRun& run, const Font& font)
     {
-        TextRun run = RenderBlockFlow::constructTextRun(text, font, text, text->style());
         return font.codePath(run) == Font::Complex;
     }
 
-    TextLayout(RenderText* text, const Font& font, float xPos)
+    TextLayout(const TextRun& run, unsigned textLength, const Font& font, float xPos)
         : m_font(font)
-        , m_run(constructTextRun(text, font, xPos))
+        , m_run(constructTextRun(run, textLength, font, xPos))
         , m_controller(adoptPtr(new ComplexTextController(&m_font, m_run, true)))
     {
     }
 
     float width(unsigned from, unsigned len, HashSet<const SimpleFontData*>* fallbackFonts)
     {
         m_controller->advance(from, 0, ByWholeGlyphs, fallbackFonts);
         float beforeWidth = m_controller->runWidthSoFar();
         if (m_font.wordSpacing() && from && Font::treatAsSpace(m_run[from]))
             beforeWidth += m_font.wordSpacing();
         m_controller->advance(from + len, 0, ByWholeGlyphs, fallbackFonts);
         float afterWidth = m_controller->runWidthSoFar();
         return afterWidth - beforeWidth;
     }
 
 private:
-    static TextRun constructTextRun(RenderText* text, const Font& font, float xPos)
+    static TextRun constructTextRun(const TextRun& textRun, unsigned textLength, const Font& font, float xPos)
     {
-        TextRun run = RenderBlockFlow::constructTextRun(text, font, text, text->style());
-        run.setCharactersLength(text->textLength());
+        TextRun run = textRun;
+        run.setCharactersLength(textLength);
         ASSERT(run.charactersLength() >= run.length());
 
         run.setXPos(xPos);
         return run;
     }
 
     // ComplexTextController has only references to its Font and TextRun so they must be kept alive here.
     Font m_font;
     TextRun m_run;
     OwnPtr<ComplexTextController> m_controller;
 };
 
-PassOwnPtr<TextLayout> Font::createLayout(RenderText* text, float xPos, bool collapseWhiteSpace) const
+PassOwnPtr<TextLayout> Font::createLayoutForMacComplexText(const TextRun& run, unsigned textLength, float xPos, bool collapseWhiteSpace) const
 {
-    if (!collapseWhiteSpace || !TextLayout::isNeeded(text, *this))
+    if (!collapseWhiteSpace || !TextLayout::isNeeded(run, *this))
         return nullptr;
-    return adoptPtr(new TextLayout(text, *this, xPos));
+    return adoptPtr(new TextLayout(run, textLength, *this, xPos));
 }
 
 void Font::deleteLayout(TextLayout* layout)
 {
     delete layout;
 }
 
 float Font::width(TextLayout& layout, unsigned from, unsigned len, HashSet<const SimpleFontData*>* fallbackFonts)
 {
     return layout.width(from, len, fallbackFonts);
@@ skipping 621 matching lines @@
 
             lastCharacterIndex = characterIndex;
         }
         if (!isMonotonic)
             complexTextRun.setIsNonMonotonic();
     }
     m_totalWidth += widthSinceLastCommit;
 }
 
 } // namespace WebCore