commit fc11d222a0b6479e9f7ea449d555f9d61a5c1e49
author mcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jan 28 03:03:31 2019 +0000
committer mcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jan 28 03:03:31 2019 +0000
tree 185a5b7208d2d797b7bc50311cadd60368c2464f
parent a9251b881d768c60bed9df1f160cd756b9035ca2

Unreviewed, fix WPE/GTK debug builds after r240557
https://bugs.webkit.org/show_bug.cgi?id=192742
<rdar://problem/46757369>

Also fix an improper format string that was recently added in a different commit.

* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::logLayerInfo):
(WebCore::RenderLayerCompositor::reattachSubframeScrollLayers):

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

Source/WebCore/ChangeLog

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a84d958..57c90ac 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2019-01-27  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Unreviewed, fix WPE/GTK debug builds after r240557
+        https://bugs.webkit.org/show_bug.cgi?id=192742
+        <rdar://problem/46757369>
+
+        Also fix an improper format string that was recently added in a different commit.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::logLayerInfo):
+        (WebCore::RenderLayerCompositor::reattachSubframeScrollLayers):
+
 2018-12-15  Darin Adler  <darin@apple.com>
 
         Replace many uses of String::format with more type-safe alternatives

Source/WebCore/rendering/RenderLayerCompositor.cpp

diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 88bc5d1..3defc8a 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -1278,7 +1278,7 @@
         backing->backingStoreMemoryEstimate() / 1024));
     
     if (!layer.renderer().style().hasAutoZIndex())
-        logString.append(makeString(" z-index: ", layer.renderer().style().zIndex()));
+        logString.append(String::format(" z-index: %d", layer.renderer().style().zIndex()));
 
     logString.appendLiteral(" (");
     logString.append(logReasonsForCompositing(layer));
@@ -3836,7 +3836,7 @@
 
         auto parentNodeID = scrollCoordinatedAncestorInParentOfFrame(*child);
         if (!parentNodeID) {
-            LOG(Scrolling, "RenderLayerCompositor %p reattachSubframeScrollLayers: failed to find scrolling node parent for frame with nodeID %llu.", this, frameScrollingNodeID);
+            LOG(Scrolling, "RenderLayerCompositor %p reattachSubframeScrollLayers: failed to find scrolling node parent for frame with nodeID %" PRIu64 ".", this, frameScrollingNodeID);
             continue;
         }