168240 2017-02-13 11:25:57 -0800 Simplify DragController::startDrag 2017-02-13 17:46:10 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue oldest_to_newest 1276263 0 andersca 2017-02-13 11:25:57 -0800 Simplify DragController::startDrag 1276432 1 301412 andersca 2017-02-13 16:21:47 -0800 Created attachment 301412 Patch 1276490 2 andersca 2017-02-13 17:46:10 -0800 Committed r212267: <http://trac.webkit.org/changeset/212267> 301412 2017-02-13 16:21:47 -0800 2017-02-13 17:43:54 -0800 Patch bug-168240-20170213161915.patch text/plain 5857 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyMjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTZjODUwNTU0N2ZlMjQ0 NjZlY2FjYjEzOWNmOGMyMTk3MzAzYjE1ZS4uYWJmZTBmMWU1MWQzZDQyNjMzYWU2NzQzNDVhNGYw YmI0MGZhOTU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE3LTAyLTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgRHJh Z0NvbnRyb2xsZXI6OnN0YXJ0RHJhZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTY4MjQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIGVhcmx5IHJldHVybnMgaW5zdGVhZCBvZiBhc3NpZ25pbmcgdG8g YSB2YXJpYWJsZSB0aGF0J3MgcmV0dXJuZWQgYXQgdGhlIGVuZCBvZiB0aGUgZnVuY3Rpb24uCisK KyAgICAgICAgKiBwYWdlL0RyYWdDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRy YWdDb250cm9sbGVyOjpzdGFydERyYWcpOgorCisyMDE3LTAyLTEzICBBbmRlcnMgQ2FybHNzb24g IDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgRml4IGlPUyBidWlsZC4KIAogICAgICAg ICAqIHBsYXRmb3JtL2lvcy9EcmFnSW1hZ2VJT1MubW06CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0Nv bnRyb2xsZXIuY3BwCmluZGV4IDIxMDEyMTRlMDczZGRjYzQ2OGNmZTkxOTk4YTY1MjQ2MmE2ZWM1 M2IuLmI2YjgxODA3NDhmZGZkNzFjYzc2ZjI0YzNlZDM1MzgyOWVkYTcwODEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCkBAIC04MTMsOCArODEzLDYgQEAgYm9vbCBEcmFn Q29udHJvbGxlcjo6c3RhcnREcmFnKEZyYW1lJiBzcmMsIGNvbnN0IERyYWdTdGF0ZSYgc3RhdGUs IERyYWdPcGVyYXRpb24KICAgICAgICAgbV9kcmFnT2Zmc2V0ID0gZHJhZ0ltYWdlT2Zmc2V0Owog ICAgIH0KIAotICAgIGJvb2wgc3RhcnRlZERyYWcgPSB0cnVlOyAvLyBvcHRpbWlzbSAtIHdlIGFs bW9zdCBhbHdheXMgbWFuYWdlIHRvIHN0YXJ0IHRoZSBkcmFnCi0KICAgICBBU1NFUlQoc3RhdGUu c291cmNlKTsKICAgICBFbGVtZW50JiBlbGVtZW50ID0gKnN0YXRlLnNvdXJjZTsKIApAQCAtODIz LDcgKzgyMSw2IEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OnN0YXJ0RHJhZyhGcmFtZSYgc3JjLCBj b25zdCBEcmFnU3RhdGUmIHN0YXRlLCBEcmFnT3BlcmF0aW9uCiAgICAgaWYgKHN0YXRlLnR5cGUg PT0gRHJhZ1NvdXJjZUFjdGlvblNlbGVjdGlvbikgewogICAgICAgICBpZiAoIWRhdGFUcmFuc2Zl ci5wYXN0ZWJvYXJkKCkuaGFzRGF0YSgpKSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBl bnRpcmUgYmxvY2sgaXMgYWxtb3N0IGlkZW50aWNhbCB0byB0aGUgY29kZSBpbiBFZGl0b3I6OmNv cHksIGFuZCB0aGUgY29kZSBzaG91bGQgYmUgc2hhcmVkLgotCiAgICAgICAgICAgICBSZWZQdHI8 UmFuZ2U+IHNlbGVjdGlvblJhbmdlID0gc3JjLnNlbGVjdGlvbigpLnRvTm9ybWFsaXplZFJhbmdl KCk7CiAgICAgICAgICAgICBBU1NFUlQoc2VsZWN0aW9uUmFuZ2UpOwogCkBAIC04NjEsMTAgKzg1 OCwxNSBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWcoRnJhbWUmIHNyYywgY29uc3Qg RHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJhdGlvbgogICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgICAgIGRvU3lzdGVtRHJhZyhXVEZNb3ZlKGRyYWdJbWFnZSksIGRyYWdMb2MsIGRy YWdPcmlnaW4sIGRyYWdJbWFnZUJvdW5kcywgZGF0YVRyYW5zZmVyLCBzcmMsIGZhbHNlKTsKLSAg ICB9IGVsc2UgaWYgKCFzcmMuZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS5jYW5EaXNwbGF5 KGxpbmtVUkwpKSB7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmICghc3Jj LmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCkuY2FuRGlzcGxheShsaW5rVVJMKSkgewogICAg ICAgICBzcmMuZG9jdW1lbnQoKS0+YWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJjZTo6U2Vj dXJpdHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsICJOb3QgYWxsb3dlZCB0byBkcmFnIGxvY2FsIHJl c291cmNlOiAiICsgbGlua1VSTC5zdHJpbmdDZW50ZXJFbGxpcHNpemVkVG9MZW5ndGgoKSk7Ci0g ICAgICAgIHN0YXJ0ZWREcmFnID0gZmFsc2U7Ci0gICAgfSBlbHNlIGlmICghaW1hZ2VVUkwuaXNF bXB0eSgpICYmIGltYWdlICYmICFpbWFnZS0+aXNOdWxsKCkgJiYgKG1fZHJhZ1NvdXJjZUFjdGlv biAmIERyYWdTb3VyY2VBY3Rpb25JbWFnZSkpIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg IH0KKworICAgIGlmICghaW1hZ2VVUkwuaXNFbXB0eSgpICYmIGltYWdlICYmICFpbWFnZS0+aXNO dWxsKCkgJiYgKG1fZHJhZ1NvdXJjZUFjdGlvbiAmIERyYWdTb3VyY2VBY3Rpb25JbWFnZSkpIHsK ICAgICAgICAgLy8gV2Ugc2hvdWxkbid0IGJlIHN0YXJ0aW5nIGEgZHJhZyBmb3IgYW4gaW1hZ2Ug dGhhdCBjYW4ndCBwcm92aWRlIGFuIGV4dGVuc2lvbi4KICAgICAgICAgLy8gVGhpcyBpcyBhbiBl YXJseSBkZXRlY3Rpb24gZm9yIHByb2JsZW1zIGVuY291bnRlcmVkIGxhdGVyIHVwb24gZHJvcC4K ICAgICAgICAgQVNTRVJUKCFpbWFnZS0+ZmlsZW5hbWVFeHRlbnNpb24oKS5pc0VtcHR5KCkpOwpA QCAtODg1LDcgKzg4NywxMCBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWcoRnJhbWUm IHNyYywgY29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJhdGlvbgogICAgICAgICAgICAg Ly8gREhUTUwgZGVmaW5lZCBkcmFnIGltYWdlCiAgICAgICAgICAgICBkb1N5c3RlbURyYWcoV1RG TW92ZShkcmFnSW1hZ2UpLCBkcmFnTG9jLCBkcmFnT3JpZ2luLCB7IH0sIGRhdGFUcmFuc2Zlciwg c3JjLCBmYWxzZSk7CiAgICAgICAgIH0KLSAgICB9IGVsc2UgaWYgKCFsaW5rVVJMLmlzRW1wdHko KSAmJiAobV9kcmFnU291cmNlQWN0aW9uICYgRHJhZ1NvdXJjZUFjdGlvbkxpbmspKSB7CisgICAg ICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIGlmICghbGlua1VSTC5pc0VtcHR5KCkgJiYg KG1fZHJhZ1NvdXJjZUFjdGlvbiAmIERyYWdTb3VyY2VBY3Rpb25MaW5rKSkgewogICAgICAgICBp ZiAoIWRhdGFUcmFuc2Zlci5wYXN0ZWJvYXJkKCkuaGFzRGF0YSgpKSB7CiAgICAgICAgICAgICAv LyBTaW1wbGlmeSB3aGl0ZXNwYWNlIHNvIHRoZSB0aXRsZSBwdXQgb24gdGhlIGRhdGFUcmFuc2Zl ciByZXNlbWJsZXMgd2hhdCB0aGUgdXNlciBzZWVzCiAgICAgICAgICAgICAvLyBvbiB0aGUgd2Vi IHBhZ2UuIFRoaXMgaW5jbHVkZXMgcmVwbGFjaW5nIG5ld2xpbmVzIHdpdGggc3BhY2VzLgpAQCAt OTIwLDggKzkyNSwxMiBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWcoRnJhbWUmIHNy YywgY29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJhdGlvbgogICAgICAgICAgICAgZHJh Z0ltYWdlID0gRHJhZ0ltYWdlIHsgc2NhbGVEcmFnSW1hZ2UoZHJhZ0ltYWdlLmdldCgpLCBGbG9h dFNpemUobV9wYWdlLmRldmljZVNjYWxlRmFjdG9yKCksIG1fcGFnZS5kZXZpY2VTY2FsZUZhY3Rv cigpKSkgfTsKICAgICAgICAgfQogICAgICAgICBkb1N5c3RlbURyYWcoV1RGTW92ZShkcmFnSW1h Z2UpLCBkcmFnTG9jLCBtb3VzZURyYWdnZWRQb2ludCwgeyB9LCBkYXRhVHJhbnNmZXIsIHNyYywg dHJ1ZSk7CisKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAjaWYgRU5BQkxFKEFUVEFD SE1FTlRfRUxFTUVOVCkKLSAgICB9IGVsc2UgaWYgKCFhdHRhY2htZW50VVJMLmlzRW1wdHkoKSAm JiAobV9kcmFnU291cmNlQWN0aW9uICYgRHJhZ1NvdXJjZUFjdGlvbkF0dGFjaG1lbnQpKSB7Cisg ICAgaWYgKCFhdHRhY2htZW50VVJMLmlzRW1wdHkoKSAmJiAobV9kcmFnU291cmNlQWN0aW9uICYg RHJhZ1NvdXJjZUFjdGlvbkF0dGFjaG1lbnQpKSB7CiAgICAgICAgIGlmICghZGF0YVRyYW5zZmVy LnBhc3RlYm9hcmQoKS5oYXNEYXRhKCkpIHsKICAgICAgICAgICAgIG1fZHJhZ2dpbmdBdHRhY2ht ZW50VVJMID0gYXR0YWNobWVudFVSTDsKICAgICAgICAgICAgIHNlbGVjdEVsZW1lbnQoZWxlbWVu dCk7CkBAIC05MzYsMjEgKzk0NSwxOCBAQCBib29sIERyYWdDb250cm9sbGVyOjpzdGFydERyYWco RnJhbWUmIHNyYywgY29uc3QgRHJhZ1N0YXRlJiBzdGF0ZSwgRHJhZ09wZXJhdGlvbgogICAgICAg ICAgICAgbV9kcmFnT2Zmc2V0ID0gSW50UG9pbnQoZHJhZ09yaWdpbi54KCkgLSBkcmFnTG9jLngo KSwgZHJhZ09yaWdpbi55KCkgLSBkcmFnTG9jLnkoKSk7CiAgICAgICAgIH0KICAgICAgICAgZG9T eXN0ZW1EcmFnKFdURk1vdmUoZHJhZ0ltYWdlKSwgZHJhZ0xvYywgZHJhZ09yaWdpbiwgeyB9LCBk YXRhVHJhbnNmZXIsIHNyYywgZmFsc2UpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CiAj ZW5kaWYKLSAgICB9IGVsc2UgaWYgKHN0YXRlLnR5cGUgPT0gRHJhZ1NvdXJjZUFjdGlvbkRIVE1M KSB7Ci0gICAgICAgIGlmIChkcmFnSW1hZ2UpIHsKLSAgICAgICAgICAgIEFTU0VSVChtX2RyYWdT b3VyY2VBY3Rpb24gJiBEcmFnU291cmNlQWN0aW9uREhUTUwpOwotICAgICAgICAgICAgbV9jbGll bnQud2lsbFBlcmZvcm1EcmFnU291cmNlQWN0aW9uKERyYWdTb3VyY2VBY3Rpb25ESFRNTCwgZHJh Z09yaWdpbiwgZGF0YVRyYW5zZmVyKTsKLSAgICAgICAgICAgIGRvU3lzdGVtRHJhZyhXVEZNb3Zl KGRyYWdJbWFnZSksIGRyYWdMb2MsIGRyYWdPcmlnaW4sIHsgfSwgZGF0YVRyYW5zZmVyLCBzcmMs IGZhbHNlKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBzdGFydGVkRHJhZyA9IGZhbHNl OwotICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIGRyYWdnYWJsZUVsZW1lbnQoKSBkZXRlcm1pbmVk IGFuIGltYWdlIG9yIGxpbmsgbm9kZSB3YXMgZHJhZ2dhYmxlLCBidXQgaXQgdHVybnMgb3V0IHRo ZQotICAgICAgICAvLyBpbWFnZSBvciBsaW5rIGhhZCBubyBVUkwsIHNvIHRoZXJlIGlzIG5vdGhp bmcgdG8gZHJhZy4KLSAgICAgICAgc3RhcnRlZERyYWcgPSBmYWxzZTsKKworICAgIGlmIChzdGF0 ZS50eXBlID09IERyYWdTb3VyY2VBY3Rpb25ESFRNTCAmJiBkcmFnSW1hZ2UpIHsKKyAgICAgICAg QVNTRVJUKG1fZHJhZ1NvdXJjZUFjdGlvbiAmIERyYWdTb3VyY2VBY3Rpb25ESFRNTCk7CisgICAg ICAgIG1fY2xpZW50LndpbGxQZXJmb3JtRHJhZ1NvdXJjZUFjdGlvbihEcmFnU291cmNlQWN0aW9u REhUTUwsIGRyYWdPcmlnaW4sIGRhdGFUcmFuc2Zlcik7CisgICAgICAgIGRvU3lzdGVtRHJhZyhX VEZNb3ZlKGRyYWdJbWFnZSksIGRyYWdMb2MsIGRyYWdPcmlnaW4sIHsgfSwgZGF0YVRyYW5zZmVy LCBzcmMsIGZhbHNlKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgcmV0dXJu IHN0YXJ0ZWREcmFnOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBEcmFnQ29udHJvbGxl cjo6ZG9JbWFnZURyYWcoRWxlbWVudCYgZWxlbWVudCwgY29uc3QgSW50UG9pbnQmIGRyYWdPcmln aW4sIGNvbnN0IEludFJlY3QmIGxheW91dFJlY3QsIERhdGFUcmFuc2ZlciYgZGF0YVRyYW5zZmVy LCBGcmFtZSYgZnJhbWUsIEludFBvaW50JiBkcmFnSW1hZ2VPZmZzZXQpCg==