67094 2011-08-28 12:29:25 -0700 [Qt][WK2] Qt layer should be hardened against C API versioning in the sense of build failures 2011-09-11 20:20:39 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P3 Normal --- 1 kbalazs webkit-unassigned jturcotte webkit.review.bot oldest_to_newest 458017 0 kbalazs 2011-08-28 12:29:25 -0700 A build fix related to C API versioning: http://trac.webkit.org/changeset/93949 I suggest to apply this style of initialization everywhere for consistency and to avoid future build breakages. 462472 1 106408 kbalazs 2011-09-06 05:14:53 -0700 Created attachment 106408 proposed fix 463224 2 106408 kbalazs 2011-09-07 01:15:28 -0700 Comment on attachment 106408 proposed fix It's not correct. Since we always build against trunk we should use the current version of the client structures. This way we can notice functional changes that affect us. Another argument is that WebKit::APIClient except the version number and the layout of the structure is matching. 463232 3 106555 kbalazs 2011-09-07 01:29:55 -0700 Created attachment 106555 fix v2 465430 4 106555 kling 2011-09-11 17:14:10 -0700 Comment on attachment 106555 fix v2 LGTM. 465454 5 106555 webkit.review.bot 2011-09-11 20:20:35 -0700 Comment on attachment 106555 fix v2 Clearing flags on attachment: 106555 Committed r94937: <http://trac.webkit.org/changeset/94937> 465455 6 webkit.review.bot 2011-09-11 20:20:39 -0700 All reviewed patches have been landed. Closing bug. 106408 2011-09-06 05:14:53 -0700 2011-09-07 01:15:27 -0700 proposed fix struct_memset.diff text/plain 4141 kbalazs ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkZjNmMDRiLi4wODIzMWExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDktMDYgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisg ICAgICAgIFtRdF1bV0syXSBRdCBsYXllciBzaG91bGQgYmUgaGFyZGVuZWQgYWdhaW5zdCBDIEFQ SSB2ZXJzaW9uaW5nIGluIHRoZSBzZW5zZSBvZiBidWlsZCBmYWlsdXJlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjcwOTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6aW5pdCk6CisKIDIwMTEtMDkt MDUgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1b V0syXSBBZGQgcGl4ZWwgdGVzdCBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCBmNTk2NTJiLi4yM2ExNThjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKQEAgLTExOCwzNSAr MTE4LDIxIEBAIFF0V2ViUGFnZVByb3h5OjpRdFdlYlBhZ2VQcm94eShWaWV3SW50ZXJmYWNlKiB2 aWV3SW50ZXJmYWNlLCBQb2xpY3lJbnRlcmZhY2UqIHBvCiB2b2lkIFF0V2ViUGFnZVByb3h5Ojpp bml0KCkKIHsKICAgICBtX3dlYlBhZ2VQcm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKLSAgICBX S1BhZ2VMb2FkZXJDbGllbnQgbG9hZENsaWVudCA9IHsKLSAgICAgICAgMCwgICAgICAvKiB2ZXJz aW9uICovCi0gICAgICAgIHRoaXMsICAgLyogY2xpZW50SW5mbyAqLwotICAgICAgICBxdF93a19k aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lLAotICAgICAgICAwLCAvKiBkaWRSZWNlaXZl U2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSAqLwotICAgICAgICBxdF93 a19kaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUsCi0gICAgICAgIHF0X3dr X2RpZENvbW1pdExvYWRGb3JGcmFtZSwKLSAgICAgICAgMCwgLyogZGlkRmluaXNoRG9jdW1lbnRM b2FkRm9yRnJhbWUgKi8KLSAgICAgICAgcXRfd2tfZGlkRmluaXNoTG9hZEZvckZyYW1lLAotICAg ICAgICBxdF93a19kaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lLAotICAgICAgICBxdF93a19k aWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUsCi0gICAgICAgIHF0X3drX2RpZFJlY2Vp dmVUaXRsZUZvckZyYW1lLAotICAgICAgICAwLCAvKiBkaWRGaXJzdExheW91dEZvckZyYW1lICov Ci0gICAgICAgIDAsIC8qIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lICov Ci0gICAgICAgIDAsIC8qIGRpZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeSAqLwotICAgICAgICAw LCAvKiBkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUgKi8KLSAgICAgICAgMCwgLyog ZGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWUgKi8KLSAgICAgICAgMCwgLyogY2FuQXV0aGVu dGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUgKi8KLSAgICAgICAgMCwgLyogZGlk UmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlSW5GcmFtZSAqLwotICAgICAgICBxdF93a19k aWRTdGFydFByb2dyZXNzLAotICAgICAgICBxdF93a19kaWRDaGFuZ2VQcm9ncmVzcywKLSAgICAg ICAgcXRfd2tfZGlkRmluaXNoUHJvZ3Jlc3MsCi0gICAgICAgIDAsICAvKiBwcm9jZXNzRGlkQmVj b21lVW5yZXNwb25zaXZlICovCi0gICAgICAgIDAsICAvKiBwcm9jZXNzRGlkQmVjb21lUmVzcG9u c2l2ZSAqLwotICAgICAgICAwLCAgLyogcHJvY2Vzc0RpZENyYXNoICovCi0gICAgICAgIDAsICAv KiBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QgKi8KLSAgICAgICAgMCwgIC8qIHNob3VsZEdvVG9C YWNrRm9yd2FyZExpc3RJdGVtICovCi0gICAgICAgIDAgICAvKiBkaWRGYWlsVG9Jbml0aWFsaXpl UGx1Z2luICovCi0gICAgfTsKKworICAgIFdLUGFnZUxvYWRlckNsaWVudCBsb2FkQ2xpZW50Owor ICAgIG1lbXNldCgmbG9hZENsaWVudCwgMCwgc2l6ZW9mKFdLUGFnZUxvYWRlckNsaWVudCkpOwor ICAgIGxvYWRDbGllbnQudmVyc2lvbiA9IDA7CisgICAgbG9hZENsaWVudC5jbGllbnRJbmZvID0g dGhpczsKKyAgICBsb2FkQ2xpZW50LmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgPSBx dF93a19kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOworICAgIGxvYWRDbGllbnQuZGlk RmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lID0gcXRfd2tfZGlkRmFpbFByb3Zp c2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lOworICAgIGxvYWRDbGllbnQuZGlkQ29tbWl0TG9h ZEZvckZyYW1lID0gcXRfd2tfZGlkQ29tbWl0TG9hZEZvckZyYW1lOworICAgIGxvYWRDbGllbnQu ZGlkRmluaXNoTG9hZEZvckZyYW1lID0gcXRfd2tfZGlkRmluaXNoTG9hZEZvckZyYW1lOworICAg IGxvYWRDbGllbnQuZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZSA9IHF0X3drX2RpZEZhaWxM b2FkV2l0aEVycm9yRm9yRnJhbWU7CisgICAgbG9hZENsaWVudC5kaWRTYW1lRG9jdW1lbnROYXZp Z2F0aW9uRm9yRnJhbWUgPSBxdF93a19kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWU7 CisgICAgbG9hZENsaWVudC5kaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSA9IHF0X3drX2RpZFJlY2Vp dmVUaXRsZUZvckZyYW1lOworICAgIGxvYWRDbGllbnQuZGlkU3RhcnRQcm9ncmVzcyA9IHF0X3dr X2RpZFN0YXJ0UHJvZ3Jlc3M7CisgICAgbG9hZENsaWVudC5kaWRDaGFuZ2VQcm9ncmVzcyA9IHF0 X3drX2RpZENoYW5nZVByb2dyZXNzOworICAgIGxvYWRDbGllbnQuZGlkRmluaXNoUHJvZ3Jlc3Mg PSBxdF93a19kaWRGaW5pc2hQcm9ncmVzczsKICAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50 KHBhZ2VSZWYoKSwgJmxvYWRDbGllbnQpOwogCiAgICAgV0tQYWdlVUlDbGllbnQgdWlDbGllbnQ7 CkBAIC0xNTcsMTQgKzE0MywxMSBAQCB2b2lkIFF0V2ViUGFnZVByb3h5Ojppbml0KCkKICAgICBX S1BhZ2VTZXRQYWdlVUlDbGllbnQodG9BUEkobV93ZWJQYWdlUHJveHkuZ2V0KCkpLCAmdWlDbGll bnQpOwogCiAgICAgaWYgKG1fcG9saWN5SW50ZXJmYWNlKSB7Ci0gICAgICAgIFdLUGFnZVBvbGlj eUNsaWVudCBwb2xpY3lDbGllbnQgPSB7Ci0gICAgICAgICAgICAwLAotICAgICAgICAgICAgbV9w b2xpY3lJbnRlcmZhY2UsCi0gICAgICAgICAgICBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uLAotICAgICAgICAgICAgMCwgIC8qIGRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0Fj dGlvbiAqLwotICAgICAgICAgICAgMCwgIC8qIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlICovCi0g ICAgICAgICAgICAwLCAgLyogdW5hYmxlVG9JbXBsZW1lbnRQb2xpY3kgKi8KLSAgICAgICAgfTsK KyAgICAgICAgV0tQYWdlUG9saWN5Q2xpZW50IHBvbGljeUNsaWVudDsKKyAgICAgICAgbWVtc2V0 KCZwb2xpY3lDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VQb2xpY3lDbGllbnQpKTsKKyAgICAgICAg cG9saWN5Q2xpZW50LnZlcnNpb24gPSAwOworICAgICAgICBwb2xpY3lDbGllbnQuY2xpZW50SW5m byA9IG1fcG9saWN5SW50ZXJmYWNlOworICAgICAgICBwb2xpY3lDbGllbnQuZGVjaWRlUG9saWN5 Rm9yTmF2aWdhdGlvbkFjdGlvbiA9IHF0X3drX2RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b247CiAgICAgICAgIFdLUGFnZVNldFBhZ2VQb2xpY3lDbGllbnQodG9BUEkobV93ZWJQYWdlUHJv eHkuZ2V0KCkpLCAmcG9saWN5Q2xpZW50KTsKICAgICB9CiB9Cg== 106555 2011-09-07 01:29:55 -0700 2011-09-11 20:20:35 -0700 fix v2 struct_memset.diff text/plain 4383 kbalazs ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkZjNmMDRiLi5hNDQyOGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDktMDcgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgorCisg ICAgICAgIFtRdF1bV0syXSBRdCBsYXllciBzaG91bGQgYmUgaGFyZGVuZWQgYWdhaW5zdCBDIEFQ SSB2ZXJzaW9uaW5nIGluIHRoZSBzZW5zZSBvZiBidWlsZCBmYWlsdXJlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjcwOTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6aW5pdCk6CisKIDIwMTEtMDkt MDUgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF1b V0syXSBBZGQgcGl4ZWwgdGVzdCBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCBmNTk2NTJiLi42NGYzYTkwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKQEAgLTExOCw1MyAr MTE4LDM2IEBAIFF0V2ViUGFnZVByb3h5OjpRdFdlYlBhZ2VQcm94eShWaWV3SW50ZXJmYWNlKiB2 aWV3SW50ZXJmYWNlLCBQb2xpY3lJbnRlcmZhY2UqIHBvCiB2b2lkIFF0V2ViUGFnZVByb3h5Ojpp bml0KCkKIHsKICAgICBtX3dlYlBhZ2VQcm94eS0+aW5pdGlhbGl6ZVdlYlBhZ2UoKTsKLSAgICBX S1BhZ2VMb2FkZXJDbGllbnQgbG9hZENsaWVudCA9IHsKLSAgICAgICAgMCwgICAgICAvKiB2ZXJz aW9uICovCi0gICAgICAgIHRoaXMsICAgLyogY2xpZW50SW5mbyAqLwotICAgICAgICBxdF93a19k aWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lLAotICAgICAgICAwLCAvKiBkaWRSZWNlaXZl U2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZSAqLwotICAgICAgICBxdF93 a19kaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUsCi0gICAgICAgIHF0X3dr X2RpZENvbW1pdExvYWRGb3JGcmFtZSwKLSAgICAgICAgMCwgLyogZGlkRmluaXNoRG9jdW1lbnRM b2FkRm9yRnJhbWUgKi8KLSAgICAgICAgcXRfd2tfZGlkRmluaXNoTG9hZEZvckZyYW1lLAotICAg ICAgICBxdF93a19kaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lLAotICAgICAgICBxdF93a19k aWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUsCi0gICAgICAgIHF0X3drX2RpZFJlY2Vp dmVUaXRsZUZvckZyYW1lLAotICAgICAgICAwLCAvKiBkaWRGaXJzdExheW91dEZvckZyYW1lICov Ci0gICAgICAgIDAsIC8qIGRpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dEZvckZyYW1lICov Ci0gICAgICAgIDAsIC8qIGRpZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeSAqLwotICAgICAgICAw LCAvKiBkaWREaXNwbGF5SW5zZWN1cmVDb250ZW50Rm9yRnJhbWUgKi8KLSAgICAgICAgMCwgLyog ZGlkUnVuSW5zZWN1cmVDb250ZW50Rm9yRnJhbWUgKi8KLSAgICAgICAgMCwgLyogY2FuQXV0aGVu dGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUgKi8KLSAgICAgICAgMCwgLyogZGlk UmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlSW5GcmFtZSAqLwotICAgICAgICBxdF93a19k aWRTdGFydFByb2dyZXNzLAotICAgICAgICBxdF93a19kaWRDaGFuZ2VQcm9ncmVzcywKLSAgICAg ICAgcXRfd2tfZGlkRmluaXNoUHJvZ3Jlc3MsCi0gICAgICAgIDAsICAvKiBwcm9jZXNzRGlkQmVj b21lVW5yZXNwb25zaXZlICovCi0gICAgICAgIDAsICAvKiBwcm9jZXNzRGlkQmVjb21lUmVzcG9u c2l2ZSAqLwotICAgICAgICAwLCAgLyogcHJvY2Vzc0RpZENyYXNoICovCi0gICAgICAgIDAsICAv KiBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QgKi8KLSAgICAgICAgMCwgIC8qIHNob3VsZEdvVG9C YWNrRm9yd2FyZExpc3RJdGVtICovCi0gICAgICAgIDAgICAvKiBkaWRGYWlsVG9Jbml0aWFsaXpl UGx1Z2luICovCi0gICAgfTsKKworICAgIFdLUGFnZUxvYWRlckNsaWVudCBsb2FkQ2xpZW50Owor ICAgIG1lbXNldCgmbG9hZENsaWVudCwgMCwgc2l6ZW9mKFdLUGFnZUxvYWRlckNsaWVudCkpOwor ICAgIGxvYWRDbGllbnQudmVyc2lvbiA9IGtXS1BhZ2VMb2FkZXJDbGllbnRDdXJyZW50VmVyc2lv bjsKKyAgICBsb2FkQ2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIGxvYWRDbGllbnQuZGlk U3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZSA9IHF0X3drX2RpZFN0YXJ0UHJvdmlzaW9uYWxM b2FkRm9yRnJhbWU7CisgICAgbG9hZENsaWVudC5kaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVy cm9yRm9yRnJhbWUgPSBxdF93a19kaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJh bWU7CisgICAgbG9hZENsaWVudC5kaWRDb21taXRMb2FkRm9yRnJhbWUgPSBxdF93a19kaWRDb21t aXRMb2FkRm9yRnJhbWU7CisgICAgbG9hZENsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUgPSBx dF93a19kaWRGaW5pc2hMb2FkRm9yRnJhbWU7CisgICAgbG9hZENsaWVudC5kaWRGYWlsTG9hZFdp dGhFcnJvckZvckZyYW1lID0gcXRfd2tfZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKKyAg ICBsb2FkQ2xpZW50LmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSA9IHF0X3drX2Rp ZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZTsKKyAgICBsb2FkQ2xpZW50LmRpZFJlY2Vp dmVUaXRsZUZvckZyYW1lID0gcXRfd2tfZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWU7CisgICAgbG9h ZENsaWVudC5kaWRTdGFydFByb2dyZXNzID0gcXRfd2tfZGlkU3RhcnRQcm9ncmVzczsKKyAgICBs b2FkQ2xpZW50LmRpZENoYW5nZVByb2dyZXNzID0gcXRfd2tfZGlkQ2hhbmdlUHJvZ3Jlc3M7Cisg ICAgbG9hZENsaWVudC5kaWRGaW5pc2hQcm9ncmVzcyA9IHF0X3drX2RpZEZpbmlzaFByb2dyZXNz OwogICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQocGFnZVJlZigpLCAmbG9hZENsaWVudCk7 CiAKICAgICBXS1BhZ2VVSUNsaWVudCB1aUNsaWVudDsKICAgICBtZW1zZXQoJnVpQ2xpZW50LCAw LCBzaXplb2YoV0tQYWdlVUlDbGllbnQpKTsKLSAgICB1aUNsaWVudC52ZXJzaW9uID0gMDsKKyAg ICB1aUNsaWVudC52ZXJzaW9uID0ga1dLUGFnZVVJQ2xpZW50Q3VycmVudFZlcnNpb247CiAgICAg dWlDbGllbnQuY2xpZW50SW5mbyA9IG1fdmlld0ludGVyZmFjZTsKICAgICB1aUNsaWVudC5zZXRT dGF0dXNUZXh0ID0gcXRfd2tfc2V0U3RhdHVzVGV4dDsKICAgICBXS1BhZ2VTZXRQYWdlVUlDbGll bnQodG9BUEkobV93ZWJQYWdlUHJveHkuZ2V0KCkpLCAmdWlDbGllbnQpOwogCiAgICAgaWYgKG1f cG9saWN5SW50ZXJmYWNlKSB7Ci0gICAgICAgIFdLUGFnZVBvbGljeUNsaWVudCBwb2xpY3lDbGll bnQgPSB7Ci0gICAgICAgICAgICAwLAotICAgICAgICAgICAgbV9wb2xpY3lJbnRlcmZhY2UsCi0g ICAgICAgICAgICBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uLAotICAgICAg ICAgICAgMCwgIC8qIGRlY2lkZVBvbGljeUZvck5ld1dpbmRvd0FjdGlvbiAqLwotICAgICAgICAg ICAgMCwgIC8qIGRlY2lkZVBvbGljeUZvclJlc3BvbnNlICovCi0gICAgICAgICAgICAwLCAgLyog dW5hYmxlVG9JbXBsZW1lbnRQb2xpY3kgKi8KLSAgICAgICAgfTsKKyAgICAgICAgV0tQYWdlUG9s aWN5Q2xpZW50IHBvbGljeUNsaWVudDsKKyAgICAgICAgbWVtc2V0KCZwb2xpY3lDbGllbnQsIDAs IHNpemVvZihXS1BhZ2VQb2xpY3lDbGllbnQpKTsKKyAgICAgICAgcG9saWN5Q2xpZW50LnZlcnNp b24gPSBrV0tQYWdlUG9saWN5Q2xpZW50Q3VycmVudFZlcnNpb247CisgICAgICAgIHBvbGljeUNs aWVudC5jbGllbnRJbmZvID0gbV9wb2xpY3lJbnRlcmZhY2U7CisgICAgICAgIHBvbGljeUNsaWVu dC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0gcXRfd2tfZGVjaWRlUG9saWN5Rm9y TmF2aWdhdGlvbkFjdGlvbjsKICAgICAgICAgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVudCh0b0FQ SShtX3dlYlBhZ2VQcm94eS5nZXQoKSksICZwb2xpY3lDbGllbnQpOwogICAgIH0KIH0K