2010-07-08 Sheriff Bot <webkit.review.bot@gmail.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Jul 2010 17:26:22 +0000 (17:26 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Jul 2010 17:26:22 +0000 (17:26 +0000)
        Unreviewed, rolling out r62778.
        http://trac.webkit.org/changeset/62778
        https://bugs.webkit.org/show_bug.cgi?id=41866

        Broke svg/W3C-SVG-1.1/text-intro-05-t.svg in debug (Requested
        by pfeldman on #webkit).

        * fast/text/international/bidi-mirror-he-ar.html: Removed.
        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum: Removed.
        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png: Removed.
        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt: Removed.
2010-07-08  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r62778.
        http://trac.webkit.org/changeset/62778
        https://bugs.webkit.org/show_bug.cgi?id=41866

        Broke svg/W3C-SVG-1.1/text-intro-05-t.svg in debug (Requested
        by pfeldman on #webkit).

        * platform/graphics/chromium/FontLinux.cpp:
        (WebCore::TextRunWalker::TextRunWalker):
        (WebCore::TextRunWalker::~TextRunWalker):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@62798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/text/international/bidi-mirror-he-ar.html [deleted file]
LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum [deleted file]
LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png [deleted file]
LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt [deleted file]
WebCore/ChangeLog
WebCore/platform/graphics/chromium/FontLinux.cpp

index 22b224e..1d19f35 100644 (file)
@@ -1,3 +1,17 @@
+2010-07-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r62778.
+        http://trac.webkit.org/changeset/62778
+        https://bugs.webkit.org/show_bug.cgi?id=41866
+
+        Broke svg/W3C-SVG-1.1/text-intro-05-t.svg in debug (Requested
+        by pfeldman on #webkit).
+
+        * fast/text/international/bidi-mirror-he-ar.html: Removed.
+        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum: Removed.
+        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png: Removed.
+        * platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt: Removed.
+
 2010-07-08  Andreas Kling  <andreas.kling@nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/LayoutTests/fast/text/international/bidi-mirror-he-ar.html b/LayoutTests/fast/text/international/bidi-mirror-he-ar.html
deleted file mode 100644 (file)
index 4159c2b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
-<title>Test bidi mirroring in Hebrew and Arabic</title>
-</head>
-<body dir=rtl>
-<p>This test tests bidi mirroring in Hebrew and Arabic</p>
-<p>The parenthesis should be displayed as "(...)..." visually from left to right</p>
-<div>&#x05e9(&#x05e9)</div>  <!-- Hebrew letter treated as simple script -->
-<div>&#x05c6(&#x05c6)</div>  <!-- Hebrew letter treated as complex script -->
-<div>&#x0644(&#x0644)</div>  <!-- Arabic letter treated as complex script -->
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum b/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.checksum
deleted file mode 100644 (file)
index e4dd57d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-b39185ca33028772ede1b054b5364b7d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png b/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png
deleted file mode 100644 (file)
index bae72b3..0000000
Binary files a/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt b/LayoutTests/platform/mac/fast/text/international/bidi-mirror-he-ar-expected.txt
deleted file mode 100644 (file)
index 0232e91..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (464,0) size 320x18
-          text run at (464,0) width 320: "This test tests bidi mirroring in Hebrew and Arabic"
-      RenderBlock {P} at (0,34) size 784x18
-        RenderText {#text} at (327,0) size 457x18
-          text run at (327,0) width 457: "The parenthesis should be displayed as \"(...)...\" visually from left to right"
-      RenderBlock {DIV} at (0,68) size 784x19
-        RenderText {#text} at (751,1) size 33x18
-          text run at (751,1) width 33 RTL: "\x{5E9}(\x{5E9})"
-      RenderBlock {DIV} at (0,87) size 784x18
-        RenderText {#text} at (750,0) size 34x18
-          text run at (750,0) width 34 RTL: "\x{5C6}(\x{5C6})"
-      RenderBlock {DIV} at (0,105) size 784x21
-        RenderText {#text} at (760,3) size 24x18
-          text run at (760,3) width 24 RTL: "\x{644}(\x{644})"
index 6d6dfa5..7cce765 100644 (file)
@@ -1,3 +1,16 @@
+2010-07-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r62778.
+        http://trac.webkit.org/changeset/62778
+        https://bugs.webkit.org/show_bug.cgi?id=41866
+
+        Broke svg/W3C-SVG-1.1/text-intro-05-t.svg in debug (Requested
+        by pfeldman on #webkit).
+
+        * platform/graphics/chromium/FontLinux.cpp:
+        (WebCore::TextRunWalker::TextRunWalker):
+        (WebCore::TextRunWalker::~TextRunWalker):
+
 2010-07-08  Vitaly Repeshko  <vitalyr@chromium.org>
 
         Reviewed by Pavel Feldman.
index c44ecc9..a2098a4 100644 (file)
@@ -49,7 +49,6 @@
 #include <unicode/uchar.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/OwnPtr.h>
-#include <wtf/unicode/Unicode.h>
 
 namespace WebCore {
 
@@ -181,20 +180,10 @@ public:
         m_item.face = 0;
         m_item.font = allocHarfbuzzFont();
 
+        m_item.string = m_run.characters();
+        m_item.stringLength = m_run.length();
         m_item.item.bidiLevel = m_run.rtl();
 
-        int length = m_run.length();
-        m_item.stringLength = length;
-
-        if (!m_item.item.bidiLevel)
-            m_item.string = m_run.characters();
-        else {
-            // Assume mirrored character is in the same multilingual plane as the original one.
-            UChar* string = new UChar[length];
-            mirrorCharacters(string, m_run.characters(), length);
-            m_item.string = string;
-        }
-
         reset();
     }
 
@@ -203,8 +192,6 @@ public:
         fastFree(m_item.font);
         deleteGlyphArrays();
         delete[] m_item.log_clusters;
-        if (m_item.item.bidiLevel)
-            delete[] m_item.string;
     }
 
     void reset()
@@ -468,22 +455,6 @@ private:
         m_offsetX += m_pixelWidth;
     }
 
-    void mirrorCharacters(UChar* destination, const UChar* source, int length) const
-    {
-        int position = 0;
-        bool error;
-        // Iterate characters in source and mirror character if needed.
-        while (position < length) {
-            UChar32 character;
-            int nextPosition = position;
-            U16_NEXT(source, nextPosition, length, character);
-            character = u_charMirror(character);
-            U16_APPEND(destination, position, length, character, error);
-            ASSERT(!error);
-            position = nextPosition;
-        }
-    }
-
     const Font* const m_font;
     HB_ShaperItem m_item;
     uint16_t* m_glyphs16; // A vector of 16-bit glyph ids.