171875 2017-05-09 12:17:22 -0700 Avoid -Wformat warnings in RenderLayerCompositor.cpp and RenderLayerBacking.cpp 2017-05-09 13:24:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. Other PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro commit-queue mcatanzaro simon.fraser oldest_to_newest 1306494 0 mcatanzaro 2017-05-09 12:17:22 -0700 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); ^ 1306501 1 309522 mcatanzaro 2017-05-09 12:26:10 -0700 Created attachment 309522 Patch 1306526 2 309522 commit-queue 2017-05-09 13:24:39 -0700 Comment on attachment 309522 Patch Clearing flags on attachment: 309522 Committed r216535: <http://trac.webkit.org/changeset/216535> 1306527 3 commit-queue 2017-05-09 13:24:41 -0700 All reviewed patches have been landed. Closing bug. 309522 2017-05-09 12:26:10 -0700 2017-05-09 13:24:39 -0700 Patch bug-171875-20170509142609.patch text/plain 4460 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2NTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTcxNDg4OWUyZTBlNmQz OGZkMGQ4NGE3ODYwMmI3NjBhNDJkMDc5Yi4uNmI0ZDBmYzUwODViNzJmZjNmY2UxMjRhOWIwZWYx ZThjMGYxYWU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA1LTA5ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBBdm9pZCAt V2Zvcm1hdCB3YXJuaW5ncyBpbiBSZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGFuZCBSZW5kZXJM YXllckJhY2tpbmcuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzE4NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpkZXRhY2hGcm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3Ip OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpsb2dMYXllckluZm8pOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29yZGluYXRl ZExheWVyKToKKwogMjAxNy0wNS0wOSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCB1cGRhdGUgYmluZGluZy10ZXN0cyByZXN1bHRz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCmlu ZGV4IGIzNTY2ZTkyMjNjNDVhYjliMWY4Yjg3MmNlN2UxZDJlN2U4MmZlOWUuLjEzYzQyM2RlNDI0 NmRmN2EzYWNjMWZkYTk1NTBjN2MwMDM4NGE1Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xNzgxLDEzICsxNzgxLDEzIEBAIHZv aWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpkZXRhY2hGcm9tU2Nyb2xsaW5nQ29vcmRpbmF0b3IoTGF5 ZXJTY3JvbGxDb29yZGluYXRpb25SCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmICgocm9sZXMg JiBTY3JvbGxpbmcpICYmIG1fc2Nyb2xsaW5nTm9kZUlEKSB7Ci0gICAgICAgIExPRyhDb21wb3Np dGluZywgIkRldGFjaGluZyBTY3JvbGxpbmcgbm9kZSAlbGx1IiwgbV9zY3JvbGxpbmdOb2RlSUQp OworICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJEZXRhY2hpbmcgU2Nyb2xsaW5nIG5vZGUgJSIg UFJJdTY0LCBtX3Njcm9sbGluZ05vZGVJRCk7CiAgICAgICAgIHNjcm9sbGluZ0Nvb3JkaW5hdG9y LT5kZXRhY2hGcm9tU3RhdGVUcmVlKG1fc2Nyb2xsaW5nTm9kZUlEKTsKICAgICAgICAgbV9zY3Jv bGxpbmdOb2RlSUQgPSAwOwogICAgIH0KICAgICAKICAgICBpZiAoKHJvbGVzICYgVmlld3BvcnRD b25zdHJhaW5lZCkgJiYgbV92aWV3cG9ydENvbnN0cmFpbmVkTm9kZUlEKSB7Ci0gICAgICAgIExP RyhDb21wb3NpdGluZywgIkRldGFjaGluZyBWaWV3cG9ydENvbnN0cmFpbmVkIG5vZGUgJWxsdSIs IG1fdmlld3BvcnRDb25zdHJhaW5lZE5vZGVJRCk7CisgICAgICAgIExPRyhDb21wb3NpdGluZywg IkRldGFjaGluZyBWaWV3cG9ydENvbnN0cmFpbmVkIG5vZGUgJSIgUFJJdTY0LCBtX3ZpZXdwb3J0 Q29uc3RyYWluZWROb2RlSUQpOwogICAgICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+ZGV0YWNo RnJvbVN0YXRlVHJlZShtX3ZpZXdwb3J0Q29uc3RyYWluZWROb2RlSUQpOwogICAgICAgICBtX3Zp ZXdwb3J0Q29uc3RyYWluZWROb2RlSUQgPSAwOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggOWZmNDBmMmEzMjc2 MTM2ZmYxZGEyZjk4ZWE4ZWE2MDM5OThjMGEyZS4uMDg1YmU5NjJhNzI0YzJhMThlNzVkOTk0YTBk ODQxZTAzYTViZjFlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTgxMCw3ICs4MTAsNyBAQCB2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6bG9nTGF5ZXJJbmZvKGNvbnN0IFJlbmRlckxheWVyJiBsYXllciwgaW50IGRl cHRoKQogICAgIGFic29sdXRlQm91bmRzLm1vdmUobGF5ZXIub2Zmc2V0RnJvbUFuY2VzdG9yKG1f cmVuZGVyVmlldy5sYXllcigpKSk7CiAgICAgCiAgICAgU3RyaW5nQnVpbGRlciBsb2dTdHJpbmc7 Ci0gICAgbG9nU3RyaW5nLmFwcGVuZChTdHJpbmc6OmZvcm1hdCgiJSpwIGlkICVsbHUgKCUuM2Ys JS4zZi0lLjNmLCUuM2YpICUuMmZLQiIsIDEyICsgZGVwdGggKiAyLCAmbGF5ZXIsIGJhY2tpbmct PmdyYXBoaWNzTGF5ZXIoKS0+cHJpbWFyeUxheWVySUQoKSwKKyAgICBsb2dTdHJpbmcuYXBwZW5k KFN0cmluZzo6Zm9ybWF0KCIlKnAgaWQgJSIgUFJJdTY0ICIgKCUuM2YsJS4zZi0lLjNmLCUuM2Yp ICUuMmZLQiIsIDEyICsgZGVwdGggKiAyLCAmbGF5ZXIsIGJhY2tpbmctPmdyYXBoaWNzTGF5ZXIo KS0+cHJpbWFyeUxheWVySUQoKSwKICAgICAgICAgYWJzb2x1dGVCb3VuZHMueCgpLnRvRmxvYXQo KSwgYWJzb2x1dGVCb3VuZHMueSgpLnRvRmxvYXQoKSwgYWJzb2x1dGVCb3VuZHMubWF4WCgpLnRv RmxvYXQoKSwgYWJzb2x1dGVCb3VuZHMubWF4WSgpLnRvRmxvYXQoKSwKICAgICAgICAgYmFja2lu Zy0+YmFja2luZ1N0b3JlTWVtb3J5RXN0aW1hdGUoKSAvIDEwMjQpKTsKICAgICAKQEAgLTM5MDQs NyArMzkwNCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVTY3JvbGxDb29y ZGluYXRlZExheWVyKFJlbmRlckxheWVyJiBsYXllciwgTGF5CiAgICAgICAgIGlmICghbm9kZUlE KQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgCi0gICAgICAgIExPRyhDb21wb3Np dGluZywgIlJlZ2lzdGVyaW5nIFZpZXdwb3J0Q29uc3RyYWluZWQgc2Nyb2xsaW5nIG5vZGUgJWxs dSAobGF5ZXIgJWxsdSkgYXMgY2hpbGQgb2YgJWxsdSIsIG5vZGVJRCwgYmFja2luZy0+Z3JhcGhp Y3NMYXllcigpLT5wcmltYXJ5TGF5ZXJJRCgpLCBwYXJlbnROb2RlSUQpOworICAgICAgICBMT0co Q29tcG9zaXRpbmcsICJSZWdpc3RlcmluZyBWaWV3cG9ydENvbnN0cmFpbmVkIHNjcm9sbGluZyBu b2RlICUiIFBSSXU2NCAiIChsYXllciAlIiBQUkl1NjQgIikgYXMgY2hpbGQgb2YgJSIgUFJJdTY0 LCBub2RlSUQsIGJhY2tpbmctPmdyYXBoaWNzTGF5ZXIoKS0+cHJpbWFyeUxheWVySUQoKSwgcGFy ZW50Tm9kZUlEKTsKIAogICAgICAgICBzd2l0Y2ggKG5vZGVUeXBlKSB7CiAgICAgICAgIGNhc2Ug Rml4ZWROb2RlOgpAQCAtMzk1MCw3ICszOTUwLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OnVwZGF0ZVNjcm9sbENvb3JkaW5hdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGxheWVyLCBMYXkK ICAgICAgICAgICAgIHNjcm9sbGluZ0dlb21ldHJ5LmN1cnJlbnRWZXJ0aWNhbFNuYXBQb2ludElu ZGV4ID0gbGF5ZXIuY3VycmVudFZlcnRpY2FsU25hcFBvaW50SW5kZXgoKTsKICNlbmRpZgogCi0g ICAgICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJSZWdpc3RlcmluZyBTY3JvbGxpbmcgc2Nyb2xs aW5nIG5vZGUgJWxsdSAobGF5ZXIgJWxsdSkgYXMgY2hpbGQgb2YgJWxsdSIsIG5vZGVJRCwgYmFj a2luZy0+Z3JhcGhpY3NMYXllcigpLT5wcmltYXJ5TGF5ZXJJRCgpLCBwYXJlbnROb2RlSUQpOwor ICAgICAgICAgICAgTE9HKENvbXBvc2l0aW5nLCAiUmVnaXN0ZXJpbmcgU2Nyb2xsaW5nIHNjcm9s bGluZyBub2RlICUiIFBSSXU2NCAiIChsYXllciAlIiBQUkl1NjQgIikgYXMgY2hpbGQgb2YgJSIg UFJJdTY0LCBub2RlSUQsIGJhY2tpbmctPmdyYXBoaWNzTGF5ZXIoKS0+cHJpbWFyeUxheWVySUQo KSwgcGFyZW50Tm9kZUlEKTsKIAogICAgICAgICAgICAgc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnVw ZGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZShub2RlSUQsIGJhY2tpbmctPnNjcm9sbGluZ0xheWVy KCksIGJhY2tpbmctPnNjcm9sbGluZ0NvbnRlbnRzTGF5ZXIoKSwgJnNjcm9sbGluZ0dlb21ldHJ5 KTsKICAgICAgICAgfQo=