Unreviewed GTK+ and WPE build fix when building with GCC 4.9.
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jul 2017 10:58:41 +0000 (10:58 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Jul 2017 10:58:41 +0000 (10:58 +0000)
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::renderNextFrame): Don't use brace-list
initialization to override the m_forceRepaintAsync struct. Instead, manually
assign the OptionalCallbackID() value to the m_forceRepaintAsync.callbackID
member variable, and override the m_forceRepaintAsync.needsFreshFlush member
variable with `false`.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp

index 68b1616..1910597 100644 (file)
@@ -1,5 +1,16 @@
 2017-07-03  Zan Dobersek  <zdobersek@igalia.com>
 
+        Unreviewed GTK+ and WPE build fix when building with GCC 4.9.
+
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+        (WebKit::CoordinatedLayerTreeHost::renderNextFrame): Don't use brace-list
+        initialization to override the m_forceRepaintAsync struct. Instead, manually
+        assign the OptionalCallbackID() value to the m_forceRepaintAsync.callbackID
+        member variable, and override the m_forceRepaintAsync.needsFreshFlush member
+        variable with `false`.
+
+2017-07-03  Zan Dobersek  <zdobersek@igalia.com>
+
         [ThreadedCompositor] Update and retrieve scene attributes under a Lock
         https://bugs.webkit.org/show_bug.cgi?id=173762
 
index 729eeb4..119ba33 100644 (file)
@@ -168,9 +168,9 @@ void CoordinatedLayerTreeHost::renderNextFrame()
         // is called after the next update.
         if (!m_forceRepaintAsync.needsFreshFlush) {
             m_webPage.send(Messages::WebPageProxy::VoidCallback(m_forceRepaintAsync.callbackID.callbackID()));
-            m_forceRepaintAsync = { OptionalCallbackID() , false };
-        } else
-            m_forceRepaintAsync.needsFreshFlush = false;
+            m_forceRepaintAsync.callbackID = OptionalCallbackID();
+        }
+        m_forceRepaintAsync.needsFreshFlush = false;
     }
 
     if (scheduledWhileWaitingForRenderer || m_layerFlushTimer.isActive()) {