Support additional emoji group candidates
Created attachment 283598 [details] WIP
Tests (specified emoji font / specified other font (like Times)) 1. 1F3CC ZWJ 2640 2. 1F3CC FE0F ZWJ 2640 3. 1F3CC ZWJ 2640 FE0F 4. 1F3CC FE0F ZWJ 2640 FE0F 1F46E ZWJ 2640 Backspace Caret & arrow keys Number of glyphs Line break doesn't occur in the middle
Created attachment 283703 [details] Patch
<rdar://problem/27325521>
Created attachment 283705 [details] Patch
Comment on attachment 283705 [details] Patch Attachment 283705 [details] did not pass ios-sim-ews (ios-simulator-wk2): Output: http://webkit-queues.webkit.org/results/1682632 New failing tests: fast/text/emoji-gender-4.html fast/text/emoji-gender-3.html
Created attachment 283710 [details] Archive of layout-test-results from ews121 for ios-simulator-wk2 The attached test failures were seen while running run-webkit-tests on the ios-sim-ews. Bot: ews121 Port: ios-simulator-wk2 Platform: Mac OS X 10.11.5
Comment on attachment 283705 [details] Patch Attachment 283705 [details] did not pass mac-ews (mac): Output: http://webkit-queues.webkit.org/results/1682666 New failing tests: fast/text/emoji-gender-4.html fast/text/emoji-gender-3.html
Created attachment 283711 [details] Archive of layout-test-results from ews101 for mac-yosemite The attached test failures were seen while running run-webkit-tests on the mac-ews. Bot: ews101 Port: mac-yosemite Platform: Mac OS X 10.10.5
Comment on attachment 283705 [details] Patch Attachment 283705 [details] did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.webkit.org/results/1682669 New failing tests: fast/text/emoji-gender-4.html fast/text/emoji-gender-3.html
Created attachment 283712 [details] Archive of layout-test-results from ews107 for mac-yosemite-wk2 The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews. Bot: ews107 Port: mac-yosemite-wk2 Platform: Mac OS X 10.10.5
Comment on attachment 283705 [details] Patch Attachment 283705 [details] did not pass mac-debug-ews (mac): Output: http://webkit-queues.webkit.org/results/1682677 New failing tests: fast/text/emoji-gender-4.html fast/text/emoji-gender-3.html
Created attachment 283717 [details] Archive of layout-test-results from ews112 for mac-yosemite The attached test failures were seen while running run-webkit-tests on the mac-debug-ews. Bot: ews112 Port: mac-yosemite Platform: Mac OS X 10.10.5
Created attachment 283732 [details] Patch
Comment on attachment 283732 [details] Patch Clearing flags on attachment: 283732 Committed r203266: <http://trac.webkit.org/changeset/203266>
All reviewed patches have been landed. Closing bug.
Re-opened since this is blocked by bug 159821
Reverted r203266 for reason: This change caused editing/deleting/delete-emoji.html to time out on El Capitan, crash under GuardMalloc Committed r203287: <http://trac.webkit.org/changeset/203287>
(In reply to comment #18) > Reverted r203266 for reason: > > This change caused editing/deleting/delete-emoji.html to time out on El > Capitan, crash under GuardMalloc > > Committed r203287: <http://trac.webkit.org/changeset/203287> Link to test timeout: https://build.webkit.org/results/Apple%20El%20Capitan%20Release%20WK2%20(Tests)/r203284%20(7687)/results.html See <rdar://problem/27374787> for GuardMalloc crashlog
Comment on attachment 283732 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=283732&action=review > Source/WebCore/platform/text/CharacterProperties.h:41 > + || character >= 0x1F46E This line looks incorrect since it makes the rest of this conditional unnecessary.
Comment on attachment 283732 [details] Patch Rejecting attachment 283732 [details] from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 283732, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: .txt patching file LayoutTests/fast/text/emoji-num-glyphs.html patching file LayoutTests/fast/text/emoji-single-parent-family-2-expected-mismatch.html patching file LayoutTests/fast/text/emoji-single-parent-family-2.html patching file LayoutTests/fast/text/emoji-single-parent-family-expected-mismatch.html patching file LayoutTests/fast/text/emoji-single-parent-family.html Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: http://webkit-queues.webkit.org/results/1688570
Created attachment 283834 [details] Patch for committing
Comment on attachment 283834 [details] Patch for committing Attachment 283834 [details] did not pass mac-ews (mac): Output: http://webkit-queues.webkit.org/results/1689089 New failing tests: editing/deleting/delete-emoji.html
Created attachment 283838 [details] Archive of layout-test-results from ews102 for mac-yosemite The attached test failures were seen while running run-webkit-tests on the mac-ews. Bot: ews102 Port: mac-yosemite Platform: Mac OS X 10.10.5
Comment on attachment 283834 [details] Patch for committing Attachment 283834 [details] did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.webkit.org/results/1689095 New failing tests: editing/deleting/delete-emoji.html
Created attachment 283839 [details] Archive of layout-test-results from ews107 for mac-yosemite-wk2 The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews. Bot: ews107 Port: mac-yosemite-wk2 Platform: Mac OS X 10.10.5
Comment on attachment 283834 [details] Patch for committing Attachment 283834 [details] did not pass ios-sim-ews (ios-simulator-wk2): Output: http://webkit-queues.webkit.org/results/1689093 New failing tests: editing/deleting/delete-emoji.html
Created attachment 283840 [details] Archive of layout-test-results from ews121 for ios-simulator-wk2 The attached test failures were seen while running run-webkit-tests on the ios-sim-ews. Bot: ews121 Port: ios-simulator-wk2 Platform: Mac OS X 10.11.5
Comment on attachment 283834 [details] Patch for committing Attachment 283834 [details] did not pass mac-debug-ews (mac): Output: http://webkit-queues.webkit.org/results/1689092 New failing tests: editing/deleting/delete-emoji.html
Created attachment 283841 [details] Archive of layout-test-results from ews114 for mac-yosemite The attached test failures were seen while running run-webkit-tests on the mac-debug-ews. Bot: ews114 Port: mac-yosemite Platform: Mac OS X 10.10.5
Created attachment 283862 [details] Path for committing
Comment on attachment 283862 [details] Path for committing Clearing flags on attachment: 283862 Committed r203330: <http://trac.webkit.org/changeset/203330>
Comment on attachment 283862 [details] Path for committing View in context: https://bugs.webkit.org/attachment.cgi?id=283862&action=review > Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm:156 > - if (U_IS_SURROGATE(m_characters[r])) { > - ASSERT(r + 1 < m_stringLength); > - ASSERT(U_IS_SURROGATE_LEAD(m_characters[r])); > - ASSERT(U_IS_TRAIL(m_characters[r + 1])); > + if (U_IS_LEAD(m_characters[r]) && r + 1 < m_stringLength && U_IS_TRAIL(m_characters[r + 1])) > r += 2; > - } else > + else > r++; Technically this should be using U16_IS_LEAD and U16_IS_TRAIL since the arguments are UChar, not UChar32. But, even better, ICU's utf16.h header has a macro for exactly this purpose, called U16_FWD_1 and so this should just be replaced by this single line of code: U16_FWD_1(m_characters, r, m_stringLength);