Changeset 236068 in webkit

Timestamp:

Sep 17, 2018, 10:11:15 AM (8 years ago)

Author:

ap@apple.com

Message:

Revert ​https://trac.webkit.org/r235910, because the new test times out.
Crash under PlatformPopupMenuData::encode when interacting with a select menu that has variable fonts
​https://bugs.webkit.org/show_bug.cgi?id=188008

Source/WebKit:

• Shared/cf/ArgumentCodersCF.cpp:

(IPC::encode):
(IPC::decode):

LayoutTests:

• fast/text/variations/ipc2-expected.txt: Removed.
• fast/text/variations/ipc2.html: Removed.
• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/variations/ipc2-expected.txt (deleted)
• LayoutTests/fast/text/variations/ipc2.html (deleted)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Shared/cf/ArgumentCodersCF.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-17  Alexey Proskuryakov  <ap@apple.com>
+
+        Revert https://trac.webkit.org/r235910, because the new test times out.
+        Crash under PlatformPopupMenuData::encode when interacting with a select menu that has variable fonts
+        https://bugs.webkit.org/show_bug.cgi?id=188008
+
+        * fast/text/variations/ipc2-expected.txt: Removed.
+        * fast/text/variations/ipc2.html: Removed.
+        * platform/mac-wk1/TestExpectations:
+
 2018-09-17  Dawei Fenton  <realdawei@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -615 +615 @@
 webkit.org/b/189087 svg/animations/animate-end-attribute-numeric-precision.html [ Pass Failure ]
 
-webkit.org/b/188008 fast/text/variations/ipc2.html [ Skip ]
 webkit.org/b/189594 imported/w3c/web-platform-tests/css/css-animations/pending-style-changes-001.html [ Pass Failure ]
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-09-17  Alexey Proskuryakov  <ap@apple.com>
+
+        Revert https://trac.webkit.org/r235910, because the new test times out.
+        Crash under PlatformPopupMenuData::encode when interacting with a select menu that has variable fonts
+        https://bugs.webkit.org/show_bug.cgi?id=188008
+
+        * Shared/cf/ArgumentCodersCF.cpp:
+        (IPC::encode):
+        (IPC::decode):
+
 2018-09-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp

@@ -428 +428 @@
     for (CFIndex i = 0; i < size; ++i) {
         ASSERT(keys[i]);
+        ASSERT(CFGetTypeID(keys[i]) == CFStringGetTypeID());
         ASSERT(values[i]);
 
@@ -434 +435 @@
             continue;
 
-        encode(encoder, keys[i]);
+        encode(encoder, static_cast<CFStringRef>(keys[i]));
         encode(encoder, values[i]);
     }
@@ -456 +457 @@
     for (uint64_t i = 0; i < size; ++i) {
         // Try to decode the key name.
-        RetainPtr<CFTypeRef> key;
+        RetainPtr<CFStringRef> key;
         if (!decode(decoder, key))
             return false;