133039 2014-05-17 18:55:27 -0700 [iOS][WK2] Fix some state reset on crash on WKWebView 2014-05-25 17:05:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin oldest_to_newest 1010023 0 benjamin 2014-05-17 18:55:27 -0700 [iOS][WK2] Fix some state reset on crash on the WKWebView/WKContentView 1010026 1 231644 benjamin 2014-05-17 19:10:59 -0700 Created attachment 231644 Patch 1011603 2 benjamin 2014-05-25 17:05:19 -0700 Committed r169326: <http://trac.webkit.org/changeset/169326> 231644 2014-05-17 19:10:59 -0700 2014-05-25 15:09:00 -0700 Patch bug-133039-20140517191035.patch text/plain 5592 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4OTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjY2M2U4Yjc1ZTAzMTIx NTlkNWYzNjFlZDcyNjUwNDRiNDgzNWZiZi4uMGFjM2FhM2YzYWQzNWRhZGJjZWJkN2ZhNWY0MTM3 ZGUyYzEzZmViMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA1LTE3ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBbaU9TXVtXSzJd IEZpeCBzb21lIHN0YXRlIHJlc2V0IG9uIGNyYXNoIG9uIHRoZSBXS1dlYlZpZXcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzAzOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gbm8gd2F5 IGNvbXBsZXRlLCBidXQgdGhpcyBzaG91bGQgcmVkdWNlIHRoZSB1bmRlZmluZWQgc3RhdGVzIG9u IGNyYXNoLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06Cisg ICAgICAgICgtW1dLV2ViVmlldyBfcHJvY2Vzc0RpZEV4aXRdKToKKyAgICAgICAgSWYgdGhlIHZp ZXcgaXMgYW5pbWF0aW5nLCBudWtlIHRoZSByZXNpemUgYW5pbWF0aW9uLiBUaGF0IHNob3VsZCBi ZSBpbnZpc2libGUgdG8gdGhlIHVzZXIKKyAgICAgICAgYmVjYXVzZSB0aGUgYmFja2dyb3VuZCBj b2xvciBpcyByZXNldCB0byB3aGl0ZSBiZWxvdy4KKworICAgICAgICBSZXNldCB0aGUgY29udGVu dFZpZXcgZnJhbWUgYW5kIHNjcm9sbHZpZXcgc3RhdGUuCisKKyAgICAgICAgUmVzZXQgdGhlIHJ1 bnRpbWUgc3RhdGVzLiBXZSBkbyBub3Qgc3RyaWN0bHkgbmVlZCB0byByZXNldCBfbmVlZHNSZXNl dFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSwKKyAgICAgICAgX2RlbGF5VXBk YXRlVmlzaWJsZUNvbnRlbnRSZWN0cyBhbmQgX2hhZERlbGF5ZWRVcGRhdGVWaXNpYmxlQ29udGVu dFJlY3RzIGJ1dCBpdCBzZWVtcyBiZXR0ZXIgdG8gaGF2ZQorICAgICAgICBhIGNsZWFuIHNsYXRl LgorCisgICAgICAgICgtW1dLV2ViVmlldyBfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVz Ol0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2VuZEFuaW1hdGVkUmVzaXplXSk6CisgICAgICAg IFdlIGNvdWxkIGhhdmUgY3Jhc2hlcyBkdXJpbmcgcm90YXRpb24uIFRvIHNpbXBsaWZ5IHRoZSBy ZXNldCBjb2RlLCB0aGUgYW5pbWF0ZWQgcmVzaXplIGNvZGUKKyAgICAgICAgbm8gbG9uZ2VyIGNo YW5nZSBhbnkgc3RhdGUgd2hlbiBXS1dlYlZpZXcgaXMgdXNpbmcgYSBjdXN0b20gY29udGVudCB2 aWV3LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW06CisgICAgICAg IChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpwcm9jZXNzRGlkRXhpdCk6CisgICAgICAgIFNlbmQg YSBfcHJvY2Vzc0RpZEV4aXQgb24gdGhlIFdLV2ViVmlldyB0b28uCisKIDIwMTQtMDUtMTcgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBsYWNlIFdL Q29udGV4dFNldERhdGFiYXNlRGlyZWN0b3J5IHdpdGggdHdvIFdLQ29udGV4dENvbmZpZ3VyYXRp b24gcGFyYW1ldGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbQppbmRleCAxYzlkYzI0MTZhZWM4OGJjYmIzZGE3ZDFiYzc5NWUyNDllYjgyMDM0 Li43OTcxYmE0Y2MzZGIwNDdiZTBkOGExZDc1OTJjYzRiMjc2YzQ2YmNjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtNDgwLDYgKzQ4 MCwyOSBAQCBzdGF0aWMgQ0dGbG9hdCBjb250ZW50Wm9vbVNjYWxlKFdLV2ViVmlldyogd2ViVmll dykKICAgICBbX3Njcm9sbFZpZXcgc2V0QmFja2dyb3VuZENvbG9yOnVpQmFja2dyb3VuZENvbG9y LmdldCgpXTsKIH0KIAorLSAodm9pZClfcHJvY2Vzc0RpZEV4aXQKK3sKKyAgICBpZiAoIV9jdXN0 b21Db250ZW50VmlldyAmJiBfaXNBbmltYXRpbmdSZXNpemUpIHsKKyAgICAgICAgTlNVSW50ZWdl ciBpbmRleE9mUmVzaXplQW5pbWF0aW9uVmlldyA9IFtbX3Njcm9sbFZpZXcgc3Vidmlld3NdIGlu ZGV4T2ZPYmplY3Q6X3Jlc2l6ZUFuaW1hdGlvblZpZXcuZ2V0KCldOworICAgICAgICBbX3Njcm9s bFZpZXcgaW5zZXJ0U3VidmlldzpfY29udGVudFZpZXcuZ2V0KCkgYXRJbmRleDppbmRleE9mUmVz aXplQW5pbWF0aW9uVmlld107CisgICAgICAgIFtfcmVzaXplQW5pbWF0aW9uVmlldyByZW1vdmVG cm9tU3VwZXJ2aWV3XTsKKyAgICAgICAgX3Jlc2l6ZUFuaW1hdGlvblZpZXcgPSBuaWw7CisKKyAg ICAgICAgX2lzQW5pbWF0aW5nUmVzaXplID0gTk87CisgICAgICAgIF9yZXNpemVBbmltYXRpb25U cmFuc2Zvcm1BZGp1c3RtZW50cyA9IENBVHJhbnNmb3JtM0RJZGVudGl0eTsKKyAgICB9CisgICAg W19jb250ZW50VmlldyBzZXRGcmFtZTpzZWxmLmJvdW5kc107CisgICAgW19zY3JvbGxWaWV3IHNl dEJhY2tncm91bmRDb2xvcjpbVUlDb2xvciB3aGl0ZUNvbG9yXV07CisgICAgW19zY3JvbGxWaWV3 IHNldENvbnRlbnRPZmZzZXQ6Q0dQb2ludE1ha2UoLV9vYnNjdXJlZEluc2V0cy5sZWZ0LCAtX29i c2N1cmVkSW5zZXRzLnRvcCldOworICAgIFtfc2Nyb2xsVmlldyBzZXRab29tU2NhbGU6MV07CisK KyAgICBfdmlld3BvcnRNZXRhVGFnV2lkdGggPSAtMTsKKyAgICBfbmVlZHNSZXNldFZpZXdTdGF0 ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSA9IE5POworICAgIF9zY3JvbGxWaWV3QmFja2dy b3VuZENvbG9yID0gV2ViQ29yZTo6Q29sb3IoKTsKKyAgICBfZGVsYXlVcGRhdGVWaXNpYmxlQ29u dGVudFJlY3RzID0gTk87CisgICAgX2hhZERlbGF5ZWRVcGRhdGVWaXNpYmxlQ29udGVudFJlY3Rz ID0gTk87Cit9CisKIC0gKHZvaWQpX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWUKIHsKICAgICBf bmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSA9IFlFUzsKQEAg LTE1MjAsNiArMTU0MywxMiBAQCBzdGF0aWMgaW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9G aW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyB3a0ZpbmRPcHRpb25zKQogLSAodm9pZClfYmVnaW5B bmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogewog ICAgIF9pc0FuaW1hdGluZ1Jlc2l6ZSA9IFlFUzsKKworICAgIGlmIChfY3VzdG9tQ29udGVudFZp ZXcpIHsKKyAgICAgICAgdXBkYXRlQmxvY2soKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwog ICAgIF9yZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50cyA9IENBVHJhbnNmb3JtM0RJ ZGVudGl0eTsKIAogICAgIE5TVUludGVnZXIgaW5kZXhPZkNvbnRlbnRWaWV3ID0gW1tfc2Nyb2xs VmlldyBzdWJ2aWV3c10gaW5kZXhPZk9iamVjdDpfY29udGVudFZpZXcuZ2V0KCldOwpAQCAtMTUz Niw5ICsxNTY1LDYgQEAgc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmluZE9w dGlvbnMoX1dLRmluZE9wdGlvbnMgd2tGaW5kT3B0aW9ucykKIAogICAgIHVwZGF0ZUJsb2NrKCk7 CiAKLSAgICBpZiAoX2N1c3RvbUNvbnRlbnRWaWV3KQotICAgICAgICByZXR1cm47Ci0KICAgICBD R1JlY3QgbmV3Qm91bmRzID0gc2VsZi5ib3VuZHM7CiAgICAgQ0dTaXplIG5ld01pbmltdW1MYXlv dXRTaXplID0gbmV3Qm91bmRzLnNpemU7CiAgICAgaWYgKF9oYXNTdGF0aWNNaW5pbXVtTGF5b3V0 U2l6ZSkKQEAgLTE1OTksNyArMTYyNSw3IEBAIHN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0 aW9ucyB0b0ZpbmRPcHRpb25zKF9XS0ZpbmRPcHRpb25zIHdrRmluZE9wdGlvbnMpCiAKIC0gKHZv aWQpX2VuZEFuaW1hdGVkUmVzaXplCiB7Ci0gICAgaWYgKCFfY3VzdG9tQ29udGVudFZpZXcpIHsK KyAgICBpZiAoIV9jdXN0b21Db250ZW50VmlldyAmJiBfaXNBbmltYXRpbmdSZXNpemUpIHsKICAg ICAgICAgTlNVSW50ZWdlciBpbmRleE9mUmVzaXplQW5pbWF0aW9uVmlldyA9IFtbX3Njcm9sbFZp ZXcgc3Vidmlld3NdIGluZGV4T2ZPYmplY3Q6X3Jlc2l6ZUFuaW1hdGlvblZpZXcuZ2V0KCldOwog ICAgICAgICBbX3Njcm9sbFZpZXcgaW5zZXJ0U3VidmlldzpfY29udGVudFZpZXcuZ2V0KCkgYXRJ bmRleDppbmRleE9mUmVzaXplQW5pbWF0aW9uVmlld107CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaAppbmRleCA5ZmEx OTlhNzE5Y2RiMDM0NjIwZDA4NzU2MjM1NzQ5MTYyYWNmMjAwLi5kOGQ4Y2VkYTY4YWNjNDVlNzgw YjA4Njc3ZmI2MzFmZDZkZDg1ODBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCkBAIC01OCw2ICs1OCw4IEBAIHN0 cnVjdCBWaWV3U25hcHNob3Q7CiB9CiAKICNpZiBQTEFURk9STShJT1MpCistICh2b2lkKV9wcm9j ZXNzRGlkRXhpdDsKKwogLSAodm9pZClfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZTsKIC0gKHZv aWQpX2RpZENvbW1pdExheWVyVHJlZTooY29uc3QgV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFu c2FjdGlvbiYpbGF5ZXJUcmVlVHJhbnNhY3Rpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCmluZGV4IDUyYjVkYTUwYWMzNjdmMTY3 MTM4ZGU1MGY2NDNkNzMwNmYwYjk2YTEuLjdiMzBkOTRjYzAwMzQ1MjJmZmVmM2NjZmJiMGQxNTli M2U4NjI4MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNs aWVudEltcGxJT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xp ZW50SW1wbElPUy5tbQpAQCAtMTQxLDYgKzE0MSw3IEBAIGJvb2wgUGFnZUNsaWVudEltcGw6Omlz VmlzdWFsbHlJZGxlKCkKIHZvaWQgUGFnZUNsaWVudEltcGw6OnByb2Nlc3NEaWRFeGl0KCkKIHsK ICAgICBbbV9jb250ZW50VmlldyBfcHJvY2Vzc0RpZEV4aXRdOworICAgIFttX3dlYlZpZXcgX3By b2Nlc3NEaWRFeGl0XTsKIH0KIAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlkUmVsYXVuY2hQcm9j ZXNzKCkK