Ticket #3360: 3306.patch

_source/core/dom/range.js

@@ -806 +806 @@
 
                                                         // If we don't need space or this element breaks
                                                         // the line, then enlarge it.
-                                                        if ( !needsWhiteSpace || enlargeable.getComputedStyle( 'display' ) != 'inline' )
+                                                        var isBlock = enlargeable.getComputedStyle( 'display' ) != 'inline';
+                                                        if ( !needsWhiteSpace || isBlock )
                                                         {
                                                                 needsWhiteSpace = false;
 
@@ -815 +816 @@
                                                                 // mark it to be enlarged later if the end
                                                                 // boundary also enlarges it.
                                                                 if ( commonReached )
+                                                                {
                                                                         startTop = enlargeable;
+                                                                        
+                                                                        // Block element above ancestor would be the last node to enlarge.
+                                                                        if ( isBlock )
+                                                                                break;
+                                                                }
                                                                 else
                                                                         this.setStartBefore( enlargeable );
                                                         }
@@ -886 +893 @@
                                                                 if ( needsWhiteSpace )
                                                                 {
                                                                         if ( commonReached )
+                                                                        {
                                                                                 startTop = enlargeable;
+                                                                                
+                                                                                // Block element above ancestor would be the last node to enlarge.                                        
+                                                                                if ( enlargeable.getComputedStyle( 'display' ) != 'inline' )
+                                                                                        break;
+                                                                        }
                                                                         else if ( enlargeable )
                                                                                 this.setStartBefore( enlargeable );
                                                                 }
@@ -971 +984 @@
 
                                                         if ( !body.contains( enlargeable ) )
                                                                 break;
-
-                                                        if ( !needsWhiteSpace || enlargeable.getComputedStyle( 'display' ) != 'inline' )
+                                                        var isBlock = enlargeable.getComputedStyle( 'display' ) != 'inline';
+                                                        if ( !needsWhiteSpace || isBlock )
                                                         {
                                                                 needsWhiteSpace = false;
 
@@ -977 +990 @@
                                                                 needsWhiteSpace = false;
 
                                                                 if ( commonReached )
+                                                                {
                                                                         endTop = enlargeable;
+                                                                        if ( isBlock )
+                                                                                break;
+                                                                }
                                                                 else if ( enlargeable )
                                                                         this.setEndAfter( enlargeable );
                                                         }
@@ -1040 +1057 @@
                                                                 if ( needsWhiteSpace )
                                                                 {
                                                                         if ( commonReached )
+                                                                        {
                                                                                 endTop = enlargeable;
+
+                                                                                // Block element above ancestor would be the last node to enlarge.                                        
+                                                                                if ( enlargeable.getComputedStyle( 'display' ) != 'inline' )
+                                                                                        break;
+                                                                        }
                                                                         else
                                                                                 this.setEndAfter( enlargeable );
                                                                 }