Bug 171875 – Avoid -Wformat warnings in RenderLayerCompositor.cpp and RenderLayerBacking.cpp

• Component: WebCore Misc.
• Status: RESOLVED FIXED

[Michael Catanzaro]

Avoid -Wformat warnings in RenderLayerCompositor.cpp and RenderLayerBacking.cpp, caused by r216103:

[2383/4357] Building CXX object Source.../rendering/RenderLayerCompositor.cpp.o
../../Source/WebCore/rendering/RenderLayerCompositor.cpp: In member function ‘void WebCore::RenderLayerCompositor::logLayerInfo(const WebCore::RenderLayer&, int)’:
../../Source/WebCore/rendering/RenderLayerCompositor.cpp:815:53: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 4 has type ‘WebCore::GraphicsLayer::PlatformLayerID {aka long unsigned int}’ [-Wformat=]
         backing->backingStoreMemoryEstimate() / 1024));
                                                     ^
In file included from ../../Source/WTF/wtf/StdLibExtras.h:34:0,
                 from ../../Source/WTF/wtf/FastMalloc.h:26,
                 from ../../Source/WebCore/config.h:67,
                 from ../../Source/WebCore/rendering/RenderLayerCompositor.cpp:26:
../../Source/WebCore/rendering/RenderLayerCompositor.cpp: In member function ‘void WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer(WebCore::RenderLayer&, WebCore::LayerScrollCoordinationRoles)’:
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘WebCore::ScrollingNodeID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerCompositor.cpp:3907:9: note: in expansion of macro ‘LOG’
         LOG(Compositing, "Registering ViewportConstrained scrolling node %llu (layer %llu) as child of %llu", nodeID, backing->graphicsLayer()->primaryLayerID(), parentNodeID);
         ^
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 4 has type ‘WebCore::GraphicsLayer::PlatformLayerID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerCompositor.cpp:3907:9: note: in expansion of macro ‘LOG’
         LOG(Compositing, "Registering ViewportConstrained scrolling node %llu (layer %llu) as child of %llu", nodeID, backing->graphicsLayer()->primaryLayerID(), parentNodeID);
         ^
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 5 has type ‘WebCore::ScrollingNodeID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerCompositor.cpp:3907:9: note: in expansion of macro ‘LOG’
         LOG(Compositing, "Registering ViewportConstrained scrolling node %llu (layer %llu) as child of %llu", nodeID, backing->graphicsLayer()->primaryLayerID(), parentNodeID);
         ^
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘WebCore::ScrollingNodeID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerCompositor.cpp:3953:13: note: in expansion of macro ‘LOG’
             LOG(Compositing, "Registering Scrolling scrolling node %llu (layer %llu) as child of %llu", nodeID, backing->graphicsLayer()->primaryLayerID(), parentNodeID);
             ^
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 4 has type ‘WebCore::GraphicsLayer::PlatformLayerID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerCompositor.cpp:3953:13: note: in expansion of macro ‘LOG’
             LOG(Compositing, "Registering Scrolling scrolling node %llu (layer %llu) as child of %llu", nodeID, backing->graphicsLayer()->primaryLayerID(), parentNodeID);
             ^
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 5 has type ‘WebCore::ScrollingNodeID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerCompositor.cpp:3953:13: note: in expansion of macro ‘LOG’
             LOG(Compositing, "Registering Scrolling scrolling node %llu (layer %llu) as child of %llu", nodeID, backing->graphicsLayer()->primaryLayerID(), parentNodeID);
             ^
[2386/4357] Building CXX object Source...dir/rendering/RenderLayerBacking.cpp.o
In file included from ../../Source/WTF/wtf/StdLibExtras.h:34:0,
                 from ../../Source/WTF/wtf/FastMalloc.h:26,
                 from ../../Source/WebCore/config.h:67,
                 from ../../Source/WebCore/rendering/RenderLayerBacking.cpp:26:
../../Source/WebCore/rendering/RenderLayerBacking.cpp: In member function ‘void WebCore::RenderLayerBacking::detachFromScrollingCoordinator(WebCore::LayerScrollCoordinationRoles)’:
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘WebCore::ScrollingNodeID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerBacking.cpp:1784:9: note: in expansion of macro ‘LOG’
         LOG(Compositing, "Detaching Scrolling node %llu", m_scrollingNodeID);
         ^
../../Source/WTF/wtf/Assertions.h:407:68: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘WebCore::ScrollingNodeID {aka long unsigned int}’ [-Wformat=]
 #define LOG(channel, ...) WTFLog(&LOG_CHANNEL(channel), __VA_ARGS__)
                                                                    ^
../../Source/WebCore/rendering/RenderLayerBacking.cpp:1790:9: note: in expansion of macro ‘LOG’
         LOG(Compositing, "Detaching ViewportConstrained node %llu", m_viewportConstrainedNodeID);
         ^

[Michael Catanzaro]

Created attachment 309522 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 309522 [details]
Patch

Clearing flags on attachment: 309522

Committed r216535: <http://trac.webkit.org/changeset/216535>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.