122153 2013-10-01 03:46:02 -0700 [Qt][WK2] Fix the build after r156688 2013-10-01 04:37:34 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 122136 1 abrhm abrhm abecsi allan.jensen cmarcelo commit-queue kadam menard ossy zarvai oldest_to_newest 934961 0 abrhm 2013-10-01 03:46:02 -0700 Fix the build after r156688 934970 1 213072 abrhm 2013-10-01 03:59:44 -0700 Created attachment 213072 Proposed patch 934972 2 213072 allan.jensen 2013-10-01 04:10:29 -0700 Comment on attachment 213072 Proposed patch LGTM 934975 3 213072 commit-queue 2013-10-01 04:37:32 -0700 Comment on attachment 213072 Proposed patch Clearing flags on attachment: 213072 Committed r156706: <http://trac.webkit.org/changeset/156706> 934976 4 commit-queue 2013-10-01 04:37:34 -0700 All reviewed patches have been landed. Closing bug. 213072 2013-10-01 03:59:44 -0700 2013-10-01 04:37:32 -0700 Proposed patch patch56.patch text/plain 7474 abrhm ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4NjBjODE1Li45M2EyNjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMTAtMDEgIEdhYm9yIEFicmFoYW0gIDxhYnJobUBpbmYudS1zemVnZWQuaHU+CisK KyAgICAgICAgW1F0XVtXSzJdIEZpeCBidWlsZCBhZnRlciByMTU2Njg4LgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyMTUzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvcXQvU2hhcmVhYmxl Qml0bWFwUXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpTaGFyZWFibGVCaXRtYXA6OmNyZWF0ZUdy YXBoaWNzQ29udGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjpjcmVhdGVEcmF3aW5nQXJlYVBy b3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9yYXcvcXJhd3dlYnZpZXcuY3BwOgorICAgICAgICAo UVJhd1dlYlZpZXdQcml2YXRlOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vidmlld19wX3AuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvcXQvUXRQYWdlQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRQYWdlQ2xpZW50Ojpj cmVhdGVEcmF3aW5nQXJlYVByb3h5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRQYWdlQ2xp ZW50Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9xdC9XZWJEcmFnQ2xp ZW50UXQuY3BwOgorICAgICAgICAoV2ViS2l0Ojpjb252ZXJ0UVBpeG1hcFRvU2hhcmVhYmxlQml0 bWFwKToKKwogMjAxMy0wOS0zMCAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+ CiAKICAgICAgICAgQnVpbGQgZml4IGZvciBFRkwsIFF0LCBHdGsgcG9ydCBhZnRlciByMTU2Njg4 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvcXQvU2hhcmVhYmxlQml0bWFwUXQu Y3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL3F0L1NoYXJlYWJsZUJpdG1hcFF0LmNwcAppbmRl eCA0ZDAyZTQxLi43NjQ1NjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvcXQv U2hhcmVhYmxlQml0bWFwUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9xdC9TaGFy ZWFibGVCaXRtYXBRdC5jcHAKQEAgLTU2LDE1ICs1NiwxNSBAQCBQYXNzUmVmUHRyPEltYWdlPiBT aGFyZWFibGVCaXRtYXA6OmNyZWF0ZUltYWdlKCkKICAgICByZXR1cm4gQml0bWFwSW1hZ2U6OmNy ZWF0ZShwaXhtYXApOwogfQogCi1QYXNzT3duUHRyPEdyYXBoaWNzQ29udGV4dD4gU2hhcmVhYmxl Qml0bWFwOjpjcmVhdGVHcmFwaGljc0NvbnRleHQoKQorc3RkOjp1bmlxdWVfcHRyPEdyYXBoaWNz Q29udGV4dD4gU2hhcmVhYmxlQml0bWFwOjpjcmVhdGVHcmFwaGljc0NvbnRleHQoKQogewogICAg IC8vIEZJWE1FOiBTaG91bGQgdGhpcyBiZSBPd25QdHI8UUltYWdlPj8KICAgICBRSW1hZ2UqIGlt YWdlID0gbmV3IFFJbWFnZShjcmVhdGVRSW1hZ2UoKSk7CiAgICAgUVBhaW50ZXIqIHBhaW50ZXIg PSBuZXcgUVBhaW50ZXIoaW1hZ2UpOwogICAgIHBhaW50ZXItPnNldFJlbmRlckhpbnQoUVBhaW50 ZXI6OlNtb290aFBpeG1hcFRyYW5zZm9ybSwgdHJ1ZSk7Ci0gICAgT3duUHRyPEdyYXBoaWNzQ29u dGV4dD4gY29udGV4dCA9IGFkb3B0UHRyKG5ldyBHcmFwaGljc0NvbnRleHQocGFpbnRlcikpOwor ICAgIGF1dG8gY29udGV4dCA9IHN0ZDo6bWFrZV91bmlxdWU8R3JhcGhpY3NDb250ZXh0PihwYWlu dGVyKTsKICAgICBjb250ZXh0LT50YWtlT3duZXJzaGlwT2ZQbGF0Zm9ybUNvbnRleHQoKTsKLSAg ICByZXR1cm4gY29udGV4dC5yZWxlYXNlKCk7CisgICAgcmV0dXJuIGNvbnRleHQ7CiB9CiAKIHZv aWQgU2hhcmVhYmxlQml0bWFwOjpwYWludChHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0 IEludFBvaW50JiBkc3RQb2ludCwgY29uc3QgSW50UmVjdCYgc3JjUmVjdCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IGFhMjU0 ZDguLjYwYmJlMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3LmNwcApAQCAtNjM1LDkgKzYzNSw5IEBAIHZvaWQgUVF1aWNrV2ViVmlld1By aXZhdGU6OnByb2Nlc3NEaWRCZWNvbWVSZXNwb25zaXZlKFdLUGFnZVJlZiwgY29uc3Qgdm9pZCog Y2xpCiAgICAgZW1pdCBxLT5leHBlcmltZW50YWwoKS0+cHJvY2Vzc0RpZEJlY29tZVJlc3BvbnNp dmUoKTsKIH0KIAotT3duUHRyPERyYXdpbmdBcmVhUHJveHk+IFFRdWlja1dlYlZpZXdQcml2YXRl OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkKK3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVBy b3h5PiBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCiB7Ci0g ICAgcmV0dXJuIGNyZWF0ZU93bmVkPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eUltcGw+KHdlYlBh Z2VQcm94eS5nZXQoKSk7CisgICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8V2ViS2l0OjpEcmF3 aW5nQXJlYVByb3h5SW1wbD4od2ViUGFnZVByb3h5LmdldCgpKTsKIH0KIAogdm9pZCBRUXVpY2tX ZWJWaWV3UHJpdmF0ZTo6aGFuZGxlRG93bmxvYWRSZXF1ZXN0KERvd25sb2FkUHJveHkqIGRvd25s b2FkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3 ZWJ2aWV3X3BfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3X3BfcC5oCmluZGV4IDFjZDc1MmQuLjgwMjc2YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKQEAgLTEzMyw3ICsxMzMs NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0 IFFQb2ludCYgcG9zKSB7IH0KICAgICB2b2lkIHByb2Nlc3NEaWRDcmFzaCgpOwogICAgIHZvaWQg ZGlkUmVsYXVuY2hQcm9jZXNzKCk7Ci0gICAgT3duUHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94 eT4gY3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpOworICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6 OkRyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKICAgICB2b2lkIGhh bmRsZURvd25sb2FkUmVxdWVzdChXZWJLaXQ6OkRvd25sb2FkUHJveHkqKTsKIAogICAgIHZvaWQg ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QoV0tTdHJpbmdSZWYgbWVzc2Fn ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3 d2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vi dmlldy5jcHAKaW5kZXggY2MwMTk3My4uMzFiM2Q4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9yYXcvcXJhd3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcmF3L3FyYXd3ZWJ2aWV3LmNwcApAQCAtMjM5LDkgKzIzOSw5 IEBAIHZvaWQgUVJhd1dlYlZpZXdQcml2YXRlOjpkb25lV2l0aEtleUV2ZW50KGNvbnN0IFdlYktp dDo6TmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYKICAgICBtX2NsaWVudC0+ZG9uZVdpdGhLZXlFdmVu dChldmVudC5uYXRpdmVFdmVudCgpLCB3YXNFdmVudEhhbmRsZWQpOwogfQogCi1Pd25QdHI8V2Vi S2l0OjpEcmF3aW5nQXJlYVByb3h5PiBRUmF3V2ViVmlld1ByaXZhdGU6OmNyZWF0ZURyYXdpbmdB cmVhUHJveHkoKQorc3RkOjp1bmlxdWVfcHRyPFdlYktpdDo6RHJhd2luZ0FyZWFQcm94eT4gUVJh d1dlYlZpZXdQcml2YXRlOjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkKIHsKLSAgICByZXR1cm4g Y3JlYXRlT3duZWQ8V2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbD4obV93ZWJQYWdlUHJveHku Z2V0KCkpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPFdlYktpdDo6RHJhd2luZ0FyZWFQ cm94eUltcGw+KG1fd2ViUGFnZVByb3h5LmdldCgpKTsKIH0KIAogUVJhd1dlYlZpZXdQcml2YXRl OjpRUmF3V2ViVmlld1ByaXZhdGUoV2ViS2l0OjpXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJLaXQ6 OldlYlBhZ2VHcm91cCogcGFnZUdyb3VwLCBRUmF3V2ViVmlld0NsaWVudCogY2xpZW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9yYXcvcXJhd3dlYnZpZXdf cF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vidmlld19w X3AuaAppbmRleCA3NzE0ZThmLi40MmVmM2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vidmlld19wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vidmlld19wX3AuaApAQCAtOTQsNyArOTQsNyBA QCBwdWJsaWM6CiAKICAgICAvLyBQYWdlQ2xpZW50CiAKLSAgICB2aXJ0dWFsIE93blB0cjxXZWJL aXQ6OkRyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKKyAgICB2aXJ0 dWFsIHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdp bmdBcmVhUHJveHkoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBwYWdlRGlkUmVxdWVzdFNjcm9sbChj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9zKTsKICAgICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc0Rp ZENyYXNoKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQYWdl Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFBhZ2VDbGllbnQuY3Bw CmluZGV4IDg4N2M0ZjkuLmIwMWJlMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFBhZ2VDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFBhZ2VDbGllbnQuY3BwCkBAIC02Myw3ICs2Myw3IEBAIHZvaWQgUXRQYWdlQ2xpZW50Ojpp bml0aWFsaXplKFFRdWlja1dlYlZpZXcqIHdlYlZpZXcsIFF0V2ViUGFnZUV2ZW50SGFuZGxlciog ZXZlCiAgICAgbV91bmRvQ29udHJvbGxlciA9IHVuZG9Db250cm9sbGVyOwogfQogCi1Pd25QdHI8 RHJhd2luZ0FyZWFQcm94eT4gUXRQYWdlQ2xpZW50OjpjcmVhdGVEcmF3aW5nQXJlYVByb3h5KCkK K3N0ZDo6dW5pcXVlX3B0cjxEcmF3aW5nQXJlYVByb3h5PiBRdFBhZ2VDbGllbnQ6OmNyZWF0ZURy YXdpbmdBcmVhUHJveHkoKQogewogICAgIHJldHVybiBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Z2V0 KG1fd2ViVmlldyktPmNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFBhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFBhZ2VDbGllbnQuaAppbmRleCBiMDZhY2M4Li4zY2I1YThlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQYWdlQ2xpZW50LmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVudC5oCkBAIC01Miw3ICs1Miw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVz KGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYpOwogICAgIHZpcnR1YWwgdm9pZCBw cm9jZXNzRGlkQ3Jhc2goKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVsYXVuY2hQcm9jZXNzKCk7 Ci0gICAgdmlydHVhbCBPd25QdHI8RHJhd2luZ0FyZWFQcm94eT4gY3JlYXRlRHJhd2luZ0FyZWFQ cm94eSgpOworICAgIHZpcnR1YWwgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlRG93bmxvYWRS ZXF1ZXN0KERvd25sb2FkUHJveHkqKTsKICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQXBwbGljYXRp b25TY2hlbWVSZXF1ZXN0KFBhc3NSZWZQdHI8UXRSZWZDb3VudGVkTmV0d29ya1JlcXVlc3REYXRh Pik7CiAgICAgdmlydHVhbCB2b2lkIGhhbmRsZUF1dGhlbnRpY2F0aW9uUmVxdWlyZWRSZXF1ZXN0 KGNvbnN0IFN0cmluZyYgaG9zdG5hbWUsIGNvbnN0IFN0cmluZyYgcmVhbG0sIGNvbnN0IFN0cmlu ZyYgcHJlZmlsbGVkVXNlcm5hbWUsIFN0cmluZyYgdXNlcm5hbWUsIFN0cmluZyYgcGFzc3dvcmQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9x dC9XZWJEcmFnQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9xdC9XZWJEcmFnQ2xpZW50UXQuY3BwCmluZGV4IDIwZjdlOTUuLjA1NjQxMjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvcXQvV2Vi RHJhZ0NsaWVudFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVT dXBwb3J0L3F0L1dlYkRyYWdDbGllbnRRdC5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAgc3RhdGljIFBh c3NSZWZQdHI8U2hhcmVhYmxlQml0bWFwPiBjb252ZXJ0UVBpeG1hcFRvU2hhcmVhYmxlQml0bWFw KFFQaXhtYXAqIHBpeG0KICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBSZWZQdHI8U2hhcmVhYmxl Qml0bWFwPiBiaXRtYXAgPSBTaGFyZWFibGVCaXRtYXA6OmNyZWF0ZVNoYXJlYWJsZShJbnRTaXpl KHBpeG1hcC0+c2l6ZSgpKSwgU2hhcmVhYmxlQml0bWFwOjpTdXBwb3J0c0FscGhhKTsKLSAgICBP d25QdHI8R3JhcGhpY3NDb250ZXh0PiBncmFwaGljc0NvbnRleHQgPSBiaXRtYXAtPmNyZWF0ZUdy YXBoaWNzQ29udGV4dCgpOworICAgIGF1dG8gZ3JhcGhpY3NDb250ZXh0ID0gYml0bWFwLT5jcmVh dGVHcmFwaGljc0NvbnRleHQoKTsKIAogICAgIGdyYXBoaWNzQ29udGV4dC0+cGxhdGZvcm1Db250 ZXh0KCktPmRyYXdQaXhtYXAoMCwgMCwgKnBpeG1hcCk7CiAgICAgcmV0dXJuIGJpdG1hcC5yZWxl YXNlKCk7Cg==