Changeset 106563 in webkit


Ignore:
Timestamp:
Feb 2, 2012 9:20:15 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r106551.
​http://trac.webkit.org/changeset/106551
​https://bugs.webkit.org/show_bug.cgi?id=77648

Breaking mac and gtk tests due to font differences. (Requested
by _pdr_ on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-02-02

Source/WebCore:

  • platform/graphics/SVGGlyph.cpp:

(WebCore::charactersWithArabicForm):

  • svg/SVGFontData.cpp:

(WebCore::SVGFontData::applySVGGlyphSelection):

  • svg/SVGFontData.h:

(SVGFontData):

LayoutTests:

  • svg/custom/glyph-selection-arabic-forms-expected.png: Removed.
  • svg/custom/glyph-selection-arabic-forms-expected.txt: Removed.
  • svg/custom/glyph-selection-arabic-forms.svg: Removed.
  • svg/custom/glyph-selection-bidi-mirror-expected.png: Removed.
  • svg/custom/glyph-selection-bidi-mirror-expected.txt: Removed.
  • svg/custom/glyph-selection-bidi-mirror.svg: Removed.
  • svg/custom/glyph-selection-non-bmp-expected.png: Removed.
  • svg/custom/glyph-selection-non-bmp-expected.txt: Removed.
  • svg/custom/glyph-selection-non-bmp.svg: Removed.
Location:
trunk
Files:
9 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r106560 r106563  
     12012-02-02  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106551.
     4        http://trac.webkit.org/changeset/106551
     5        https://bugs.webkit.org/show_bug.cgi?id=77648
     6
     7        Breaking mac and gtk tests due to font differences. (Requested
     8        by _pdr_ on #webkit).
     9
     10        * svg/custom/glyph-selection-arabic-forms-expected.png: Removed.
     11        * svg/custom/glyph-selection-arabic-forms-expected.txt: Removed.
     12        * svg/custom/glyph-selection-arabic-forms.svg: Removed.
     13        * svg/custom/glyph-selection-bidi-mirror-expected.png: Removed.
     14        * svg/custom/glyph-selection-bidi-mirror-expected.txt: Removed.
     15        * svg/custom/glyph-selection-bidi-mirror.svg: Removed.
     16        * svg/custom/glyph-selection-non-bmp-expected.png: Removed.
     17        * svg/custom/glyph-selection-non-bmp-expected.txt: Removed.
     18        * svg/custom/glyph-selection-non-bmp.svg: Removed.
     19
    1202012-02-02  Alexander Pavlov  <apavlov@chromium.org>
    221

  • trunk/Source/WebCore/ChangeLog

    r106560 r106563  
     12012-02-02  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106551.
     4        http://trac.webkit.org/changeset/106551
     5        https://bugs.webkit.org/show_bug.cgi?id=77648
     6
     7        Breaking mac and gtk tests due to font differences. (Requested
     8        by _pdr_ on #webkit).
     9
     10        * platform/graphics/SVGGlyph.cpp:
     11        (WebCore::charactersWithArabicForm):
     12        * svg/SVGFontData.cpp:
     13        (WebCore::SVGFontData::applySVGGlyphSelection):
     14        * svg/SVGFontData.h:
     15        (SVGFontData):
     16
    1172012-02-02  Alexander Pavlov  <apavlov@chromium.org>
    218

  • trunk/Source/WebCore/platform/graphics/SVGGlyph.cpp

    r106551 r106563  
    8181}
    8282
    83 Vector<SVGGlyph::ArabicForm> charactersWithArabicForm(const String& input, bool rtl)
     83Vector<SVGGlyph::ArabicForm> charactersWithArabicForm(const String& input, bool mirror)
    8484{
    8585    Vector<SVGGlyph::ArabicForm> forms;
    … …  
    100100
    101101    // Start identifying arabic forms
    102     if (rtl) {
     102    if (mirror) {
    103103        for (int i = length - 1; i >= 0; --i)
    104104            forms.prepend(processArabicFormDetection(input[i], lastCharShapesRight, forms.isEmpty() ? 0 : &forms.first()));

  • trunk/Source/WebCore/svg/SVGFontData.cpp

    r106551 r106563  
    3232#include "WidthIterator.h"
    3333#include "XMLNames.h"
    34 #include <wtf/text/StringBuilder.h>
    35 #include <wtf/unicode/CharacterNames.h>
    36 #include <wtf/unicode/Unicode.h>
    37 
    38 using namespace WTF;
    39 using namespace Unicode;
    4034
    4135namespace WebCore {
    … …  
    137131    String remainingTextInRun(run.data(currentCharacter), run.charactersLength() - currentCharacter);
    138132    remainingTextInRun = Font::normalizeSpaces(remainingTextInRun.characters(), remainingTextInRun.length());
    139     if (mirror)
    140         remainingTextInRun = createStringWithMirroredCharacters(remainingTextInRun.characters(), remainingTextInRun.length());
    141133    if (!currentCharacter && arabicForms.isEmpty())
    142134        arabicForms = charactersWithArabicForm(remainingTextInRun, mirror);
    … …  
    269261}
    270262
    271 String SVGFontData::createStringWithMirroredCharacters(const UChar* characters, unsigned length) const
    272 {
    273     StringBuilder mirroredCharacters;
    274     mirroredCharacters.reserveCapacity(length);
    275 
    276     UChar32 character;
    277     unsigned i = 0;
    278     while (i < length) {
    279         U16_NEXT(characters, i, length, character);
    280         character = mirroredChar(character);
    281 
    282         if (U16_LENGTH(character) == 1)
    283             mirroredCharacters.append(static_cast<UChar>(character));
    284         else {
    285             mirroredCharacters.append(U16_LEAD(character));
    286             mirroredCharacters.append(U16_TRAIL(character));
    287         }
    288     }
    289 
    290     return mirroredCharacters.toString();
    291 }
    292263
    293264} // namespace WebCore

  • trunk/Source/WebCore/svg/SVGFontData.h

    r106551 r106563  
    5757    bool fillNonBMPGlyphs(SVGFontElement*, GlyphPage* , unsigned offset, unsigned length, UChar* buffer, const SimpleFontData*) const;
    5858
    59     String createStringWithMirroredCharacters(const UChar* characters, unsigned length) const;
    60 
    6159    // Ths SVGFontFaceElement is kept alive --
    6260    // 1) in the external font case: by the CSSFontFaceSource, which holds a reference to the external SVG document
Note: See TracChangeset for help on using the changeset viewer.