Changeset 240558 in webkit

Timestamp:

Jan 27, 2019 7:03:31 PM (5 years ago)

Author:

Michael Catanzaro

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1279 +1279 @@
     
     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(" (");
@@ -3837 +3837 @@
         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;
         }