commit e6bc029de99194ba151343c97699d9621fdcf850 Author: Danny Rawlins <monster.romster@gmail.com> Date: Thu Jul 27 21:55:18 2017 +1000 chromium: 59.0.3071.109 -> 60.0.3112.78 diff --git a/chromium/.footprint b/chromium/.footprint index fde892e1e..0c5b46d45 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -26,10 +26,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-left.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-right.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-top.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_bw.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_bw_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional_2x.png @@ -53,6 +50,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/mediumIcons_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/nodeIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileIcon.png @@ -178,16 +176,18 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers/layers_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/network/network_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network_group_lookup/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_group_lookup/network_group_lookup_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/object_ui/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/object_ui/object_ui_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/perf_ui/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/perf_ui/perf_ui_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry/product_registry_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry_impl/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry_impl/product_registry_impl_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler/profiler_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/protocol/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/protocol/protocol_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/quick_open/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/quick_open/quick_open_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/resources/ @@ -196,6 +196,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass/sass_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/screencast/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/screencast/screencast_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sdk/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sdk/sdk_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/security/security_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/settings/ diff --git a/chromium/.md5sum b/chromium/.md5sum index 1765030fd..121e798a7 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,6 +1,8 @@ -7ad48853453a431b689c1ff97378840a 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch -de9345fb5cd756ed43c4ea7b9223e5ee 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch -81885367434a85aecdb7b5a8d666590d chromium-59.0.3071.109.tar.xz +c8b274991cdd5064aed600add48a0bf6 0001-Clip-FreeType-glyph-bitmap-to-mask.patch +e5f1c85bec4a50df09da6d4b17249826 chromium-60.0.3112.78.tar.xz +034bc28a6988f3d6d1e7f291ec95365c chromium-blink-gcc7.patch +3d379c46c547a21d6f20fc1c1761bff1 chromium-gn-bootstrap-r8.patch +c2f283eee77d4123a0952d9ee277ec3c chromium-v8-gcc7.patch b527005e021b14869a669e42c46b661d chromium.desktop 64968626706b07721983ac59fb3babbf chromium.sh 3354997dd0bfde3443499133a6e16a85 last-commit-position.patch diff --git a/chromium/.signature b/chromium/.signature index e59e60f97..c33bcc9a4 100644 --- a/chromium/.signature +++ b/chromium/.signature @@ -1,10 +1,12 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/esFuYuwpVHLuIsNopga1umJ/mXnCBPIpcwi+/lUU1pH7ep70vfbEtZNzYsaeRHECOqWAaCh11k2R2Z/bY2R9wA= -SHA256 (Pkgfile) = 42813130cc9658975bd901675e5673747688d7dd06685743f4e2bd11c25609c8 -SHA256 (.footprint) = ecc99206edaf6df789ab643b4e401d05dd4c35a733789bb6a7b21ff6c40664b9 -SHA256 (chromium-59.0.3071.109.tar.xz) = 83faeb3537428d83728258b28e907caaee6e6572bcd7d9b9a5f6009e7ea758d9 +RWSE3ohX2g5d/XLaCVmbCMsspxPKBcx0491RclWXvUzRDeDgDIhVMOlvG9QywXC8RZ6nwAVoRIbmwtLLrCW5rFBjhkH0BWFQfQE= +SHA256 (Pkgfile) = a2d1d95c4dead5dd2cddd4331807481f82233b5d810433fe2b4c42937d494d79 +SHA256 (.footprint) = 1212ab960b6ace8249ad85297b0c158b11ab0822da7f8098c82b3f6e5e8a4909 +SHA256 (chromium-60.0.3112.78.tar.xz) = a82db2aa1b9348b619c01894db565eba686780de0e6fa9e83a8f406d06ce03ea SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154 SHA256 (chromium.desktop) = caf015652ac7ce9403a5cb6c7bec3dc597222b20c5842059ee15674e2c9209cc -SHA256 (0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch) = 9c081c84a4f85dbef82a9edf34cf0b1e8377c563874fd9c1b4efddf1476748f9 -SHA256 (0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch) = 42eb6ada30d5d507f2bda2d2caece37e397e7086bc0d430db776fad143562fb6 +SHA256 (0001-Clip-FreeType-glyph-bitmap-to-mask.patch) = e60aa0ff01f8bee67e45fde7bbe932901194984673ec4b10ea82bba1bace0cd7 +SHA256 (chromium-blink-gcc7.patch) = f94310a7ba9b8b777adfb4442bcc0a8f0a3d549b2cf4a156066f8e2e28e2f323 +SHA256 (chromium-v8-gcc7.patch) = 46dacc4fa52652b7d99b8996d6a97e5e3bac586f879aefb9fb95020d2c4e5aec +SHA256 (chromium-gn-bootstrap-r8.patch) = 06345804c00d9618dad98a2dc04f31ef19912cdf6e9d6e577ef7ffb1fa57003f diff --git a/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch b/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch deleted file mode 100644 index 8a1bf2b20..000000000 --- a/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 27bab2297187099229a1e4304d8feb866c8da55a Mon Sep 17 00:00:00 2001 -From: "dongseong.hwang" <dongseong.hwang@intel.com> -Date: Tue, 18 Apr 2017 16:44:55 -0700 -Subject: [PATCH] ClientNativePixmapFactoryDmabuf uses ioctl, instead of - drmIoctl. - -DMA_BUF_SYNC ioctl is not drmIoctl, because it uses dma-buf fd, instead of drm -device fd. - -In addition, remove LOCAL_ prefix to fix build failure >= kernel 4.6 - -Actually, ChromeOS doesn't need this local DMA_BUF_SYNC definition as all -verion of kernel for cros has dma-buf.h header. -https://chromium-review.googlesource.com/c/459544/ -However, there is not any way to distinguish real ChromeOS build and -current_os="chromeos" build, so remain the local definition to ChromeOS as -well. - -BUG=584248 -R=reveman@chromium.org - -Review-Url: https://codereview.chromium.org/2805503003 -Cr-Commit-Position: refs/heads/master@{#465425} ---- - ui/gfx/linux/client_native_pixmap_dmabuf.cc | 49 +++++++++++++---------------- - 1 file changed, 21 insertions(+), 28 deletions(-) - -diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -index d656c338f0a6..1bb441dc25ce 100644 ---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc -+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -@@ -7,36 +7,35 @@ - #include <fcntl.h> - #include <linux/version.h> - #include <stddef.h> -+#include <sys/ioctl.h> - #include <sys/mman.h> - #include <xf86drm.h> - - #include "base/debug/crash_logging.h" - #include "base/memory/ptr_util.h" -+#include "base/posix/eintr_wrapper.h" - #include "base/process/memory.h" - #include "base/process/process_metrics.h" - #include "base/strings/stringprintf.h" - #include "base/trace_event/trace_event.h" - --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#include <linux/dma-buf.h> -+#else - #include <linux/types.h> - --struct local_dma_buf_sync { -+struct dma_buf_sync { - __u64 flags; - }; - --#define LOCAL_DMA_BUF_SYNC_READ (1 << 0) --#define LOCAL_DMA_BUF_SYNC_WRITE (2 << 0) --#define LOCAL_DMA_BUF_SYNC_RW \ -- (LOCAL_DMA_BUF_SYNC_READ | LOCAL_DMA_BUF_SYNC_WRITE) --#define LOCAL_DMA_BUF_SYNC_START (0 << 2) --#define LOCAL_DMA_BUF_SYNC_END (1 << 2) -+#define DMA_BUF_SYNC_READ (1 << 0) -+#define DMA_BUF_SYNC_WRITE (2 << 0) -+#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) -+#define DMA_BUF_SYNC_START (0 << 2) -+#define DMA_BUF_SYNC_END (1 << 2) - --#define LOCAL_DMA_BUF_BASE 'b' --#define LOCAL_DMA_BUF_IOCTL_SYNC \ -- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync) -- --#else --#include <linux/dma-buf.h> -+#define DMA_BUF_BASE 'b' -+#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) - #endif - - namespace gfx { -@@ -44,25 +43,19 @@ namespace gfx { - namespace { - - void PrimeSyncStart(int dmabuf_fd) { -- struct local_dma_buf_sync sync_start = {0}; -+ struct dma_buf_sync sync_start = {0}; - -- sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_RW; --#if DCHECK_IS_ON() -- int rv = --#endif -- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start); -- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; -+ sync_start.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW; -+ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_start)); -+ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; - } - - void PrimeSyncEnd(int dmabuf_fd) { -- struct local_dma_buf_sync sync_end = {0}; -+ struct dma_buf_sync sync_end = {0}; - -- sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_RW; --#if DCHECK_IS_ON() -- int rv = --#endif -- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end); -- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; -+ sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW; -+ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_end)); -+ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; - } - - } // namespace --- -2.13.0 - diff --git a/chromium/0001-Clip-FreeType-glyph-bitmap-to-mask.patch b/chromium/0001-Clip-FreeType-glyph-bitmap-to-mask.patch new file mode 100644 index 000000000..5a395b53d --- /dev/null +++ b/chromium/0001-Clip-FreeType-glyph-bitmap-to-mask.patch @@ -0,0 +1,170 @@ +From 6cdb5f2ad7684302a8a66217462d2aef4c5f4632 Mon Sep 17 00:00:00 2001 +From: Ben Wagner <bungeman@behemoth.cnc.corp.google.com> +Date: Thu, 15 Jun 2017 10:43:17 -0400 +Subject: [PATCH] Clip FreeType glyph bitmap to mask. + +Skia has for some time assumed that when using FT_Render_Glyph with one +of the LCD render modes that one extra pixel would be applied to each +side of the resulting bitmap. FreieType has changed to make this more +conservative when possible, so the pre-allocated SkMask and the generated +FT_Bitmap may no longer agree on the size and origin. + +This change ensures the SkMask and FT_Bitmap are the same size and their +origins align. This is not an ideal long term fix, but is both simple and +localized for easy and quick back-porting, should that become necessary. + +BUG=skia:6663 + +Change-Id: I49ec8f45376be8d867e8aef54eab79537731c310 +Reviewed-on: https://skia-review.googlesource.com/20327 +Reviewed-by: Herb Derby <herb@google.com> +Commit-Queue: Ben Wagner <bungeman@google.com> +--- + src/ports/SkFontHost_FreeType_common.cpp | 100 +++++++++++++++++++++++++------ + 1 file changed, 83 insertions(+), 17 deletions(-) + +diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp +index 9df7268bb4..a216fdb29c 100644 +--- a/src/ports/SkFontHost_FreeType_common.cpp ++++ b/src/ports/SkFontHost_FreeType_common.cpp +@@ -395,8 +395,6 @@ void SkScalerContext_FreeType_Base::generateGlyphImage( + switch ( face->glyph->format ) { + case FT_GLYPH_FORMAT_OUTLINE: { + FT_Outline* outline = &face->glyph->outline; +- FT_BBox bbox; +- FT_Bitmap target; + + int dx = 0, dy = 0; + if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) { +@@ -405,36 +403,97 @@ void SkScalerContext_FreeType_Base::generateGlyphImage( + // negate dy since freetype-y-goes-up and skia-y-goes-down + dy = -dy; + } +- FT_Outline_Get_CBox(outline, &bbox); +- /* +- what we really want to do for subpixel is +- offset(dx, dy) +- compute_bounds +- offset(bbox & !63) +- but that is two calls to offset, so we do the following, which +- achieves the same thing with only one offset call. +- */ +- FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), +- dy - ((bbox.yMin + dy) & ~63)); ++ ++ memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); + + if (SkMask::kLCD16_Format == glyph.fMaskFormat) { ++ FT_Outline_Translate(outline, dx, dy); + FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : + FT_RENDER_MODE_LCD); + if (err) { + SK_TRACEFTR(err, "Could not render glyph."); +- sk_bzero(glyph.fImage, glyph.computeImageSize()); + return; + } ++ + SkMask mask; + glyph.toMask(&mask); ++#ifdef SK_SHOW_TEXT_BLIT_COVERAGE ++ memset(mask.fImage, 0x80, mask.fBounds.height() * mask.fRowBytes); ++#endif ++ FT_GlyphSlotRec& ftGlyph = *face->glyph; ++ ++ if (!SkIRect::Intersects(mask.fBounds, ++ SkIRect::MakeXYWH( ftGlyph.bitmap_left, ++ -ftGlyph.bitmap_top, ++ ftGlyph.bitmap.width, ++ ftGlyph.bitmap.rows))) ++ { ++ return; ++ } ++ ++ // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask. ++ // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded). ++ unsigned char* origBuffer = ftGlyph.bitmap.buffer; ++ // First align the top left (origin). ++ if (-ftGlyph.bitmap_top < mask.fBounds.fTop) { ++ int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top); ++ ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff; ++ ftGlyph.bitmap.rows -= topDiff; ++ ftGlyph.bitmap_top = -mask.fBounds.fTop; ++ } ++ if (ftGlyph.bitmap_left < mask.fBounds.fLeft) { ++ int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left; ++ ftGlyph.bitmap.buffer += leftDiff; ++ ftGlyph.bitmap.width -= leftDiff; ++ ftGlyph.bitmap_left = mask.fBounds.fLeft; ++ } ++ if (mask.fBounds.fTop < -ftGlyph.bitmap_top) { ++ mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop); ++ mask.fBounds.fTop = -ftGlyph.bitmap_top; ++ } ++ if (mask.fBounds.fLeft < ftGlyph.bitmap_left) { ++ mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft); ++ mask.fBounds.fLeft = ftGlyph.bitmap_left; ++ } ++ // Origins aligned, clean up the width and height. ++ int ftVertScale = (doVert ? 3 : 1); ++ int ftHoriScale = (doVert ? 1 : 3); ++ if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) { ++ ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale; ++ } ++ if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) { ++ ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale; ++ } ++ if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) { ++ mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale; ++ } ++ if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) { ++ mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale; ++ } + if (fPreBlend.isApplicable()) { +- copyFT2LCD16<true>(face->glyph->bitmap, mask, doBGR, ++ copyFT2LCD16<true>(ftGlyph.bitmap, mask, doBGR, + fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } else { +- copyFT2LCD16<false>(face->glyph->bitmap, mask, doBGR, ++ copyFT2LCD16<false>(ftGlyph.bitmap, mask, doBGR, + fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } ++ // Restore the buffer pointer so FreeType can properly free it. ++ ftGlyph.bitmap.buffer = origBuffer; + } else { ++ FT_BBox bbox; ++ FT_Bitmap target; ++ FT_Outline_Get_CBox(outline, &bbox); ++ /* ++ what we really want to do for subpixel is ++ offset(dx, dy) ++ compute_bounds ++ offset(bbox & !63) ++ but that is two calls to offset, so we do the following, which ++ achieves the same thing with only one offset call. ++ */ ++ FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), ++ dy - ((bbox.yMin + dy) & ~63)); ++ + target.width = glyph.fWidth; + target.rows = glyph.fHeight; + target.pitch = glyph.rowBytes(); +@@ -442,8 +501,15 @@ void SkScalerContext_FreeType_Base::generateGlyphImage( + target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat); + target.num_grays = 256; + +- memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); + FT_Outline_Get_Bitmap(face->glyph->library, outline, &target); ++#ifdef SK_SHOW_TEXT_BLIT_COVERAGE ++ for (int y = 0; y < glyph.fHeight; ++y) { ++ for (int x = 0; x < glyph.fWidth; ++x) { ++ uint8_t& a = ((uint8_t*)glyph.fImage)[(glyph.rowBytes() * y) + x]; ++ a = SkTMax<uint8_t>(a, 0x20); ++ } ++ } ++#endif + } + } break; + +-- +2.13.2 + diff --git a/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch b/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch deleted file mode 100644 index 345770000..000000000 --- a/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 63901da067e069e298595618e01c4758c7896ff5 Mon Sep 17 00:00:00 2001 -From: thomasanderson <thomasanderson@google.com> -Date: Fri, 28 Apr 2017 11:56:12 -0700 -Subject: [PATCH] Fix kernel version condition for including dma-buf.h - -Kernel 4.11 merges the commit that added linux/dma-buf.h -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... - -This CL increases the required kernel to include this file to 4.11. - -BUG=707604 -R=danakj@chromium.org - -Review-Url: https://codereview.chromium.org/2851803002 -Cr-Commit-Position: refs/heads/master@{#468078} ---- - ui/gfx/linux/client_native_pixmap_dmabuf.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -index 31ff4f4395b6..4927daf3a61d 100644 ---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc -+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -@@ -19,7 +19,7 @@ - #include "base/strings/stringprintf.h" - #include "base/trace_event/trace_event.h" - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) - #include <linux/dma-buf.h> - #else - #include <linux/types.h> --- -2.13.0 - diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 7f531b4cb..fa94de289 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,12 +5,14 @@ # Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm name=chromium -version=59.0.3071.109 +version=60.0.3112.78 release=1 -source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$versio... \ +source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$versi... last-commit-position.patch $name.sh $name.desktop - 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch - 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch) + 0001-Clip-FreeType-glyph-bitmap-to-mask.patch + chromium-blink-gcc7.patch + chromium-v8-gcc7.patch + chromium-gn-bootstrap-r8.patch) build() { cd $name-$version @@ -21,23 +23,27 @@ build() { # we don't use git sources patch -p1 -i $SRC/last-commit-position.patch - # https://bugs.chromium.org/p/chromium/issues/detail?id=707604 - patch -p1 -i $SRC/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch - patch -p1 -i $SRC/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch + # https://bugs.chromium.org/p/skia/issues/detail?id=6663 + patch -p1 -d third_party/skia -i $SRC/0001-Clip-FreeType-glyph-bitmap-to-mask.patch + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347 + patch -p1 -i $SRC/chromium-blink-gcc7.patch + + # https://bugs.chromium.org/p/chromium/issues/detail?id=614289 + patch -p1 -i $SRC/chromium-v8-gcc7.patch + + # Fixes from Gentoo + patch -p1 -i $SRC/chromium-gn-bootstrap-r8.patch mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ - # Fix a build issue with GCC-6 - sed 's/^config("compiler") {/&\ncflags_cc = [ "-fno-delete-null-pointer-checks" ]/' \ - -i build/config/linux/BUILD.gn - _gn_args=( 'blink_gc_plugin=false' 'clang_use_chrome_plugins=false' 'enable_hangout_services_extension=true' 'enable_nacl=false' - 'enable_nacl_nonsfi=false' + 'enable_swiftshader=false' 'fatal_linker_warnings=false' 'ffmpeg_branding="Chrome"' 'is_clang=false' diff --git a/chromium/chromium-blink-gcc7.patch b/chromium/chromium-blink-gcc7.patch new file mode 100644 index 000000000..fb6118b30 --- /dev/null +++ b/chromium/chromium-blink-gcc7.patch @@ -0,0 +1,76 @@ +--- 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 { diff --git a/chromium/chromium-gn-bootstrap-r8.patch b/chromium/chromium-gn-bootstrap-r8.patch new file mode 100644 index 000000000..d9f389aaf --- /dev/null +++ b/chromium/chromium-gn-bootstrap-r8.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/chromium/chromium-v8-gcc7.patch b/chromium/chromium-v8-gcc7.patch new file mode 100644 index 000000000..a63b9a495 --- /dev/null +++ b/chromium/chromium-v8-gcc7.patch @@ -0,0 +1,73 @@ +diff -upr chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h chromium-59.0.3071.86/v8/src/objects/hash-table.h +--- chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects/hash-table.h 2017-06-06 14:35:41.558245559 +0300 +@@ -135,22 +135,10 @@ class HashTable : public HashTableBase { + public: + 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 HashForObject(Key key, Object* object) { +- if (Shape::UsesSeed) { +- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); +- } else { +- return Shape::HashForObject(key, object); +- } +- } ++ // Wrapper methods. Defined in src/objects-inl.h ++ // to break a cycle with src/heap/heap.h. ++ inline uint32_t Hash(Key key); ++ inline uint32_t HashForObject(Key key, Object* object); + + // Returns a new HashTable object. + MUST_USE_RESULT static Handle<Derived> New( +diff -upr chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h chromium-59.0.3071.86/v8/src/objects-body-descriptors.h +--- chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects-body-descriptors.h 2017-06-06 14:35:41.554912132 +0300 +@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public + + template <typename StaticVisitor> + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody<StaticVisitor>(obj); + } + }; + +diff -upr chromium-59.0.3071.86.orig/v8/src/objects-inl.h chromium-59.0.3071.86/v8/src/objects-inl.h +--- chromium-59.0.3071.86.orig/v8/src/objects-inl.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects-inl.h 2017-06-06 14:35:41.558245559 +0300 +@@ -46,6 +46,27 @@ + namespace v8 { + namespace internal { + ++template <typename Derived, typename Shape, typename Key> ++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> ++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); ++ } ++} ++ ++ + PropertyDetails::PropertyDetails(Smi* smi) { + value_ = smi->value(); + }