Merge branch 'master' into f24

chromium-54.0.2840.90-setopaque.patch

@@ -0,0 +1,13 @@
+diff -up chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque chromium-54.0.2840.90/cc/blink/web_layer_impl.h
+--- chromium-54.0.2840.90/cc/blink/web_layer_impl.h.setopaque	2016-11-03 09:07:03.422497483 -0400
++++ chromium-54.0.2840.90/cc/blink/web_layer_impl.h	2016-11-03 09:07:13.302307531 -0400
+@@ -80,7 +80,7 @@ class WebLayerImpl : public blink::WebLa
+   blink::WebBlendMode blendMode() const override;
+   void setIsRootForIsolatedGroup(bool root) override;
+   bool isRootForIsolatedGroup() override;
+-  void setOpaque(bool opaque) override;
++  CC_BLINK_EXPORT void setOpaque(bool opaque) override;
+   bool opaque() const override;
+   void setPosition(const blink::WebFloatPoint& position) override;
+   blink::WebFloatPoint position() const override;
+diff -up chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc.setopaque chromium-54.0.2840.90/content/renderer/child_frame_compositing_helper.cc

chromium.spec

@@ -94,7 +94,7 @@ BuildRequires:  libicu-devel >= 5.4
 
 Name:		chromium%{chromium_channel}
 Version:	54.0.2840.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A WebKit (Blink) powered web browser
 Url:		http://www.chromium.org/Home
 License:	BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -152,6 +152,9 @@ Patch24:	chromium-54.0.2840.59-nullfix.patch
 Patch25:	chromium-54.0.2840.59-jpeg-include-dir.patch
 # On i686, pass --no-keep-memory --reduce-memory-overheads to ld.
 Patch26:	chromium-54.0.2840.59-i686-ld-memory-tricks.patch
+# obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)':
+# /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)'
+Patch27:	chromium-54.0.2840.90-setopaque.patch
 
 
 ### Chromium Tests Patches ###
@@ -530,6 +533,7 @@ members of the Chromium and WebDriver teams.
 %patch24 -p1 -b .nullfix
 %patch25 -p1 -b .jpegfix
 %patch26 -p1 -b .ldmemory
+%patch27 -p1 -b .setopaque
 
 ### Chromium Tests Patches ###
 %patch100 -p1 -b .use_system_opus
@@ -1709,6 +1713,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chromedriver
 
 %changelog
+* Wed Nov  2 2016 Tom Callaway <spot@fedoraproject.org> 54.0.2840.90-2
+- export setOpaque in cc_blink
+
 * Wed Nov  2 2016 Tom Callaway <spot@fedoraproject.org> 54.0.2840.90-1
 - update to 54.0.2840.90
 - undo ld manipulation for i686, just use -g1 there