chromium/chromium-blink-gcc7.patch

   1 --- chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h.orig   2017-06-06 15:05:38.145247996 +0300
   2 +++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h        2017-06-06 15:06:13.866246667 +0300
   3 @@ -685,6 +685,31 @@ inline LinkedHashSet<T, U, V, W>& Linked
   4    return *this;
   5  }
   6
   7 +inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
   8 +  DCHECK(a.prev_);
   9 +  DCHECK(a.next_);
  10 +  DCHECK(b.prev_);
  11 +  DCHECK(b.next_);
  12 +  swap(a.prev_, b.prev_);
  13 +  swap(a.next_, b.next_);
  14 +  if (b.next_ == &a) {
  15 +    DCHECK_EQ(b.prev_, &a);
  16 +    b.next_ = &b;
  17 +    b.prev_ = &b;
  18 +  } else {
  19 +    b.next_->prev_ = &b;
  20 +    b.prev_->next_ = &b;
  21 +  }
  22 +  if (a.next_ == &b) {
  23 +    DCHECK_EQ(a.prev_, &b);
  24 +    a.next_ = &a;
  25 +    a.prev_ = &a;
  26 +  } else {
  27 +    a.next_->prev_ = &a;
  28 +    a.prev_->next_ = &a;
  29 +  }
  30 +}
  31 +
  32  template <typename T, typename U, typename V, typename W>
  33  inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
  34    impl_.Swap(other.impl_);
  35 @@ -877,31 +902,6 @@ inline void LinkedHashSet<T, U, V, W>::e
  36    erase(Find(value));
  37  }
  38
  39 -inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
  40 -  DCHECK(a.prev_);
  41 -  DCHECK(a.next_);
  42 -  DCHECK(b.prev_);
  43 -  DCHECK(b.next_);
  44 -  swap(a.prev_, b.prev_);
  45 -  swap(a.next_, b.next_);
  46 -  if (b.next_ == &a) {
  47 -    DCHECK_EQ(b.prev_, &a);
  48 -    b.next_ = &b;
  49 -    b.prev_ = &b;
  50 -  } else {
  51 -    b.next_->prev_ = &b;
  52 -    b.prev_->next_ = &b;
  53 -  }
  54 -  if (a.next_ == &b) {
  55 -    DCHECK_EQ(a.prev_, &b);
  56 -    a.next_ = &a;
  57 -    a.prev_ = &a;
  58 -  } else {
  59 -    a.next_->prev_ = &a;
  60 -    a.prev_->next_ = &a;
  61 -  }
  62 -}
  63 -
  64  inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
  65    DCHECK_NE(a.next_, &a);
  66    DCHECK_NE(b.next_, &b);
  67 --- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.orig       2017-06-06 16:16:43.657661313 +0300
  68 +++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h    2017-06-06 16:16:50.911198032 +0300
  69 @@ -5,6 +5,7 @@
  70  #include "platform/PlatformExport.h"
  71  #include "platform/wtf/ThreadSpecific.h"
  72
  73 +#include <functional>
  74  #include <memory>
  75
  76  namespace gpu {