Update from https://crrev.com/304121
Includes DEPS updates and port of
https://codereview.chromium.org/665223004 to accomodate skia API change
on android.
Review URL: https://codereview.chromium.org/723343002
diff --git a/tools/clang/empty_string/EmptyStringConverter.cpp b/tools/clang/empty_string/EmptyStringConverter.cpp
index 28cc602..d056755 100644
--- a/tools/clang/empty_string/EmptyStringConverter.cpp
+++ b/tools/clang/empty_string/EmptyStringConverter.cpp
@@ -196,8 +196,8 @@
// tools.
llvm::outs() << "==== BEGIN EDITS ====\n";
for (const auto& r : replacements) {
- llvm::outs() << "r:" << r.getFilePath() << ":" << r.getOffset() << ":"
- << r.getLength() << ":" << r.getReplacementText() << "\n";
+ llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset() << ":::"
+ << r.getLength() << ":::" << r.getReplacementText() << "\n";
}
llvm::outs() << "==== END EDITS ====\n";
diff --git a/tools/clang/rewrite_scoped_refptr/RewriteScopedRefptr.cpp b/tools/clang/rewrite_scoped_refptr/RewriteScopedRefptr.cpp
index b2cd31f..fe9d860 100644
--- a/tools/clang/rewrite_scoped_refptr/RewriteScopedRefptr.cpp
+++ b/tools/clang/rewrite_scoped_refptr/RewriteScopedRefptr.cpp
@@ -419,8 +419,8 @@
for (const auto& r : replacements) {
std::string replacement_text = r.getReplacementText().str();
std::replace(replacement_text.begin(), replacement_text.end(), '\n', '\0');
- llvm::outs() << "r:" << r.getFilePath() << ":" << r.getOffset() << ":"
- << r.getLength() << ":" << replacement_text << "\n";
+ llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset() << ":::"
+ << r.getLength() << ":::" << replacement_text << "\n";
}
llvm::outs() << "==== END EDITS ====\n";
diff --git a/tools/clang/scripts/run_tool.py b/tools/clang/scripts/run_tool.py
index 33bb462..61417e4 100755
--- a/tools/clang/scripts/run_tool.py
+++ b/tools/clang/scripts/run_tool.py
@@ -54,12 +54,17 @@
Args:
paths: Prefix filter for the returned paths. May contain multiple entries.
"""
- args = ['git', 'ls-files']
+ args = []
+ if sys.platform == 'win32':
+ args.append('git.bat')
+ else:
+ args.append('git')
+ args.append('ls-files')
if paths:
args.extend(paths)
command = subprocess.Popen(args, stdout=subprocess.PIPE)
output, _ = command.communicate()
- return output.splitlines()
+ return [os.path.realpath(p) for p in output.splitlines()]
def _ExtractEditsFromStdout(build_directory, stdout):
@@ -81,11 +86,10 @@
edits = collections.defaultdict(list)
for line in lines[start_index + 1:end_index]:
try:
- edit_type, path, offset, length, replacement = line.split(':', 4)
+ edit_type, path, offset, length, replacement = line.split(':::', 4)
replacement = replacement.replace("\0", "\n");
- # Normalize the file path emitted by the clang tool to be relative to the
- # current working directory.
- path = os.path.relpath(os.path.join(build_directory, path))
+ # Normalize the file path emitted by the clang tool.
+ path = os.path.realpath(os.path.join(build_directory, path))
edits[path].append(Edit(edit_type, int(offset), int(length), replacement))
except ValueError:
print 'Unable to parse edit: %s' % line
@@ -140,6 +144,7 @@
self.__filenames = filenames
self.__success_count = 0
self.__failed_count = 0
+ self.__edit_count = 0
self.__edits = collections.defaultdict(list)
@property
@@ -172,6 +177,7 @@
self.__success_count += 1
for k, v in result['edits'].iteritems():
self.__edits[k].extend(v)
+ self.__edit_count += len(v)
else:
self.__failed_count += 1
sys.stdout.write('\nFailed to process %s\n' % result['filename'])
@@ -180,8 +186,9 @@
percentage = (
float(self.__success_count + self.__failed_count) /
len(self.__filenames)) * 100
- sys.stdout.write('Succeeded: %d, Failed: %d [%.2f%%]\r' % (
- self.__success_count, self.__failed_count, percentage))
+ sys.stdout.write('Succeeded: %d, Failed: %d, Edits: %d [%.2f%%]\r' % (
+ self.__success_count, self.__failed_count, self.__edit_count,
+ percentage))
sys.stdout.flush()
@@ -283,7 +290,9 @@
'../../../third_party/llvm/tools/clang/tools/clang-format',
'clang-format-diff.py')
# TODO(dcheng): Allow this to be controlled with a flag as well.
- if not os.path.isfile(clang_format_diff_path):
+ # TODO(dcheng): Shell escaping of args to git diff to clang-format is broken
+ # on Windows.
+ if not os.path.isfile(clang_format_diff_path) or sys.platform == 'win32':
clang_format_diff_path = None
filenames = frozenset(_GetFilesFromGit(argv[2:]))
@@ -297,7 +306,7 @@
# useful to modify files that aren't under source control--typically, these
# are generated files or files in a git submodule that's not part of Chromium.
_ApplyEdits({k : v for k, v in dispatcher.edits.iteritems()
- if k in filenames},
+ if os.path.realpath(k) in filenames},
clang_format_diff_path)
if dispatcher.failed_count != 0:
return 2
diff --git a/tools/clang/scripts/test_tool.py b/tools/clang/scripts/test_tool.py
index d14dfda..1f64be4 100755
--- a/tools/clang/scripts/test_tool.py
+++ b/tools/clang/scripts/test_tool.py
@@ -20,7 +20,7 @@
include_path_flags = ' '.join('-I %s' % include_path
for include_path in include_paths)
return json.dumps([{'directory': '.',
- 'command': 'clang++ -fsyntax-only %s -c %s' % (
+ 'command': 'clang++ -std=c++11 -fsyntax-only %s -c %s' % (
include_path_flags, f),
'file': f} for f in files], indent=2)
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 5ee7c30..25aa5a5 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -32,6 +32,7 @@
'Release+Asserts')
COMPILER_RT_BUILD_DIR = os.path.join(LLVM_BUILD_DIR, '32bit-compiler-rt')
CLANG_DIR = os.path.join(LLVM_DIR, 'tools', 'clang')
+LLD_DIR = os.path.join(LLVM_DIR, 'tools', 'lld')
COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'projects', 'compiler-rt')
STAMP_FILE = os.path.join(LLVM_BUILD_DIR, 'cr_build_revision')
@@ -179,6 +180,7 @@
Checkout('LLVM', LLVM_REPO_URL + '/llvm/trunk', LLVM_DIR)
Checkout('Clang', LLVM_REPO_URL + '/cfe/trunk', CLANG_DIR)
+ Checkout('LLD', LLVM_REPO_URL + '/lld/trunk', LLD_DIR)
Checkout('compiler-rt', LLVM_REPO_URL + '/compiler-rt/trunk', COMPILER_RT_DIR)
if not os.path.exists(LLVM_BUILD_DIR):
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 4681b25..f80cdd0 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -133,6 +133,10 @@
"includes": [23000],
"structures": [23200],
},
+ "chrome/browser/resources/options_test_resources.grd": {
+ "includes": [23400],
+ "structures": [23450],
+ },
"cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
"messages": [23500],
"includes": [23550],
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index 8735e0d..27d554e 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -129,11 +129,14 @@
# TODO(timurrrr): also check TSan and MSan?
# `nm` might not be available, so use try-except.
try:
- nm_output = subprocess.check_output(["nm", exe_path])
- if nm_output.find("__asan_init") != -1:
- raise BadBinary("You're trying to run an executable instrumented "
- "with AddressSanitizer under %s. Please provide "
- "an uninstrumented executable." % tool_name)
+ # Do not perform this check on OS X, as 'nm' on 10.6 can't handle
+ # binaries built with Clang 3.5+.
+ if not common.IsMac():
+ nm_output = subprocess.check_output(["nm", exe_path])
+ if nm_output.find("__asan_init") != -1:
+ raise BadBinary("You're trying to run an executable instrumented "
+ "with AddressSanitizer under %s. Please provide "
+ "an uninstrumented executable." % tool_name)
except OSError:
pass
diff --git a/tools/valgrind/drmemory/suppressions.txt b/tools/valgrind/drmemory/suppressions.txt
index 5840dc1..96ae6fa 100644
--- a/tools/valgrind/drmemory/suppressions.txt
+++ b/tools/valgrind/drmemory/suppressions.txt
@@ -550,15 +550,6 @@
*!content::BrowserThreadImpl::CacheThreadRun
*!content::BrowserThreadImpl::Run
-UNADDRESSABLE ACCESS
-name=http://crbug.com/379204
-...
-*!WTF::MessageQueue<>::waitForMessageWithTimeout
-*!blink::WorkerRunLoop::run
-*!blink::WorkerRunLoop::run
-*!blink::WorkerThread::workerThread
-*!WTF::threadEntryPoint
-
GDI USAGE ERROR
name=379774
system call NtUserCallOneParam.RELEASEDC
@@ -667,3 +658,10 @@
blink_web.dll!blink::FrameView::prepareForDetach
blink_web.dll!blink::LocalFrame::setView
blink_web.dll!blink::FrameTree::~FrameTree
+
+UNADDRESSABLE ACCESS
+name=http://crbug.com/432070
+blink_web.dll!blink::Frame::detach
+content.dll!content::RenderFrameProxy::OnDeleteProxy
+content.dll!content::RenderFrameProxy::OnMessageReceived
+content.dll!content::MessageRouter::RouteMessage
diff --git a/tools/valgrind/drmemory/suppressions_full.txt b/tools/valgrind/drmemory/suppressions_full.txt
index ebe6a15..3cd6ca0 100644
--- a/tools/valgrind/drmemory/suppressions_full.txt
+++ b/tools/valgrind/drmemory/suppressions_full.txt
@@ -1864,3 +1864,10 @@
name=bug_425097
...
*!ash::test::ShelfViewTest_CheckDragAndDropFromOverflowBubbleToShelf_Test::TestBody
+
+UNINITIALIZED READ
+name=bug_432067
+system call NtCreateFile parameter #9
+MSWSOCK.dll!*
+content.dll!content::AppCacheStorageImpl::DatabaseTask::CallRun
+
diff --git a/tools/valgrind/gtest_exclude/aura_unittests.gtest.txt b/tools/valgrind/gtest_exclude/aura_unittests.gtest.txt
index 321f281..69ce8dc 100644
--- a/tools/valgrind/gtest_exclude/aura_unittests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/aura_unittests.gtest.txt
@@ -1,5 +1,2 @@
# Flaky under Valgrind, see http://crbug.com/348331
WindowEventDispatcherTest.TouchMovesHeld
-
-# Failing on cros/win. crbug.com/427729
-GestureRecognizerTest.GestureEventSmallPinchEnabled
diff --git a/tools/valgrind/gtest_exclude/gfx_unittests.gtest-memcheck.txt b/tools/valgrind/gtest_exclude/gfx_unittests.gtest-memcheck.txt
new file mode 100644
index 0000000..3aaaafc
--- /dev/null
+++ b/tools/valgrind/gtest_exclude/gfx_unittests.gtest-memcheck.txt
@@ -0,0 +1,2 @@
+# http://crbug.com/402209
+FontRenderParamsTest.Default
diff --git a/tools/valgrind/gtest_exclude/ui_unittests.gtest-memcheck_linux.txt b/tools/valgrind/gtest_exclude/ui_unittests.gtest-memcheck_linux.txt
new file mode 100644
index 0000000..282de6b
--- /dev/null
+++ b/tools/valgrind/gtest_exclude/ui_unittests.gtest-memcheck_linux.txt
@@ -0,0 +1,2 @@
+# http://crbug.com/431708
+TouchExplorationTest.TwoFingerTapAndHold
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 852a638..fa0f599 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -2506,19 +2506,6 @@
fun:nssTrustDomain_UpdateCachedTokenCerts
}
{
- bug_331063
- Memcheck:Uninitialized
- ...
- fun:_ZN5blink11RenderImage12imageChangedEPvPKNS_7IntRectE
- fun:_ZN5blink12RenderObject12imageChangedEPNS_13ImageResourceEPKNS_7IntRectE
- fun:_ZN5blink13ImageResource12didAddClientEPNS_14ResourceClientE
- fun:_ZN5blink8Resource9addClientEPNS_14ResourceClientE
- fun:_ZN5blink19RenderImageResource16setImageResourceEPNS_13ImageResourceE
- fun:_ZN5blink30PasswordGeneratorButtonElement11updateImageEv
- fun:_ZN5blink30PasswordGeneratorButtonElement6attachERKNS_4Node13AttachContextE
- fun:_ZN5blink13ContainerNode14attachChildrenERKNS_4Node13AttachContextE
-}
-{
bug_331925
Memcheck:Leak
...
@@ -2845,19 +2832,6 @@
fun:_ZN7content27ServiceWorkerContextWrapper12InitInternalERKN4base8FilePathEPNS1_19SequencedTaskRunnerEPNS1_16MessageLoopProxyEPN5quota17QuotaManagerProxyE
}
{
- bug_379359
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN7content27ServiceWorkerContextWrapperC1EPNS_14BrowserContextE
- fun:_ZN7content20StoragePartitionImpl6CreateEPNS_14BrowserContextEbRKN4base8FilePathE
- fun:_ZN7content23StoragePartitionImplMap3GetERKSsS2_b
- fun:_ZN7content12_GLOBAL__N_129GetStoragePartitionFromConfigEPNS_14BrowserContext*
- fun:_ZN7content14BrowserContext19GetStoragePartitionEPS0_PNS_12SiteInstanceE
- fun:_ZN7content14BrowserContext26GetDefaultStoragePartitionEPS0_
- fun:_ZN7content21ShellBrowserMainParts21PreMainMessageLoopRunEv
- fun:_ZN7content15BrowserMainLoop21PreMainMessageLoopRunEv
-}
-{
bug_379943
Memcheck:Leak
fun:_Znw*
@@ -2867,6 +2841,7 @@
fun:_ZN7content12_GLOBAL__N_129GetStoragePartitionFromConfigEPNS_14BrowserContext*
fun:_ZN7content14BrowserContext19GetStoragePartitionEPS0_PNS_12SiteInstanceE
fun:_ZN7content14BrowserContext26GetDefaultStoragePartitionEPS0_
+ ...
fun:_ZN7content21ShellBrowserMainParts21PreMainMessageLoopRunEv
fun:_ZN7content15BrowserMainLoop21PreMainMessageLoopRunEv
}
@@ -3435,3 +3410,28 @@
fun:_ZN7content19TestRenderFrameHost41SendNavigateWithTransitionAndResponseCodeEiRK4GURLN2ui14PageTransitionEi
fun:_ZN7content19TestRenderFrameHost26SendNavigateWithTransitionEiRK4GURLN2ui14PageTransitionE
}
+{
+ bug_431209a
+ Memcheck:Leak
+ fun:_Znw*
+ fun:_ZN8remoting13ClipboardAuraC1E13scoped_refptrIN4base22SingleThreadTaskRunnerEE
+ fun:_ZN8remoting17ClipboardAuraTest5SetUpEv
+}
+{
+ bug_431209b
+ Memcheck:Leak
+ fun:_Znw*
+ fun:_ZN2ui9Clipboard6CreateEv
+ fun:_ZN2ui9Clipboard19GetForCurrentThreadEv
+ fun:_ZN2ui21ScopedClipboardWriterD1Ev
+ fun:_ZN8remoting13ClipboardAura4Core20InjectClipboardEventERKNS_8protocol14ClipboardEventE
+}
+{
+ bug_431213
+ Memcheck:Leak
+ fun:_Znw*
+ fun:_ZN3gin22CreateFunctionTemplateIFSsPN4mojo2js13HandleWrapperEEEEN2v85LocalINS6_16FunctionTemplateEEEPNS6_7IsolateEN4base8CallbackIT_EEi
+ fun:_ZN3gin12_GLOBAL__N_114CallbackTraitsIMN4mojo2js13HandleWrapperEFSsvEvE14CreateTemplateEPN2v87IsolateES6_
+ fun:_ZN3gin21ObjectTemplateBuilder9SetMethodIMN4mojo2js13HandleWrapperEFSsvEEERS0_RKN4base16BasicStringPieceISsEERKT_
+ fun:_ZN4mojo2js13HandleWrapper24GetObjectTemplateBuilderEPN2v87IsolateE
+}
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index fe8f8a1..154e4e9 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -194,19 +194,6 @@
fun:_ZN3gfx9GLSurface24InitializeOneOffForTestsEv
}
{
- bug_380568
- Memcheck:Leak
- fun:calloc
- fun:_internal_class_createInstanceFromZone
- fun:_internal_class_createInstance
- fun:NSAllocateObject
- fun:+[NSObject(NSObject) alloc]
- fun:-[VideoCaptureDeviceQTKit initWithFrameReceiver:]
- fun:_ZN5media21VideoCaptureDeviceMac4InitENS_18VideoCaptureDevice4Name14CaptureApiTypeE
- fun:_ZN5media28VideoCaptureDeviceFactoryMac6CreateERKNS_18VideoCaptureDevice4NameE
- fun:_ZN5media45VideoCaptureDeviceTest_OpenInvalidDevice_Test8TestBodyEv
-}
-{
bug_385604_b
Memcheck:Leak
fun:calloc
