128263 2014-02-05 11:49:29 -0800 FrameLoader::stateMachine() should return a reference. 2014-02-05 12:37:51 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue japhet oldest_to_newest 977018 0 kling 2014-02-05 11:49:29 -0800 FrameLoader::stateMachine() should return a reference. 977019 1 223253 kling 2014-02-05 11:49:55 -0800 Created attachment 223253 Patch 977038 2 223253 commit-queue 2014-02-05 12:37:49 -0800 Comment on attachment 223253 Patch Clearing flags on attachment: 223253 Committed r163466: <http://trac.webkit.org/changeset/163466> 977039 3 commit-queue 2014-02-05 12:37:51 -0800 All reviewed patches have been landed. Closing bug. 223253 2014-02-05 11:49:55 -0800 2014-02-05 12:37:49 -0800 Patch bug-128263.diff text/plain 15099 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwN2ExYjIyLi5iMDg4MTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDMg QEAKIDIwMTQtMDItMDUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIEZyYW1lTG9hZGVyOjpzdGF0ZU1hY2hpbmUoKSBzaG91bGQgcmV0dXJuIGEgcmVmZXJlbmNl LgorICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTI4MjYzPgorCisgICAgICAgIFRoZXJl IGlzIGFsd2F5cyBhIEZyYW1lTG9hZGVyU3RhdGVNYXRjaGluZSwgc28gcmV0dXJuIGl0IGJ5Cisg ICAgICAgIHJlZmVyZW5jZSBzaW5jZSBpdCBjYW4gbmV2ZXIgYmUgbnVsbC4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGhpc3RvcnkvUGFnZUNhY2hl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvZ0NhbkNhY2hlUGFnZURlY2lzaW9uKToKKyAgICAg ICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnRMb2FkZXI6OmZpbmlzaGVkTG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExv YWRlcjo6Y29tbWl0RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudExvYWRlcjo6bWF5 YmVMb2FkRW1wdHkpOgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFdyaXRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudFdyaXRlcjo6Y3JlYXRlRG9jdW1lbnQpOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRXcml0ZXI6OmJlZ2luKToKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnByZXBhcmVGb3JIaXN0 b3J5TmF2aWdhdGlvbik6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c3RhdGVNYWNoaW5lKToKKyAgICAgICAgKiBsb2FkZXIv SGlzdG9yeUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xs ZXI6OnJlc3RvcmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpIaXN0b3J5Q29udHJvbGxlcjo6c2F2ZURvY3VtZW50U3RhdGUpOgorICAgICAgICAqIGxvYWRl ci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5hdmlnYXRpb25T Y2hlZHVsZXI6OnNjaGVkdWxlTG9jYXRpb25DaGFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6TmF2 aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVGb3JtU3VibWlzc2lvbik6CisgICAgICAgICogbG9h ZGVyL1Byb2dyZXNzVHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNr ZXI6OmluY3JlbWVudFByb2dyZXNzKToKKyAgICAgICAgKiBsb2FkZXIvY2FjaGUvQ2FjaGVkUmVz b3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVzb3VyY2VMb2FkZXI6 OnN0b3JlUmVzb3VyY2VUaW1pbmdJbml0aWF0b3JJbmZvcm1hdGlvbik6CisgICAgICAgICogcGFn ZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6aW5qZWN0VXNlclNjcmlwdHMp OgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6cXVhbGlmaWVzQXNWaXN1YWxseU5vbkVtcHR5KToKKworMjAxNC0wMi0wNSAgQW5kcmVh cyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKICAgICAgICAgQ1RURTogSW1hZ2VMb2FkZXIg aXMgYWx3YXlzIG93bmVkIGJ5IGFuIEVsZW1lbnQuCiAgICAgICAgIDxodHRwczovL3dlYmtpdC5v cmcvYi8xMjgyNTQ+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNh Y2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmNwcAppbmRleCBkNzhm YTEyLi5iNDhiZjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNo ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9QYWdlQ2FjaGUuY3BwCkBAIC0yMTcs NyArMjE3LDcgQEAgQ09NUElMRV9BU1NFUlQoTnVtYmVyT2ZSZWFzb25zUGFnZXNDYW5ub3RCZUlu UGFnZUNhY2hlIDw9IHNpemVvZih1bnNpZ25lZCkqOCwgUmUKIHN0YXRpYyB2b2lkIGxvZ0NhbkNh Y2hlUGFnZURlY2lzaW9uKFBhZ2UqIHBhZ2UpCiB7CiAgICAgLy8gT25seSBib3RoZXIgbG9nZ2lu ZyBmb3IgbWFpbiBmcmFtZXMgdGhhdCBoYXZlIGFjdHVhbGx5IGxvYWRlZCBhbmQgaGF2ZSBjb250 ZW50LgotICAgIGlmIChwYWdlLT5tYWluRnJhbWUoKS5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS0+ Y3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpKQorICAgIGlmIChwYWdlLT5tYWluRnJhbWUo KS5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkp CiAgICAgICAgIHJldHVybjsKICAgICBVUkwgY3VycmVudFVSTCA9IHBhZ2UtPm1haW5GcmFtZSgp LmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkgPyBwYWdlLT5tYWluRnJhbWUoKS5sb2FkZXIoKS5k b2N1bWVudExvYWRlcigpLT51cmwoKSA6IFVSTCgpOwogICAgIGlmIChjdXJyZW50VVJMLmlzRW1w dHkoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDVkMGEw ODUuLmZmNTU2YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExv YWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcApA QCAtNDQwLDcgKzQ0MCw3IEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmZpbmlzaGVkTG9hZGluZyhk b3VibGUgZmluaXNoVGltZSkKICAgICBpZiAoIW1fbWFpbkRvY3VtZW50RXJyb3IuaXNOdWxsKCkp CiAgICAgICAgIHJldHVybjsKICAgICBjbGVhck1haW5SZXNvdXJjZUxvYWRlcigpOwotICAgIGlm ICghZnJhbWVMb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmNyZWF0aW5nSW5pdGlhbEVtcHR5RG9j dW1lbnQoKSkKKyAgICBpZiAoIWZyYW1lTG9hZGVyKCktPnN0YXRlTWFjaGluZSgpLmNyZWF0aW5n SW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKICAgICAgICAgZnJhbWVMb2FkZXIoKS0+Y2hlY2tMb2Fk Q29tcGxldGUoKTsKIAogICAgIC8vIElmIHRoZSBkb2N1bWVudCBzcGVjaWZpZWQgYW4gYXBwbGlj YXRpb24gY2FjaGUgbWFuaWZlc3QsIGl0IHZpb2xhdGVzIHRoZSBhdXRob3IncyBpbnRlbnQgaWYg d2Ugc3RvcmUgaXQgaW4gdGhlIG1lbW9yeSBjYWNoZQpAQCAtODAwLDcgKzgwMCw3IEBAIHZvaWQg RG9jdW1lbnRMb2FkZXI6OmNvbW1pdERhdGEoY29uc3QgY2hhciogYnl0ZXMsIHNpemVfdCBsZW5n dGgpCiAgICAgICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5zZWN1cml0eU9yaWdpbigpLT5n cmFudExvYWRMb2NhbFJlc291cmNlcygpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGZyYW1l TG9hZGVyKCktPnN0YXRlTWFjaGluZSgpLT5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkp CisgICAgICAgIGlmIChmcmFtZUxvYWRlcigpLT5zdGF0ZU1hY2hpbmUoKS5jcmVhdGluZ0luaXRp YWxFbXB0eURvY3VtZW50KCkpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIAogI2lmIEVO QUJMRShNSFRNTCkKQEAgLTEzODIsNyArMTM4Miw3IEBAIGJvb2wgRG9jdW1lbnRMb2FkZXI6Om1h eWJlTG9hZEVtcHR5KCkKICAgICBpZiAoIXNob3VsZExvYWRFbXB0eSAmJiAhZnJhbWVMb2FkZXIo KS0+Y2xpZW50KCkucmVwcmVzZW50YXRpb25FeGlzdHNGb3JVUkxTY2hlbWUobV9yZXF1ZXN0LnVy bCgpLnByb3RvY29sKCkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9yZXF1 ZXN0LnVybCgpLmlzRW1wdHkoKSAmJiAhZnJhbWVMb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmNy ZWF0aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKKyAgICBpZiAobV9yZXF1ZXN0LnVybCgpLmlz RW1wdHkoKSAmJiAhZnJhbWVMb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCkuY3JlYXRpbmdJbml0aWFs RW1wdHlEb2N1bWVudCgpKQogICAgICAgICBtX3JlcXVlc3Quc2V0VVJMKGJsYW5rVVJMKCkpOwog ICAgIFN0cmluZyBtaW1lVHlwZSA9IHNob3VsZExvYWRFbXB0eSA/ICJ0ZXh0L2h0bWwiIDogZnJh bWVMb2FkZXIoKS0+Y2xpZW50KCkuZ2VuZXJhdGVkTUlNRVR5cGVGb3JVUkxTY2hlbWUobV9yZXF1 ZXN0LnVybCgpLnByb3RvY29sKCkpOwogICAgIG1fcmVzcG9uc2UgPSBSZXNvdXJjZVJlc3BvbnNl KG1fcmVxdWVzdC51cmwoKSwgbWltZVR5cGUsIDAsIFN0cmluZygpLCBTdHJpbmcoKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50V3JpdGVyLmNwcAppbmRleCA3NDJlYjk5Li45Y2NkMzI0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAKQEAgLTEwNCw3ICsx MDQsNyBAQCB2b2lkIERvY3VtZW50V3JpdGVyOjpiZWdpbigpCiAKIFBhc3NSZWZQdHI8RG9jdW1l bnQ+IERvY3VtZW50V3JpdGVyOjpjcmVhdGVEb2N1bWVudChjb25zdCBVUkwmIHVybCkKIHsKLSAg ICBpZiAoIW1fZnJhbWUtPmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLT5pc0Rpc3BsYXlpbmdJbml0 aWFsRW1wdHlEb2N1bWVudCgpICYmIG1fZnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLnNob3VsZEFs d2F5c1VzZVBsdWdpbkRvY3VtZW50KG1fbWltZVR5cGUpKQorICAgIGlmICghbV9mcmFtZS0+bG9h ZGVyKCkuc3RhdGVNYWNoaW5lKCkuaXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSAm JiBtX2ZyYW1lLT5sb2FkZXIoKS5jbGllbnQoKS5zaG91bGRBbHdheXNVc2VQbHVnaW5Eb2N1bWVu dChtX21pbWVUeXBlKSkKICAgICAgICAgcmV0dXJuIFBsdWdpbkRvY3VtZW50OjpjcmVhdGUobV9m cmFtZSwgdXJsKTsKICNpZiBQTEFURk9STShJT1MpCiAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNl KG1fbWltZVR5cGUsICJhcHBsaWNhdGlvbi9wZGYiKSkKQEAgLTEzMyw3ICsxMzMsNyBAQCB2b2lk IERvY3VtZW50V3JpdGVyOjpiZWdpbihjb25zdCBVUkwmIHVybFJlZmVyZW5jZSwgYm9vbCBkaXNw YXRjaCwgRG9jdW1lbnQqIG93bgogCiAgICAgLy8gRklYTUU6IERvIHdlIG5lZWQgdG8gY29uc3Vs dCB0aGUgY29udGVudCBzZWN1cml0eSBwb2xpY3kgaGVyZSBhYm91dCBibG9ja2VkIHBsdWctaW5z PwogCi0gICAgYm9vbCBzaG91bGRSZXVzZURlZmF1bHRWaWV3ID0gbV9mcmFtZS0+bG9hZGVyKCku c3RhdGVNYWNoaW5lKCktPmlzRGlzcGxheWluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgJiYgbV9m cmFtZS0+ZG9jdW1lbnQoKS0+aXNTZWN1cmVUcmFuc2l0aW9uVG8odXJsKTsKKyAgICBib29sIHNo b3VsZFJldXNlRGVmYXVsdFZpZXcgPSBtX2ZyYW1lLT5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5p c0Rpc3BsYXlpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpICYmIG1fZnJhbWUtPmRvY3VtZW50KCkt PmlzU2VjdXJlVHJhbnNpdGlvblRvKHVybCk7CiAgICAgaWYgKHNob3VsZFJldXNlRGVmYXVsdFZp ZXcpCiAgICAgICAgIGRvY3VtZW50LT50YWtlRE9NV2luZG93RnJvbShtX2ZyYW1lLT5kb2N1bWVu dCgpKTsKICAgICBlbHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCA5 YzU0OWY1Li5mMDM5OTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAg LTExNjcsOSArMTE2Nyw5IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnByZXBhcmVGb3JIaXN0b3J5TmF2 aWdhdGlvbigpCiAgICAgICAgIGhpc3RvcnkoKS5zZXRDdXJyZW50SXRlbShjdXJyZW50SXRlbS5n ZXQoKSk7CiAgICAgICAgIG1fZnJhbWUucGFnZSgpLT5iYWNrRm9yd2FyZCgpLnNldEN1cnJlbnRJ dGVtKGN1cnJlbnRJdGVtLmdldCgpKTsKIAotICAgICAgICBBU1NFUlQoc3RhdGVNYWNoaW5lKCkt PmlzRGlzcGxheWluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkpOwotICAgICAgICBzdGF0ZU1hY2hp bmUoKS0+YWR2YW5jZVRvKEZyYW1lTG9hZGVyU3RhdGVNYWNoaW5lOjpEaXNwbGF5aW5nSW5pdGlh bEVtcHR5RG9jdW1lbnRQb3N0Q29tbWl0KTsKLSAgICAgICAgc3RhdGVNYWNoaW5lKCktPmFkdmFu Y2VUbyhGcmFtZUxvYWRlclN0YXRlTWFjaGluZTo6Q29tbWl0dGVkRmlyc3RSZWFsTG9hZCk7Cisg ICAgICAgIEFTU0VSVChzdGF0ZU1hY2hpbmUoKS5pc0Rpc3BsYXlpbmdJbml0aWFsRW1wdHlEb2N1 bWVudCgpKTsKKyAgICAgICAgc3RhdGVNYWNoaW5lKCkuYWR2YW5jZVRvKEZyYW1lTG9hZGVyU3Rh dGVNYWNoaW5lOjpEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnRQb3N0Q29tbWl0KTsKKyAg ICAgICAgc3RhdGVNYWNoaW5lKCkuYWR2YW5jZVRvKEZyYW1lTG9hZGVyU3RhdGVNYWNoaW5lOjpD b21taXR0ZWRGaXJzdFJlYWxMb2FkKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmgKaW5kZXggZWNkZDMxNS4uNTM1ZjM5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmgKQEAgLTI0NSw3ICsyNDUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRMb2Fkc1N5 bmNocm9ub3VzbHkoYm9vbCBsb2Fkc1N5bmNocm9ub3VzbHkpIHsgbV9sb2Fkc1N5bmNocm9ub3Vz bHkgPSBsb2Fkc1N5bmNocm9ub3VzbHk7IH0KICAgICBib29sIGxvYWRzU3luY2hyb25vdXNseSgp IGNvbnN0IHsgcmV0dXJuIG1fbG9hZHNTeW5jaHJvbm91c2x5OyB9CiAKLSAgICBGcmFtZUxvYWRl clN0YXRlTWFjaGluZSogc3RhdGVNYWNoaW5lKCkgY29uc3QgeyByZXR1cm4gJm1fc3RhdGVNYWNo aW5lOyB9CisgICAgRnJhbWVMb2FkZXJTdGF0ZU1hY2hpbmUmIHN0YXRlTWFjaGluZSgpIHsgcmV0 dXJuIG1fc3RhdGVNYWNoaW5lOyB9CiAKICAgICBGcmFtZSogZmluZEZyYW1lRm9yTmF2aWdhdGlv bihjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIERvY3VtZW50KiBhY3RpdmVEb2N1bWVudCA9IDAp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAppbmRleCBm ZmQ5ZDMyLi5mNmRlZTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9y eUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJv bGxlci5jcHAKQEAgLTExMCw3ICsxMTAsNyBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjpjbGVh clNjcm9sbFBvc2l0aW9uQW5kVmlld1N0YXRlKCkKICovCiB2b2lkIEhpc3RvcnlDb250cm9sbGVy OjpyZXN0b3JlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3RhdGUoKQogewotICAgIGlmICghbV9mcmFt ZS5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS0+Y29tbWl0dGVkRmlyc3RSZWFsRG9jdW1lbnRMb2Fk KCkpCisgICAgaWYgKCFtX2ZyYW1lLmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLmNvbW1pdHRlZEZp cnN0UmVhbERvY3VtZW50TG9hZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBBU1NFUlQobV9j dXJyZW50SXRlbSk7CkBAIC0xNjAsNyArMTYwLDcgQEAgdm9pZCBIaXN0b3J5Q29udHJvbGxlcjo6 c2F2ZURvY3VtZW50U3RhdGUoKQogewogICAgIC8vIEZJWE1FOiBSZWFkaW5nIHRoaXMgYml0IG9m IEZyYW1lTG9hZGVyIHN0YXRlIGhlcmUgaXMgdW5mb3J0dW5hdGUuICBJIG5lZWQgdG8gc3R1ZHkK ICAgICAvLyB0aGlzIG1vcmUgdG8gc2VlIGlmIHdlIGNhbiByZW1vdmUgdGhpcyBkZXBlbmRlbmN5 LgotICAgIGlmIChtX2ZyYW1lLmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLT5jcmVhdGluZ0luaXRp YWxFbXB0eURvY3VtZW50KCkpCisgICAgaWYgKG1fZnJhbWUubG9hZGVyKCkuc3RhdGVNYWNoaW5l KCkuY3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpKQogICAgICAgICByZXR1cm47CiAKICAg ICAvLyBGb3IgYSBzdGFuZGFyZCBwYWdlIGxvYWQsIHdlIHdpbGwgaGF2ZSBhIHByZXZpb3VzIGl0 ZW0gc2V0LCB3aGljaCB3aWxsIGJlIHVzZWQgdG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9OYXZpZ2F0aW9uU2NoZWR1bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9O YXZpZ2F0aW9uU2NoZWR1bGVyLmNwcAppbmRleCA3YTYzNTE2Li43ZjM0ODVjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTmF2aWdhdGlvblNjaGVkdWxlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL05hdmlnYXRpb25TY2hlZHVsZXIuY3BwCkBAIC0zNjIsNyArMzYy LDcgQEAgdm9pZCBOYXZpZ2F0aW9uU2NoZWR1bGVyOjpzY2hlZHVsZUxvY2F0aW9uQ2hhbmdlKFNl Y3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdpbiwKIAogICAgIC8vIEhhbmRsZSBhIGxvY2F0aW9u IGNoYW5nZSBvZiBhIHBhZ2Ugd2l0aCBubyBkb2N1bWVudCBhcyBhIHNwZWNpYWwgY2FzZS4KICAg ICAvLyBUaGlzIG1heSBoYXBwZW4gd2hlbiBhIGZyYW1lIGNoYW5nZXMgdGhlIGxvY2F0aW9uIG9m IGFub3RoZXIgZnJhbWUuCi0gICAgYm9vbCBkdXJpbmdMb2FkID0gIWxvYWRlci5zdGF0ZU1hY2hp bmUoKS0+Y29tbWl0dGVkRmlyc3RSZWFsRG9jdW1lbnRMb2FkKCk7CisgICAgYm9vbCBkdXJpbmdM b2FkID0gIWxvYWRlci5zdGF0ZU1hY2hpbmUoKS5jb21taXR0ZWRGaXJzdFJlYWxEb2N1bWVudExv YWQoKTsKIAogICAgIHNjaGVkdWxlKHN0ZDo6bWFrZV91bmlxdWU8U2NoZWR1bGVkTG9jYXRpb25D aGFuZ2U+KHNlY3VyaXR5T3JpZ2luLCB1cmwsIHJlZmVycmVyLCBsb2NrSGlzdG9yeSwgbG9ja0Jh Y2tGb3J3YXJkTGlzdCwgZHVyaW5nTG9hZCkpOwogfQpAQCAtMzc2LDcgKzM3Niw3IEBAIHZvaWQg TmF2aWdhdGlvblNjaGVkdWxlcjo6c2NoZWR1bGVGb3JtU3VibWlzc2lvbihQYXNzUmVmUHRyPEZv cm1TdWJtaXNzaW9uPiBzdWJtCiAKICAgICAvLyBIYW5kbGUgYSBsb2NhdGlvbiBjaGFuZ2Ugb2Yg YSBwYWdlIHdpdGggbm8gZG9jdW1lbnQgYXMgYSBzcGVjaWFsIGNhc2UuCiAgICAgLy8gVGhpcyBt YXkgaGFwcGVuIHdoZW4gYSBmcmFtZSBjaGFuZ2VzIHRoZSBsb2NhdGlvbiBvZiBhbm90aGVyIGZy YW1lLgotICAgIGJvb2wgZHVyaW5nTG9hZCA9ICFtX2ZyYW1lLmxvYWRlcigpLnN0YXRlTWFjaGlu ZSgpLT5jb21taXR0ZWRGaXJzdFJlYWxEb2N1bWVudExvYWQoKTsKKyAgICBib29sIGR1cmluZ0xv YWQgPSAhbV9mcmFtZS5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5jb21taXR0ZWRGaXJzdFJlYWxE b2N1bWVudExvYWQoKTsKIAogICAgIC8vIElmIHRoaXMgaXMgYSBjaGlsZCBmcmFtZSBhbmQgdGhl IGZvcm0gc3VibWlzc2lvbiB3YXMgdHJpZ2dlcmVkIGJ5IGEgc2NyaXB0LCBsb2NrIHRoZSBiYWNr L2ZvcndhcmQgbGlzdAogICAgIC8vIHRvIG1hdGNoIElFIGFuZCBPcGVyYS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5jcHAKaW5kZXggMjkxYzEzNi4uMTZkNWJlOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5jcHAKQEAgLTI0Niw3ICsyNDYs NyBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6aW5jcmVtZW50UHJvZ3Jlc3ModW5zaWduZWQgbG9u ZyBpZGVudGlmaWVyLCB1bnNpZ25lZCBieXRlcwogICAgIC8vIEZvciBkb2N1bWVudHMgdGhhdCB1 c2UgV2ViQ29yZSdzIGxheW91dCBzeXN0ZW0sIHRyZWF0IGZpcnN0IGxheW91dCBhcyB0aGUgaGFs Zi13YXkgcG9pbnQuCiAgICAgLy8gRklYTUU6IFRoZSBoYXNIVE1MVmlldyBmdW5jdGlvbiBpcyBh IHNvcnQgb2Ygcm91bmRhYm91dCB3YXkgb2YgYXNraW5nICJkbyB5b3UgdXNlIFdlYkNvcmUncyBs YXlvdXQgc3lzdGVtIi4KICAgICBib29sIHVzZUNsYW1wZWRNYXhQcm9ncmVzcyA9IGZyYW1lLT5s b2FkZXIoKS5jbGllbnQoKS5oYXNIVE1MVmlldygpCi0gICAgICAgICYmICFmcmFtZS0+bG9hZGVy KCkuc3RhdGVNYWNoaW5lKCktPmZpcnN0TGF5b3V0RG9uZSgpOworICAgICAgICAmJiAhZnJhbWUt PmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLmZpcnN0TGF5b3V0RG9uZSgpOwogICAgIGRvdWJsZSBt YXhQcm9ncmVzc1ZhbHVlID0gdXNlQ2xhbXBlZE1heFByb2dyZXNzID8gMC41IDogZmluYWxQcm9n cmVzc1ZhbHVlOwogICAgIGluY3JlbWVudCA9IChtYXhQcm9ncmVzc1ZhbHVlIC0gbV9wcm9ncmVz c1ZhbHVlKSAqIHBlcmNlbnRPZlJlbWFpbmluZ0J5dGVzOwogICAgIG1fcHJvZ3Jlc3NWYWx1ZSAr PSBpbmNyZW1lbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2Fj aGVkUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlTG9hZGVyLmNwcAppbmRleCA2NmI4YTA5Li45YWM0MTY3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKQEAg LTUyOCw3ICs1MjgsNyBAQCB2b2lkIENhY2hlZFJlc291cmNlTG9hZGVyOjpzdG9yZVJlc291cmNl VGltaW5nSW5pdGlhdG9ySW5mb3JtYXRpb24oY29uc3QgQ2FjaGVkUgogewogICAgIGlmIChyZXNv dXJjZS0+dHlwZSgpID09IENhY2hlZFJlc291cmNlOjpNYWluUmVzb3VyY2UpIHsKICAgICAgICAg Ly8gPGlmcmFtZT5zIHNob3VsZCByZXBvcnQgdGhlIGluaXRpYWwgbmF2aWdhdGlvbiByZXF1ZXN0 ZWQgYnkgdGhlIHBhcmVudCBkb2N1bWVudCwgYnV0IG5vdCBzdWJzZXF1ZW50IG5hdmlnYXRpb25z LgotICAgICAgICBpZiAoZnJhbWUoKS0+b3duZXJFbGVtZW50KCkgJiYgbV9kb2N1bWVudExvYWRl ci0+ZnJhbWVMb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmNvbW1pdHRpbmdGaXJzdFJlYWxMb2Fk KCkpIHsKKyAgICAgICAgaWYgKGZyYW1lKCktPm93bmVyRWxlbWVudCgpICYmIG1fZG9jdW1lbnRM b2FkZXItPmZyYW1lTG9hZGVyKCktPnN0YXRlTWFjaGluZSgpLmNvbW1pdHRpbmdGaXJzdFJlYWxM b2FkKCkpIHsKICAgICAgICAgICAgIEluaXRpYXRvckluZm8gaW5mbyA9IHsgZnJhbWUoKS0+b3du ZXJFbGVtZW50KCktPmxvY2FsTmFtZSgpLCBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKSB9 OwogICAgICAgICAgICAgbV9pbml0aWF0b3JNYXAuYWRkKHJlc291cmNlLmdldCgpLCBpbmZvKTsK ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAppbmRleCA1YTk1OThlLi45OTI4NDhiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lLmNwcApAQCAtNjk4LDcgKzY5OCw3IEBAIHZvaWQgRnJhbWU6OmluamVjdFVz ZXJTY3JpcHRzKFVzZXJTY3JpcHRJbmplY3Rpb25UaW1lIGluamVjdGlvblRpbWUpCiAgICAgaWYg KCFtX3BhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChsb2FkZXIoKS5zdGF0ZU1hY2hp bmUoKS0+Y3JlYXRpbmdJbml0aWFsRW1wdHlEb2N1bWVudCgpICYmICFzZXR0aW5ncygpLnNob3Vs ZEluamVjdFVzZXJTY3JpcHRzSW5Jbml0aWFsRW1wdHlEb2N1bWVudCgpKQorICAgIGlmIChsb2Fk ZXIoKS5zdGF0ZU1hY2hpbmUoKS5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgJiYgIXNl dHRpbmdzKCkuc2hvdWxkSW5qZWN0VXNlclNjcmlwdHNJbkluaXRpYWxFbXB0eURvY3VtZW50KCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIGNvbnN0IGF1dG8qIHVzZXJDb250ZW50Q29udHJvbGxl ciA9IG1fcGFnZS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKaW5kZXggNDUzNGJkOC4uYTMzZWVjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cApAQCAtMzY4MSw3ICszNjgxLDcgQEAgYm9vbCBGcmFtZVZpZXc6OnF1YWxpZmllc0FzVmlzdWFs bHlOb25FbXB0eSgpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIEVuc3Vy ZSB0aGF0IHdlIGFsd2F5cyBnZXQgbWFya2VkIHZpc3VhbGx5IG5vbi1lbXB0eSBldmVudHVhbGx5 LgotICAgIGlmICghZnJhbWUoKS5kb2N1bWVudCgpLT5wYXJzaW5nKCkgJiYgZnJhbWUoKS5sb2Fk ZXIoKS5zdGF0ZU1hY2hpbmUoKS0+Y29tbWl0dGVkRmlyc3RSZWFsRG9jdW1lbnRMb2FkKCkpCisg ICAgaWYgKCFmcmFtZSgpLmRvY3VtZW50KCktPnBhcnNpbmcoKSAmJiBmcmFtZSgpLmxvYWRlcigp LnN0YXRlTWFjaGluZSgpLmNvbW1pdHRlZEZpcnN0UmVhbERvY3VtZW50TG9hZCgpKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKIAogICAgIC8vIFJlcXVpcmUgdGhlIGRvY3VtZW50IHRvIGdyb3cgYSBi aXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTG9hZGVyQ2xpZW50Lm1tCmluZGV4IDNmNGMzMzUuLjRjOTEyNTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 Lm1tCkBAIC0xNDU4LDcgKzE0NTgsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFu c2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKICAgICAvLyBGSVhNRSAoVmlld2xlc3MpOiBJ IGFzc3VtZSB3ZSB3YW50IHRoZSBlcXVpdmFsZW50IG9mIHRoaXMgb3B0aW1pemF0aW9uIGZvciB2 aWV3bGVzcyBtb2RlIHRvby4KICAgICBib29sIHdpbGxQcm9kdWNlSFRNTFZpZXcgPSBbbV93ZWJG cmFtZS0+X3ByaXZhdGUtPndlYkZyYW1lVmlldyBfdmlld0NsYXNzRm9yTUlNRVR5cGU6W2RhdGFT b3VyY2UgX3Jlc3BvbnNlTUlNRVR5cGVdXSA9PSBbV2ViSFRNTFZpZXcgY2xhc3NdOwogI2VuZGlm Ci0gICAgYm9vbCBjYW5Ta2lwQ3JlYXRpb24gPSBjb3JlKG1fd2ViRnJhbWUuZ2V0KCkpLT5sb2Fk ZXIoKS5zdGF0ZU1hY2hpbmUoKS0+Y29tbWl0dGluZ0ZpcnN0UmVhbExvYWQoKSAmJiB3aWxsUHJv ZHVjZUhUTUxWaWV3OworICAgIGJvb2wgY2FuU2tpcENyZWF0aW9uID0gY29yZShtX3dlYkZyYW1l LmdldCgpKS0+bG9hZGVyKCkuc3RhdGVNYWNoaW5lKCkuY29tbWl0dGluZ0ZpcnN0UmVhbExvYWQo KSAmJiB3aWxsUHJvZHVjZUhUTUxWaWV3OwogICAgIGlmIChjYW5Ta2lwQ3JlYXRpb24pIHsKICAg ICAgICAgW1ttX3dlYkZyYW1lLT5fcHJpdmF0ZS0+d2ViRnJhbWVWaWV3IGRvY3VtZW50Vmlld10g c2V0RGF0YVNvdXJjZTpkYXRhU291cmNlXTsKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViRnJhbWUubW0KaW5kZXggZDQxZmJhMC4uZjU0NGY5MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCkBAIC0xMDUzLDcgKzEwNTMsNyBAQCBzdGF0aWMgaW5s aW5lIFdlYkRhdGFTb3VyY2UgKmRhdGFTb3VyY2UoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKIAog LSAoQk9PTClfZmlyc3RMYXlvdXREb25lCiB7Ci0gICAgcmV0dXJuIF9wcml2YXRlLT5jb3JlRnJh bWUtPmxvYWRlcigpLnN0YXRlTWFjaGluZSgpLT5maXJzdExheW91dERvbmUoKTsKKyAgICByZXR1 cm4gX3ByaXZhdGUtPmNvcmVGcmFtZS0+bG9hZGVyKCkuc3RhdGVNYWNoaW5lKCkuZmlyc3RMYXlv dXREb25lKCk7CiB9CiAKIC0gKEJPT0wpX2lzVmlzdWFsbHlOb25FbXB0eQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC93aW4vV2ViRnJhbWUuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViRnJh bWUuY3BwCmluZGV4IGI1MzE3OWYuLmRjYTM2ODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv d2luL1dlYkZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKQEAg LTk0Niw3ICs5NDYsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYkZyYW1lOjpmaXJz dExheW91dERvbmUoCiAgICAgaWYgKCFjb3JlRnJhbWUpCiAgICAgICAgIHJldHVybiBFX0ZBSUw7 CiAKLSAgICAqcmVzdWx0ID0gY29yZUZyYW1lLT5sb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS0+Zmly c3RMYXlvdXREb25lKCk7CisgICAgKnJlc3VsdCA9IGNvcmVGcmFtZS0+bG9hZGVyKCkuc3RhdGVN YWNoaW5lKCkuZmlyc3RMYXlvdXREb25lKCk7CiAgICAgcmV0dXJuIFNfT0s7CiB9CiAK