community/chromium: upgrade to 52.0.2743.116

1 files changed, 49 insertions, 31 deletions

diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch
index bc5eefcd55..fd4ced7deb 100644
--- a/community/chromium/no-execinfo.patch
+++ b/community/chromium/no-execinfo.patch
@@ -1,103 +1,121 @@
---- ./base/debug/stack_trace_posix.cc.orig
-+++ ./base/debug/stack_trace_posix.cc
-@@ -22,7 +22,7 @@
+--- a/base/debug/stack_trace_posix.cc.orig	2016-05-08 07:59:51.749087517 +0200
++++ b/base/debug/stack_trace_posix.cc	2016-05-08 08:01:24.988950619 +0200
+@@ -24,7 +24,7 @@
  #if defined(__GLIBCXX__)
  #include <cxxabi.h>
  #endif
 -#if !defined(__UCLIBC__)
-+#if defined(HAVE_BACKTRACE)
++#if defined(__GLIBC__)
  #include <execinfo.h>
  #endif
  
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@ void DemangleSymbols(std::string* text)
    // Note: code in this function is NOT async-signal safe (std::string uses
    // malloc internally).
  
 -#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
-+#if defined(__GLIBCXX__) && defined(HAVE_BACKTRACE)
++#if defined(__GLIBCXX__) && defined(__GLIBC__)
  
    std::string::size_type search_from = 0;
    while (search_from < text->size()) {
-@@ -169,7 +169,7 @@
+@@ -112,7 +112,7 @@ void DemangleSymbols(std::string* text)
+     }
+   }
+ 
+-#endif  // defined(__GLIBCXX__) && !defined(__UCLIBC__)
++#endif  // defined(__GLIBCXX__) && defined(__GLIBC__)
+ }
+ #endif  // !defined(USE_SYMBOLIZE)
+ 
+@@ -124,7 +124,7 @@ class BacktraceOutputHandler {
+   virtual ~BacktraceOutputHandler() {}
+ };
  
-     handler->HandleOutput("\n");
+-#if !defined(__UCLIBC__)
++#if defined(__GLIBC__)
+ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
+   // This should be more than enough to store a 64-bit number in hex:
+   // 16 hex digits + 1 for null-terminator.
+@@ -201,7 +201,7 @@ void ProcessBacktrace(void *const *trace
    }
--#elif !defined(__UCLIBC__)
-+#elif defined(HAVE_BACKTRACE)
-   bool printed = false;
+ #endif  // defined(USE_SYMBOLIZE)
+ }
+-#endif  // !defined(__UCLIBC__)
++#endif  // defined(__GLIBC__)
  
-   // Below part is async-signal unsafe (uses malloc), so execute it only
-@@ -738,7 +738,7 @@
+ void PrintToStderr(const char* output) {
+   // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -716,7 +716,7 @@ StackTrace::StackTrace() {
    // NOTE: This code MUST be async-signal safe (it's used by in-process
    // stack dumping signal handler). NO malloc or stdio is allowed here.
  
 -#if !defined(__UCLIBC__)
-+#if defined(HAVE_BACKTRACE)
++#if defined(__GLIBC__)
    // Though the backtrace API man page does not list any possible negative
    // return values, we take no chance.
    count_ = base::saturated_cast<size_t>(backtrace(trace_, arraysize(trace_)));
-@@ -751,13 +751,13 @@
+@@ -729,13 +729,13 @@ void StackTrace::Print() const {
    // NOTE: This code MUST be async-signal safe (it's used by in-process
    // stack dumping signal handler). NO malloc or stdio is allowed here.
  
 -#if !defined(__UCLIBC__)
-+#if defined(HAVE_BACKTRACE)
++#if defined(__GLIBC__)
    PrintBacktraceOutputHandler handler;
    ProcessBacktrace(trace_, count_, &handler);
  #endif
  }
  
 -#if !defined(__UCLIBC__)
-+#if defined(HAVE_BACKTRACE)
++#if defined(__GLIBC__)
  void StackTrace::OutputToStream(std::ostream* os) const {
    StreamBacktraceOutputHandler handler(os);
    ProcessBacktrace(trace_, count_, &handler);
---- ./third_party/WebKit/Source/wtf/Assertions.cpp.orig
-+++ ./third_party/WebKit/Source/wtf/Assertions.cpp
-@@ -61,7 +61,7 @@
- #define HAVE_ISDEBUGGERPRESENT 1
+--- a/third_party/WebKit/Source/wtf/Assertions.cpp.orig	2016-05-08 08:02:03.230553120 +0200
++++ b/third_party/WebKit/Source/wtf/Assertions.cpp	2016-05-08 08:02:35.822504255 +0200
+@@ -60,7 +60,7 @@
+ #include <windows.h>
  #endif
  
 -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
-+#if defined(HAVE_BACKTRACE)
++#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__))
  #include <cxxabi.h>
  #include <dlfcn.h>
  #include <execinfo.h>
-@@ -222,7 +222,7 @@
+@@ -220,7 +220,7 @@ void WTFReportArgumentAssertionFailure(c
  
  void WTFGetBacktrace(void** stack, int* size)
  {
 -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
-+#if defined(HAVE_BACKTRACE)
++#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__))
      *size = backtrace(stack, *size);
  #elif OS(WIN)
      // The CaptureStackBackTrace function is available in XP, but it is not defined
-@@ -260,7 +260,7 @@
+@@ -258,7 +258,7 @@ FrameToNameScope::FrameToNameScope(void*
      : m_name(0)
      , m_cxaDemangled(0)
  {
 -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
-+#if defined(HAVE_BACKTRACE)
++#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__))
      Dl_info info;
      if (!dladdr(addr, &info) || !info.dli_sname)
          return;
---- ./third_party/webrtc/base/checks.cc.orig
-+++ ./third_party/webrtc/base/checks.cc
+--- a/third_party/webrtc/base/checks.cc.orig	2016-05-08 08:03:04.398461275 +0200
++++ b/third_party/webrtc/base/checks.cc	2016-05-08 08:03:24.254431362 +0200
 @@ -16,7 +16,7 @@
  #include <cstdio>
  #include <cstdlib>
  
 -#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
-+#if defined(HAVE_BACKTRACE)
++#if defined(__GLIBCXX__) && defined(__GLIBC__)
  #include <cxxabi.h>
  #include <execinfo.h>
  #endif
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ void PrintError(const char* format, ...)
  // to get usable symbols on Linux. This is copied from V8. Chromium has a more
  // advanced stace trace system; also more difficult to copy.
  void DumpBacktrace() {
 -#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
-+#if defined(HAVE_BACKTRACE)
++#if defined(__GLIBCXX__) && defined(__GLIBC__)
    void* trace[100];
    int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
    char** symbols = backtrace_symbols(trace, size);