Merge 101272

Source/WebCore/rendering/InlineIterator.h

Index: Source/WebCore/rendering/InlineIterator.h
===================================================================
--- Source/WebCore/rendering/InlineIterator.h	(revision 101564)
+++ Source/WebCore/rendering/InlineIterator.h	(working copy)
@@ -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: Source\WebCore\rendering\InlineIterator.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/WebCore/rendering/InlineIterator.h:r53455