127517 2014-01-23 15:22:27 -0800 Clean up WKView.mm a little 2014-01-23 15:24:26 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 971363 0 andersca 2014-01-23 15:22:27 -0800 Clean up WKView.mm a little 971364 1 222032 andersca 2014-01-23 15:23:01 -0800 Created attachment 222032 Patch 971365 2 andersca 2014-01-23 15:24:26 -0800 Committed r162655: <http://trac.webkit.org/changeset/162655> 222032 2014-01-23 15:23:01 -0800 2014-01-23 15:23:38 -0800 Patch bug-127517-20140123152300.patch text/plain 6423 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNjU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjhjZTgwZDU4OTRlZjQ3 NGU5MDNhYTI0NWViZjJkOTVjY2E3MDZhOS4uZWRhZjZmNDNjNTVlZTM4ZDZjNDg3MTE0NjkyZjdl YTg4YjQ1ZTA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTAxLTIzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgV0tW aWV3Lm1tIGEgbGl0dGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjc1MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmUgYW4gdW51c2VkIGl2YXIgYW5kIG1pZ3JhdGUgdG8gQVBJIGNvbnN0YW50 cyB0aGF0IHdlcmUgYWRkZWQgaW4gTGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IHNldEZyYW1lU2l6ZTpdKToKKyAgICAgICAg KC1bV0tWaWV3IGFkZFdpbmRvd09ic2VydmVyc0ZvcldpbmRvdzpdKToKKyAgICAgICAgKC1bV0tW aWV3IHJlbW92ZVdpbmRvd09ic2VydmVyc10pOgorICAgICAgICAoLVtXS1ZpZXcgdmlld0RpZE1v dmVUb1dpbmRvd10pOgorICAgICAgICAoLVtXS1ZpZXcgX3dpbmRvd0RpZE1pbmlhdHVyaXplOl0p OgorICAgICAgICAoLVtXS1ZpZXcgX3dpbmRvd0RpZFJlc2l6ZTpdKToKKyAgICAgICAgKC1bV0tW aWV3IF93aW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVydGllczpdKToKKworMjAxNC0wMS0yMyAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFRyeSB0byBm aXggdGhlIDMyLWJpdCBidWlsZC4KIAogICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQ cmVmZXJlbmNlcy5tbToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQppbmRleCBkMjAzNzM3ZjA0ZGE1NDJiZDI2ODJkMzQzNzJkYTE1YjNmNjhlNmY1Li41YTNkMzA4 YmYzMzA1ZjMzNTU4MWQ0OGE4ZTkyOGRmNzhhODk2YWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC0yMDMsMTIgKzIwMyw2IEBAIHN0cnVjdCBXS1Zp ZXdJbnRlcnByZXRLZXlFdmVudHNQYXJhbWV0ZXJzIHsKICAgICBCT09MIF9uZWVkc1ZpZXdGcmFt ZUluV2luZG93Q29vcmRpbmF0ZXM7CiAgICAgQk9PTCBfZGlkU2NoZWR1bGVXaW5kb3dBbmRWaWV3 RnJhbWVVcGRhdGU7CiAKLSAgICAvLyBXaGV0aGVyIHRoZSBjb250YWluaW5nIHdpbmRvdyBvZiB0 aGUgV0tWaWV3IGhhcyBhIHZhbGlkIGJhY2tpbmcgc3RvcmUuCi0gICAgLy8gVGhlIHdpbmRvdyBz ZXJ2ZXIgaW52YWxpZGF0ZXMgdGhlIGJhY2tpbmcgc3RvcmUgd2hlbmV2ZXIgdGhlIHdpbmRvdyBp cyByZXNpemVkIG9yIG1pbmltaXplZC4KLSAgICAvLyBXZSB1c2UgdGhpcyBmbGFnIHRvIGRldGVy bWluZSB3aGVuIHdlIG5lZWQgdG8gcGFpbnQgdGhlIGJhY2tncm91bmQgKHdoaXRlIG9yIGNsZWFy KQotICAgIC8vIHdoZW4gdGhlIHdlYiBwcm9jZXNzIGlzIHVucmVzcG9uc2l2ZSBvciB0YWtlcyB0 b28gbG9uZyB0byBwYWludC4KLSAgICBCT09MIF93aW5kb3dIYXNWYWxpZEJhY2tpbmdTdG9yZTsK LQogICAgIFJldGFpblB0cjxOU0NvbG9yU3BhY2U+IF9jb2xvclNwYWNlOwogCiAgICAgUmVmUHRy PFdlYkNvcmU6OkltYWdlPiBfcHJvbWlzZWRJbWFnZTsKQEAgLTQwNCw5ICszOTgsNiBAQCBzdHJ1 Y3QgV0tWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYW1ldGVycyB7CiAKIC0gKHZvaWQpc2V0RnJh bWVTaXplOihOU1NpemUpc2l6ZQogewotICAgIGlmICghTlNFcXVhbFNpemVzKHNpemUsIFtzZWxm IGZyYW1lXS5zaXplKSkKLSAgICAgICAgX2RhdGEtPl93aW5kb3dIYXNWYWxpZEJhY2tpbmdTdG9y ZSA9IE5POwotCiAgICAgW3N1cGVyIHNldEZyYW1lU2l6ZTpzaXplXTsKIAogICAgIGlmICghW3Nl bGYgZnJhbWVTaXplVXBkYXRlc0Rpc2FibGVkXSkgewpAQCAtMTgxNywxMCArMTgwOCw2IEBAIHN0 YXRpYyB2b2lkIGNyZWF0ZVNhbmRib3hFeHRlbnNpb25zRm9yRmlsZVVwbG9hZChOU1Bhc3RlYm9h cmQgKnBhc3RlYm9hcmQsIFNhbmRiCiAgICAgcmV0dXJuIE5TTW91c2VJblJlY3QobG9jYWxQb2lu dCwgdmlzaWJsZVRodW1iUmVjdCwgW3NlbGYgaXNGbGlwcGVkXSk7CiB9CiAKLS8vIEZJWE1FOiBV c2UgQXBwS2l0IGNvbnN0YW50cyBmb3IgdGhlc2Ugd2hlbiB0aGV5IGFyZSBhdmFpbGFibGUuCi1z dGF0aWMgTlNTdHJpbmcgKiBjb25zdCB3aW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVydGllc05v dGlmaWNhdGlvbiA9IEAiTlNXaW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVydGllc05vdGlmaWNh dGlvbiI7Ci1zdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBiYWNraW5nUHJvcGVydHlPbGRTY2FsZUZh Y3RvcktleSA9IEAiTlNCYWNraW5nUHJvcGVydHlPbGRTY2FsZUZhY3RvcktleSI7Ci0KIC0gKHZv aWQpYWRkV2luZG93T2JzZXJ2ZXJzRm9yV2luZG93OihOU1dpbmRvdyAqKXdpbmRvdwogewogICAg IGlmICh3aW5kb3cpIHsKQEAgLTE4NDEsNyArMTgyOCw3IEBAIHN0YXRpYyBOU1N0cmluZyAqIGNv bnN0IGJhY2tpbmdQcm9wZXJ0eU9sZFNjYWxlRmFjdG9yS2V5ID0gQCJOU0JhY2tpbmdQcm9wZXJ0 eU9sCiAgICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2Jz ZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX3dpbmRvd0RpZE9yZGVyT25TY3JlZW46KSAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmFt ZTpAIl9OU1dpbmRvd0RpZEJlY29tZVZpc2libGUiIG9iamVjdDp3aW5kb3ddOwogICAgICAgICBb W05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2Vs ZWN0b3I6QHNlbGVjdG9yKF93aW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVydGllczopCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5hbWU6d2lu ZG93RGlkQ2hhbmdlQmFja2luZ1Byb3BlcnRpZXNOb3RpZmljYXRpb24gb2JqZWN0OndpbmRvd107 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5h bWU6TlNXaW5kb3dEaWRDaGFuZ2VCYWNraW5nUHJvcGVydGllc05vdGlmaWNhdGlvbiBvYmplY3Q6 d2luZG93XTsKICAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBh ZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rvcihfd2luZG93RGlkQ2hhbmdlU2NyZWVu OikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bmFtZTpOU1dpbmRvd0RpZENoYW5nZVNjcmVlbk5vdGlmaWNhdGlvbiBvYmplY3Q6d2luZG93XTsK ICNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKQEAgLTE4NjYsNyAr MTg1Myw3IEBAIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGJhY2tpbmdQcm9wZXJ0eU9sZFNjYWxl RmFjdG9yS2V5ID0gQCJOU0JhY2tpbmdQcm9wZXJ0eU9sCiAgICAgW1tOU05vdGlmaWNhdGlvbkNl bnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmIG5hbWU6QCJOU1dpbmRvd1dp bGxPcmRlck9mZlNjcmVlbk5vdGlmaWNhdGlvbiIgb2JqZWN0OndpbmRvd107CiAgICAgW1tOU05v dGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmIG5hbWU6 QCJOU1dpbmRvd0RpZE9yZGVyT2ZmU2NyZWVuTm90aWZpY2F0aW9uIiBvYmplY3Q6d2luZG93XTsK ICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVy OnNlbGYgbmFtZTpAIl9OU1dpbmRvd0RpZEJlY29tZVZpc2libGUiIG9iamVjdDp3aW5kb3ddOwot ICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6 c2VsZiBuYW1lOndpbmRvd0RpZENoYW5nZUJhY2tpbmdQcm9wZXJ0aWVzTm90aWZpY2F0aW9uIG9i amVjdDp3aW5kb3ddOworICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0g cmVtb3ZlT2JzZXJ2ZXI6c2VsZiBuYW1lOk5TV2luZG93RGlkQ2hhbmdlQmFja2luZ1Byb3BlcnRp ZXNOb3RpZmljYXRpb24gb2JqZWN0OndpbmRvd107CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmIG5hbWU6TlNXaW5kb3dEaWRDaGFu Z2VTY3JlZW5Ob3RpZmljYXRpb24gb2JqZWN0OndpbmRvd107CiAjaWYgX19NQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCA+PSAxMDkwCiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZh dWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmIG5hbWU6TlNXaW5kb3dEaWRDaGFuZ2VPY2Ns dXNpb25TdGF0ZU5vdGlmaWNhdGlvbiBvYmplY3Q6d2luZG93XTsKQEAgLTE4ODgsNyArMTg3NSw2 IEBAIHN0YXRpYyBOU1N0cmluZyAqIGNvbnN0IGJhY2tpbmdQcm9wZXJ0eU9sZFNjYWxlRmFjdG9y S2V5ID0gQCJOU0JhY2tpbmdQcm9wZXJ0eU9sCiAtICh2b2lkKXZpZXdEaWRNb3ZlVG9XaW5kb3cK IHsKICAgICBpZiAoW3NlbGYgd2luZG93XSkgewotICAgICAgICBfZGF0YS0+X3dpbmRvd0hhc1Zh bGlkQmFja2luZ1N0b3JlID0gTk87CiAgICAgICAgIFtzZWxmIGRvV2luZG93RGlkQ2hhbmdlU2Ny ZWVuXTsKIAogICAgICAgICBWaWV3U3RhdGU6OkZsYWdzIHZpZXdTdGF0ZUNoYW5nZXMgPSBWaWV3 U3RhdGU6OldpbmRvd0lzQWN0aXZlIHwgVmlld1N0YXRlOjpJc1Zpc2libGU7CkBAIC0xOTU1LDcg KzE5NDEsNiBAQCBzdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBiYWNraW5nUHJvcGVydHlPbGRTY2Fs ZUZhY3RvcktleSA9IEAiTlNCYWNraW5nUHJvcGVydHlPbAogCiAtICh2b2lkKV93aW5kb3dEaWRN aW5pYXR1cml6ZTooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KIHsKLSAgICBfZGF0YS0+ X3dpbmRvd0hhc1ZhbGlkQmFja2luZ1N0b3JlID0gTk87CiAgICAgX2RhdGEtPl9wYWdlLT52aWV3 U3RhdGVEaWRDaGFuZ2UoVmlld1N0YXRlOjpJc1Zpc2libGUpOwogfQogCkBAIC0xOTcxLDggKzE5 NTYsNiBAQCBzdGF0aWMgTlNTdHJpbmcgKiBjb25zdCBiYWNraW5nUHJvcGVydHlPbGRTY2FsZUZh Y3RvcktleSA9IEAiTlNCYWNraW5nUHJvcGVydHlPbAogCiAtICh2b2lkKV93aW5kb3dEaWRSZXNp emU6KE5TTm90aWZpY2F0aW9uICopbm90aWZpY2F0aW9uCiB7Ci0gICAgX2RhdGEtPl93aW5kb3dI YXNWYWxpZEJhY2tpbmdTdG9yZSA9IE5POwotCiAgICAgW3NlbGYgX3VwZGF0ZVdpbmRvd0FuZFZp ZXdGcmFtZXNdOwogfQogCkBAIC0xOTg4LDEyICsxOTcxLDExIEBAIHN0YXRpYyBOU1N0cmluZyAq IGNvbnN0IGJhY2tpbmdQcm9wZXJ0eU9sZFNjYWxlRmFjdG9yS2V5ID0gQCJOU0JhY2tpbmdQcm9w ZXJ0eU9sCiAKIC0gKHZvaWQpX3dpbmRvd0RpZENoYW5nZUJhY2tpbmdQcm9wZXJ0aWVzOihOU05v dGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgogewotICAgIENHRmxvYXQgb2xkQmFja2luZ1NjYWxl RmFjdG9yID0gW1tub3RpZmljYXRpb24udXNlckluZm8gb2JqZWN0Rm9yS2V5OmJhY2tpbmdQcm9w ZXJ0eU9sZFNjYWxlRmFjdG9yS2V5XSBkb3VibGVWYWx1ZV07Ci0gICAgQ0dGbG9hdCBuZXdCYWNr aW5nU2NhbGVGYWN0b3IgPSBbc2VsZiBfaW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3JdOyAKKyAg ICBDR0Zsb2F0IG9sZEJhY2tpbmdTY2FsZUZhY3RvciA9IFtub3RpZmljYXRpb24udXNlckluZm9b TlNCYWNraW5nUHJvcGVydHlPbGRTY2FsZUZhY3RvcktleV0gZG91YmxlVmFsdWVdOworICAgIENH RmxvYXQgbmV3QmFja2luZ1NjYWxlRmFjdG9yID0gW3NlbGYgX2ludHJpbnNpY0RldmljZVNjYWxl RmFjdG9yXTsKICAgICBpZiAob2xkQmFja2luZ1NjYWxlRmFjdG9yID09IG5ld0JhY2tpbmdTY2Fs ZUZhY3RvcikKICAgICAgICAgcmV0dXJuOyAKIAotICAgIF9kYXRhLT5fd2luZG93SGFzVmFsaWRC YWNraW5nU3RvcmUgPSBOTzsKICAgICBfZGF0YS0+X3BhZ2UtPnNldEludHJpbnNpY0RldmljZVNj YWxlRmFjdG9yKG5ld0JhY2tpbmdTY2FsZUZhY3Rvcik7CiB9CiAK