148493 2015-08-26 15:15:17 -0700 [ThreadedCompositor] Use WTF::Condition together with WTF::Lock 2015-08-26 20:32:32 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 147841 1 emanuele.aina webkit-unassigned commit-queue fpizlo gyuyoung.kim yoon oldest_to_newest 1121074 0 emanuele.aina 2015-08-26 15:15:17 -0700 The recent switch to WTF::Lock results in build failures with ENABLE_THREADED_COMPOSITOR=ON: ../../Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp: In member function ‘void WebKit::ThreadedCompositor::createCompositingThread()’: ../../Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:301:72: error: no matching function for call to ‘WTF::ThreadCondition::wait(WTF::Lock&)’ m_initializeRunLoopCondition.wait(m_initializeRunLoopConditionMutex); ^ ../../Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:301:72: note: candidate is: In file included from ../../Source/WTF/wtf/Threading.h:44:0, from ../../Source/WebCore/platform/Timer.h:32, from ../../Source/WebCore/platform/graphics/FontCache.h:34, from ../../Source/WebCore/platform/graphics/freetype/FontPlatformData.h:29, from ../../Source/WebCore/platform/graphics/FontPlatformData.h:27, from ../../Source/WebCore/platform/graphics/Font.h:30, from ../../Source/WebCore/platform/graphics/FontCascade.h:29, from ../../Source/WebCore/platform/graphics/GraphicsContext.h:33, from DerivedSources/ForwardingHeaders/WebCore/GraphicsContext.h:1, from ../../Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:27, from ../../Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:31, from ../../Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:29: ../../Source/WTF/wtf/ThreadingPrimitives.h:97:10: note: void WTF::ThreadCondition::wait(WTF::Mutex&) WTF_EXPORT_PRIVATE void wait(Mutex& mutex); ^ ../../Source/WTF/wtf/ThreadingPrimitives.h:97:10: note: no known conversion for argument 1 from ‘WTF::Lock’ to ‘WTF::Mutex&’ ../../Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp: In member function ‘void WebKit::ThreadedCompositor::terminateCompositingThread()’: ../../Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:340:70: error: no matching function for call to ‘WTF::ThreadCondition::wait(WTF::Lock&)’ m_terminateRunLoopCondition.wait(m_terminateRunLoopConditionMutex); 1121075 1 259983 emanuele.aina 2015-08-26 15:18:12 -0700 Created attachment 259983 Patch 1121159 2 259983 gyuyoung.kim 2015-08-26 19:13:56 -0700 Comment on attachment 259983 Patch LGTM based on recent changes (r188323). 1121166 3 fpizlo 2015-08-26 19:43:18 -0700 LGTM! 1121178 4 259983 commit-queue 2015-08-26 20:32:28 -0700 Comment on attachment 259983 Patch Clearing flags on attachment: 259983 Committed r189010: <http://trac.webkit.org/changeset/189010> 1121179 5 commit-queue 2015-08-26 20:32:32 -0700 All reviewed patches have been landed. Closing bug. 259983 2015-08-26 15:18:12 -0700 2015-08-26 20:32:28 -0700 Patch bug-148493-20150827001800.patch text/plain 3166 emanuele.aina U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMWJlZDJiMjE5MWZhMDA1 Njk3NmZjMmRkOWExMDlhZTJiOWZlMmYyYS4uOGE0MDAzYzUwMTNlYTFmYWVkMDBjY2FmOTFkZmZh NzE3NGVjODM2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA4LTI2ICBFbWFu dWVsZSBBaW5hICA8ZW1hbnVlbGUuYWluYUBjb2xsYWJvcmEuY29tPgorCisgICAgICAgIFtUaHJl YWRlZENvbXBvc2l0b3JdIFVzZSBXVEY6OkNvbmRpdGlvbiB0b2dldGhlciB3aXRoIFdURjo6TG9j aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NDkz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFy ZWQvQ29vcmRpbmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3Np dG9yLmNwcDoKKyAgICAgICAgUmVwbGFjZSBUaHJlYWRDb25kaXRpb246OnNpZ25hbCgpIGNhbGxz IHdpdGggQ29uZGl0aW9uOjpub3RpZnlPbmUoKS4KKyAgICAgICAgKiBTaGFyZWQvQ29vcmRpbmF0 ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmg6CisgICAg ICAgIFJlcGxhY2UgVGhyZWFkQ29uZGl0aW9uIHVzYWdlIHdpdGggQ29uZGl0aW9uLgorCiAyMDE1 LTA4LTI1ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBTcGVjdWxh dGl2ZSBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRp bmF0ZWRHcmFwaGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9z aXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCmluZGV4IGE2YWU5OGEwM2JhNzczZjQ1NDM0YWYz ODBlNzQwNGIyNDc1MTcxNjEuLmEzNzI0OGFkNGM0YmJmYzQyOWU3ZGUwMWExNjg5OTgwMWZkNTFk OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNz L3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRlZENvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJl YWRlZENvbXBvc2l0b3IuY3BwCkBAIC0zMTIsNyArMzEyLDcgQEAgdm9pZCBUaHJlYWRlZENvbXBv c2l0b3I6OnJ1bkNvbXBvc2l0aW5nVGhyZWFkKCkKICAgICAgICAgbV9zY2VuZSA9IGFkb3B0UmVm KG5ldyBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmUodGhpcykpOwogICAgICAgICBtX3ZpZXdwb3J0 Q29udHJvbGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8U2ltcGxlVmlld3BvcnRDb250cm9sbGVyPih0 aGlzKTsKIAotICAgICAgICBtX2luaXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uLnNpZ25hbCgpOwor ICAgICAgICBtX2luaXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uLm5vdGlmeU9uZSgpOwogICAgIH0K IAogICAgIG1fY29tcG9zaXRpbmdSdW5Mb29wLT5ydW5Mb29wKCkucnVuKCk7CkBAIC0zMjQsNyAr MzI0LDcgQEAgdm9pZCBUaHJlYWRlZENvbXBvc2l0b3I6OnJ1bkNvbXBvc2l0aW5nVGhyZWFkKCkK ICAgICAgICAgTG9ja0hvbGRlciBsb2NrZXIobV90ZXJtaW5hdGVSdW5Mb29wQ29uZGl0aW9uTXV0 ZXgpOwogICAgICAgICBtX2NvbXBvc2l0aW5nUnVuTG9vcCA9IG51bGxwdHI7CiAgICAgICAgIG1f Y29udGV4dCA9IG51bGxwdHI7Ci0gICAgICAgIG1fdGVybWluYXRlUnVuTG9vcENvbmRpdGlvbi5z aWduYWwoKTsKKyAgICAgICAgbV90ZXJtaW5hdGVSdW5Mb29wQ29uZGl0aW9uLm5vdGlmeU9uZSgp OwogICAgIH0KIAogICAgIGRldGFjaFRocmVhZChtX3RocmVhZElkZW50aWZpZXIpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nvb3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRj b21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0Nv b3JkaW5hdGVkR3JhcGhpY3MvdGhyZWFkZWRjb21wb3NpdG9yL1RocmVhZGVkQ29tcG9zaXRvci5o CmluZGV4IDFkNmMyNjYyODIxMzA4M2NmMmM2MDQ2NWU3MmQ1ZjM0MDY5YjUyMzQuLjBlNjgzZGMw MWM2YTliMGNjNTQ4MGY1MDczNDRlMzhkZTkyZTU4NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9Db29yZGluYXRlZEdyYXBoaWNzL3RocmVhZGVkY29tcG9zaXRvci9UaHJlYWRl ZENvbXBvc2l0b3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ29vcmRpbmF0ZWRHcmFw aGljcy90aHJlYWRlZGNvbXBvc2l0b3IvVGhyZWFkZWRDb21wb3NpdG9yLmgKQEAgLTMzLDYgKzMz LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL0dMQ29udGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUv SW50U2l6ZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVHJhbnNmb3JtYXRpb25NYXRyaXguaD4KKyNp bmNsdWRlIDx3dGYvQ29uZGl0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL0Zhc3RNYWxsb2MuaD4KICNp bmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvVGhyZWFkU2FmZVJlZkNv dW50ZWQuaD4KQEAgLTExMCw5ICsxMTEsOSBAQCBwcml2YXRlOgogICAgIHN0ZDo6dW5pcXVlX3B0 cjxDb21wb3NpdGluZ1J1bkxvb3A+IG1fY29tcG9zaXRpbmdSdW5Mb29wOwogCiAgICAgVGhyZWFk SWRlbnRpZmllciBtX3RocmVhZElkZW50aWZpZXI7Ci0gICAgVGhyZWFkQ29uZGl0aW9uIG1faW5p dGlhbGl6ZVJ1bkxvb3BDb25kaXRpb247CisgICAgQ29uZGl0aW9uIG1faW5pdGlhbGl6ZVJ1bkxv b3BDb25kaXRpb247CiAgICAgTG9jayBtX2luaXRpYWxpemVSdW5Mb29wQ29uZGl0aW9uTXV0ZXg7 Ci0gICAgVGhyZWFkQ29uZGl0aW9uIG1fdGVybWluYXRlUnVuTG9vcENvbmRpdGlvbjsKKyAgICBD b25kaXRpb24gbV90ZXJtaW5hdGVSdW5Mb29wQ29uZGl0aW9uOwogICAgIExvY2sgbV90ZXJtaW5h dGVSdW5Mb29wQ29uZGl0aW9uTXV0ZXg7CiB9OwogCg==