Update to 67.0.3396.79

3 files changed, 52 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30501d28d512..6cee5a647759 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-vaapi
 	pkgdesc = Chromium compiled with VA-API support for Intel Graphics
-	pkgver = 67.0.3396.62
+	pkgver = 67.0.3396.79
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	install = chromium.install
@@ -52,16 +52,18 @@ pkgbase = chromium-vaapi
 	optdepends = libva-intel-driver: Needed to support VA-API for Intel graphics cards
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-67.0.3396.62.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-67.0.3396.79.tar.xz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
 	source = remove-dependency-on-ffmpeg-internals-for-start-time.patch
+	source = x11-fix-mixup-between-DIP-pixel-coordinates.patch
 	source = chromium-ffmpeg-r1.patch
 	source = chromium-widevine-r2.patch
 	source = chromium-skia-harmony.patch
 	source = chromium-vaapi-r18.patch
-	sha256sums = d5ee63932ff1c8c4a5f69c834f6577e7127b416681eddd23bc54886caffd770d
+	sha256sums = f8b1e5319163e378027826b12cf256b97423bb90e10e2013469d96e03bc9db8a
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = 2cc80f5ed8a9b42495a0f3ab3c1bae026b9081972269a1b6d407331d33f7d257
+	sha256sums = e2c2754536243a60fa70541bbd4121715eccd83caa8f1fb1873bd994cd81f871
 	sha256sums = aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde
 	sha256sums = 02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15
 	sha256sums = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3
diff --git a/PKGBUILD b/PKGBUILD
index 2849a4334e80..a9aa202c1b6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=chromium-vaapi
-pkgver=67.0.3396.62
+pkgver=67.0.3396.79
 pkgrel=1
 _launcher_ver=6
 pkgdesc="Chromium compiled with VA-API support for Intel Graphics"
@@ -33,13 +33,15 @@ install=chromium.install
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
         remove-dependency-on-ffmpeg-internals-for-start-time.patch
+        x11-fix-mixup-between-DIP-pixel-coordinates.patch
         chromium-ffmpeg-r1.patch
         chromium-widevine-r2.patch
         chromium-skia-harmony.patch
         chromium-vaapi-r18.patch)
-sha256sums=('d5ee63932ff1c8c4a5f69c834f6577e7127b416681eddd23bc54886caffd770d'
+sha256sums=('f8b1e5319163e378027826b12cf256b97423bb90e10e2013469d96e03bc9db8a'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             '2cc80f5ed8a9b42495a0f3ab3c1bae026b9081972269a1b6d407331d33f7d257'
+            'e2c2754536243a60fa70541bbd4121715eccd83caa8f1fb1873bd994cd81f871'
             'aa885330bc4180b78d915f9dfdfc3210038a0acab7b16735ea9828ab6a633bde'
             '02c69bb3954087db599def7f5b6d65cf8f7cf2ed81dfbdaa4bb7b51863b4df15'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
@@ -90,6 +92,9 @@ prepare() {
   # https://crbug.com/731766
   patch -Np1 -i ../remove-dependency-on-ffmpeg-internals-for-start-time.patch
 
+  # https://crbug.com/707721
+  patch -Np1 -i ../x11-fix-mixup-between-DIP-pixel-coordinates.patch
+
   # https://crbug.com/skia/6663#c10
   patch -Np4 -i ../chromium-skia-harmony.patch
 
diff --git a/x11-fix-mixup-between-DIP-pixel-coordinates.patch b/x11-fix-mixup-between-DIP-pixel-coordinates.patch
new file mode 100644
index 000000000000..34bd51dc33e1
--- /dev/null
+++ b/x11-fix-mixup-between-DIP-pixel-coordinates.patch
@@ -0,0 +1,40 @@
+From 2752a03ba6435130848aa620b7ab4246eec2f77a Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Mon, 4 Jun 2018 22:09:08 +0000
+Subject: [PATCH] X11: Fix mixup between DIP/pixel coordinates
+
+BUG=707721
+R=sky
+
+Change-Id: Ibbbff9c2c815700324f553a3b66e878f76938534
+Reviewed-on: https://chromium-review.googlesource.com/1083692
+Reviewed-by: Scott Violet <sky@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#564261}
+---
+ ui/views/widget/desktop_aura/desktop_screen_x11.cc | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
+index 8fd5d379d344..e90710c2c39c 100644
+--- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc
++++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
+@@ -216,8 +216,13 @@ display::Display DesktopScreenX11::GetDisplayNearestWindow(
+   if (host) {
+     DesktopWindowTreeHostX11* rwh = DesktopWindowTreeHostX11::GetHostForXID(
+         host->GetAcceleratedWidget());
+-    if (rwh)
+-      return GetDisplayMatching(rwh->GetX11RootWindowBounds());
++    if (rwh) {
++      const float scale = 1.0f / GetDeviceScaleFactor();
++      const gfx::Rect pixel_rect = rwh->GetX11RootWindowBounds();
++      return GetDisplayMatching(
++          gfx::Rect(gfx::ScaleToFlooredPoint(pixel_rect.origin(), scale),
++                    gfx::ScaleToCeiledSize(pixel_rect.size(), scale)));
++    }
+   }
+ 
+   return GetPrimaryDisplay();
+-- 
+2.17.1
+