Title: [156888] trunk
Revision
156888
Author
[email protected]
Date
2013-10-04 07:22:31 -0700 (Fri, 04 Oct 2013)

Log Message

[EFL] Enable correct behaviour for deleting regional indicator symbols
https://bugs.webkit.org/show_bug.cgi?id=122209

Patch by Krzysztof Wolanski <[email protected]> on 2013-10-04
Reviewed by Gyuyoung Kim.

Source/WebCore:

Regional indicator symbols that are combined should behave as a single character when deleting.
Removed unused variable initialState.

* rendering/RenderText.cpp:
(WebCore::RenderText::previousOffsetForBackwardDeletion):

LayoutTests:

Now editing/deleting/regional-indicators.html is passing on EFL port.

* platform/efl/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (156887 => 156888)


--- trunk/LayoutTests/ChangeLog	2013-10-04 14:16:22 UTC (rev 156887)
+++ trunk/LayoutTests/ChangeLog	2013-10-04 14:22:31 UTC (rev 156888)
@@ -1,3 +1,14 @@
+2013-10-04  Krzysztof Wolanski  <[email protected]>
+
+        [EFL] Enable correct behaviour for deleting regional indicator symbols
+        https://bugs.webkit.org/show_bug.cgi?id=122209
+
+        Reviewed by Gyuyoung Kim.
+
+        Now editing/deleting/regional-indicators.html is passing on EFL port.
+
+        * platform/efl/TestExpectations:
+
 2013-10-04  Andrei Bucur  <[email protected]>
 
         [CSS Regions] Infinite loop when computing widows

Modified: trunk/LayoutTests/platform/efl/TestExpectations (156887 => 156888)


--- trunk/LayoutTests/platform/efl/TestExpectations	2013-10-04 14:16:22 UTC (rev 156887)
+++ trunk/LayoutTests/platform/efl/TestExpectations	2013-10-04 14:22:31 UTC (rev 156888)
@@ -1414,8 +1414,6 @@
 # Identical failures on GTK, EFL and Qt.
 webkit.org/b/101539 editing/execCommand/switch-list-type-with-orphaned-li.html [ Failure ]
 
-webkit.org/b/66268 editing/deleting/regional-indicators.html [ Failure ]
-
 # Wrong video colors.
 webkit.org/b/102091 media/video-colorspace-yuv420.html [ Skip ]
 webkit.org/b/102091 media/video-colorspace-yuv422.html [ Skip ]

Modified: trunk/Source/WebCore/ChangeLog (156887 => 156888)


--- trunk/Source/WebCore/ChangeLog	2013-10-04 14:16:22 UTC (rev 156887)
+++ trunk/Source/WebCore/ChangeLog	2013-10-04 14:22:31 UTC (rev 156888)
@@ -1,3 +1,16 @@
+2013-10-04  Krzysztof Wolanski  <[email protected]>
+
+        [EFL] Enable correct behaviour for deleting regional indicator symbols
+        https://bugs.webkit.org/show_bug.cgi?id=122209
+
+        Reviewed by Gyuyoung Kim.
+
+        Regional indicator symbols that are combined should behave as a single character when deleting.
+        Removed unused variable initialState.
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::previousOffsetForBackwardDeletion):
+
 2013-10-04  Zan Dobersek  <[email protected]>
 
         [WebIDL] Annotate IDL interfaces under Source/WebCore/css/ with the OperationsNotDeletable attribute

Modified: trunk/Source/WebCore/rendering/RenderText.cpp (156887 => 156888)


--- trunk/Source/WebCore/rendering/RenderText.cpp	2013-10-04 14:16:22 UTC (rev 156887)
+++ trunk/Source/WebCore/rendering/RenderText.cpp	2013-10-04 14:22:31 UTC (rev 156888)
@@ -1683,7 +1683,7 @@
     return result;
 }
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(EFL)
 
 #define HANGUL_CHOSEONG_START (0x1100)
 #define HANGUL_CHOSEONG_END (0x115F)
@@ -1725,7 +1725,7 @@
 
 int RenderText::previousOffsetForBackwardDeletion(int current) const
 {
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(EFL)
     ASSERT(m_text);
     StringImpl& text = *m_text.impl();
     UChar32 character;
@@ -1768,7 +1768,6 @@
     character = text.characterStartingAt(current);
     if (((character >= HANGUL_CHOSEONG_START) && (character <= HANGUL_JONGSEONG_END)) || ((character >= HANGUL_SYLLABLE_START) && (character <= HANGUL_SYLLABLE_END))) {
         HangulState state;
-        HangulState initialState;
 
         if (character < HANGUL_JUNGSEONG_START)
             state = HangulStateL;
@@ -1779,8 +1778,6 @@
         else
             state = isHangulLVT(character) ? HangulStateLVT : HangulStateLV;
 
-        initialState = state;
-
         while (current > 0 && ((character = text.characterStartingAt(current - 1)) >= HANGUL_CHOSEONG_START) && (character <= HANGUL_SYLLABLE_END) && ((character <= HANGUL_JONGSEONG_END) || (character >= HANGUL_SYLLABLE_START))) {
             switch (state) {
             case HangulStateV:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to