From c8c2d1901aec01e934adf561a9fdf0cc776cdef8 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 29 Jan 2018 16:35:13 +0100
Subject: BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .../compositor_model_bench/compositor_model_bench.cc      | 15 +++++----------
 .../gpu/tools/compositor_model_bench/render_models.cc     |  2 +-
 chromium/gpu/tools/compositor_model_bench/render_tree.cc  |  8 ++++----
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'chromium/gpu/tools')

diff --git a/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc b/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc
index d93841e35ed..6b2ee211c3e 100644
--- a/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc
+++ b/chromium/gpu/tools/compositor_model_bench/compositor_model_bench.cc
@@ -13,9 +13,6 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <X11/keysym.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 #include <string>
 #include <utility>
@@ -37,6 +34,7 @@
 #include "gpu/tools/compositor_model_bench/render_model_utils.h"
 #include "gpu/tools/compositor_model_bench/render_models.h"
 #include "gpu/tools/compositor_model_bench/render_tree.h"
+#include "ui/gfx/x/x11.h"
 #include "ui/gl/init/gl_factory.h"
 
 using base::TimeTicks;
@@ -159,7 +157,7 @@ class Simulator {
 
     // Get properties of the screen.
     int screen = DefaultScreen(display_);
-    int root_window = RootWindow(display_, screen);
+    int root_window = XRootWindow(display_, screen);
 
     // Creates the window.
     window_ = XCreateSimpleWindow(display_,
@@ -200,7 +198,7 @@ class Simulator {
 
     for (int i = 0; i < visual_info_count && !gl_context_; ++i) {
       gl_context_ = glXCreateContext(display_, visual_info_list + i, 0,
-                                     True /* Direct rendering */);
+                                     x11::True /* Direct rendering */);
     }
 
     XFree(visual_info_list);
@@ -251,11 +249,8 @@ class Simulator {
 
     XExposeEvent ev = { Expose, 0, 1, display_, window_,
                         0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, 0 };
-    XSendEvent(display_,
-      window_,
-      False,
-      ExposureMask,
-      reinterpret_cast<XEvent*>(&ev));
+    XSendEvent(display_, window_, x11::False, ExposureMask,
+               reinterpret_cast<XEvent*>(&ev));
 
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
diff --git a/chromium/gpu/tools/compositor_model_bench/render_models.cc b/chromium/gpu/tools/compositor_model_bench/render_models.cc
index eedfe7d9049..68970ead737 100644
--- a/chromium/gpu/tools/compositor_model_bench/render_models.cc
+++ b/chromium/gpu/tools/compositor_model_bench/render_models.cc
@@ -32,7 +32,7 @@ std::unique_ptr<RenderModelSimulator> ConstructSimulationModel(
     int window_height) {
   switch (model) {
     case ForwardRenderModel:
-      return base::MakeUnique<ForwardRenderSimulator>(
+      return std::make_unique<ForwardRenderSimulator>(
           std::move(render_tree_root), window_width, window_height);
     default:
       LOG(ERROR) << "Unrecognized render model. "
diff --git a/chromium/gpu/tools/compositor_model_bench/render_tree.cc b/chromium/gpu/tools/compositor_model_bench/render_tree.cc
index e98d1749b90..02a7da86ed5 100644
--- a/chromium/gpu/tools/compositor_model_bench/render_tree.cc
+++ b/chromium/gpu/tools/compositor_model_bench/render_tree.cc
@@ -334,7 +334,7 @@ bool InterpretCCData(const base::DictionaryValue& node, CCNode* c) {
 
 std::unique_ptr<RenderNode> InterpretContentLayer(
     const base::DictionaryValue& node) {
-  auto n = base::MakeUnique<ContentLayerNode>();
+  auto n = std::make_unique<ContentLayerNode>();
   if (!InterpretCommonContents(node, n.get()))
     return nullptr;
 
@@ -367,7 +367,7 @@ std::unique_ptr<RenderNode> InterpretContentLayer(
 
 std::unique_ptr<RenderNode> InterpretCanvasLayer(
     const base::DictionaryValue& node) {
-  auto n = base::MakeUnique<CCNode>();
+  auto n = std::make_unique<CCNode>();
   if (!InterpretCommonContents(node, n.get()))
     return nullptr;
 
@@ -386,7 +386,7 @@ std::unique_ptr<RenderNode> InterpretCanvasLayer(
 
 std::unique_ptr<RenderNode> InterpretVideoLayer(
     const base::DictionaryValue& node) {
-  auto n = base::MakeUnique<CCNode>();
+  auto n = std::make_unique<CCNode>();
   if (!InterpretCommonContents(node, n.get()))
     return nullptr;
 
@@ -405,7 +405,7 @@ std::unique_ptr<RenderNode> InterpretVideoLayer(
 
 std::unique_ptr<RenderNode> InterpretImageLayer(
     const base::DictionaryValue& node) {
-  auto n = base::MakeUnique<CCNode>();
+  auto n = std::make_unique<CCNode>();
   if (!InterpretCommonContents(node, n.get()))
     return nullptr;
 
-- 
cgit v1.2.1