147203 2015-07-22 15:04:50 -0700 [iOS] Adjust the preview architecture 2015-07-22 18:10:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin enrica sam simon.fraser oldest_to_newest 1111440 0 thorton 2015-07-22 15:04:50 -0700 [iOS] Adjust the preview architecture 1111441 1 257299 thorton 2015-07-22 15:09:38 -0700 Created attachment 257299 Patch 1111469 2 thorton 2015-07-22 16:29:04 -0700 http://trac.webkit.org/changeset/187193 1111506 3 thorton 2015-07-22 18:08:17 -0700 Reopening to attach new patch. 1111507 4 257317 thorton 2015-07-22 18:08:18 -0700 Created attachment 257317 Patch 1111508 5 thorton 2015-07-22 18:10:08 -0700 Follow up in http://trac.webkit.org/changeset/187198 257299 2015-07-22 15:09:38 -0700 2015-07-22 18:08:30 -0700 Patch bug-147203-20150722150824.patch text/plain 19965 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTRhYTBiMzFmYjZhMTcw ZjBkMWFiNDRiZTk4NDQyYzM0ZDQ3NDEzOC4uM2ViODA0NGZiMDBiMWRmYzg4MzU0ZmQ5YTk0ZDIx NWQxYzgyZmEzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE1LTA3LTIyICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFkanVz dCB0aGUgcHJldmlldyBhcmNoaXRlY3R1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0NzIwMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjE5NDU3 NzU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQ bGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfc2V0QWxsb3dzTGlua1ByZXZp ZXc6XSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1t OgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHdpbGxNb3ZlVG9XaW5kb3c6XSk6IERlbGV0ZWQu CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBzZXR1cEludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgY2xlYW51cEludGVyYWN0aW9uXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcg X3JlZ2lzdGVyUHJldmlld10pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF91bnJlZ2lzdGVy UHJldmlld10pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9pbnRlcmFjdGlvblNob3VsZEJl Z2luRnJvbVByZXZpZXdJdGVtQ29udHJvbGxlcjpmb3JQb3NpdGlvbjpdKToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBfZGF0YUZvclByZXZpZXdJdGVtQ29udHJvbGxlcjphdFBvc2l0aW9uOnR5 cGU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3ByZXNlbnRhdGlvblJlY3RGb3JQcmV2 aWV3SXRlbUNvbnRyb2xsZXI6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3ByZXNlbnRl ZFZpZXdDb250cm9sbGVyRm9yUHJldmlld0l0ZW1Db250cm9sbGVyOl0pOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXI6Y29tbWl0UHJldmlldzpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBfcHJldmlld0l0ZW1Db250cm9sbGVyOndpbGxQcmVzZW50 UHJldmlldzpmb3JQb3NpdGlvbjppblNvdXJjZVZpZXc6XSk6CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgX3ByZXZpZXdJdGVtQ29udHJvbGxlcjpkaWREaXNtaXNzUHJldmlldzpjb21taXR0aW5n Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9wcmVzZW50YXRpb25TbmFwc2hvdEZvclBy ZXZpZXdJdGVtQ29udHJvbGxlcjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfcHJlc2Vu dGF0aW9uUmVjdHNGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6XSk6CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgZ2VzdHVyZVJlY29nbml6ZXJTaG91bGRCZWdpbjpdKTogRGVsZXRlZC4KKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBfcmVnaXN0ZXJQcmV2aWV3SW5XaW5kb3c6XSk6IERlbGV0ZWQu CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3VucmVnaXN0ZXJQcmV2aWV3SW5XaW5kb3c6XSk6 IERlbGV0ZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgcHJldmlld1ZpZXdDb250cm9sbGVy Rm9yUG9zaXRpb246aW5Tb3VyY2VWaWV3Ol0pOiBEZWxldGVkLgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IGNvbW1pdFByZXZpZXdWaWV3Q29udHJvbGxlcjpdKTogRGVsZXRlZC4KKyAgICAgICAg KC1bV0tDb250ZW50VmlldyB3aWxsUHJlc2VudFByZXZpZXdWaWV3Q29udHJvbGxlcjpmb3JQb3Np dGlvbjppblNvdXJjZVZpZXc6XSk6IERlbGV0ZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcg ZGlkRGlzbWlzc1ByZXZpZXdWaWV3Q29udHJvbGxlcjpjb21taXR0aW5nOl0pOiBEZWxldGVkLgor ICAgICAgICBSZWdpc3RlciBhbmQgdW5yZWdpc3RlciBpbiBzZXR1cC9jbGVhbnVwSW50ZXJhY3Rp b24gaW5zdGVhZCBvZiB3aGVuIG1vdmluZyBiZXR3ZWVuIHdpbmRvd3MuCisgICAgICAgIEltcGxl bWVudCAnc2hvdWxkQmVnaW4nIGluc3RlYWQgb2YgaW50ZXJhY3RpbmcgZGlyZWN0bHkgd2l0aCB0 aGUgcmVjb2duaXplci4KKyAgICAgICAgTWFrZSB1c2Ugb2Ygc3lzdGVtIGVudW1zIGluc3RlYWQg b2Ygb3VyIG93bi4KKyAgICAgICAgTGV0IFVJUHJldmlld0l0ZW1Db250cm9sbGVyIGhhbmRsZSBz aHJpbmstd3JhcHBpbmcgYW5kIHRoZSBpbmRpY2F0b3Igdmlldy4KKwogMjAxNS0wNy0yMiAgTWlj aGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgW1NlY2Nv bXAgRmlsdGVyc10gQWRkIGhlbHBlcnMgdG8gZ2V0IFhERyBiYXNlIGRpcmVjdG9yeSBsb2NhdGlv bnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEku aCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAppbmRleCAyMjcx YzY2MjQ5NTFmMDM1YzIxZWNiMzUxOGI5MGI2MmViOWY3MjVlLi4zYmEwZTY3ODk2NTlhMjA1OGNl YWIxNWU3ZjZiZWE4ZGE3ZTFiNDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9zcGkvaW9zL1VJS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lv cy9VSUtpdFNQSS5oCkBAIC00OCw2ICs0OCw3IEBACiAjaW1wb3J0IDxVSUtpdC9VSVBpY2tlckNv bnRlbnRWaWV3X1ByaXZhdGUuaD4KICNpbXBvcnQgPFVJS2l0L1VJUGlja2VyVmlld19Qcml2YXRl Lmg+CiAjaW1wb3J0IDxVSUtpdC9VSVByZXNlbnRhdGlvbkNvbnRyb2xsZXJfUHJpdmF0ZS5oPgor I2ltcG9ydCA8VUlLaXQvVUlQcmV2aWV3SXRlbUNvbnRyb2xsZXIuaD4KICNpbXBvcnQgPFVJS2l0 L1VJUmVzcG9uZGVyX1ByaXZhdGUuaD4KICNpbXBvcnQgPFVJS2l0L1VJU2Nyb2xsVmlld19Qcml2 YXRlLmg+CiAjaW1wb3J0IDxVSUtpdC9VSVN0cmluZ0RyYXdpbmdfUHJpdmF0ZS5oPgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCAzNDlj NjM3M2E3MjMyN2NmZGIyOGZjMDYxMGYyYTg5ZDgzMDhhMmQzLi4wZmZjYTgzZWU5MzYxYzI0YzFh ODUwMWQ3MWEwYWI2YTI1ZjE3YzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMjk5OCwxMiArMjk5OCw2IEBAIHN0YXRpYyBpbmxp bmUgV2ViS2l0OjpGaW5kT3B0aW9ucyB0b0ZpbmRPcHRpb25zKF9XS0ZpbmRPcHRpb25zIHdrRmlu ZE9wdGlvbnMpCiAgICAgICAgIHJldHVybjsKIAogICAgIF9hbGxvd3NMaW5rUHJldmlldyA9IGFs bG93c0xpbmtQcmV2aWV3OwotI2lmIEhBVkUoTElOS19QUkVWSUVXKQotICAgIGlmIChfYWxsb3dz TGlua1ByZXZpZXcpCi0gICAgICAgIFtfY29udGVudFZpZXcgX3JlZ2lzdGVyUHJldmlld0luV2lu ZG93OltfY29udGVudFZpZXcgd2luZG93XV07Ci0gICAgZWxzZQotICAgICAgICBbX2NvbnRlbnRW aWV3IF91bnJlZ2lzdGVyUHJldmlld0luV2luZG93OltfY29udGVudFZpZXcgd2luZG93XV07Ci0j ZW5kaWYKIH0KIAogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlldy5tbQppbmRleCA2YjdkMzU5MzBkOWZhMjBiZjE1N2E1ZWU1ZTg0ZTk3Zjg1NWYxYmM4 Li4xMTExMjYzZTVlNDgyNTE4NWYxZWIyZTVhM2NhZDc1NTU5N2ExYzI1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBAIC0yNjgsMTAgKzI2OCw2 IEBAIHByaXZhdGU6CiAKICAgICBpZiAod2luZG93KSB7CiAgICAgICAgIFtkZWZhdWx0Q2VudGVy IHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpVSVdpbmRvd0RpZE1vdmVUb1NjcmVlbk5vdGlmaWNh dGlvbiBvYmplY3Q6d2luZG93XTsKLSNpZiBIQVZFKExJTktfUFJFVklFVykKLSAgICAgICAgaWYg KF93ZWJWaWV3Ll9hbGxvd3NMaW5rUHJldmlldykKLSAgICAgICAgICAgIFtzZWxmIF91bnJlZ2lz dGVyUHJldmlld0luV2luZG93OndpbmRvd107Ci0jZW5kaWYKIAogICAgICAgICBpZiAoIW5ld1dp bmRvdykgewogICAgICAgICAgICAgQVNTRVJUKF9hcHBsaWNhdGlvblN0YXRlVHJhY2tlcik7CkBA IC0yODEsMTAgKzI3Nyw2IEBAIHByaXZhdGU6CiAKICAgICBpZiAobmV3V2luZG93KSB7CiAgICAg ICAgIFtkZWZhdWx0Q2VudGVyIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKF93 aW5kb3dEaWRNb3ZlVG9TY3JlZW5Ob3RpZmljYXRpb246KSBuYW1lOlVJV2luZG93RGlkTW92ZVRv U2NyZWVuTm90aWZpY2F0aW9uIG9iamVjdDpuZXdXaW5kb3ddOwotI2lmIEhBVkUoTElOS19QUkVW SUVXKQotICAgICAgICBpZiAoX3dlYlZpZXcuX2FsbG93c0xpbmtQcmV2aWV3KQotICAgICAgICAg ICAgW3NlbGYgX3JlZ2lzdGVyUHJldmlld0luV2luZG93Om5ld1dpbmRvd107Ci0jZW5kaWYKIAog ICAgICAgICBbc2VsZiBfdXBkYXRlRm9yU2NyZWVuOm5ld1dpbmRvdy5zY3JlZW5dOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5oCmluZGV4IDQzZDRhMWZmNTBmNTA3ODZkNGUxZDNhODk0NWUwODhlZmI0MTE3 OTkuLjMwZTA5NzE0YjM1Y2QyZDJkMzQ3YzBjMmJlY2UxZmI3YmVlZGEwNzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24uaApAQCAtOTQsMTIgKzk0LDYgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAg ICBVSVdLQXV0b2NvcnJlY3Rpb25Db250ZXh0SGFuZGxlciBhdXRvY29ycmVjdGlvbkNvbnRleHRI YW5kbGVyOwogfTsKIAotZW51bSBjbGFzcyBQcmV2aWV3RWxlbWVudFR5cGUgewotICAgIE5vbmUg PSAwLAotICAgIExpbmssCi0gICAgSW1hZ2UKLX07Ci0KIH0KIAogQGludGVyZmFjZSBXS0NvbnRl bnRWaWV3ICgpIHsKQEAgLTEyNyw3ICsxMjEsNyBAQCBlbnVtIGNsYXNzIFByZXZpZXdFbGVtZW50 VHlwZSB7CiAgICAgUmV0YWluUHRyPFdLRm9ybUlucHV0U2Vzc2lvbj4gX2Zvcm1JbnB1dFNlc3Np b247CiAgICAgUmV0YWluUHRyPFdLRmlsZVVwbG9hZFBhbmVsPiBfZmlsZVVwbG9hZFBhbmVsOwog ICAgIFJldGFpblB0cjxVSUdlc3R1cmVSZWNvZ25pemVyPiBfcHJldmlld0dlc3R1cmVSZWNvZ25p emVyOwotICAgIFdlYktpdDo6UHJldmlld0VsZW1lbnRUeXBlIF9wcmV2aWV3VHlwZTsKKyAgICBS ZXRhaW5QdHI8VUlQcmV2aWV3SXRlbUNvbnRyb2xsZXI+IF9wcmV2aWV3SXRlbUNvbnRyb2xsZXI7 CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpTbWFydE1hZ25pZmljYXRpb25Db250cm9s bGVyPiBfc21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlcjsKIApAQCAtMTUyLDExICsxNDYsNiBA QCBlbnVtIGNsYXNzIFByZXZpZXdFbGVtZW50VHlwZSB7CiAgICAgQ0dQb2ludCBfbGFzdEludGVy YWN0aW9uTG9jYXRpb247CiAKICAgICBXZWJLaXQ6OldLU2VsZWN0aW9uRHJhd2luZ0luZm8gX2xh c3RTZWxlY3Rpb25EcmF3aW5nSW5mbzsKLSNpZiBIQVZFKExJTktfUFJFVklFVykKLSAgICBpZCA8 VUlWaWV3Q29udHJvbGxlclByZXZpZXdpbmc+IF9wcmV2aWV3aW5nOwotI2VuZGlmCi0KLSAgICBS ZXRhaW5QdHI8VUlJbWFnZVZpZXc+IF9wcmV2aWV3SW5kaWNhdG9yVmlldzsKIAogICAgIEJPT0wg X2lzRWRpdGFibGU7CiAgICAgQk9PTCBfc2hvd2luZ1RleHRTdHlsZU9wdGlvbnM7CkBAIC0yMTgs MTAgKzIwNywxMCBAQCBlbnVtIGNsYXNzIFByZXZpZXdFbGVtZW50VHlwZSB7CiBAZW5kCiAKICNp ZiBIQVZFKExJTktfUFJFVklFVykKLUBpbnRlcmZhY2UgV0tDb250ZW50VmlldyAoV0tJbnRlcmFj dGlvblByZXZpZXcpIDxVSVZpZXdDb250cm9sbGVyUHJldmlld2luZ0RlbGVnYXRlPgorQGludGVy ZmFjZSBXS0NvbnRlbnRWaWV3IChXS0ludGVyYWN0aW9uUHJldmlldykgPFVJUHJldmlld0l0ZW1E ZWxlZ2F0ZT4KIAotLSAodm9pZClfcmVnaXN0ZXJQcmV2aWV3SW5XaW5kb3c6KFVJV2luZG93ICop d2luZG93OwotLSAodm9pZClfdW5yZWdpc3RlclByZXZpZXdJbldpbmRvdzooVUlXaW5kb3cgKil3 aW5kb3c7CistICh2b2lkKV9yZWdpc3RlclByZXZpZXc7CistICh2b2lkKV91bnJlZ2lzdGVyUHJl dmlldzsKIEBlbmQKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDZjY2I0Nzg4YmY2YjZm MDYwMjVkNzVkM2Q3OTk3MTBhYjc4YTJhMjYuLmY5ZTk5M2Y5ZTI3NTYxOWIzNTIyNDRkYjQ1ODU2 YWNjY2NhOWNiMjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0zNDEsNiArMzQxLDggQEAgc3RhdGlj IFVJV2ViU2VsZWN0aW9uTW9kZSB0b1VJV2ViU2VsZWN0aW9uTW9kZShXS1NlbGVjdGlvbkdyYW51 bGFyaXR5IGdyYW51bGFyaXQKICAgICBbX2xvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyIHNldERl bGVnYXRlOnNlbGZdOwogICAgIFtzZWxmIGFkZEdlc3R1cmVSZWNvZ25pemVyOl9sb25nUHJlc3NH ZXN0dXJlUmVjb2duaXplci5nZXQoKV07CiAKKyAgICBbc2VsZiBfcmVnaXN0ZXJQcmV2aWV3XTsK KwogICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6 c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX3Jlc2V0U2hvd2luZ1RleHRTdHlsZTopIG5hbWU6VUlN ZW51Q29udHJvbGxlckRpZEhpZGVNZW51Tm90aWZpY2F0aW9uIG9iamVjdDpuaWxdOwogICAgIF9z aG93aW5nVGV4dFN0eWxlT3B0aW9ucyA9IE5POwogCkBAIC0zOTYsNiArMzk4LDcgQEAgc3RhdGlj IFVJV2ViU2VsZWN0aW9uTW9kZSB0b1VJV2ViU2VsZWN0aW9uTW9kZShXS1NlbGVjdGlvbkdyYW51 bGFyaXR5IGdyYW51bGFyaXQKICAgICAgICAgX2luc3BlY3Rvck5vZGVTZWFyY2hHZXN0dXJlUmVj b2duaXplciA9IG5pbDsKICAgICB9CiAKKyAgICBbc2VsZiBfdW5yZWdpc3RlclByZXZpZXddOwog ICAgIGlmIChfZmlsZVVwbG9hZFBhbmVsKSB7CiAgICAgICAgIFtfZmlsZVVwbG9hZFBhbmVsIHNl dERlbGVnYXRlOm5pbF07CiAgICAgICAgIFtfZmlsZVVwbG9hZFBhbmVsIGRpc21pc3NdOwpAQCAt OTY1LDE2ICs5NjgsNiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNTYW1lUGFpcihVSUdlc3R1cmVS ZWNvZ25pemVyICphLCBVSUdlc3R1cmVSZWNvZ25pemVyICpiLCBVSQogICAgICAgICB9CiAgICAg fQogCi0gICAgaWYgKGdlc3R1cmVSZWNvZ25pemVyID09IF9wcmV2aWV3R2VzdHVyZVJlY29nbml6 ZXIpIHsKLSAgICAgICAgW3NlbGYgZW5zdXJlUG9zaXRpb25JbmZvcm1hdGlvbklzVXBUb0RhdGU6 cG9pbnRdOwotICAgICAgICBpZiAoX3Bvc2l0aW9uSW5mb3JtYXRpb24uY2xpY2thYmxlRWxlbWVu dE5hbWUgIT0gIkEiICYmIF9wb3NpdGlvbkluZm9ybWF0aW9uLmNsaWNrYWJsZUVsZW1lbnROYW1l ICE9ICJJTUciKQotICAgICAgICAgICAgcmV0dXJuIE5POwotCi0gICAgICAgIFN0cmluZyBhYnNv bHV0ZUxpbmtVUkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi51cmw7Ci0gICAgICAgIGlmIChfcG9z aXRpb25JbmZvcm1hdGlvbi5jbGlja2FibGVFbGVtZW50TmFtZSA9PSAiQSIgJiYgKGFic29sdXRl TGlua1VSTC5pc0VtcHR5KCkgfHwgIVdlYkNvcmU6OnByb3RvY29sSXNJbkhUVFBGYW1pbHkoYWJz b2x1dGVMaW5rVVJMKSkpCi0gICAgICAgICAgICByZXR1cm4gTk87Ci0gICAgfQotCiAgICAgcmV0 dXJuIFlFUzsKIH0KIApAQCAtMzIwMywzMCArMzE5Niw0MyBAQCBzdGF0aWMgYm9vbCBpc0Fzc2lz dGFibGVJbnB1dFR5cGUoSW5wdXRUeXBlIHR5cGUpCiAKIEBpbXBsZW1lbnRhdGlvbiBXS0NvbnRl bnRWaWV3IChXS0ludGVyYWN0aW9uUHJldmlldykKIAotLSAodm9pZClfcmVnaXN0ZXJQcmV2aWV3 SW5XaW5kb3c6KFVJV2luZG93ICopd2luZG93CistICh2b2lkKV9yZWdpc3RlclByZXZpZXcKIHsK LSAgICBfcHJldmlld2luZyA9IFtbd2luZG93LnJvb3RWaWV3Q29udHJvbGxlciByZWdpc3RlckZv clByZXZpZXdpbmdXaXRoU291cmNlVmlldzpzZWxmXSByZXRhaW5dOwotICAgIF9wcmV2aWV3aW5n LmRlbGVnYXRlID0gc2VsZjsKLSAgICBfcHJldmlld0dlc3R1cmVSZWNvZ25pemVyID0gX3ByZXZp ZXdpbmcucHJlc2VudGF0aW9uR2VzdHVyZVJlY29nbml6ZXI7Ci0gICAgW19wcmV2aWV3R2VzdHVy ZVJlY29nbml6ZXIgc2V0RGVsZWdhdGU6c2VsZl07CisgICAgX3ByZXZpZXdJdGVtQ29udHJvbGxl ciA9IGFkb3B0TlMoW1tVSVByZXZpZXdJdGVtQ29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhWaWV3 OnNlbGZdKTsKKyAgICBbX3ByZXZpZXdJdGVtQ29udHJvbGxlciBzZXREZWxlZ2F0ZTpzZWxmXTsK KyAgICBfcHJldmlld0dlc3R1cmVSZWNvZ25pemVyID0gX3ByZXZpZXdJdGVtQ29udHJvbGxlci5n ZXQoKS5wcmVzZW50YXRpb25HZXN0dXJlUmVjb2duaXplcjsKIH0KIAotLSAodm9pZClfdW5yZWdp c3RlclByZXZpZXdJbldpbmRvdzooVUlXaW5kb3cgKil3aW5kb3cKKy0gKHZvaWQpX3VucmVnaXN0 ZXJQcmV2aWV3CiB7Ci0gICAgW3dpbmRvdy5yb290Vmlld0NvbnRyb2xsZXIgdW5yZWdpc3RlclBy ZXZpZXdpbmc6X3ByZXZpZXdpbmddOwotICAgIF9wcmV2aWV3aW5nLmRlbGVnYXRlID0gbmlsOwot ICAgIFtfcHJldmlld0dlc3R1cmVSZWNvZ25pemVyIHNldERlbGVnYXRlOm5pbF07CisgICAgW19w cmV2aWV3SXRlbUNvbnRyb2xsZXIgc2V0RGVsZWdhdGU6bmlsXTsKICAgICBfcHJldmlld0dlc3R1 cmVSZWNvZ25pemVyID0gbmlsOwotICAgIFtfcHJldmlld2luZyByZWxlYXNlXTsKLSAgICBfcHJl dmlld2luZyA9IG5pbDsKKyAgICBfcHJldmlld0l0ZW1Db250cm9sbGVyID0gbmlsOwogfQogCi0t IChVSVZpZXdDb250cm9sbGVyICopcHJldmlld1ZpZXdDb250cm9sbGVyRm9yUG9zaXRpb246KENH UG9pbnQpcG9zaXRpb24gaW5Tb3VyY2VWaWV3OihVSVZpZXcgKilzb3VyY2VWaWV3CistIChCT09M KV9pbnRlcmFjdGlvblNob3VsZEJlZ2luRnJvbVByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2 aWV3SXRlbUNvbnRyb2xsZXIgKiljb250cm9sbGVyIGZvclBvc2l0aW9uOihDR1BvaW50KXBvc2l0 aW9uCiB7Ci0gICAgQVNTRVJUKHNlbGYgPT0gc291cmNlVmlldyk7Ci0KLSAgICBfcHJldmlld1R5 cGUgPSBQcmV2aWV3RWxlbWVudFR5cGU6Ok5vbmU7CisgICAgW3NlbGYgZW5zdXJlUG9zaXRpb25J bmZvcm1hdGlvbklzVXBUb0RhdGU6cG9zaXRpb25dOworICAgIGlmIChfcG9zaXRpb25JbmZvcm1h dGlvbi5jbGlja2FibGVFbGVtZW50TmFtZSAhPSAiQSIgJiYgX3Bvc2l0aW9uSW5mb3JtYXRpb24u Y2xpY2thYmxlRWxlbWVudE5hbWUgIT0gIklNRyIpCisgICAgICAgIHJldHVybiBOTzsKKyAgICAK KyAgICBTdHJpbmcgYWJzb2x1dGVMaW5rVVJMID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24udXJsOwor ICAgIGlmIChfcG9zaXRpb25JbmZvcm1hdGlvbi5jbGlja2FibGVFbGVtZW50TmFtZSA9PSAiQSIp IHsKKyAgICAgICAgaWYgKGFic29sdXRlTGlua1VSTC5pc0VtcHR5KCkpCisgICAgICAgICAgICBy ZXR1cm4gTk87CisgICAgICAgIGlmIChXZWJDb3JlOjpwcm90b2NvbElzSW5IVFRQRmFtaWx5KGFi c29sdXRlTGlua1VSTCkpCisgICAgICAgICAgICByZXR1cm4gWUVTOworICAgICAgICBOU1VSTCAq dGFyZ2V0VVJMID0gW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpfcG9zaXRpb25JbmZvcm1h dGlvbi51cmxdOworICAgICAgICBpZiAoW1tnZXRERERldGVjdGlvbkNvbnRyb2xsZXJDbGFzcygp IHRhcEFuZEhvbGRTY2hlbWVzXSBjb250YWluc09iamVjdDpbdGFyZ2V0VVJMIHNjaGVtZV1dKQor ICAgICAgICAgICAgcmV0dXJuIFlFUzsKKyAgICAgICAgcmV0dXJuIE5POworICAgIH0KKyAgICBy ZXR1cm4gWUVTOworfQogCistIChOU0RpY3Rpb25hcnkgKilfZGF0YUZvclByZXZpZXdJdGVtQ29u dHJvbGxlcjooVUlQcmV2aWV3SXRlbUNvbnRyb2xsZXIgKiljb250cm9sbGVyIGF0UG9zaXRpb246 KENHUG9pbnQpcG9zaXRpb24gdHlwZTooVUlQcmV2aWV3SXRlbVR5cGUgKil0eXBlCit7CisgICAg KnR5cGUgPSBVSVByZXZpZXdJdGVtVHlwZU5vbmU7CiAgICAgQk9PTCBjYW5TaG93SW1hZ2VQcmV2 aWV3ID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24uY2xpY2thYmxlRWxlbWVudE5hbWUgPT0gIklNRyI7 CiAgICAgQk9PTCBjYW5TaG93TGlua1ByZXZpZXcgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5jbGlj a2FibGVFbGVtZW50TmFtZSA9PSAiQSIgfHwgY2FuU2hvd0ltYWdlUHJldmlldzsKIApAQCAtMzI0 MCwxMCArMzI0NiwyOSBAQCBzdGF0aWMgYm9vbCBpc0Fzc2lzdGFibGVJbnB1dFR5cGUoSW5wdXRU eXBlIHR5cGUpCiAgICAgICAgIGNhblNob3dMaW5rUHJldmlldyA9IE5POwogICAgIH0KIAorICAg IE5TTXV0YWJsZURpY3Rpb25hcnkgKmRhdGFGb3JQcmV2aWV3ID0gW1tbTlNNdXRhYmxlRGljdGlv bmFyeSBhbGxvY10gaW5pdF0gYXV0b3JlbGVhc2VdOworICAgIGlmIChjYW5TaG93TGlua1ByZXZp ZXcpIHsKKyAgICAgICAgKnR5cGUgPSBVSVByZXZpZXdJdGVtVHlwZUxpbms7CisgICAgICAgIGRh dGFGb3JQcmV2aWV3W1VJUHJldmlld0RhdGFMaW5rXSA9IFtOU1VSTCBfd2ViX1VSTFdpdGhXVEZT dHJpbmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24udXJsXTsKKyAgICB9CisgICAgaWYgKGNhblNob3dJ bWFnZVByZXZpZXcpIHsKKyAgICAgICAgKnR5cGUgPSBVSVByZXZpZXdJdGVtVHlwZUltYWdlOwor ICAgICAgICBkYXRhRm9yUHJldmlld1tVSVByZXZpZXdEYXRhTGlua10gPSBbTlNVUkwgX3dlYl9V UkxXaXRoV1RGU3RyaW5nOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlVVJMXTsKKyAgICB9Cisg ICAgCisgICAgcmV0dXJuIGRhdGFGb3JQcmV2aWV3OworfQorCistIChDR1JlY3QpX3ByZXNlbnRh dGlvblJlY3RGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6KFVJUHJldmlld0l0ZW1Db250cm9sbGVy ICopY29udHJvbGxlcgoreworICAgIHJldHVybiBfcG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHM7 Cit9CisKKy0gKFVJVmlld0NvbnRyb2xsZXIgKilfcHJlc2VudGVkVmlld0NvbnRyb2xsZXJGb3JQ cmV2aWV3SXRlbUNvbnRyb2xsZXI6KFVJUHJldmlld0l0ZW1Db250cm9sbGVyICopY29udHJvbGxl cgorewogICAgIGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPiB1aURlbGVnYXRlID0gc3RhdGljX2Nh c3Q8aWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+PihbX3dlYlZpZXcgVUlEZWxlZ2F0ZV0pOwogCi0g ICAgaWYgKGNhblNob3dMaW5rUHJldmlldykgewotICAgICAgICBfcHJldmlld1R5cGUgPSBQcmV2 aWV3RWxlbWVudFR5cGU6Okxpbms7CisgICAgaWYgKFtfcHJldmlld0l0ZW1Db250cm9sbGVyIHR5 cGVdID09IFVJUHJldmlld0l0ZW1UeXBlTGluaykgewogICAgICAgICBOU1VSTCAqdGFyZ2V0VVJM ID0gW05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpfcG9zaXRpb25JbmZvcm1hdGlvbi51cmxd OwogICAgICAgICBSZXRhaW5QdHI8X1dLQWN0aXZhdGVkRWxlbWVudEluZm8+IGVsZW1lbnRJbmZv ID0gYWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBl Ol9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlTGluayBVUkw6dGFyZ2V0VVJMIGxvY2F0aW9uOl9wb3Np dGlvbkluZm9ybWF0aW9uLnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIHJl Y3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzIGltYWdlOl9wb3NpdGlvbkluZm9ybWF0aW9u LmltYWdlLmdldCgpXSk7CiAgICAgICAgIFJldGFpblB0cjxOU0FycmF5PiBhY3Rpb25zID0gW19h Y3Rpb25TaGVldEFzc2lzdGFudCBkZWZhdWx0QWN0aW9uc0ZvckxpbmtTaGVldDplbGVtZW50SW5m by5nZXQoKV07CkBAIC0zMjU3LDI3ICszMjgyLDE2IEBAIHN0YXRpYyBib29sIGlzQXNzaXN0YWJs ZUlucHV0VHlwZShJbnB1dFR5cGUgdHlwZSkKICAgICAgICAgICAgIF9oaWdobGlnaHRMb25nUHJl c3NDYW5DbGljayA9IE5POwogICAgICAgICAgICAgcmV0dXJuIFt1aURlbGVnYXRlIF93ZWJWaWV3 Ol93ZWJWaWV3IHByZXZpZXdWaWV3Q29udHJvbGxlckZvclVSTDp0YXJnZXRVUkxdOwogICAgICAg ICB9Ci0jaWYgSEFWRShTQUZBUklfU0VSVklDRVNfRlJBTUVXT1JLKQotICAgICAgICBTRlNhZmFy aVZpZXdDb250cm9sbGVyICpwcmV2aWV3Vmlld0NvbnRyb2xsZXIgPSBbYWxsb2NTRlNhZmFyaVZp ZXdDb250cm9sbGVySW5zdGFuY2UoKSBpbml0V2l0aFVSTDp0YXJnZXRVUkxdOwotICAgICAgICBw cmV2aWV3Vmlld0NvbnRyb2xsZXIuX3Nob3dpbmdMaW5rUHJldmlldyA9IFlFUzsKLSAgICAgICAg cHJldmlld1ZpZXdDb250cm9sbGVyLl9hY3RpdmF0ZWRFbGVtZW50SW5mbyA9IGVsZW1lbnRJbmZv LmdldCgpOwotICAgICAgICBwcmV2aWV3Vmlld0NvbnRyb2xsZXIuX3ByZXZpZXdBY3Rpb25zID0g YWN0aW9ucy5nZXQoKTsKLSAgICAgICAgX2hpZ2hsaWdodExvbmdQcmVzc0NhbkNsaWNrID0gTk87 Ci0gICAgICAgIF9wYWdlLT5zdGFydEludGVyYWN0aW9uV2l0aEVsZW1lbnRBdFBvc2l0aW9uKF9w b3NpdGlvbkluZm9ybWF0aW9uLnBvaW50KTsKLSAgICAgICAgcmV0dXJuIFtwcmV2aWV3Vmlld0Nv bnRyb2xsZXIgYXV0b3JlbGVhc2VdOwotI2Vsc2UKICAgICAgICAgcmV0dXJuIG5pbDsKLSNlbmRp ZgogICAgIH0KIAotICAgIGlmIChjYW5TaG93SW1hZ2VQcmV2aWV3KSB7CisgICAgaWYgKFtfcHJl dmlld0l0ZW1Db250cm9sbGVyIHR5cGVdID09IFVJUHJldmlld0l0ZW1UeXBlSW1hZ2UpIHsKICAg ICAgICAgaWYgKCFbdWlEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJW aWV3OmNvbW1pdFByZXZpZXdlZEltYWdlV2l0aFVSTDopXSkKICAgICAgICAgICAgIHJldHVybiBu aWw7CiAKICAgICAgICAgU3RyaW5nIGFic29sdXRlSW1hZ2VVUkwgPSBfcG9zaXRpb25JbmZvcm1h dGlvbi5pbWFnZVVSTDsKICAgICAgICAgaWYgKGFic29sdXRlSW1hZ2VVUkwuaXNFbXB0eSgpIHx8 ICEoV2ViQ29yZTo6cHJvdG9jb2xJc0luSFRUUEZhbWlseShhYnNvbHV0ZUltYWdlVVJMKSB8fCBX ZWJDb3JlOjpwcm90b2NvbElzKGFic29sdXRlSW1hZ2VVUkwsICJkYXRhIikpKQogICAgICAgICAg ICAgcmV0dXJuIG5pbDsKLSAgICAgICAgX3ByZXZpZXdUeXBlID0gUHJldmlld0VsZW1lbnRUeXBl OjpJbWFnZTsKICAgICAgICAgTlNVUkwgKnRhcmdldFVSTCA9IFtOU1VSTCBfd2ViX1VSTFdpdGhX VEZTdHJpbmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2VVUkxdOwogICAgICAgICBpZiAoW3Vp RGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzp3aWxsUHJldmll d0ltYWdlV2l0aFVSTDopXSkKICAgICAgICAgICAgIFt1aURlbGVnYXRlIF93ZWJWaWV3Ol93ZWJW aWV3IHdpbGxQcmV2aWV3SW1hZ2VXaXRoVVJMOnRhcmdldFVSTF07CkBAIC0zMjg5LDEwICszMzAz LDEwIEBAIHN0YXRpYyBib29sIGlzQXNzaXN0YWJsZUlucHV0VHlwZShJbnB1dFR5cGUgdHlwZSkK ICAgICByZXR1cm4gbmlsOwogfQogCi0tICh2b2lkKWNvbW1pdFByZXZpZXdWaWV3Q29udHJvbGxl cjooVUlWaWV3Q29udHJvbGxlciAqKXZpZXdDb250cm9sbGVyCistICh2b2lkKV9wcmV2aWV3SXRl bUNvbnRyb2xsZXI6KFVJUHJldmlld0l0ZW1Db250cm9sbGVyICopY29udHJvbGxlciBjb21taXRQ cmV2aWV3OihVSVZpZXdDb250cm9sbGVyICopdmlld0NvbnRyb2xsZXIKIHsKICAgICBpZCA8V0tV SURlbGVnYXRlUHJpdmF0ZT4gdWlEZWxlZ2F0ZSA9IHN0YXRpY19jYXN0PGlkIDxXS1VJRGVsZWdh dGVQcml2YXRlPj4oW193ZWJWaWV3IFVJRGVsZWdhdGVdKTsKLSAgICBpZiAoX3ByZXZpZXdUeXBl ID09IFByZXZpZXdFbGVtZW50VHlwZTo6SW1hZ2UpIHsKKyAgICBpZiAoW19wcmV2aWV3SXRlbUNv bnRyb2xsZXIgdHlwZV0gPT0gVUlQcmV2aWV3SXRlbVR5cGVJbWFnZSkgewogICAgICAgICBpZiAo W3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpjb21taXRQ cmV2aWV3ZWRJbWFnZVdpdGhVUkw6KV0pIHsKICAgICAgICAgICAgIFN0cmluZyBhYnNvbHV0ZUlt YWdlVVJMID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2VVUkw7CiAgICAgICAgICAgICBpZiAo YWJzb2x1dGVJbWFnZVVSTC5pc0VtcHR5KCkgfHwgIShXZWJDb3JlOjpwcm90b2NvbElzSW5IVFRQ RmFtaWx5KGFic29sdXRlSW1hZ2VVUkwpIHx8IFdlYkNvcmU6OnByb3RvY29sSXMoYWJzb2x1dGVJ bWFnZVVSTCwgImRhdGEiKSkpCkBAIC0zMzA4LDU4ICszMzIyLDE2IEBAIHN0YXRpYyBib29sIGlz QXNzaXN0YWJsZUlucHV0VHlwZShJbnB1dFR5cGUgdHlwZSkKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotI2lmIEhBVkUoU0FGQVJJX1NFUlZJQ0VTX0ZSQU1FV09SSykKLSAgICBpZiAoIVt2aWV3 Q29udHJvbGxlciBpc0tpbmRPZkNsYXNzOmdldFNGU2FmYXJpVmlld0NvbnRyb2xsZXJDbGFzcygp XSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgU0ZTYWZhcmlWaWV3Q29udHJvbGxlciAqc2FmYXJp Vmlld0NvbnRyb2xsZXIgPSAoU0ZTYWZhcmlWaWV3Q29udHJvbGxlciAqKXZpZXdDb250cm9sbGVy OwotICAgIHNhZmFyaVZpZXdDb250cm9sbGVyLl9zaG93aW5nTGlua1ByZXZpZXcgPSBOTzsKLQot ICAgIHZpZXdDb250cm9sbGVyLnRyYW5zaXRpb25pbmdEZWxlZ2F0ZSA9IG5pbDsKLSAgICB2aWV3 Q29udHJvbGxlci5tb2RhbFByZXNlbnRhdGlvblN0eWxlID0gVUlNb2RhbFByZXNlbnRhdGlvbkZ1 bGxTY3JlZW47Ci0KLSAgICBVSVZpZXdDb250cm9sbGVyICpwcmVzZW50aW5nVmlld0NvbnRyb2xs ZXIgPSB2aWV3Q29udHJvbGxlci5wcmVzZW50aW5nVmlld0NvbnRyb2xsZXIgPzogc2VsZi53aW5k b3cucm9vdFZpZXdDb250cm9sbGVyOwotICAgIFtwcmVzZW50aW5nVmlld0NvbnRyb2xsZXIgcHJl c2VudFZpZXdDb250cm9sbGVyOnZpZXdDb250cm9sbGVyIGFuaW1hdGVkOk5PIGNvbXBsZXRpb246 bmlsXTsKLSNlbmRpZgogfQogCi0tICh2b2lkKXdpbGxQcmVzZW50UHJldmlld1ZpZXdDb250cm9s bGVyOihVSVZpZXdDb250cm9sbGVyICopdmlld0NvbnRyb2xsZXIgZm9yUG9zaXRpb246KENHUG9p bnQpcG9zaXRpb24gaW5Tb3VyY2VWaWV3OihVSVZpZXcgKilzb3VyY2VWaWV3CistICh2b2lkKV9w cmV2aWV3SXRlbUNvbnRyb2xsZXI6KFVJUHJldmlld0l0ZW1Db250cm9sbGVyICopY29udHJvbGxl ciB3aWxsUHJlc2VudFByZXZpZXc6KFVJVmlld0NvbnRyb2xsZXIgKil2aWV3Q29udHJvbGxlciBm b3JQb3NpdGlvbjooQ0dQb2ludClwb3NpdGlvbiBpblNvdXJjZVZpZXc6KFVJVmlldyAqKXNvdXJj ZVZpZXcKIHsKICAgICBbc2VsZiBfcmVtb3ZlRGVmYXVsdEdlc3R1cmVSZWNvZ25pemVyc107CiAK ICAgICBbc2VsZiBfY2FuY2VsSW50ZXJhY3Rpb25dOwotCi0gICAgW19wcmV2aWV3SW5kaWNhdG9y VmlldyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKLQotICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9y ID0gX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCk7Ci0KLSAgICBSZWZQdHI8SW1hZ2U+IGltYWdl ID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24ubGlua0luZGljYXRvci5jb250ZW50SW1hZ2U7Ci0gICAg aWYgKCFpbWFnZSkgewotICAgICAgICBJbnRSZWN0IHNvdXJjZVJlY3QgPSBfcG9zaXRpb25JbmZv cm1hdGlvbi5ib3VuZHM7Ci0gICAgICAgIGNvbnN0IGZsb2F0IG1hcmdpbkluUG9pbnRzID0gNDsK LSAgICAgICAgc291cmNlUmVjdC5pbmZsYXRlKG1hcmdpbkluUG9pbnRzICogZGV2aWNlU2NhbGVG YWN0b3IpOwotICAgICAgICBbW3ZpZXdDb250cm9sbGVyIHByZXNlbnRhdGlvbkNvbnRyb2xsZXJd IHNldFNvdXJjZVJlY3Q6c291cmNlUmVjdF07Ci0gICAgICAgIFtbdmlld0NvbnRyb2xsZXIgcHJl c2VudGF0aW9uQ29udHJvbGxlcl0gc2V0U291cmNlVmlldzpzZWxmXTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KLQotICAgIFJldGFpblB0cjxVSUltYWdlPiBpbmRpY2F0b3JJbWFnZSA9IGFkb3B0 TlMoW1tVSUltYWdlIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6aW1hZ2UtPmdldENHSW1hZ2VSZWYo KV0pOwotICAgIF9wcmV2aWV3SW5kaWNhdG9yVmlldyA9IGFkb3B0TlMoW1tVSUltYWdlVmlldyBh bGxvY10gaW5pdFdpdGhJbWFnZTppbmRpY2F0b3JJbWFnZS5nZXQoKV0pOwotCi0gICAgY29uc3Qg ZmxvYXQgY29ybmVyUmFkaXVzSW5Qb2ludHMgPSA1OwotICAgIFBhdGggcGF0aCA9IFBhdGhVdGls aXRpZXM6OnBhdGhXaXRoU2hyaW5rV3JhcHBlZFJlY3RzKF9wb3NpdGlvbkluZm9ybWF0aW9uLmxp bmtJbmRpY2F0b3IudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RDb29yZGluYXRlcywgY29ybmVyUmFk aXVzSW5Qb2ludHMgKiBkZXZpY2VTY2FsZUZhY3Rvcik7Ci0gICAgUmV0YWluUHRyPENBU2hhcGVM YXllcj4gbWFza0xheWVyID0gYWRvcHROUyhbW0NBU2hhcGVMYXllciBhbGxvY10gaW5pdF0pOwot ICAgIFttYXNrTGF5ZXIgc2V0UGF0aDpwYXRoLmVuc3VyZVBsYXRmb3JtUGF0aCgpXTsKLQotICAg IFtfcHJldmlld0luZGljYXRvclZpZXcgbGF5ZXJdLm1hc2sgPSBtYXNrTGF5ZXIuZ2V0KCk7Ci0g ICAgW19wcmV2aWV3SW5kaWNhdG9yVmlldyBzZXRGcmFtZTpfcG9zaXRpb25JbmZvcm1hdGlvbi5s aW5rSW5kaWNhdG9yLnRleHRCb3VuZGluZ1JlY3RJblJvb3RWaWV3Q29vcmRpbmF0ZXNdOwotICAg IFtzZWxmIGFkZFN1YnZpZXc6X3ByZXZpZXdJbmRpY2F0b3JWaWV3LmdldCgpXTsKLQotICAgIFtb dmlld0NvbnRyb2xsZXIgcHJlc2VudGF0aW9uQ29udHJvbGxlcl0gc2V0U291cmNlUmVjdDpbX3By ZXZpZXdJbmRpY2F0b3JWaWV3IGJvdW5kc11dOwotICAgIFtbdmlld0NvbnRyb2xsZXIgcHJlc2Vu dGF0aW9uQ29udHJvbGxlcl0gc2V0U291cmNlVmlldzpfcHJldmlld0luZGljYXRvclZpZXcuZ2V0 KCldOwogfQogCi0tICh2b2lkKWRpZERpc21pc3NQcmV2aWV3Vmlld0NvbnRyb2xsZXI6KFVJVmll d0NvbnRyb2xsZXIgKil2aWV3Q29udHJvbGxlciBjb21taXR0aW5nOihCT09MKWNvbW1pdHRpbmcK Ky0gKHZvaWQpX3ByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2aWV3SXRlbUNvbnRyb2xsZXIg Kiljb250cm9sbGVyIGRpZERpc21pc3NQcmV2aWV3OihVSVZpZXdDb250cm9sbGVyICopdmlld0Nv bnRyb2xsZXIgY29tbWl0dGluZzooQk9PTCljb21taXR0aW5nCiB7CiAgICAgW3NlbGYgX2FkZERl ZmF1bHRHZXN0dXJlUmVjb2duaXplcnNdOwogICAgIF9wYWdlLT5zdG9wSW50ZXJhY3Rpb24oKTsK QEAgLTMzNjcsOSArMzMzOSwzNCBAQCBzdGF0aWMgYm9vbCBpc0Fzc2lzdGFibGVJbnB1dFR5cGUo SW5wdXRUeXBlIHR5cGUpCiAgICAgaWQ8V0tVSURlbGVnYXRlUHJpdmF0ZT4gdWlEZWxlZ2F0ZSA9 IHN0YXRpY19jYXN0PGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPj4oW193ZWJWaWV3IFVJRGVsZWdh dGVdKTsKICAgICBpZiAoW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihf d2ViVmlldzpkaWREaXNtaXNzUHJldmlld1ZpZXdDb250cm9sbGVyOildKQogICAgICAgICBbdWlE ZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyBkaWREaXNtaXNzUHJldmlld1ZpZXdDb250cm9sbGVy OnZpZXdDb250cm9sbGVyXTsKK30KKworLSAoVUlJbWFnZSAqKV9wcmVzZW50YXRpb25TbmFwc2hv dEZvclByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2aWV3SXRlbUNvbnRyb2xsZXIgKiljb250 cm9sbGVyCit7CisgICAgaWYgKCFfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5kaWNhdG9yLmNv bnRlbnRJbWFnZSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIFtbW1VJSW1h Z2UgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpfcG9zaXRpb25JbmZvcm1hdGlvbi5saW5rSW5kaWNh dG9yLmNvbnRlbnRJbWFnZS0+Z2V0Q0dJbWFnZVJlZigpXSBhdXRvcmVsZWFzZV07Cit9CisKKy0g KE5TQXJyYXkgKilfcHJlc2VudGF0aW9uUmVjdHNGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6KFVJ UHJldmlld0l0ZW1Db250cm9sbGVyICopY29udHJvbGxlcgoreworICAgIFJldGFpblB0cjxOU011 dGFibGVBcnJheT4gcmVjdEFycmF5ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBp bml0XSk7CisKKyAgICBpZiAoX3Bvc2l0aW9uSW5mb3JtYXRpb24ubGlua0luZGljYXRvci5jb250 ZW50SW1hZ2UpIHsKKyAgICAgICAgRmxvYXRQb2ludCBvcmlnaW4gPSBfcG9zaXRpb25JbmZvcm1h dGlvbi5saW5rSW5kaWNhdG9yLnRleHRCb3VuZGluZ1JlY3RJblJvb3RWaWV3Q29vcmRpbmF0ZXMu bG9jYXRpb24oKTsKKyAgICAgICAgZm9yIChGbG9hdFJlY3QmIHJlY3QgOiBfcG9zaXRpb25JbmZv cm1hdGlvbi5saW5rSW5kaWNhdG9yLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMp IHsKKyAgICAgICAgICAgIENHUmVjdCBjZ1JlY3QgPSByZWN0OworICAgICAgICAgICAgY2dSZWN0 Lm9yaWdpbi54ICs9IG9yaWdpbi54KCk7CisgICAgICAgICAgICBjZ1JlY3Qub3JpZ2luLnkgKz0g b3JpZ2luLnkoKTsKKyAgICAgICAgICAgIFtyZWN0QXJyYXkgYWRkT2JqZWN0OltOU1ZhbHVlIHZh bHVlV2l0aENHUmVjdDpjZ1JlY3RdXTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAgICAg IGNvbnN0IGZsb2F0IG1hcmdpbkluUHggPSA0ICogX3BhZ2UtPmRldmljZVNjYWxlRmFjdG9yKCk7 CisgICAgICAgIENHUmVjdCBjZ1JlY3QgPSBDR1JlY3RJbnNldChfcG9zaXRpb25JbmZvcm1hdGlv bi5ib3VuZHMsIC1tYXJnaW5JblB4LCAtbWFyZ2luSW5QeCk7CisgICAgICAgIFtyZWN0QXJyYXkg YWRkT2JqZWN0OltOU1ZhbHVlIHZhbHVlV2l0aENHUmVjdDpjZ1JlY3RdXTsKKyAgICB9CiAKLSAg ICBbX3ByZXZpZXdJbmRpY2F0b3JWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXddOwotICAgIF9wcmV2 aWV3SW5kaWNhdG9yVmlldyA9IG5pbDsKKyAgICByZXR1cm4gcmVjdEFycmF5LmF1dG9yZWxlYXNl KCk7CiB9CiAKIEBlbmQK 257317 2015-07-22 18:08:18 -0700 2015-07-22 18:09:10 -0700 Patch bug-147203-20150722180703.patch text/plain 1761 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTdhYWQyNGYwZWZlOTI1 ZTE5MGJkY2RhNmFmNmU5OGE1ZTk4NzFiYi4uYzU3NjZhMDY1MGZkNThkNDczZDY0YWJkZDhhNWRm ZmI5ODkxNDU2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtNCw2ICs0LDE4IEBACiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcyMDMKICAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzIxOTQ1Nzc1PgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06Cisg ICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RhdGFGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6YXRQ b3NpdGlvbjp0eXBlOl0pOgorICAgICAgICBMaW5rIHByZXZpZXdzIHNob3VsZCB3aW4gb3ZlciBp bWFnZSBwcmV2aWV3cyBpZiBib3RoIGFyZSBwb3NzaWJsZS4KKworMjAxNS0wNy0yMiAgVGltIEhv cnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBBZGp1c3Qg dGhlIHByZXZpZXcgYXJjaGl0ZWN0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDcyMDMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxOTQ1Nzc1 PgorCiAgICAgICAgIFJldmlld2VkIGJ5IEJldGggRGFraW4uCiAKICAgICAgICAgKiBQbGF0Zm9y bS9zcGkvaW9zL1VJS2l0U1BJLmg6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDQ2Zjk2NGUyMzBiYjk3 OWRjZGMyMjYzNzlkNzEzNDJkZTYxOGY0ZjUuLjE5MGMwM2ZlN2MwNzg1NDRmNGJjNTRmODIxNzk0 ZDZjYTYyNGRkYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0zMjYzLDggKzMyNjMsNyBAQCBzdGF0 aWMgYm9vbCBpc0Fzc2lzdGFibGVJbnB1dFR5cGUoSW5wdXRUeXBlIHR5cGUpCiAgICAgICAgICAg ICBkYXRhRm9yUHJldmlld1tVSVByZXZpZXdEYXRhTGlua10gPSBbTlNVUkwgX3dlYl9VUkxXaXRo V1RGU3RyaW5nOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlVVJMXTsKICAgICAgICAgZWxzZQog ICAgICAgICAgICAgZGF0YUZvclByZXZpZXdbVUlQcmV2aWV3RGF0YUxpbmtdID0gW05TVVJMIF93 ZWJfVVJMV2l0aFdURlN0cmluZzpfcG9zaXRpb25JbmZvcm1hdGlvbi51cmxdOwotICAgIH0KLSAg ICBpZiAoY2FuU2hvd0ltYWdlUHJldmlldykgeworICAgIH0gZWxzZSBpZiAoY2FuU2hvd0ltYWdl UHJldmlldykgewogICAgICAgICAqdHlwZSA9IFVJUHJldmlld0l0ZW1UeXBlSW1hZ2U7CiAgICAg ICAgIGRhdGFGb3JQcmV2aWV3W1VJUHJldmlld0RhdGFMaW5rXSA9IFtOU1VSTCBfd2ViX1VSTFdp dGhXVEZTdHJpbmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2VVUkxdOwogICAgIH0K