146299 2015-06-24 16:57:29 -0700 Prevent new loads while in PageCache (or being added to PageCache) 2015-06-26 11:27:09 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=145748 InRadar P2 Normal --- 1 cdumez cdumez aestes ap barraclough beidson commit-queue ddkilzer japhet oldest_to_newest 1104548 0 cdumez 2015-06-24 16:57:29 -0700 Prevent new loads while in PageCache (or being added to PageCache). 1104549 1 cdumez 2015-06-24 16:57:45 -0700 rdar://problem/21523788 1104594 2 255540 cdumez 2015-06-24 21:36:23 -0700 Created attachment 255540 Patch 1104665 3 255540 cdumez 2015-06-25 09:41:40 -0700 Comment on attachment 255540 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255540&action=review > Source/WebCore/loader/cache/CachedResource.cpp:218 > + if (cachedResourceLoader.frame()->page() && cachedResourceLoader.frame()->page()->inPageCache()) { This is the actual change. The test of the patch is about getting rid of the complexity I added in r185337. 1104979 4 255540 darin 2015-06-26 10:56:18 -0700 Comment on attachment 255540 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=255540&action=review > Source/WebCore/loader/FrameLoader.h:280 > + enum class PageDismissalType { > + None, > + BeforeUnload, > + PageHide, > + Unload > + }; I like this better in a single line; not sure if others agree. > Source/WebCore/loader/cache/CachedResource.cpp:217 > + // Prevent new loads if we are in the PageCache (or being added to the PageCache). I would not use parentheses here. Just leave them out. > Source/WebCore/page/Page.cpp:571 > + auto* document = mainFrame().document(); > + if (!document) > + return false; > + > + return document->inPageCache(); I like writing it like this: auto* document = mainFrame().document(); return document && document->inPageCache(); 1104995 5 cdumez 2015-06-26 11:27:09 -0700 Committed r186005: <http://trac.webkit.org/changeset/186005> 255540 2015-06-24 21:36:23 -0700 2015-06-26 10:56:18 -0700 Patch bug-146299-20150624213539.patch text/plain 14101 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1OTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTk4ODFmNzRiMjk1YzI1 NzRiZjZiOWY1MDYwNTJlYjVmNGE0ODY3Ny4uMmE4YzhjMGY4OWFkOWZkZjA1MzY1Yzk0YjQyMDcw OWRiNWZkYTUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ5IEBACiAyMDE1LTA2LTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgUHJldmVudCBuZXcgbG9hZHMg d2hpbGUgaW4gUGFnZUNhY2hlIChvciBiZWluZyBhZGRlZCB0byBQYWdlQ2FjaGUpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDYyOTkKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzIxNTIzNzg4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEdlbmVyYWxpemUgdGhlIGNoYW5nZSBpbiByMTg1MzM3IHRvIHBy ZXZlbnQgbmV3IGxvYWRzIHdoaWxlIGluIHRoZQorICAgICAgICBQYWdlQ2FjaGUgKG9yIGJlaW5n IGFkZGVkIHRvIHRoZSBQYWdlQ2FjaGUpLCBpbnN0ZWFkIG9mIG1lcmVseQorICAgICAgICBwcmV2 ZW50aW5nIG5ldyBsb2FkcyBpbiBwYWdlaGlkZSBldmVudCBoYW5kbGVycy4gV2Ugc2hvdWxkIG5l dmVyCisgICAgICAgIGhhdmUgYW55IHBhZ2VzIHRoYXQgYXJlIHN0aWxsIGxvYWRpbmcgaW5zaWRl IHRoZSBQYWdlQ2FjaGUuCisKKyAgICAgICAgVGhlIGZpeCBpbiByMTg1MzM3IHdhcyBhcHBhcmVu dGx5IGluc3VmZmljaWVudCB0byBhZGRyZXNzIHRoZQorICAgICAgICBwcm9ibGVtIHNvIGdlbmVy YWxpemluZyB0aGUgY2hlY2sgLyBwb2xpY3kgd2lsbCBob3BlZnVsbHkgY2F0Y2gKKyAgICAgICAg bW9yZSBjYXNlcyB3aGVyZSBjb250ZW50IGlzIGFibGUgdG8gc3RhcnQgbG9hZHMgd2hpbGUgYmVp bmcgYWRkZWQKKyAgICAgICAgdG8gdGhlIFBhZ2VDYWNoZS4gVGhpcyBwYXRjaCBhbHNvIHJlbW92 ZXMgc29tZSBvZiB0aGUgY29tcGxleGl0eQorICAgICAgICBhZGRlZCBpbiByMTg1MzM3IGFzIGl0 IGlzIG5vIGxvbmdlciBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBhbHJlYWR5IGNv dmVyZWQgYnk6CisgICAgICAgIGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9pbWFnZS1sb2FkLWluLXBh Z2VoaWRlLWhhbmRsZXIuaHRtbAorICAgICAgICBodHRwL3Rlc3RzL25hdmlnYXRpb24vc3ViZnJh bWUtcGFnZWhpZGUtaGFuZGxlci1zdGFydHMtbG9hZC5odG1sCisgICAgICAgIGh0dHAvdGVzdHMv bmF2aWdhdGlvbi9zdWJmcmFtZS1wYWdlaGlkZS1oYW5kbGVyLXN0YXJ0cy1sb2FkMi5odG1sCisK KyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXI6OnN0b3BMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjps b2FkVVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkV2l0aERvY3VtZW50 TG9hZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpzdG9wQWxsTG9hZGVycyk6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6aGFuZGxlQmVmb3JlVW5sb2FkRXZlbnQp OgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OkZyYW1lTG9hZGVyKTogRGVsZXRlZC4K KyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyOjpwYWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQpOgorICAgICAgICAqIGxv YWRlci9JbWFnZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwYWdlSXNCZWluZ0Rpc21p c3NlZCk6CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlOjpsb2FkKToKKyAgICAgICAgKiBsb2FkZXIvY2Fj aGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FjaGVkUmVz b3VyY2VMb2FkZXI6OnJlcXVlc3RJbWFnZSk6CisgICAgICAgICogcGFnZS9QYWdlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBhZ2U6OmluUGFnZUNhY2hlKToKKyAgICAgICAgKiBwYWdlL1BhZ2Uu aDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6Omdyb3VwKTogRGVsZXRlZC4KKworMjAxNS0wNi0y NCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCiAgICAgICAgIE51bGwgZGVyZWZl cmVuY2UgaW4gRG9jdW1lbnRMb2FkZXI6OmFyZUFsbExvYWRlcnNQYWdlQ2FjaGVBY2NlcHRhYmxl KCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjI4 NgogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjE1MjM3ODg+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmNwcAppbmRleCAyZWY5NTAwODJmNTQ0YTM1NzNjNzQ3NzMzNzJhYTUwMWNkYWVl YzFlLi4xZTQ5NTU3Y2E2ZWE1NmMwYjQ0YzZjNzViNmE3NTZiNjIxMWU4YTEyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTIyNSw3ICsyMjUsNiBAQCBGcmFtZUxvYWRl cjo6RnJhbWVMb2FkZXIoRnJhbWUmIGZyYW1lLCBGcmFtZUxvYWRlckNsaWVudCYgY2xpZW50KQog ICAgICwgbV9pc0V4ZWN1dGluZ0phdmFTY3JpcHRGb3JtQWN0aW9uKGZhbHNlKQogICAgICwgbV9k aWRDYWxsSW1wbGljaXRDbG9zZSh0cnVlKQogICAgICwgbV93YXNVbmxvYWRFdmVudEVtaXR0ZWQo ZmFsc2UpCi0gICAgLCBtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZChmcmFtZSkK ICAgICAsIG1faXNDb21wbGV0ZShmYWxzZSkKICAgICAsIG1fbmVlZHNDbGVhcihmYWxzZSkKICAg ICAsIG1fY2hlY2tUaW1lcigqdGhpcywgJkZyYW1lTG9hZGVyOjpjaGVja1RpbWVyRmlyZWQpCkBA IC00MjQsOSArNDIzLDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c3RvcExvYWRpbmcoVW5sb2FkRXZl bnRQb2xpY3kgdW5sb2FkRXZlbnRQb2xpY3kpCiAgICAgICAgICAgICAgICAgRWxlbWVudCogY3Vy cmVudEZvY3VzZWRFbGVtZW50ID0gbV9mcmFtZS5kb2N1bWVudCgpLT5mb2N1c2VkRWxlbWVudCgp OwogICAgICAgICAgICAgICAgIGlmIChjdXJyZW50Rm9jdXNlZEVsZW1lbnQgJiYgY3VycmVudEZv Y3VzZWRFbGVtZW50LT50b0lucHV0RWxlbWVudCgpKQogICAgICAgICAgICAgICAgICAgICBjdXJy ZW50Rm9jdXNlZEVsZW1lbnQtPnRvSW5wdXRFbGVtZW50KCktPmVuZEVkaXRpbmcoKTsKLSAgICAg ICAgICAgICAgICBpZiAobV9wYWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQgPT0gUGFn ZTo6RGlzbWlzc2FsVHlwZTo6Tm9uZSkgeworICAgICAgICAgICAgICAgIGlmIChtX3BhZ2VEaXNt aXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCA9PSBQYWdlRGlzbWlzc2FsVHlwZTo6Tm9uZSkgewog ICAgICAgICAgICAgICAgICAgICBpZiAodW5sb2FkRXZlbnRQb2xpY3kgPT0gVW5sb2FkRXZlbnRQ b2xpY3lVbmxvYWRBbmRQYWdlSGlkZSkgewotICAgICAgICAgICAgICAgICAgICAgICAgbV9wYWdl RGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQgPSBQYWdlOjpEaXNtaXNzYWxUeXBlOjpQYWdl SGlkZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fcGFnZURpc21pc3NhbEV2ZW50QmVpbmdE aXNwYXRjaGVkID0gUGFnZURpc21pc3NhbFR5cGU6OlBhZ2VIaWRlOwogICAgICAgICAgICAgICAg ICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+ZGlzcGF0Y2hFdmVudChQ YWdlVHJhbnNpdGlvbkV2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnBhZ2VoaWRlRXZlbnQsIG1f ZnJhbWUuZG9jdW1lbnQoKS0+aW5QYWdlQ2FjaGUoKSksIG1fZnJhbWUuZG9jdW1lbnQoKSk7CiAg ICAgICAgICAgICAgICAgICAgIH0KIApAQCAtNDM5LDcgKzQzOCw3IEBAIHZvaWQgRnJhbWVMb2Fk ZXI6OnN0b3BMb2FkaW5nKFVubG9hZEV2ZW50UG9saWN5IHVubG9hZEV2ZW50UG9saWN5KQogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gd2hpbGUgZGlzcGF0Y2hpbmcgdGhlIGV2ZW50LCBzbyBw cm90ZWN0IGl0IHRvIHByZXZlbnQgd3JpdGluZyB0aGUgZW5kCiAgICAgICAgICAgICAgICAgICAg ICAgICAvLyB0aW1lIGludG8gZnJlZWQgbWVtb3J5LgogICAgICAgICAgICAgICAgICAgICAgICAg UmVmUHRyPERvY3VtZW50TG9hZGVyPiBkb2N1bWVudExvYWRlciA9IG1fcHJvdmlzaW9uYWxEb2N1 bWVudExvYWRlcjsKLSAgICAgICAgICAgICAgICAgICAgICAgIG1fcGFnZURpc21pc3NhbEV2ZW50 QmVpbmdEaXNwYXRjaGVkID0gUGFnZTo6RGlzbWlzc2FsVHlwZTo6VW5sb2FkOworICAgICAgICAg ICAgICAgICAgICAgICAgbV9wYWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQgPSBQYWdl RGlzbWlzc2FsVHlwZTo6VW5sb2FkOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGRvY3Vt ZW50TG9hZGVyICYmICFkb2N1bWVudExvYWRlci0+dGltaW5nKCkudW5sb2FkRXZlbnRTdGFydCgp ICYmICFkb2N1bWVudExvYWRlci0+dGltaW5nKCkudW5sb2FkRXZlbnRFbmQoKSkgewogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIERvY3VtZW50TG9hZFRpbWluZyYgdGltaW5nID0gZG9jdW1l bnRMb2FkZXItPnRpbWluZygpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVCh0 aW1pbmcubmF2aWdhdGlvblN0YXJ0KCkpOwpAQCAtNDUwLDcgKzQ0OSw3IEBAIHZvaWQgRnJhbWVM b2FkZXI6OnN0b3BMb2FkaW5nKFVubG9hZEV2ZW50UG9saWN5IHVubG9hZEV2ZW50UG9saWN5KQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+ZG9tV2luZG93 KCktPmRpc3BhdGNoRXZlbnQodW5sb2FkRXZlbnQsIG1fZnJhbWUuZG9jdW1lbnQoKSk7CiAgICAg ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgbV9w YWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQgPSBQYWdlOjpEaXNtaXNzYWxUeXBlOjpO b25lOworICAgICAgICAgICAgICAgIG1fcGFnZURpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVk ID0gUGFnZURpc21pc3NhbFR5cGU6Ok5vbmU7CiAgICAgICAgICAgICAgICAgaWYgKG1fZnJhbWUu ZG9jdW1lbnQoKSkKICAgICAgICAgICAgICAgICAgICAgbV9mcmFtZS5kb2N1bWVudCgpLT51cGRh dGVTdHlsZUlmTmVlZGVkKCk7CiAgICAgICAgICAgICAgICAgbV93YXNVbmxvYWRFdmVudEVtaXR0 ZWQgPSB0cnVlOwpAQCAtMTIyNiw3ICsxMjI1LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVS TChjb25zdCBGcmFtZUxvYWRSZXF1ZXN0JiBmcmFtZUxvYWRSZXF1ZXN0LCBjb25zdCBTdHJpbmcK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlmIChtX3BhZ2VEaXNtaXNzYWxFdmVudEJl aW5nRGlzcGF0Y2hlZCAhPSBQYWdlOjpEaXNtaXNzYWxUeXBlOjpOb25lKQorICAgIGlmIChtX3Bh Z2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCAhPSBQYWdlRGlzbWlzc2FsVHlwZTo6Tm9u ZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgTmF2aWdhdGlvbkFjdGlvbiBhY3Rpb24ocmVxdWVz dCwgbmV3TG9hZFR5cGUsIGlzRm9ybVN1Ym1pc3Npb24sIGV2ZW50LCBmcmFtZUxvYWRSZXF1ZXN0 LnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3koKSk7CkBAIC0xNDE3LDcgKzE0MTYsNyBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpsb2FkV2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiBs b2FkZXIsIEZyYW1lTG9hZFR5cGUgdAogCiAgICAgQVNTRVJUKG1fZnJhbWUudmlldygpKTsKIAot ICAgIGlmIChtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCAhPSBQYWdlOjpEaXNt aXNzYWxUeXBlOjpOb25lKQorICAgIGlmIChtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0 Y2hlZCAhPSBQYWdlRGlzbWlzc2FsVHlwZTo6Tm9uZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg aWYgKG1fZnJhbWUuZG9jdW1lbnQoKSkKQEAgLTE1OTEsNyArMTU5MCw3IEBAIHZvaWQgRnJhbWVM b2FkZXI6OnJlbG9hZChib29sIGVuZFRvRW5kUmVsb2FkKQogdm9pZCBGcmFtZUxvYWRlcjo6c3Rv cEFsbExvYWRlcnMoQ2xlYXJQcm92aXNpb25hbEl0ZW1Qb2xpY3kgY2xlYXJQcm92aXNpb25hbEl0 ZW1Qb2xpY3kpCiB7CiAgICAgQVNTRVJUKCFtX2ZyYW1lLmRvY3VtZW50KCkgfHwgIW1fZnJhbWUu ZG9jdW1lbnQoKS0+aW5QYWdlQ2FjaGUoKSk7Ci0gICAgaWYgKG1fcGFnZURpc21pc3NhbEV2ZW50 QmVpbmdEaXNwYXRjaGVkICE9IFBhZ2U6OkRpc21pc3NhbFR5cGU6Ok5vbmUpCisgICAgaWYgKG1f cGFnZURpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkICE9IFBhZ2VEaXNtaXNzYWxUeXBlOjpO b25lKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBJZiB0aGlzIG1ldGhvZCBpcyBjYWxsZWQg ZnJvbSB3aXRoaW4gdGhpcyBtZXRob2QsIGluZmluaXRlIHJlY3Vyc2lvbiBjYW4gb2NjdXIgKDM0 NDIyMTgpLiBBdm9pZCB0aGlzLgpAQCAtMjg0Nyw3ICsyODQ2LDcgQEAgYm9vbCBGcmFtZUxvYWRl cjo6aGFuZGxlQmVmb3JlVW5sb2FkRXZlbnQoQ2hyb21lJiBjaHJvbWUsIEZyYW1lTG9hZGVyKiBm cmFtZUxvYWQKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgCiAgICAgUmVmUHRyPEJlZm9yZVVu bG9hZEV2ZW50PiBiZWZvcmVVbmxvYWRFdmVudCA9IEJlZm9yZVVubG9hZEV2ZW50OjpjcmVhdGUo KTsKLSAgICBtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCA9IFBhZ2U6OkRpc21p c3NhbFR5cGU6OkJlZm9yZVVubG9hZDsKKyAgICBtX3BhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlz cGF0Y2hlZCA9IFBhZ2VEaXNtaXNzYWxUeXBlOjpCZWZvcmVVbmxvYWQ7CiAKICAgICAvLyBXZSBz dG9yZSB0aGUgZnJhbWUncyBwYWdlIGluIGEgbG9jYWwgdmFyaWFibGUgYmVjYXVzZSB0aGUgZnJh bWUgbWlnaHQgZ2V0IGRldGFjaGVkIGluc2lkZSBkaXNwYXRjaEV2ZW50LgogICAgIFBhZ2UqIHBh Z2UgPSBtX2ZyYW1lLnBhZ2UoKTsKQEAgLTI4NTUsNyArMjg1NCw3IEBAIGJvb2wgRnJhbWVMb2Fk ZXI6OmhhbmRsZUJlZm9yZVVubG9hZEV2ZW50KENocm9tZSYgY2hyb21lLCBGcmFtZUxvYWRlciog ZnJhbWVMb2FkCiAgICAgZG9tV2luZG93LT5kaXNwYXRjaEV2ZW50KGJlZm9yZVVubG9hZEV2ZW50 LmdldCgpLCBkb21XaW5kb3ctPmRvY3VtZW50KCkpOwogICAgIHBhZ2UtPmRlY3JlbWVudEZyYW1l SGFuZGxpbmdCZWZvcmVVbmxvYWRFdmVudENvdW50KCk7CiAKLSAgICBtX3BhZ2VEaXNtaXNzYWxF dmVudEJlaW5nRGlzcGF0Y2hlZCA9IFBhZ2U6OkRpc21pc3NhbFR5cGU6Ok5vbmU7CisgICAgbV9w YWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQgPSBQYWdlRGlzbWlzc2FsVHlwZTo6Tm9u ZTsKIAogICAgIGlmICghYmVmb3JlVW5sb2FkRXZlbnQtPmRlZmF1bHRQcmV2ZW50ZWQoKSkKICAg ICAgICAgZG9jdW1lbnQtPmRlZmF1bHRFdmVudEhhbmRsZXIoYmVmb3JlVW5sb2FkRXZlbnQuZ2V0 KCkpOwpAQCAtMzU1MywxNCArMzU1Miw0IEBAIFJlZlB0cjxGcmFtZT4gY3JlYXRlV2luZG93KEZy YW1lJiBvcGVuZXJGcmFtZSwgRnJhbWUmIGxvb2t1cEZyYW1lLCBjb25zdCBGcmFtZUxvCiAgICAg cmV0dXJuIFdURjo6bW92ZShmcmFtZSk7CiB9CiAKLWF1dG8gRnJhbWVMb2FkZXI6OlBhZ2VEaXNt aXNzYWxFdmVudFR5cGU6Om9wZXJhdG9yPShQYWdlOjpEaXNtaXNzYWxUeXBlIGRpc21pc3NhbFR5 cGUpIC0+IFBhZ2VEaXNtaXNzYWxFdmVudFR5cGUmCi17Ci0gICAgbV9kaXNtaXNzYWxFdmVudEJl aW5nRGlzcGF0Y2hlZCA9IGRpc21pc3NhbFR5cGU7Ci0KLSAgICBpZiAoYXV0byogcGFnZSA9IG1f ZnJhbWUucGFnZSgpKQotICAgICAgICBwYWdlLT5zZXREaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0 Y2hlZChkaXNtaXNzYWxUeXBlKTsKLQotICAgIHJldHVybiAqdGhpczsKLX0KLQogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCBlN2JmZTE3 NWVlZmVkNWExNDU5MWIzOGU5Y2JkYTg3YWY0Yjg3OTg0Li42M2JiMjliNWU1ZDNlZmM0NzBiOTFk ZmZlZTE1YzkwMWZhYjIzOWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaApAQCAt MjcyLDcgKzI3MiwxMyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBzdGFydGVkKCk7CiAKLSAg ICBQYWdlOjpEaXNtaXNzYWxUeXBlIHBhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCgp IGNvbnN0IHsgcmV0dXJuIG1fcGFnZURpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkOyB9Cisg ICAgZW51bSBjbGFzcyBQYWdlRGlzbWlzc2FsVHlwZSB7CisgICAgICAgIE5vbmUsCisgICAgICAg IEJlZm9yZVVubG9hZCwKKyAgICAgICAgUGFnZUhpZGUsCisgICAgICAgIFVubG9hZAorICAgIH07 CisgICAgUGFnZURpc21pc3NhbFR5cGUgcGFnZURpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVk KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQ7IH0K IAogICAgIFdFQkNPUkVfRVhQT1JUIE5ldHdvcmtpbmdDb250ZXh0KiBuZXR3b3JraW5nQ29udGV4 dCgpIGNvbnN0OwogCkBAIC00MTMsMjEgKzQxOSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2Rp ZENhbGxJbXBsaWNpdENsb3NlOwogICAgIGJvb2wgbV93YXNVbmxvYWRFdmVudEVtaXR0ZWQ7CiAK LSAgICBjbGFzcyBQYWdlRGlzbWlzc2FsRXZlbnRUeXBlIHsKLSAgICBwdWJsaWM6Ci0gICAgICAg IFBhZ2VEaXNtaXNzYWxFdmVudFR5cGUoRnJhbWUmIGZyYW1lKQotICAgICAgICAgICAgOiBtX2Zy YW1lKGZyYW1lKQotICAgICAgICB7IH0KLQotICAgICAgICBQYWdlRGlzbWlzc2FsRXZlbnRUeXBl JiBvcGVyYXRvcj0oUGFnZTo6RGlzbWlzc2FsVHlwZSk7Ci0gICAgICAgIG9wZXJhdG9yIFBhZ2U6 OkRpc21pc3NhbFR5cGUoKSBjb25zdCB7IHJldHVybiBtX2Rpc21pc3NhbEV2ZW50QmVpbmdEaXNw YXRjaGVkOyB9Ci0KLSAgICBwcml2YXRlOgotICAgICAgICBGcmFtZSYgbV9mcmFtZTsKLSAgICAg ICAgUGFnZTo6RGlzbWlzc2FsVHlwZSBtX2Rpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkIHsg UGFnZTo6RGlzbWlzc2FsVHlwZTo6Tm9uZSB9OwotICAgIH07Ci0KLSAgICBQYWdlRGlzbWlzc2Fs RXZlbnRUeXBlIG1fcGFnZURpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkOworICAgIFBhZ2VE aXNtaXNzYWxUeXBlIG1fcGFnZURpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkIHsgUGFnZURp c21pc3NhbFR5cGU6Ok5vbmUgfTsKICAgICBib29sIG1faXNDb21wbGV0ZTsKIAogICAgIFJlZlB0 cjxTZXJpYWxpemVkU2NyaXB0VmFsdWU+IG1fcGVuZGluZ1N0YXRlT2JqZWN0OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9JbWFnZUxvYWRlci5jcHAKaW5kZXggMjAzOTRkMTM5MzA4NjUwODZjNWFiOWM4ZmI4 ZWNkYzU3YWFjZmQyMS4uODI4MDhiNmY1ZjlkNGEwOWEzMmQ1M2YyNzIyNzczM2E3MTQ1NzJjYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ltYWdlTG9hZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvSW1hZ2VMb2FkZXIuY3BwCkBAIC04NCw3ICs4NCw3IEBAIHN0 YXRpYyBJbWFnZUV2ZW50U2VuZGVyJiBlcnJvckV2ZW50U2VuZGVyKCkKIHN0YXRpYyBpbmxpbmUg Ym9vbCBwYWdlSXNCZWluZ0Rpc21pc3NlZChEb2N1bWVudCYgZG9jdW1lbnQpCiB7CiAgICAgRnJh bWUqIGZyYW1lID0gZG9jdW1lbnQuZnJhbWUoKTsKLSAgICByZXR1cm4gZnJhbWUgJiYgZnJhbWUt PmxvYWRlcigpLnBhZ2VEaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCgpICE9IFBhZ2U6OkRp c21pc3NhbFR5cGU6Ok5vbmU7CisgICAgcmV0dXJuIGZyYW1lICYmIGZyYW1lLT5sb2FkZXIoKS5w YWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQoKSAhPSBGcmFtZUxvYWRlcjo6UGFnZURp c21pc3NhbFR5cGU6Ok5vbmU7CiB9CiAKIEltYWdlTG9hZGVyOjpJbWFnZUxvYWRlcihFbGVtZW50 JiBlbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hl ZFJlc291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJj ZS5jcHAKaW5kZXggNTM3OGQ5YjgwNjhiYzBlYWI2NDlmNmJlZWIzYjU1ODQ3OGJkNjU4Ni4uZWNk ZDFlZDU5ODNlNjJhN2UwZGRjMzhlNWI5ZDYyOTQ2Y2ZmMzA0NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2UuY3BwCkBAIC0yMTQsOCArMjE0LDggQEAg dm9pZCBDYWNoZWRSZXNvdXJjZTo6bG9hZChDYWNoZWRSZXNvdXJjZUxvYWRlciYgY2FjaGVkUmVz b3VyY2VMb2FkZXIsIGNvbnN0IFJlc28KICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIC8v IFByZXZlbnQgJ3BhZ2VoaWRlJyBldmVudCBoYW5kbGVycyBmcm9tIHN0YXJ0aW5nIG5ldyBsb2Fk cyBhcyB3ZSBhcmUgaW4gdGhlIFBhZ2VDYWNoZS4KLSAgICBpZiAoY2FjaGVkUmVzb3VyY2VMb2Fk ZXIuZnJhbWUoKS0+cGFnZSgpICYmIGNhY2hlZFJlc291cmNlTG9hZGVyLmZyYW1lKCktPnBhZ2Uo KS0+ZGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQoKSA9PSBQYWdlOjpEaXNtaXNzYWxUeXBl OjpQYWdlSGlkZSkgeworICAgIC8vIFByZXZlbnQgbmV3IGxvYWRzIGlmIHdlIGFyZSBpbiB0aGUg UGFnZUNhY2hlIChvciBiZWluZyBhZGRlZCB0byB0aGUgUGFnZUNhY2hlKS4KKyAgICBpZiAoY2Fj aGVkUmVzb3VyY2VMb2FkZXIuZnJhbWUoKS0+cGFnZSgpICYmIGNhY2hlZFJlc291cmNlTG9hZGVy LmZyYW1lKCktPnBhZ2UoKS0+aW5QYWdlQ2FjaGUoKSkgewogICAgICAgICBmYWlsQmVmb3JlU3Rh cnRpbmcoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDZlMDg1Y2NiNTgw NTVmNjkzNzI5ODBmMWI1MDc0NTYzOGViNTc0NmUuLjZjMzBkNzQ1YmMwMGQ1NjNjOGQ1NWRlMWFi MDlmMWY4MTg2MTc5YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtMTc2LDcgKzE3Niw3IEBAIFNlc3Npb25JRCBD YWNoZWRSZXNvdXJjZUxvYWRlcjo6c2Vzc2lvbklEKCkgY29uc3QKIENhY2hlZFJlc291cmNlSGFu ZGxlPENhY2hlZEltYWdlPiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdEltYWdlKENhY2hl ZFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBpZiAoRnJhbWUqIGZyYW1lID0gdGhp cy0+ZnJhbWUoKSkgewotICAgICAgICBpZiAoZnJhbWUtPmxvYWRlcigpLnBhZ2VEaXNtaXNzYWxF dmVudEJlaW5nRGlzcGF0Y2hlZCgpICE9IFBhZ2U6OkRpc21pc3NhbFR5cGU6Ok5vbmUpIHsKKyAg ICAgICAgaWYgKGZyYW1lLT5sb2FkZXIoKS5wYWdlRGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNo ZWQoKSAhPSBGcmFtZUxvYWRlcjo6UGFnZURpc21pc3NhbFR5cGU6Ok5vbmUpIHsKICAgICAgICAg ICAgIFVSTCByZXF1ZXN0VVJMID0gcmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKS51cmwoKTsKICAg ICAgICAgICAgIGlmIChyZXF1ZXN0VVJMLmlzVmFsaWQoKSAmJiBjYW5SZXF1ZXN0KENhY2hlZFJl c291cmNlOjpJbWFnZVJlc291cmNlLCByZXF1ZXN0VVJMLCByZXF1ZXN0Lm9wdGlvbnMoKSwgcmVx dWVzdC5mb3JQcmVsb2FkKCkpKQogICAgICAgICAgICAgICAgIFBpbmdMb2FkZXI6OmxvYWRJbWFn ZSgqZnJhbWUsIHJlcXVlc3RVUkwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggZmNiNzFiYjI3NjYx OTQ3YTM5ZGNmN2I5ZTAzMDc0N2M2MDU2M2VlZS4uMTU1ODI1YjViNTU3YTBiNTU2ZjRhOTE3M2Vk YWY3YWM1NTk4ZTY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC01NjIsNiArNTYyLDE1IEBAIHZv aWQgUGFnZTo6c2V0Q2FuU3RhcnRNZWRpYShib29sIGNhblN0YXJ0TWVkaWEpCiAgICAgfQogfQog Citib29sIFBhZ2U6OmluUGFnZUNhY2hlKCkgY29uc3QKK3sKKyAgICBhdXRvKiBkb2N1bWVudCA9 IG1haW5GcmFtZSgpLmRvY3VtZW50KCk7CisgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGRvY3VtZW50LT5pblBhZ2VDYWNoZSgpOworfQorCiBz dGF0aWMgRnJhbWUqIGluY3JlbWVudEZyYW1lKEZyYW1lKiBjdXJyLCBib29sIGZvcndhcmQsIGJv b2wgd3JhcEZsYWcpCiB7CiAgICAgcmV0dXJuIGZvcndhcmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggMTRi NTdkZjkzNjA5Nzg1MGU0NmJhZTRkYWVhM2ZhMDkyZTQwYmMxZC4uMjY0YjhkNGEwZTJjY2RjNjFm MjQ5YzAxY2NjZTllZGU2ZTRkZWNlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKQEAgLTE1NiwxNCArMTU2LDcg QEAgcHVibGljOgogICAgIE1haW5GcmFtZSYgbWFpbkZyYW1lKCkgeyBBU1NFUlQobV9tYWluRnJh bWUpOyByZXR1cm4gKm1fbWFpbkZyYW1lOyB9CiAgICAgY29uc3QgTWFpbkZyYW1lJiBtYWluRnJh bWUoKSBjb25zdCB7IEFTU0VSVChtX21haW5GcmFtZSk7IHJldHVybiAqbV9tYWluRnJhbWU7IH0K IAotICAgIGVudW0gY2xhc3MgRGlzbWlzc2FsVHlwZSB7Ci0gICAgICAgIE5vbmUsCi0gICAgICAg IEJlZm9yZVVubG9hZCwKLSAgICAgICAgUGFnZUhpZGUsCi0gICAgICAgIFVubG9hZAotICAgIH07 Ci0gICAgRGlzbWlzc2FsVHlwZSBkaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCgpIGNvbnN0 IHsgcmV0dXJuIG1fZGlzbWlzc2FsRXZlbnRCZWluZ0Rpc3BhdGNoZWQ7IH0KLSAgICB2b2lkIHNl dERpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkKERpc21pc3NhbFR5cGUgZGlzbWlzc2FsVHlw ZSkgeyBtX2Rpc21pc3NhbEV2ZW50QmVpbmdEaXNwYXRjaGVkID0gZGlzbWlzc2FsVHlwZTsgfQor ICAgIGJvb2wgaW5QYWdlQ2FjaGUoKSBjb25zdDsKIAogICAgIGJvb2wgb3BlbmVkQnlET00oKSBj b25zdDsKICAgICB2b2lkIHNldE9wZW5lZEJ5RE9NKCk7CkBAIC02MjcsNyArNjIwLDYgQEAgcHJp dmF0ZToKICAgICBib29sIG1faXNDbG9zaW5nOwogCiAgICAgTWVkaWFQcm9kdWNlcjo6TWVkaWFT dGF0ZUZsYWdzIG1fbWVkaWFTdGF0ZSB7IE1lZGlhUHJvZHVjZXI6OklzTm90UGxheWluZyB9Owot ICAgIERpc21pc3NhbFR5cGUgbV9kaXNtaXNzYWxFdmVudEJlaW5nRGlzcGF0Y2hlZCB7IERpc21p c3NhbFR5cGU6Ok5vbmUgfTsKICAgICAKICAgICBib29sIG1fdXNlckNvbnRlbnRFeHRlbnNpb25z RW5hYmxlZCB7IHRydWUgfTsKIH07Cg==