Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / fonts / GlyphPageTreeNode.cpp

diff --git a/src/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp b/src/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp
index 6c27193..0022c33 100644 (file)
--- a/src/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp
+++ b/src/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.cpp
@@ -120,10 +120,6 @@ void GlyphPageTreeNode::pruneTreeFontData(const SimpleFontData* fontData)
 
 static bool fill(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
 {
-#if ENABLE(SVG_FONTS)
-    if (fontData->isSVGFont())
-        return fontData->customFontData()->fillSVGGlyphPage(pageToFill, offset, length, buffer, bufferLength, fontData);
-#endif
     bool hasGlyphs = fontData->fillGlyphPage(pageToFill, offset, length, buffer, bufferLength);
 #if ENABLE(OPENTYPE_VERTICAL)
     if (hasGlyphs && fontData->verticalData())
@@ -169,10 +165,9 @@ void GlyphPageTreeNode::initializePage(const FontData* fontData, unsigned pageNu
                         buffer[i] = zeroWidthSpace;
                     buffer[softHyphen] = zeroWidthSpace;
 
-                    // \n, \t, and nonbreaking space must render as a space.
+                    // \n and \t must render as a space.
                     buffer[newlineCharacter] = space;
                     buffer[characterTabulation] = space;
-                    buffer[noBreakSpace] = space;
                 } else if (start == (arabicLetterMark & ~(GlyphPage::size - 1))) {
                     buffer[arabicLetterMark - start] = zeroWidthSpace;
                 } else if (start == (leftToRightMark & ~(GlyphPage::size - 1))) {