summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ppapi/proxy/nacl_message_scanner.cc1
-rw-r--r--testing/buildbot/chromium.fyi.json10
-rw-r--r--tools/cfi/blacklist.txt2
3 files changed, 12 insertions, 1 deletions
diff --git a/ppapi/proxy/nacl_message_scanner.cc b/ppapi/proxy/nacl_message_scanner.cc
index e8ca425c..643f6f7 100644
--- a/ppapi/proxy/nacl_message_scanner.cc
+++ b/ppapi/proxy/nacl_message_scanner.cc
@@ -190,6 +190,7 @@ template <class MessageType>
class MessageScannerImpl {
public:
explicit MessageScannerImpl(const IPC::Message* msg)
+ // The cast below is invalid. See https://crbug.com/520760.
: msg_(static_cast<const MessageType*>(msg)) {
}
bool ScanMessage(ScanningResults* results) {
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 0db6c55..41824f1 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -301,6 +301,16 @@
"test": "blink_platform_unittests"
},
{
+ "args": [
+ "--gtest_filter=-SaveType/SavePageMultiFrameBrowserTest.ObjectElements/0"
+ ],
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "shards": 10
+ },
+ "test": "browser_tests"
+ },
+ {
"swarming": {
"can_use_on_swarming_builders": true
},
diff --git a/tools/cfi/blacklist.txt b/tools/cfi/blacklist.txt
index d720162..ab60ab6 100644
--- a/tools/cfi/blacklist.txt
+++ b/tools/cfi/blacklist.txt
@@ -36,7 +36,7 @@ type:cdm::*
# invalid downcasts for IPC messages
# https://crbug.com/520760
-fun:*MessageScannerImpl*MessageScannerImpl*
+src:*nacl_message_scanner.cc*
# src/base/win/event_trace_provider_unittest.cc
type:*EtwTraceProvider*