Title: [101565] branches/chromium/912
- Revision
- 101565
- Author
- [email protected]
- Date
- 2011-11-30 16:08:51 -0800 (Wed, 30 Nov 2011)
Log Message
Merge 101272
BUG=104859
Review URL: http://codereview.chromium.org/8760017
Modified Paths
Added Paths
Property Changed
Diff
Copied: branches/chromium/912/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash-expected.txt (from rev 101272, trunk/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash-expected.txt) (0 => 101565)
--- branches/chromium/912/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash-expected.txt (rev 0)
+++ branches/chromium/912/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash-expected.txt 2011-12-01 00:08:51 UTC (rev 101565)
@@ -0,0 +1 @@
+ PASS, if no exception or crash in debug
Copied: branches/chromium/912/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash.html (from rev 101272, trunk/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash.html) (0 => 101565)
--- branches/chromium/912/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash.html (rev 0)
+++ branches/chromium/912/LayoutTests/fast/text/international/embed-bidi-style-in-isolate-crash.html 2011-12-01 00:08:51 UTC (rev 101565)
@@ -0,0 +1,11 @@
+<bdi>
+ <ruby>PASS, if no exception or crash in debug</ruby>
+ <em dir="ltr">
+ <embed></embed>
+ <audio _onerror_="open()" src=""
+ </em>
+</bdi>
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
Modified: branches/chromium/912/Source/WebCore/rendering/InlineIterator.h (101564 => 101565)
--- branches/chromium/912/Source/WebCore/rendering/InlineIterator.h 2011-12-01 00:04:38 UTC (rev 101564)
+++ branches/chromium/912/Source/WebCore/rendering/InlineIterator.h 2011-12-01 00:08:51 UTC (rev 101565)
@@ -139,7 +139,8 @@
}
// FIXME: Should unicode-bidi: plaintext really be embedding override/embed characters here?
- observer->embed(embedCharFromDirection(style->direction(), unicodeBidi), FromStyleOrDOM);
+ if (!observer->inIsolate())
+ observer->embed(embedCharFromDirection(style->direction(), unicodeBidi), FromStyleOrDOM);
}
template <class Observer>
@@ -157,7 +158,8 @@
}
// Otherwise we pop any embed/override character we added when we opened this tag.
- observer->embed(WTF::Unicode::PopDirectionalFormat, FromStyleOrDOM);
+ if (!observer->inIsolate())
+ observer->embed(WTF::Unicode::PopDirectionalFormat, FromStyleOrDOM);
}
static inline bool isIteratorTarget(RenderObject* object)
Property changes on: branches/chromium/912/Source/WebCore/rendering/InlineIterator.h
___________________________________________________________________
Added: svn:mergeinfo
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
