chromium/build/config/compiler/BUILD.gn

@@ -226,6 +226,7 @@ config("compiler") {
 
   if (use_qt && is_clang) {
     cflags += [
+      "-Wno-unknown-attributes",
       "-Wno-unknown-warning-option"
     ]
   }

chromium/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc

@@ -87,8 +87,12 @@ void InitializeDWriteFontProxy() {
   // fallback if IDWriteFontFallback is not available.
   // This flag can be removed when Win8.0 and earlier are no longer supported.
   bool fallback_available = font_fallback.Get() != nullptr;
+#ifndef TOOLKIT_QT
+  // qtwebengine does not supply manifest file, version of windows is always reported as
+  // windows 8
   DCHECK_EQ(fallback_available,
     base::win::GetVersion() > base::win::VERSION_WIN8);
+#endif
   blink::WebFontRendering::setUseSkiaFontFallback(fallback_available);
 }
 

chromium/storage/browser/quota/quota_manager.cc

@@ -903,7 +903,6 @@ void QuotaManager::GetUsageAndQuotaForWebApps(
     return;
   }
 
-  DCHECK(origin == origin.GetOrigin());
   LazyInitialize();
 
   bool unlimited = IsStorageUnlimited(origin, type);

chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h

@@ -5,6 +5,7 @@
 #include "platform/PlatformExport.h"
 #include "wtf/ThreadSpecific.h"
 
+#include <functional>
 #include <memory>
 
 namespace gpu {

chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h

@@ -630,6 +630,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(
   return *this;
 }
 
+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
+
 template <typename T, typename U, typename V, typename W>
 inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) {
   m_impl.swap(other.m_impl);

chromium/third_party/blimp_fonts/README.chromium

 Name: blimp_fonts
-URL: See below
 Version: unknown
 License: Apache Version 2.0 and SIL Open Font License, Version 1.1
 Security Critical: yes

chromium/third_party/cld/README.chromium

 Name: Compact Language Detector
 Short Name: cld
-URL: NA
 Version: 0
 License: Apache 2.0
 Security Critical: no

chromium/tools/gn/qmake_link_writer.cc

@@ -42,6 +42,7 @@
 // found in the LICENSE file.
 
 #include "tools/gn/qmake_link_writer.h"
+#include "tools/gn/deps_iterator.h"
 #include "tools/gn/ninja_binary_target_writer.h"
 #include "tools/gn/output_file.h"
 #include "tools/gn/settings.h"
@@ -62,6 +63,28 @@ QMakeLinkWriter::QMakeLinkWriter(const NinjaBinaryTargetWriter* writer, const Ta
 QMakeLinkWriter::~QMakeLinkWriter() {
 }
 
+// Based on similar function in qt_creator_writer.cc
+void CollectDeps(std::set<const Target*> &deps, const Target* target) {
+  for (const auto& dep : target->GetDeps(Target::DEPS_ALL)) {
+    const Target* dep_target = dep.ptr;
+    if (deps.count(dep_target))
+      continue;
+    deps.insert(dep_target);
+    CollectDeps(deps, dep_target);
+  }
+}
+
+void PrintSourceFile(std::ostream& out, PathOutput& path_output, const SourceFile& file) {
+  out << " \\\n    \"";
+  if (file.is_source_absolute()) {
+    out << "$$PWD/";
+    path_output.WriteFile(out, file);
+  } else {
+    out << file.value();
+  }
+  out << "\"";
+}
+
 void QMakeLinkWriter::Run() {
 
   CHECK(target_->output_type() == Target::SHARED_LIBRARY)
@@ -89,6 +112,42 @@ void QMakeLinkWriter::Run() {
   UniqueVector<const Target*> non_linkable_deps;
   nwriter_->GetDeps(&extra_object_files, &linkable_deps, &non_linkable_deps);
 
+  std::set<const Target*> deps;
+  deps.insert(target_);
+  CollectDeps(deps, target_);
+
+  // sources files.
+  out_ << "NINJA_SOURCES =";
+  for (const auto& target : deps) {
+    for (const auto& file : target->sources()) {
+      PrintSourceFile(out_, path_output_, file);
+    }
+  }
+  out_ << std::endl;
+
+  // headers files.
+  out_ << "NINJA_HEADERS =";
+  for (const auto& target : deps) {
+    for (const auto& file : target->public_headers()) {
+      PrintSourceFile(out_, path_output_, file);
+    }
+  }
+  out_ << std::endl;
+
+  std::set<std::string> defines;
+  for (const auto& target : deps) {
+    for (ConfigValuesIterator it(target); !it.done(); it.Next()) {
+      for (std::string define : it.cur().defines()) {
+        defines.insert(define);
+      }
+    }
+  }
+  out_ << "NINJA_DEFINES =";
+  for (const auto& define : defines) {
+    out_ << " \\\n    " << define;
+  }
+  out_ << std::endl;
+
   // object files.
   out_ << "NINJA_OBJECTS =";
   for (const auto& file : object_files) {

chromium/ui/events/gesture_detection/gesture_provider.cc

@@ -297,6 +297,16 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
                 const MotionEvent& secondary_pointer_down,
                 float raw_distance_x,
                 float raw_distance_y) override {
+    // Do not use gesture detection for scrolling on macOS, it is handled by real and synthesized
+    // wheel events received from Qt (the synthesized ones come from usage of a touchpad).
+    // The scroll gestures created by the gesture detector are incompatible with wheel events
+    // received by Qt, due to having an inverse Y coordinate and also because they overlap with
+    // each other, thus scrolling sometimes goes into one direction, and sometimes
+    // into the opposite direction.
+#if defined(TOOLKIT_QT) && defined(OS_MACOSX)
+  return true;
+#endif
+
     float distance_x = raw_distance_x;
     float distance_y = raw_distance_y;
     if (!scroll_event_sent_ && e2.GetPointerCount() < 3) {
@@ -356,6 +366,12 @@ class GestureProvider::GestureListenerImpl : public ScaleGestureListener,
                const MotionEvent& e2,
                float velocity_x,
                float velocity_y) override {
+     // Do not use gesture detection for flings on macOS. See explanation at the beginning
+     // of OnScroll.
+#if defined(TOOLKIT_QT) && defined(OS_MACOSX)
+    return true;
+#endif
+
     if (snap_scroll_controller_.IsSnappingScrolls()) {
       if (snap_scroll_controller_.IsSnapHorizontal()) {
         velocity_y = 0;

chromium/v8/src/objects-body-descriptors.h

@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
 
   template <typename StaticVisitor>
   static inline void IterateBody(HeapObject* obj, int object_size) {
-    IterateBody(obj);
+    IterateBody<StaticVisitor>(obj);
   }
 };
 

chromium/v8/src/objects-inl.h

@@ -7975,6 +7975,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) {
 }
 
 
+template <typename Derived, typename Shape, typename Key>
+inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHash(key, GetHeap()->HashSeed());
+  } else {
+    return Shape::Hash(key);
+  }
+}
+
+template <typename Derived, typename Shape, typename Key>
+inline uint32_t HashTable<Derived,Shape,Key>::HashForObject(Key key, Object* object) {
+  if (Shape::UsesSeed) {
+    return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
+  } else {
+    return Shape::HashForObject(key, object);
+  }
+}
+
 bool ObjectHashTableShape::IsMatch(Handle<Object> key, Object* other) {
   return key->SameValue(other);
 }

chromium/v8/src/objects.h

@@ -3532,21 +3532,9 @@ class HashTable : public HashTableBase {
   typedef Shape ShapeT;
 
   // Wrapper methods
-  inline uint32_t Hash(Key key) {
-    if (Shape::UsesSeed) {
-      return Shape::SeededHash(key, GetHeap()->HashSeed());
-    } else {
-      return Shape::Hash(key);
-    }
-  }
+  inline uint32_t Hash(Key key);
 
-  inline uint32_t HashForObject(Key key, Object* object) {
-    if (Shape::UsesSeed) {
-      return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
-    } else {
-      return Shape::HashForObject(key, object);
-    }
-  }
+  inline uint32_t HashForObject(Key key, Object* object);
 
   // Returns a new HashTable object.
   MUST_USE_RESULT static Handle<Derived> New(

ninja/configure.py

@@ -302,7 +302,7 @@ if platform.is_msvc():
               '/Zi',  # Create pdb with debug info.
               '/W4',  # Highest warning level.
               '/WX',  # Warnings as errors.
-              '/wd4530', '/wd4100', '/wd4706',
+              '/wd4530', '/wd4100', '/wd4706', '/wd4244',
               '/wd4512', '/wd4800', '/wd4702', '/wd4819',
               # Disable warnings about constant conditional expressions.
               '/wd4127',