Title: [203042] trunk/Source/WebCore
Revision
203042
Author
[email protected]
Date
2016-07-10 14:46:34 -0700 (Sun, 10 Jul 2016)

Log Message

Rename isEmojiModifier to isEmojiFitzpatrickModifier to better capture its function
https://bugs.webkit.org/show_bug.cgi?id=159610

Reviewed by Dan Bernstein.

* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::characterRangeCodePath):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::advanceByCombiningCharacterSequence):
Update for rename.

* platform/text/CharacterProperties.h:
(WebCore::isEmojiGroupCandidate):
(WebCore::isEmojiFitzpatrickModifier):
(WebCore::isVariationSelector):
Rename isEmojiModifier -> isEmojiFitzpatrickModifier. Also add some comments
explaining what the characters these predicate act on to demystify them a bit.

* rendering/RenderText.cpp:
(WebCore::RenderText::previousOffsetForBackwardDeletion):
Update for rename and rename a related variable.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (203041 => 203042)


--- trunk/Source/WebCore/ChangeLog	2016-07-10 18:50:59 UTC (rev 203041)
+++ trunk/Source/WebCore/ChangeLog	2016-07-10 21:46:34 UTC (rev 203042)
@@ -1,3 +1,27 @@
+2016-07-10  Sam Weinig  <[email protected]>
+
+        Rename isEmojiModifier to isEmojiFitzpatrickModifier to better capture its function
+        https://bugs.webkit.org/show_bug.cgi?id=159610
+
+        Reviewed by Dan Bernstein.
+
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::FontCascade::characterRangeCodePath):
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::advanceByCombiningCharacterSequence):
+        Update for rename.
+
+        * platform/text/CharacterProperties.h:
+        (WebCore::isEmojiGroupCandidate):
+        (WebCore::isEmojiFitzpatrickModifier):
+        (WebCore::isVariationSelector):
+        Rename isEmojiModifier -> isEmojiFitzpatrickModifier. Also add some comments
+        explaining what the characters these predicate act on to demystify them a bit.
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::previousOffsetForBackwardDeletion):
+        Update for rename and rename a related variable.
+
 2016-07-10  Alex Christensen  <[email protected]>
 
         Fix client certificate authentication after r200463

Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (203041 => 203042)


--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp	2016-07-10 18:50:59 UTC (rev 203041)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp	2016-07-10 21:46:34 UTC (rev 203042)
@@ -726,7 +726,7 @@
                 previousCharacterIsEmojiGroupCandidate = true;
                 continue;
             }
-            if (isEmojiModifier(supplementaryCharacter))
+            if (isEmojiFitzpatrickModifier(supplementaryCharacter))
                 return Complex;
             if (supplementaryCharacter < 0xE0100) // U+E0100 through U+E01EF Unicode variation selectors.
                 continue;

Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (203041 => 203042)


--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2016-07-10 18:50:59 UTC (rev 203041)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2016-07-10 21:46:34 UTC (rev 203042)
@@ -269,7 +269,7 @@
         bool shouldContinue = false;
         U16_NEXT(iterator, markLength, end - iterator, nextCharacter);
 
-        if (isVariationSelector(nextCharacter) || isEmojiModifier(nextCharacter))
+        if (isVariationSelector(nextCharacter) || isEmojiFitzpatrickModifier(nextCharacter))
             shouldContinue = true;
 
         if (sawJoiner && isEmojiGroupCandidate(nextCharacter))

Modified: trunk/Source/WebCore/platform/text/CharacterProperties.h (203041 => 203042)


--- trunk/Source/WebCore/platform/text/CharacterProperties.h	2016-07-10 18:50:59 UTC (rev 203041)
+++ trunk/Source/WebCore/platform/text/CharacterProperties.h	2016-07-10 21:46:34 UTC (rev 203042)
@@ -23,19 +23,32 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef CharacterProperties_h
-#define CharacterProperties_h
+#pragma once
 
 namespace WebCore {
 
 static inline bool isEmojiGroupCandidate(UChar32 character)
 {
-    return (character >= 0x1F466 && character <= 0x1F469) || character == 0x2764 || character == 0x1F48B
-        || character == 0x1F441 || character == 0x1F5E8;
+    // U+1F466 - BOY
+    // U+1F467 - GIRL
+    // U+1F468 - MAN
+    // U+1F469 - WOMAN
+    // U+2764  - HEAVY BLACK HEART
+    // U+1F48B - KISS MARK
+    // U+1F441 - EYE
+    // U+1F5E8 - LEFT SPEECH BUBBLE
+
+    return (character >= 0x1F466 && character <= 0x1F469) || character == 0x2764 || character == 0x1F48B || character == 0x1F441 || character == 0x1F5E8;
 }
 
-static inline bool isEmojiModifier(UChar32 character)
+static inline bool isEmojiFitzpatrickModifier(UChar32 character)
 {
+    // U+1F3FB - EMOJI MODIFIER FITZPATRICK TYPE-1-2
+    // U+1F3FC - EMOJI MODIFIER FITZPATRICK TYPE-3
+    // U+1F3FD - EMOJI MODIFIER FITZPATRICK TYPE-4
+    // U+1F3FE - EMOJI MODIFIER FITZPATRICK TYPE-5
+    // U+1F3FF - EMOJI MODIFIER FITZPATRICK TYPE-6
+
     return character >= 0x1F3FB && character <= 0x1F3FF;
 }
 
@@ -45,5 +58,3 @@
 }
 
 }
-
-#endif

Modified: trunk/Source/WebCore/rendering/RenderText.cpp (203041 => 203042)


--- trunk/Source/WebCore/rendering/RenderText.cpp	2016-07-10 18:50:59 UTC (rev 203041)
+++ trunk/Source/WebCore/rendering/RenderText.cpp	2016-07-10 21:46:34 UTC (rev 203042)
@@ -1528,7 +1528,7 @@
 #if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK)
     bool sawRegionalIndicator = false;
     bool sawEmojiGroupCandidate = false;
-    bool sawEmojiModifier = false;
+    bool sawEmojiFitzpatrickModifier = false;
     
     while (current > 0) {
         UChar32 character;
@@ -1544,8 +1544,8 @@
             break;
         }
 
-        if (sawEmojiModifier) {
-            if (isEmojiModifier(character)) {
+        if (sawEmojiFitzpatrickModifier) {
+            if (isEmojiFitzpatrickModifier(character)) {
                 // Don't treat two emoji modifiers in a row as a group.
                 U16_FWD_1_UNSAFE(text, current);
                 break;
@@ -1573,8 +1573,8 @@
             continue;
         }
         
-        if (isEmojiModifier(character)) {
-            sawEmojiModifier = true;
+        if (isEmojiFitzpatrickModifier(character)) {
+            sawEmojiFitzpatrickModifier = true;
             continue;
         }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to