Unreviewed, fix WPE/GTK debug builds after r240557
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jan 2019 03:03:31 +0000 (03:03 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 Jan 2019 03:03:31 +0000 (03:03 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@240558 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderLayerCompositor.cpp

index a84d958..57c90ac 100644 (file)
@@ -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
index 88bc5d1..3defc8a 100644 (file)
@@ -1278,7 +1278,7 @@ void RenderLayerCompositor::logLayerInfo(const RenderLayer& layer, const char* p
         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 @@ void RenderLayerCompositor::reattachSubframeScrollLayers()
 
         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;
         }