Title: [236068] trunk
- Revision
- 236068
- Author
- [email protected]
- Date
- 2018-09-17 10:11:15 -0700 (Mon, 17 Sep 2018)
Log 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:
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (236067 => 236068)
--- trunk/LayoutTests/ChangeLog 2018-09-17 17:09:43 UTC (rev 236067)
+++ trunk/LayoutTests/ChangeLog 2018-09-17 17:11:15 UTC (rev 236068)
@@ -1,3 +1,13 @@
+2018-09-17 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
Layout Test imported/w3c/web-platform-tests/2dcontext/imagebitmap/createImageBitmap-drawImage.html is a flaky failure.
Deleted: trunk/LayoutTests/fast/text/variations/ipc2-expected.txt (236067 => 236068)
--- trunk/LayoutTests/fast/text/variations/ipc2-expected.txt 2018-09-17 17:09:43 UTC (rev 236067)
+++ trunk/LayoutTests/fast/text/variations/ipc2-expected.txt 2018-09-17 17:11:15 UTC (rev 236068)
@@ -1 +0,0 @@
-This makes sure that variable fonts can be sent across IPC. The test passes if there is no crash.
Deleted: trunk/LayoutTests/fast/text/variations/ipc2.html (236067 => 236068)
--- trunk/LayoutTests/fast/text/variations/ipc2.html 2018-09-17 17:09:43 UTC (rev 236067)
+++ trunk/LayoutTests/fast/text/variations/ipc2.html 2018-09-17 17:11:15 UTC (rev 236068)
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-@font-face {
- font-family: "Boxis";
- src: url("resources/Boxis-VF.ttf") format("truetype");
-}
-</style>
-<script>
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-function test() {
- let target = document.getElementById("target");
- let x = target.offsetLeft + target.offsetWidth / 2;
- let y = target.offsetTop + target.offsetHeight / 2;
- if (window.eventSender) {
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
- if (window.testRunner)
- testRunner.notifyDone();
-}
-window.addEventListener("load", test);
-</script>
-</head>
-<body>
-This makes sure that variable fonts can be sent across IPC. The test passes if there is no crash.
-<select id="target" style="border:0; font-family: 'Boxis';">
- <option>Select option</option>
- <option>1</option>
- <option>2</option>
- <option>3</option>
-</select>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (236067 => 236068)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2018-09-17 17:09:43 UTC (rev 236067)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2018-09-17 17:11:15 UTC (rev 236068)
@@ -614,7 +614,6 @@
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 ]
webkit.org/b/188070 imported/w3c/web-platform-tests/streams/piping/error-propagation-backward.html [ Pass Failure ]
Modified: trunk/Source/WebKit/ChangeLog (236067 => 236068)
--- trunk/Source/WebKit/ChangeLog 2018-09-17 17:09:43 UTC (rev 236067)
+++ trunk/Source/WebKit/ChangeLog 2018-09-17 17:11:15 UTC (rev 236068)
@@ -1,3 +1,13 @@
+2018-09-17 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
Refactoring related to Safe Browsing
Modified: trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp (236067 => 236068)
--- trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2018-09-17 17:09:43 UTC (rev 236067)
+++ trunk/Source/WebKit/Shared/cf/ArgumentCodersCF.cpp 2018-09-17 17:11:15 UTC (rev 236068)
@@ -427,6 +427,7 @@
for (CFIndex i = 0; i < size; ++i) {
ASSERT(keys[i]);
+ ASSERT(CFGetTypeID(keys[i]) == CFStringGetTypeID());
ASSERT(values[i]);
// Ignore values we don't recognize.
@@ -433,7 +434,7 @@
if (typeFromCFTypeRef(values[i]) == Unknown)
continue;
- encode(encoder, keys[i]);
+ encode(encoder, static_cast<CFStringRef>(keys[i]));
encode(encoder, values[i]);
}
}
@@ -455,7 +456,7 @@
RetainPtr<CFMutableDictionaryRef> dictionary = adoptCF(CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
