87 lines
2.6 KiB
Diff
87 lines
2.6 KiB
Diff
|
--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h.orig 2017-06-06 15:05:38.145247996 +0300
|
||
|
|
+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h 2017-06-06 15:06:13.866246667 +0300
|
||
|
|
@@ -685,6 +685,31 @@ inline LinkedHashSet<T, U, V, W>& Linked
|
||
|
|
return *this;
|
||
|
|
}
|
||
|
|
|
||
|
|
+inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
|
||
|
|
+ DCHECK(a.prev_);
|
||
|
|
+ DCHECK(a.next_);
|
||
|
|
+ DCHECK(b.prev_);
|
||
|
|
+ DCHECK(b.next_);
|
||
|
|
+ swap(a.prev_, b.prev_);
|
||
|
|
+ swap(a.next_, b.next_);
|
||
|
|
+ if (b.next_ == &a) {
|
||
|
|
+ DCHECK_EQ(b.prev_, &a);
|
||
|
|
+ b.next_ = &b;
|
||
|
|
+ b.prev_ = &b;
|
||
|
|
+ } else {
|
||
|
|
+ b.next_->prev_ = &b;
|
||
|
|
+ b.prev_->next_ = &b;
|
||
|
|
+ }
|
||
|
|
+ if (a.next_ == &b) {
|
||
|
|
+ DCHECK_EQ(a.prev_, &b);
|
||
|
|
+ a.next_ = &a;
|
||
|
|
+ a.prev_ = &a;
|
||
|
|
+ } else {
|
||
|
|
+ a.next_->prev_ = &a;
|
||
|
|
+ a.prev_->next_ = &a;
|
||
|
|
+ }
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
template <typename T, typename U, typename V, typename W>
|
||
|
|
inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
|
||
|
|
impl_.Swap(other.impl_);
|
||
|
|
@@ -877,31 +902,6 @@ inline void LinkedHashSet<T, U, V, W>::e
|
||
|
|
erase(Find(value));
|
||
|
|
}
|
||
|
|
|
||
|
|
-inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
|
||
|
|
- DCHECK(a.prev_);
|
||
|
|
- DCHECK(a.next_);
|
||
|
|
- DCHECK(b.prev_);
|
||
|
|
- DCHECK(b.next_);
|
||
|
|
- swap(a.prev_, b.prev_);
|
||
|
|
- swap(a.next_, b.next_);
|
||
|
|
- if (b.next_ == &a) {
|
||
|
|
- DCHECK_EQ(b.prev_, &a);
|
||
|
|
- b.next_ = &b;
|
||
|
|
- b.prev_ = &b;
|
||
|
|
- } else {
|
||
|
|
- b.next_->prev_ = &b;
|
||
|
|
- b.prev_->next_ = &b;
|
||
|
|
- }
|
||
|
|
- if (a.next_ == &b) {
|
||
|
|
- DCHECK_EQ(a.prev_, &b);
|
||
|
|
- a.next_ = &a;
|
||
|
|
- a.prev_ = &a;
|
||
|
|
- } else {
|
||
|
|
- a.next_->prev_ = &a;
|
||
|
|
- a.prev_->next_ = &a;
|
||
|
|
- }
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
|
||
|
|
DCHECK_NE(a.next_, &a);
|
||
|
|
DCHECK_NE(b.next_, &b);
|
||
|
|
--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.orig 2017-06-06 16:16:43.657661313 +0300
|
||
|
|
+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-06-06 16:16:50.911198032 +0300
|
||
|
|
@@ -5,6 +5,7 @@
|
||
|
|
#include "platform/PlatformExport.h"
|
||
|
|
#include "platform/wtf/ThreadSpecific.h"
|
||
|
|
|
||
|
|
+#include <functional>
|
||
|
|
#include <memory>
|
||
|
|
|
||
|
|
namespace gpu {
|
||
|
|
--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp.orig 2017-06-16 11:15:14.424585523 +0200
|
||
|
|
+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp 2017-06-16 11:15:25.001641041 +0200
|
||
|
|
@@ -10,6 +10,7 @@
|
||
|
|
#include "CharacterProperty.h"
|
||
|
|
#include <cassert>
|
||
|
|
#include <cstring>
|
||
|
|
+#include <functional>
|
||
|
|
#include <memory>
|
||
|
|
#include <stdio.h>
|
||
|
|
#if !defined(USING_SYSTEM_ICU)
|