[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mitz at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 37773add5a5def3689de435f8254a910cf412a8d
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 18:46:38 2011 +0000

    Changing unicode-bidi doesn’t force layout
    https://bugs.webkit.org/show_bug.cgi?id=53311
    
    Reviewed by Anders Carlsson.
    
    Source/WebCore:
    
    Test: fast/dynamic/unicode-bidi.html
    
    * rendering/style/RenderStyle.cpp:
    (WebCore::RenderStyle::diff): Return a layout difference if unicode-bidi values differ.
    
    LayoutTests:
    
    * fast/dynamic/unicode-bidi-expected.checksum: Added.
    * fast/dynamic/unicode-bidi-expected.png: Added.
    * fast/dynamic/unicode-bidi-expected.txt: Added.
    * fast/dynamic/unicode-bidi.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76954 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7ce0bfa..0d7e874 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-28  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Changing unicode-bidi doesn’t force layout
+        https://bugs.webkit.org/show_bug.cgi?id=53311
+
+        * fast/dynamic/unicode-bidi-expected.checksum: Added.
+        * fast/dynamic/unicode-bidi-expected.png: Added.
+        * fast/dynamic/unicode-bidi-expected.txt: Added.
+        * fast/dynamic/unicode-bidi.html: Added.
+
 2011-01-28  Jessie Berlin  <jberlin at apple.com>
 
         Add Windows expected (failing) results to get the bots green. Unreviewed.
diff --git a/LayoutTests/platform/mac/fast/text/fixed-pitch-control-characters-expected.checksum b/LayoutTests/fast/dynamic/unicode-bidi-expected.checksum
similarity index 100%
copy from LayoutTests/platform/mac/fast/text/fixed-pitch-control-characters-expected.checksum
copy to LayoutTests/fast/dynamic/unicode-bidi-expected.checksum
diff --git a/LayoutTests/fast/dynamic/unicode-bidi-expected.png b/LayoutTests/fast/dynamic/unicode-bidi-expected.png
new file mode 100644
index 0000000..9e26faa
Binary files /dev/null and b/LayoutTests/fast/dynamic/unicode-bidi-expected.png differ
diff --git a/LayoutTests/fast/dynamic/unicode-bidi-expected.txt b/LayoutTests/fast/dynamic/unicode-bidi-expected.txt
new file mode 100644
index 0000000..e4a1e67
--- /dev/null
+++ b/LayoutTests/fast/dynamic/unicode-bidi-expected.txt
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600 layerType: background only
+layer at (8,8) size 100x50
+  RenderBlock (positioned) zI: -1 {DIV} at (8,8) size 100x50 [color=#FF0000]
+    RenderInline {SPAN} at (0,0) size 50x50 [color=#008000]
+      RenderText {#text} at (0,0) size 50x50
+        text run at (0,0) width 50: "x"
+    RenderText zI: -1 {#text} at (50,0) size 50x50
+      text run at (50,0) width 50: "x"
+layer at (0,0) size 800x600 layerType: foreground only
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {DIV} at (0,0) size 784x50 [color=#008000]
+        RenderText {#text} at (0,0) size 100x50
+          text run at (0,0) width 100 RTL override: "xp"
diff --git a/LayoutTests/fast/dynamic/unicode-bidi.html b/LayoutTests/fast/dynamic/unicode-bidi.html
new file mode 100644
index 0000000..24e460e
--- /dev/null
+++ b/LayoutTests/fast/dynamic/unicode-bidi.html
@@ -0,0 +1,6 @@
+<div style="font: 50px ahem; -webkit-font-smoothing: none; direction: rtl; position: absolute; z-index: -1; color: red;"><span style="color: green;">x</span>x</div>
+<div id="target" style="text-align: left; font: 50px ahem; -webkit-font-smoothing: none; direction: rtl; color: green;">xp</div>
+<script>
+    document.body.offsetTop;
+    document.getElementById("target").style.unicodeBidi = "bidi-override";
+</script>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 563c9c9..e2af323 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-28  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Changing unicode-bidi doesn’t force layout
+        https://bugs.webkit.org/show_bug.cgi?id=53311
+
+        Test: fast/dynamic/unicode-bidi.html
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff): Return a layout difference if unicode-bidi values differ.
+
 2011-01-27  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
index 2836fb9..b76a350 100644
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -462,7 +462,8 @@ StyleDifference RenderStyle::diff(const RenderStyle* other, unsigned& changedCon
         inherited_flags._text_transform != other->inherited_flags._text_transform ||
         inherited_flags._direction != other->inherited_flags._direction ||
         inherited_flags._white_space != other->inherited_flags._white_space ||
-        noninherited_flags._clear != other->noninherited_flags._clear)
+        noninherited_flags._clear != other->noninherited_flags._clear ||
+        noninherited_flags._unicodeBidi != other->noninherited_flags._unicodeBidi)
         return StyleDifferenceLayout;
 
     // Check block flow direction.

-- 
WebKit Debian packaging