167541 2017-01-27 20:26:48 -0800 [WK1] Do not prevent the drag client from initializing on Mac 2017-01-28 11:46:15 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh mitz webkit-bug-importer oldest_to_newest 1270892 0 wenson_hsieh 2017-01-27 20:26:48 -0800 Do not prevent the drag client from initializing on Mac. Fix fallout from refactoring drag and drop on the Mac. 1270896 1 299994 wenson_hsieh 2017-01-27 20:40:10 -0800 Created attachment 299994 Patch 1270901 2 299994 mitz 2017-01-27 20:47:57 -0800 Comment on attachment 299994 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299994&action=review > Source/WebKit/mac/ChangeLog:4 > + [WK1] Do not prevent the drag client from initializing on Mac > + https://bugs.webkit.org/show_bug.cgi?id=167541 It would be nice if the bug title described a symptom (an assertion failure when closing a WebView initialized with -initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:) rather than the change. > Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:41 > +#if PLATFORM(MAC) > #import "WebNSPasteboardExtras.h" > +#endif #if blocks should not be interspersed with the sorted import directives, but instead go separately below. > Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:62 > + UNUSED_PARAM(m_webView); Why does a member variable need to be treated as an unused parameter? > Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:157 > + > + One empty line is enough. > Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:181 > +#endif // PLATFORM(MAC) I thought we had decided to avoid comments on #endif after #else, due to the ambiguity. 1271026 3 299994 wenson_hsieh 2017-01-28 11:45:02 -0800 Comment on attachment 299994 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299994&action=review Thanks! >> Source/WebKit/mac/ChangeLog:4 >> + https://bugs.webkit.org/show_bug.cgi?id=167541 > > It would be nice if the bug title described a symptom (an assertion failure when closing a WebView initialized with -initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:) rather than the change. Added. >> Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:41 >> +#endif > > #if blocks should not be interspersed with the sorted import directives, but instead go separately below. Ok! Fixed. >> Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:62 >> + UNUSED_PARAM(m_webView); > > Why does a member variable need to be treated as an unused parameter? This will throw a compiler error when building, since m_webView is private. >> Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:157 >> + > > One empty line is enough. Fixed. >> Source/WebKit/mac/WebCoreSupport/WebDragClient.mm:181 >> +#endif // PLATFORM(MAC) > > I thought we had decided to avoid comments on #endif after #else, due to the ambiguity. Ah, that makes sense. Fixed. 1271027 4 wenson_hsieh 2017-01-28 11:45:24 -0800 Committed <https://trac.webkit.org/changeset/211323> 1271028 5 wenson_hsieh 2017-01-28 11:46:15 -0800 <rdar://problem/30247109> 299994 2017-01-27 20:40:10 -0800 2017-01-27 20:47:57 -0800 Patch bug-167541-20170127203805.patch text/plain 4317 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZmJmZGYwMzE2 OWY0MDFhYzEyZDI2YzllNmQwY2QxYThjYWE0MzQyOS4uZDgxMDFmYzUzYTJmYTdmZWRmYWEzYTYz YmI0MGIxZTEwOTkxN2I2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3 LTAxLTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAg IFtXSzFdIERvIG5vdCBwcmV2ZW50IHRoZSBkcmFnIGNsaWVudCBmcm9tIGluaXRpYWxpemluZyBv biBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 NzU0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eGVzIGZhbGxvdXQgZnJvbSByMjExMTkyLiBUbyBlbnN1cmUgY29tcGFiaWxpdHkgd2l0aCBXZWJL aXQgY2xpZW50cywgd2UgbmVlZCB0byBlbnN1cmUgdGhhdCBXZWJEcmFnQ2xpZW50IGlzCisgICAg ICAgIGluaXRpYWxpemVkIGV2ZXJ5d2hlcmUgd2hlbiBjcmVhdGluZyBhIFdlYlZpZXcuIFN0dWIg b3V0IG1ldGhvZCBpbXBsZW1lbnRhdGlvbnMgYXMgbm8tb3BzIGZvciBub24tTWFjIHBsYXRmb3Jt cy4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkRyYWdDbGllbnQubW06CisgICAgICAg IChXZWJEcmFnQ2xpZW50OjpXZWJEcmFnQ2xpZW50KToKKyAgICAgICAgKFdlYkRyYWdDbGllbnQ6 OmFjdGlvbk1hc2tGb3JEcmFnKToKKyAgICAgICAgKFdlYkRyYWdDbGllbnQ6OndpbGxQZXJmb3Jt RHJhZ0Rlc3RpbmF0aW9uQWN0aW9uKToKKyAgICAgICAgKFdlYkRyYWdDbGllbnQ6OmRyYWdTb3Vy Y2VBY3Rpb25NYXNrRm9yUG9pbnQpOgorICAgICAgICAoV2ViRHJhZ0NsaWVudDo6d2lsbFBlcmZv cm1EcmFnU291cmNlQWN0aW9uKToKKyAgICAgICAgKFdlYkRyYWdDbGllbnQ6OnN0YXJ0RHJhZyk6 CisgICAgICAgIChXZWJEcmFnQ2xpZW50OjpkZWNsYXJlQW5kV3JpdGVEcmFnSW1hZ2UpOgorICAg ICAgICAoV2ViRHJhZ0NsaWVudDo6ZGVjbGFyZUFuZFdyaXRlQXR0YWNobWVudCk6CisgICAgICAg ICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IGluaXRTaW1wbGVIVE1M RG9jdW1lbnRXaXRoU3R5bGU6ZnJhbWU6cHJlZmVyZW5jZXM6Z3JvdXBOYW1lOl0pOgorCiAyMDE3 LTAxLTI2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2gg d2hlbiBuYXZpZ2F0aW5nIGJhY2sgdG8gYSBwYWdlIGluIFBhY2hlQ2FjaGUgd2hlbiBvbmUgb2Yg aXRzIGZyYW1lcyBoYXMgYmVlbiByZW1vdmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFnQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViRHJhZ0NsaWVudC5tbQppbmRleCBlMjMzZGQxMjA2MzQ0Zjk1N2RmNDM4 NGZhNWVjNGE0NGFiMTgyMWQzLi4xYWU4Y2U3Mjk1OTM5NGE3YWQzYjhiMmQxNzgwMDY4MmE3NTc5 MzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJEcmFn Q2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkRyYWdD bGllbnQubW0KQEAgLTI1LDcgKzI1LDcgQEAKIAogI2ltcG9ydCAiV2ViRHJhZ0NsaWVudC5oIgog Ci0jaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkgJiYgUExBVEZPUk0oTUFDKQorI2lmIEVOQUJMRShE UkFHX1NVUFBPUlQpCiAKICNpbXBvcnQgIkRPTUVsZW1lbnRJbnRlcm5hbC5oIgogI2ltcG9ydCAi V2ViQXJjaGl2ZS5oIgpAQCAtMzYsNyArMzYsOSBAQAogI2ltcG9ydCAiV2ViSFRNTFZpZXdQcml2 YXRlLmgiCiAjaW1wb3J0ICJXZWJLaXRMb2dnaW5nLmgiCiAjaW1wb3J0ICJXZWJLaXROU1N0cmlu Z0V4dHJhcy5oIgorI2lmIFBMQVRGT1JNKE1BQykKICNpbXBvcnQgIldlYk5TUGFzdGVib2FyZEV4 dHJhcy5oIgorI2VuZGlmCiAjaW1wb3J0ICJXZWJOU1VSTEV4dHJhcy5oIgogI2ltcG9ydCAiV2Vi VUlEZWxlZ2F0ZS5oIgogI2ltcG9ydCAiV2ViVUlEZWxlZ2F0ZVByaXZhdGUuaCIKQEAgLTU3LDgg KzU5LDExIEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogV2ViRHJhZ0NsaWVudDo6V2ViRHJh Z0NsaWVudChXZWJWaWV3KiB3ZWJWaWV3KQogICAgIDogbV93ZWJWaWV3KHdlYlZpZXcpIAogewor ICAgIFVOVVNFRF9QQVJBTShtX3dlYlZpZXcpOwogfQogCisjaWYgUExBVEZPUk0oTUFDKQorCiBz dGF0aWMgV2ViSFRNTFZpZXcgKmdldFRvcEhUTUxWaWV3KEZyYW1lKiBmcmFtZSkKIHsKICAgICBB U1NFUlQoZnJhbWUpOwpAQCAtMTM4LDkgKzE0Myw0NiBAQCB2b2lkIFdlYkRyYWdDbGllbnQ6OmRl Y2xhcmVBbmRXcml0ZUF0dGFjaG1lbnQoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSwgRWxl bQogfQogI2VuZGlmCiAKKyNlbHNlCisKK1dlYkNvcmU6OkRyYWdEZXN0aW5hdGlvbkFjdGlvbiBX ZWJEcmFnQ2xpZW50OjphY3Rpb25NYXNrRm9yRHJhZyhjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYp Cit7CisgICAgcmV0dXJuIERyYWdEZXN0aW5hdGlvbkFjdGlvbk5vbmU7Cit9CisKK3ZvaWQgV2Vi RHJhZ0NsaWVudDo6d2lsbFBlcmZvcm1EcmFnRGVzdGluYXRpb25BY3Rpb24oV2ViQ29yZTo6RHJh Z0Rlc3RpbmF0aW9uQWN0aW9uLCBjb25zdCBXZWJDb3JlOjpEcmFnRGF0YSYpCit7Cit9CisKKwor V2ViQ29yZTo6RHJhZ1NvdXJjZUFjdGlvbiBXZWJEcmFnQ2xpZW50OjpkcmFnU291cmNlQWN0aW9u TWFza0ZvclBvaW50KGNvbnN0IEludFBvaW50JikKK3sKKyAgICByZXR1cm4gRHJhZ1NvdXJjZUFj dGlvbk5vbmU7Cit9CisKK3ZvaWQgV2ViRHJhZ0NsaWVudDo6d2lsbFBlcmZvcm1EcmFnU291cmNl QWN0aW9uKFdlYkNvcmU6OkRyYWdTb3VyY2VBY3Rpb24sIGNvbnN0IFdlYkNvcmU6OkludFBvaW50 JiwgV2ViQ29yZTo6RGF0YVRyYW5zZmVyJikKK3sKK30KKwordm9pZCBXZWJEcmFnQ2xpZW50Ojpz dGFydERyYWcoRHJhZ0ltYWdlUmVmLCBjb25zdCBJbnRQb2ludCYsIGNvbnN0IEludFBvaW50Jiwg RGF0YVRyYW5zZmVyJiwgRnJhbWUmLCBib29sKQoreworfQorCit2b2lkIFdlYkRyYWdDbGllbnQ6 OmRlY2xhcmVBbmRXcml0ZURyYWdJbWFnZShjb25zdCBTdHJpbmcmLCBFbGVtZW50JiwgY29uc3Qg VVJMJiwgY29uc3QgU3RyaW5nJiwgV2ViQ29yZTo6RnJhbWUqKQoreworfQorCisjaWYgRU5BQkxF KEFUVEFDSE1FTlRfRUxFTUVOVCkKK3ZvaWQgV2ViRHJhZ0NsaWVudDo6ZGVjbGFyZUFuZFdyaXRl QXR0YWNobWVudChjb25zdCBTdHJpbmcmLCBFbGVtZW50JiwgY29uc3QgVVJMJiwgY29uc3QgU3Ry aW5nJiwgV2ViQ29yZTo6RnJhbWUqKQoreworfQorI2VuZGlmCisKKyNlbmRpZiAvLyBQTEFURk9S TShNQUMpCisKIHZvaWQgV2ViRHJhZ0NsaWVudDo6ZHJhZ0NvbnRyb2xsZXJEZXN0cm95ZWQoKSAK IHsKICAgICBkZWxldGUgdGhpczsKIH0KIAotI2VuZGlmIC8vIEVOQUJMRShEUkFHX1NVUFBPUlQp ICYmIFBMQVRGT1JNKE1BQykKKyNlbmRpZiAvLyBFTkFCTEUoRFJBR19TVVBQT1JUKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IGIwNjJmMzYwMjgzYzAyYzY1MjQyNTk4ZDBh MGIyY2EwYzU1YzZmMDYuLmQ0YWZkZTk0NzI1Y2Q4YTQ3MGYzOTA4MjQxMmU4Y2U3NmIwYWRkZGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTE2MDksNyArMTYwOSw3IEBA IHN0YXRpYyB2b2lkIFdlYktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlkZXJJZk5lY2Vzc2FyeSgp CiAgICAgICAgIG1ha2VVbmlxdWVSZWY8V2ViQ29yZTo6TGliV2ViUlRDUHJvdmlkZXI+KCkKICAg ICApOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLmNocm9tZUNsaWVudCA9IG5ldyBXZWJDaHJvbWVD bGllbnRJT1Moc2VsZik7Ci0jaWYgRU5BQkxFKERSQUdfU1VQUE9SVCkgJiYgUExBVEZPUk0oTUFD KQorI2lmIEVOQUJMRShEUkFHX1NVUFBPUlQpCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uZHJhZ0Ns aWVudCA9IG5ldyBXZWJEcmFnQ2xpZW50KHNlbGYpOwogI2VuZGlmCiAK