92688 2012-07-30 15:47:49 -0700 -webkit-order should take an integer, not a number 2012-07-31 17:44:39 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 62048 1 tony tony cmarcelo eric macpherson menard ojan webkit.review.bot oldest_to_newest 682478 0 tony 2012-07-30 15:47:49 -0700 http://lists.w3.org/Archives/Public/www-style/2012Jul/0607.html This is basically a revert of but 88111, although there's been some renaming since then. 683607 1 155669 tony 2012-07-31 16:22:18 -0700 Created attachment 155669 Patch 683695 2 155669 webkit.review.bot 2012-07-31 17:44:35 -0700 Comment on attachment 155669 Patch Clearing flags on attachment: 155669 Committed r124276: <http://trac.webkit.org/changeset/124276> 683696 3 webkit.review.bot 2012-07-31 17:44:39 -0700 All reviewed patches have been landed. Closing bug. 155669 2012-07-31 16:22:18 -0700 2012-07-31 17:44:35 -0700 Patch bug-92688-20120731162230.patch text/plain 15282 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjk4ZWE4ZWJmMmU4ZDY2 Y2UyMWYxMmY0YTVjNzBhM2NiZDJkMGYyNy4uMzE5Y2Y5OTlmNmQwNGFjZjQ1ZTZjZTM5NDdmNjEy Y2Q1MjY4Mjk3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA3LTMxICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgLXdlYmtpdC1vcmRlciBzaG91 bGQgdGFrZSBhbiBpbnRlZ2VyLCBub3QgYSBudW1iZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNjg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNwZWMgY2hhbmdlZCBiYWNrIGZyb20gZmxvYXRz IHRvIGludGVnZXJzOgorICAgICAgICBodHRwOi8vbGlzdHMudzMub3JnL0FyY2hpdmVzL1B1Ymxp Yy93d3ctc3R5bGUvMjAxMkp1bC8wNjA3Lmh0bWwKKworICAgICAgICBUZXN0czogY3NzMy9mbGV4 Ym94L2Nzcy1wcm9wZXJ0aWVzLmh0bWw6IFVwZGF0ZWQuCisgICAgICAgICAgICAgICBjc3MzL2Zs ZXhib3gvZmxleC1vcmRlci5odG1sOiBUZXN0IGNhc2VzIG1vZGlmaWVkLgorCisKKyAgICAgICAg KiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZSk6CisgICAg ICAgICogY3NzL0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBh cnNlVmFsdWUpOgorICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGVCdWlsZGVyOjpTdHlsZUJ1aWxkZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJGbGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFJlbmRl ckZsZXhpYmxlQm94OjpPcmRlckhhc2hUcmFpdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy RmxleGlibGVCb3g6Ok9yZGVySGFzaFRyYWl0czo6ZW1wdHlWYWx1ZSk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6T3JkZXJIYXNoVHJhaXRzOjpjb25zdHJ1Y3REZWxldGVk VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6Ok9yZGVySGFzaFRy YWl0czo6aXNEZWxldGVkVmFsdWUpOgorICAgICAgICAoUmVuZGVyRmxleGlibGVCb3g6Ok9yZGVy SXRlcmF0b3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorICAg ICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAqIHJlbmRlcmlu Zy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmg6CisgICAgICAgIChTdHlsZVJhcmVO b25Jbmhlcml0ZWREYXRhKToKKwogMjAxMi0wNy0xNyAgQW50b25pbyBHb21lcyAgPGFnb21lc0By aW0uY29tPgogCiAgICAgICAgIFtCbGFja2JlcnJ5XVtGdWxsU2NyZWVuXSBIVE1MNSA8dmlkZW8+ IGNvbnRyb2xzIGFyZSBzY2FsZWQgZGlmZmVyZW50bHkgZGVwZW5kaW5nIG9uIHRoZSBjdXJyZW50 IHdlYnBhZ2Ugc2NhbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRl ZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggYWUyNDhlZDA5N2Y2MWQ2MDUzNDZjNzA1ZDY1NjRlMGIz ZDI4N2I1OC4uNjUzMThlM2U2YjQ2OTcxYjg4MDZjN2FjOWU2M2FhM2I3OTVmYWVlYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAK QEAgLTE2ODksNyArMTY4OSw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZShDU1NQcm9wZXJ0CiAgICAgICAgIGNh c2UgQ1NTUHJvcGVydHlXZWJraXRKdXN0aWZ5Q29udGVudDoKICAgICAgICAgICAgIHJldHVybiBj c3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+anVzdGlmeUNvbnRlbnQoKSk7CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRPcmRlcjoKLSAgICAgICAgICAgIHJldHVybiBjc3NW YWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHlsZS0+b3JkZXIoKSk7CisgICAgICAgICAgICByZXR1 cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPm9yZGVyKCksIENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1NfTlVNQkVSKTsKICNlbmRpZgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5Rmxv YXQ6CiAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUt PmZsb2F0aW5nKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAppbmRleCA4MGM0M2I4MjBlZDYy NGIzMmU2YjgzOTIwZmE0M2Q1ZTVkNDNlMTM0Li44OTg4ZTJlNjljMjg4ZjlhY2MwZTE1MzJhODIy MjMyNzBjZjAyM2M0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcApAQCAtMjI5MSw3ICsyMjkx LDEyIEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcElkLCBi b29sIGltcG9ydGFudCkKICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB2YWxpZFVuaXQodmFsdWUs IEZOdW1iZXIgfCBGTm9uTmVnKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdE9yZGVyOgotICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IHZhbGlkVW5pdCh2YWx1ZSwg Rk51bWJlcik7CisgICAgICAgIGlmICh2YWxpZFVuaXQodmFsdWUsIEZJbnRlZ2VyLCBDU1NTdHJp Y3RNb2RlKSkgeworICAgICAgICAgICAgLy8gV2UgcmVzdHJpY3QgdGhlIHNtYWxsZXN0IHZhbHVl IHRvIGludCBtaW4gKyAyIGJlY2F1c2Ugd2UgdXNlIGludCBtaW4gYW5kIGludCBtaW4gKyAxIGFz IHNwZWNpYWwgdmFsdWVzIGluIGEgaGFzaCBzZXQuCisgICAgICAgICAgICBwYXJzZWRWYWx1ZSA9 IGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKG1heChzdGF0aWNfY2FzdDxkb3VibGU+KHN0ZDo6 bnVtZXJpY19saW1pdHM8aW50Pjo6bWluKCkgKyAyKSwgdmFsdWUtPmZWYWx1ZSksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rh dGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU6OlVuaXRUeXBlcz4odmFsdWUtPnVuaXQpKTsKKyAg ICAgICAgICAgIG1fdmFsdWVMaXN0LT5uZXh0KCk7CisgICAgICAgIH0KICAgICAgICAgYnJlYWs7 CiAjZW5kaWYKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFycXVlZToKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlQnVpbGRlci5jcHAKaW5kZXggYjZiZjMzMmE1NzVhYjJlN2ZiNGYxNWYwNWE3NGQwNzZk NzE1OGU5NC4uYzU0Y2Y3YjI1NDdjNjRlNGM0MWU3ZTRlODY5MmI1Y2RkZjhlZmMxMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlQnVpbGRlci5jcHAKQEAgLTE5OTYsNyArMTk5Niw3IEBAIFN0eWxlQnVp bGRlcjo6U3R5bGVCdWlsZGVyKCkKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlX ZWJraXRGbGV4U2hyaW5rLCBBcHBseVByb3BlcnR5RGVmYXVsdDxmbG9hdCwgJlJlbmRlclN0eWxl OjpmbGV4U2hyaW5rLCBmbG9hdCwgJlJlbmRlclN0eWxlOjpzZXRGbGV4U2hyaW5rLCBmbG9hdCwg JlJlbmRlclN0eWxlOjppbml0aWFsRmxleFNocmluaz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0RmxleFdyYXAsIEFwcGx5UHJvcGVy dHlEZWZhdWx0PEVGbGV4V3JhcCwgJlJlbmRlclN0eWxlOjpmbGV4V3JhcCwgRUZsZXhXcmFwLCAm UmVuZGVyU3R5bGU6OnNldEZsZXhXcmFwLCBFRmxleFdyYXAsICZSZW5kZXJTdHlsZTo6aW5pdGlh bEZsZXhXcmFwPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NT UHJvcGVydHlXZWJraXRKdXN0aWZ5Q29udGVudCwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RUp1c3Rp ZnlDb250ZW50LCAmUmVuZGVyU3R5bGU6Omp1c3RpZnlDb250ZW50LCBFSnVzdGlmeUNvbnRlbnQs ICZSZW5kZXJTdHlsZTo6c2V0SnVzdGlmeUNvbnRlbnQsIEVKdXN0aWZ5Q29udGVudCwgJlJlbmRl clN0eWxlOjppbml0aWFsSnVzdGlmeUNvbnRlbnQ+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNl dFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE9yZGVyLCBBcHBseVByb3BlcnR5RGVm YXVsdDxmbG9hdCwgJlJlbmRlclN0eWxlOjpvcmRlciwgZmxvYXQsICZSZW5kZXJTdHlsZTo6c2V0 T3JkZXIsIGZsb2F0LCAmUmVuZGVyU3R5bGU6OmluaXRpYWxPcmRlcj46OmNyZWF0ZUhhbmRsZXIo KSk7CisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0T3JkZXIsIEFwcGx5 UHJvcGVydHlEZWZhdWx0PGludCwgJlJlbmRlclN0eWxlOjpvcmRlciwgaW50LCAmUmVuZGVyU3R5 bGU6OnNldE9yZGVyLCBpbnQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbE9yZGVyPjo6Y3JlYXRlSGFu ZGxlcigpKTsKICNlbmRpZgogI2lmIEVOQUJMRShDU1NfUkVHSU9OUykKICAgICBzZXRQcm9wZXJ0 eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRGbG93RnJvbSwgQXBwbHlQcm9wZXJ0eVN0cmluZzxN YXBOb25lVG9OdWxsLCAmUmVuZGVyU3R5bGU6OnJlZ2lvblRocmVhZCwgJlJlbmRlclN0eWxlOjpz ZXRSZWdpb25UaHJlYWQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFJlZ2lvblRocmVhZD46OmNyZWF0 ZUhhbmRsZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmNwcAppbmRleCA5NjFhOWYzMWUxNTBiNzgxOWEwYjZiYzYxYjg5MjQ1YjgyZTNjNDVjLi5j NTBiNDExYWZmNzUyMGMzMWIyMTcxZGMxMzE3ZjA2NTg2NzRjODYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTM5LDYgKzM5LDE2IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorLy8gTm9ybWFsbHksIC0xIGFuZCAwIGFyZSBub3Qg dmFsaWQgaW4gYSBIYXNoU2V0LCBidXQgdGhlc2UgYXJlIHJlbGF0aXZlbHkgbGlrZWx5IG9yZGVy OiB2YWx1ZXMuIEluc3RlYWQsCisvLyB3ZSBtYWtlIHRoZSB0d28gc21hbGxlc3QgaW50IHZhbHVl cyBpbnZhbGlkIG9yZGVyOiB2YWx1ZXMgKGluIHRoZSBjc3MgcGFyc2VyIGNvZGUgd2UgY2xhbXAg dGhlbSB0bworLy8gaW50IG1pbiArIDIpLgorc3RydWN0IFJlbmRlckZsZXhpYmxlQm94OjpPcmRl ckhhc2hUcmFpdHMgOiBXVEY6OkdlbmVyaWNIYXNoVHJhaXRzPGludD4geworICAgIHN0YXRpYyBj b25zdCBib29sIGVtcHR5VmFsdWVJc1plcm8gPSBmYWxzZTsKKyAgICBzdGF0aWMgaW50IGVtcHR5 VmFsdWUoKSB7IHJldHVybiBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1pbigpOyB9CisgICAg c3RhdGljIHZvaWQgY29uc3RydWN0RGVsZXRlZFZhbHVlKGludCYgc2xvdCkgeyBzbG90ID0gc3Rk OjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKSArIDE7IH0KKyAgICBzdGF0aWMgYm9vbCBpc0Rl bGV0ZWRWYWx1ZShpbnQgdmFsdWUpIHsgcmV0dXJuIHZhbHVlID09IHN0ZDo6bnVtZXJpY19saW1p dHM8aW50Pjo6bWluKCkgKyAxOyB9Cit9OworCiBjbGFzcyBSZW5kZXJGbGV4aWJsZUJveDo6T3Jk ZXJJdGVyYXRvciB7CiBwdWJsaWM6CiAgICAgT3JkZXJJdGVyYXRvcihSZW5kZXJGbGV4aWJsZUJv eCogZmxleGlibGVCb3gsIGNvbnN0IE9yZGVySGFzaFNldCYgb3JkZXJWYWx1ZXMpCkBAIC04OSw4 ICs5OSw4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgUmVuZGVyRmxleGlibGVCb3gqIG1fZmxl eGlibGVCb3g7CiAgICAgUmVuZGVyQm94KiBtX2N1cnJlbnRDaGlsZDsKLSAgICBWZWN0b3I8Zmxv YXQ+IG1fb3JkZXJWYWx1ZXM7Ci0gICAgVmVjdG9yPGZsb2F0Pjo6Y29uc3RfaXRlcmF0b3IgbV9v cmRlclZhbHVlc0l0ZXJhdG9yOworICAgIFZlY3RvcjxpbnQ+IG1fb3JkZXJWYWx1ZXM7CisgICAg VmVjdG9yPGludD46OmNvbnN0X2l0ZXJhdG9yIG1fb3JkZXJWYWx1ZXNJdGVyYXRvcjsKIH07CiAK IHN0cnVjdCBSZW5kZXJGbGV4aWJsZUJveDo6TGluZUNvbnRleHQgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAppbmRleCAxYTllYmM5ODIxYTA4YTEyYzlj M2IwY2Y3YjVmZTFlODNlMTM3OTQ1Li4zYTllNTJhNmIxNGM0MTNkNWUwMmJlNjg3YjNhMDIxNzcx NWJkOGQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3gu aApAQCAtNjIsNyArNjIsOCBAQCBwcml2YXRlOgogICAgICAgICBOb0ZsaXBGb3JSb3dSZXZlcnNl LAogICAgIH07CiAKLSAgICB0eXBlZGVmIEhhc2hTZXQ8ZmxvYXQ+IE9yZGVySGFzaFNldDsKKyAg ICBzdHJ1Y3QgT3JkZXJIYXNoVHJhaXRzOworICAgIHR5cGVkZWYgSGFzaFNldDxpbnQsIERlZmF1 bHRIYXNoPGludD46Okhhc2gsIE9yZGVySGFzaFRyYWl0cz4gT3JkZXJIYXNoU2V0OwogCiAgICAg Y2xhc3MgT3JkZXJJdGVyYXRvcjsKICAgICB0eXBlZGVmIFdURjo6SGFzaE1hcDxjb25zdCBSZW5k ZXJCb3gqLCBMYXlvdXRVbml0PiBJbmZsZXhpYmxlRmxleEl0ZW1TaXplOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAppbmRleCBkNTZkMmQzYzFjMWRmZjli ZTZlM2MxMzM5NjQ4ZmVjYzM2NzA4NmU2Li41N2IxOTVmMWEzMGRlOTFlMTZjMDg3OGM1MjVjODdl Mzg4NzY4NTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaApAQCAtNzk4LDcgKzc5OCw3IEBAIHB1YmxpYzoKICAgICBFQm94T3JpZW50IGJveE9yaWVu dCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVCb3hPcmllbnQ+KHJhcmVOb25Jbmhlcml0 ZWREYXRhLT5tX2RlcHJlY2F0ZWRGbGV4aWJsZUJveC0+b3JpZW50KTsgfQogICAgIEVCb3hQYWNr IGJveFBhY2soKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFQm94UGFjaz4ocmFyZU5vbklu aGVyaXRlZERhdGEtPm1fZGVwcmVjYXRlZEZsZXhpYmxlQm94LT5wYWNrKTsgfQogCi0gICAgZmxv YXQgb3JkZXIoKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9vcmRlcjsg fQorICAgIGludCBvcmRlcigpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5t X29yZGVyOyB9CiAgICAgZmxvYXQgZmxleEdyb3coKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5o ZXJpdGVkRGF0YS0+bV9mbGV4aWJsZUJveC0+bV9mbGV4R3JvdzsgfQogICAgIGZsb2F0IGZsZXhT aHJpbmsoKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9mbGV4aWJsZUJv eC0+bV9mbGV4U2hyaW5rOyB9CiAgICAgTGVuZ3RoIGZsZXhCYXNpcygpIGNvbnN0IHsgcmV0dXJu IHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX2ZsZXhpYmxlQm94LT5tX2ZsZXhCYXNpczsgfQpAQCAt MTI2OCw3ICsxMjY4LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0RmxleEdyb3coZmxvYXQgZikg eyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX2ZsZXhpYmxlQm94LCBt X2ZsZXhHcm93LCBmKTsgfQogICAgIHZvaWQgc2V0RmxleFNocmluayhmbG9hdCBmKSB7IFNFVF9W QVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fZmxleGlibGVCb3gsIG1fZmxleFNo cmluaywgZik7IH0KICAgICB2b2lkIHNldEZsZXhCYXNpcyhMZW5ndGggbGVuZ3RoKSB7IFNFVF9W QVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fZmxleGlibGVCb3gsIG1fZmxleEJh c2lzLCBsZW5ndGgpOyB9Ci0gICAgdm9pZCBzZXRPcmRlcihmbG9hdCBvKSB7IFNFVF9WQVIocmFy ZU5vbkluaGVyaXRlZERhdGEsIG1fb3JkZXIsIG8pOyB9CisgICAgdm9pZCBzZXRPcmRlcihpbnQg bykgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLCBtX29yZGVyLCBvKTsgfQogICAgIHZv aWQgc2V0QWxpZ25Db250ZW50KEVBbGlnbkNvbnRlbnQgcCkgeyBTRVRfVkFSKHJhcmVOb25Jbmhl cml0ZWREYXRhLCBtX2FsaWduQ29udGVudCwgcCk7IH0KICAgICB2b2lkIHNldEFsaWduSXRlbXMo RUFsaWduSXRlbXMgYSkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLCBtX2FsaWduSXRl bXMsIGEpOyB9CiAgICAgdm9pZCBzZXRBbGlnblNlbGYoRUFsaWduSXRlbXMgYSkgeyBTRVRfVkFS KHJhcmVOb25Jbmhlcml0ZWREYXRhLCBtX2FsaWduU2VsZiwgYSk7IH0KQEAgLTE2MTAsNyArMTYx MCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgZmxvYXQgaW5pdGlhbEZsZXhHcm93KCkgeyByZXR1 cm4gMDsgfQogICAgIHN0YXRpYyBmbG9hdCBpbml0aWFsRmxleFNocmluaygpIHsgcmV0dXJuIDE7 IH0KICAgICBzdGF0aWMgTGVuZ3RoIGluaXRpYWxGbGV4QmFzaXMoKSB7IHJldHVybiBMZW5ndGgo QXV0byk7IH0KLSAgICBzdGF0aWMgZmxvYXQgaW5pdGlhbE9yZGVyKCkgeyByZXR1cm4gMDsgfQor ICAgIHN0YXRpYyBpbnQgaW5pdGlhbE9yZGVyKCkgeyByZXR1cm4gMDsgfQogICAgIHN0YXRpYyBF QWxpZ25Db250ZW50IGluaXRpYWxBbGlnbkNvbnRlbnQoKSB7IHJldHVybiBBbGlnbkNvbnRlbnRT dHJldGNoOyB9CiAgICAgc3RhdGljIEVBbGlnbkl0ZW1zIGluaXRpYWxBbGlnbkl0ZW1zKCkgeyBy ZXR1cm4gQWxpZ25TdHJldGNoOyB9CiAgICAgc3RhdGljIEVBbGlnbkl0ZW1zIGluaXRpYWxBbGln blNlbGYoKSB7IHJldHVybiBBbGlnbkF1dG87IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oCmluZGV4IDVl NmZkZTJhNjE3Y2YzOTUyNWU1NTdiZDkwOTg2NjIyMTRlOGNiZWUuLjg2MmM2MWQ3YWY4YTU3OWNh OTYwNDJhYWE0NDhjYjljY2M0YTRjZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaApAQCAtMTQ2LDcg KzE0Niw3IEBAIHB1YmxpYzoKICAgICBDb2xvciBtX3Zpc2l0ZWRMaW5rQm9yZGVyVG9wQ29sb3I7 CiAgICAgQ29sb3IgbV92aXNpdGVkTGlua0JvcmRlckJvdHRvbUNvbG9yOwogCi0gICAgZmxvYXQg bV9vcmRlcjsKKyAgICBpbnQgbV9vcmRlcjsKIAogICAgIEF0b21pY1N0cmluZyBtX2Zsb3dUaHJl YWQ7CiAgICAgQXRvbWljU3RyaW5nIG1fcmVnaW9uVGhyZWFkOwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDYzOGE5OTk4Y2Uz MTk5MzEyOWNiMzRkMzY3YTI1MTMwMTM2ODFjNmEuLmFkMmE0YmRlOWU3NDgzNjMyODlhYmMwZTBi N2UwM2E1NWJlMjY3ZDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNy0zMSAgVG9ueSBD aGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIC13ZWJraXQtb3JkZXIgc2hvdWxk IHRha2UgYW4gaW50ZWdlciwgbm90IGEgbnVtYmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjY4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0ZXN0cy4KKworICAgICAgICAqIGNzczMvZmxl eGJveC9jc3MtcHJvcGVydGllcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogY3NzMy9mbGV4Ym94 L2Nzcy1wcm9wZXJ0aWVzLmh0bWw6CisgICAgICAgICogY3NzMy9mbGV4Ym94L2ZsZXgtb3JkZXIu aHRtbDoKKwogMjAxMi0wNy0zMSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFtRdF1bV0syXSBVbnJldmlld2VkIGdhcmRlbmluZywgbGFzdCBhdHRlbXB0 IHRvIHBhaW50IHRoZSBXSzIgYm90IGdyZWVuIHRvZGF5LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvY3NzMy9mbGV4Ym94L2Nzcy1wcm9wZXJ0aWVzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2NzczMvZmxleGJveC9jc3MtcHJvcGVydGllcy1leHBlY3RlZC50eHQKaW5kZXggN2U1MDRlNzNj NmU3NGM5MTRlMDQyMjQxNjFkMjYxMjkxY2ExNjU5NC4uYmY5OTc3NDI4ZjhmMjE2NjJjZDQ2ZTQx NDk3YmM3OGM0ODBmY2E4NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2Nz cy1wcm9wZXJ0aWVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gv Y3NzLXByb3BlcnRpZXMtZXhwZWN0ZWQudHh0CkBAIC0xMyw3ICsxMyw3IEBAIFBBU1MgZmxleGl0 ZW0uc3R5bGUud2Via2l0T3JkZXIgaXMgIjIiCiBQQVNTIGZsZXhpdGVtLnN0eWxlLndlYmtpdE9y ZGVyIGlzICItMSIKIFBBU1MgZmxleGl0ZW0uc3R5bGUud2Via2l0T3JkZXIgaXMgIjAiCiBQQVNT IGZsZXhpdGVtLnN0eWxlLndlYmtpdE9yZGVyIGlzICIwIgotUEFTUyBmbGV4aXRlbS5zdHlsZS53 ZWJraXRPcmRlciBpcyAiMS41IgorUEFTUyBmbGV4aXRlbS5zdHlsZS53ZWJraXRPcmRlciBpcyAi MCIKIFBBU1MgZmxleGl0ZW0uc3R5bGUud2Via2l0T3JkZXIgaXMgIiIKIFBBU1MgZmxleGJveC5z dHlsZS53ZWJraXRKdXN0aWZ5Q29udGVudCBpcyAiIgogUEFTUyB3aW5kb3cuZ2V0Q29tcHV0ZWRT dHlsZShmbGV4Ym94LCBudWxsKS53ZWJraXRKdXN0aWZ5Q29udGVudCBpcyAiZmxleC1zdGFydCIK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9jc3MtcHJvcGVydGllcy5odG1s IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2Nzcy1wcm9wZXJ0aWVzLmh0bWwKaW5kZXggOTAy ZmJlM2RkNTIwNjBkMmY0Yzg1NzQwZWIxZDhjNDY1YWQ0ZjQ0OC4uMjM2Y2U3OWQ4MWUwMTgyOWIx YzZmZDQ0ZjJlNThkZTI2NGVkYzRkYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4 Ym94L2Nzcy1wcm9wZXJ0aWVzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2Nz cy1wcm9wZXJ0aWVzLmh0bWwKQEAgLTQwLDExICs0MCwxMiBAQCBzaG91bGRCZUVxdWFsVG9TdHJp bmcoJ2ZsZXhpdGVtLnN0eWxlLndlYmtpdE9yZGVyJywgJy0xJyk7CiBmbGV4aXRlbS5zdHlsZS53 ZWJraXRPcmRlciA9IDA7CiBzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2ZsZXhpdGVtLnN0eWxlLndl YmtpdE9yZGVyJywgJzAnKTsKIAotZmxleGl0ZW0uc3R5bGUud2Via2l0T3JkZXIgPSAidGVzdCI7 CisvLyAtd2Via2l0LW9yZGVyIG11c3QgYmUgYW4gaW50ZWdlci4KK2ZsZXhpdGVtLnN0eWxlLndl YmtpdE9yZGVyID0gMS41Owogc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdmbGV4aXRlbS5zdHlsZS53 ZWJraXRPcmRlcicsICcwJyk7CiAKLWZsZXhpdGVtLnN0eWxlLndlYmtpdE9yZGVyID0gMS41Owot c2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdmbGV4aXRlbS5zdHlsZS53ZWJraXRPcmRlcicsICcxLjUn KTsKK2ZsZXhpdGVtLnN0eWxlLndlYmtpdE9yZGVyID0gInRlc3QiOworc2hvdWxkQmVFcXVhbFRv U3RyaW5nKCdmbGV4aXRlbS5zdHlsZS53ZWJraXRPcmRlcicsICcwJyk7CiAKIGZsZXhpdGVtLnN0 eWxlLndlYmtpdE9yZGVyID0gJyc7CiBzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2ZsZXhpdGVtLnN0 eWxlLndlYmtpdE9yZGVyJywgJycpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4 Ym94L2ZsZXgtb3JkZXIuaHRtbCBiL0xheW91dFRlc3RzL2NzczMvZmxleGJveC9mbGV4LW9yZGVy Lmh0bWwKaW5kZXggZDY2NTQ5ZDIwMjU3ZTAyZTE3MDA2MjA5Nzc3M2E4MjU0MzYxNDZmYS4uZTQ1 Yjc2NGE2MTZmZTM5OGQ0NjUzMWNiYjRhMTkzOTU5OTQ2ZmMwYyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvY3NzMy9mbGV4Ym94L2ZsZXgtb3JkZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9jc3Mz L2ZsZXhib3gvZmxleC1vcmRlci5odG1sCkBAIC03MiwxMiArNzIsMTIgQEAgaWYgKHdpbmRvdy50 ZXN0UnVubmVyKQogICA8ZGl2IGNsYXNzPSJmaXJzdCIgIHN0eWxlPSItd2Via2l0LW9yZGVyOiAt MTAwMDAwMDAwMCI+PC9kaXY+CiA8L2Rpdj4KIAotPCEtLSBEZWNpbWFsIG51bWJlcnMgYXJlIE9L LiAtLT4KKzwhLS0gRmxvYXRpbmcgbnVtYmVycyBhcmUgaWdub3JlZCBhbmQgd2UgdXNlIHRoZSBk ZWZhdWx0IG9mIDEgaW5zdGVhZC4gLS0+CiA8ZGl2IGNsYXNzPSJob3Jpem9udGFsLWJveCI+Ci0g IDxkaXYgY2xhc3M9ImZvdXJ0aCIgc3R5bGU9Ii13ZWJraXQtb3JkZXI6IDIuNSI+PC9kaXY+Ci0g IDxkaXYgY2xhc3M9InRoaXJkIiAgc3R5bGU9Ii13ZWJraXQtb3JkZXI6IDEuMSI+PC9kaXY+Ci0g IDxkaXYgY2xhc3M9ImZpcnN0IiAgc3R5bGU9Ii13ZWJraXQtb3JkZXI6IC0xLjciPjwvZGl2Pgot ICA8ZGl2IGNsYXNzPSJzZWNvbmQiIHN0eWxlPSIiPjwvZGl2PgorICA8ZGl2IGNsYXNzPSJzZWNv bmQiIHN0eWxlPSItd2Via2l0LW9yZGVyOiAyLjUiPjwvZGl2PgorICA8ZGl2IGNsYXNzPSJmb3Vy dGgiIHN0eWxlPSItd2Via2l0LW9yZGVyOiAyIj48L2Rpdj4KKyAgPGRpdiBjbGFzcz0iZmlyc3Qi ICBzdHlsZT0iLXdlYmtpdC1vcmRlcjogLTEiPjwvZGl2PgorICA8ZGl2IGNsYXNzPSJ0aGlyZCIg IHN0eWxlPSIiPjwvZGl2PgogPC9kaXY+CiAKIDxkaXYgY2xhc3M9Imhvcml6b250YWwtYm94Ij4K QEAgLTg3LDI1ICs4NywyNiBAQCBpZiAod2luZG93LnRlc3RSdW5uZXIpCiAgIDxkaXYgY2xhc3M9 InRoaXJkIiAgc3R5bGU9IiI+PC9kaXY+CiA8L2Rpdj4KIAotPCEtLSBWYWx1ZXMgZ3JlYXRlciB0 aGFuIHdoYXQgY2FuIGJlIHN0b3JlZCBpbiBhIGZsb2F0IGFyZSBjbGFtcGVkLiAtLT4KKzwhLS0g VmFsdWVzIGdyZWF0ZXIgdGhhbiB3aGF0IGNhbiBiZSBzdG9yZWQgaW4gYW4gaW50IGFyZSBjbGFt cGVkIGZyb20KKyAgICAgLTIsMTQ3LDQ4Myw2NDYgKGludCBtaW4gKyAyKSB0byAyLDE0Nyw0ODMs NjQ3LiAtLT4KIDxkaXYgY2xhc3M9Imhvcml6b250YWwtYm94Ij4KLSAgPGRpdiBjbGFzcz0idGhp cmQiICBzdHlsZT0iLXdlYmtpdC1vcmRlcjogOTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5 OTk5OTk5OTk5OTkiPjwvZGl2PgotICA8ZGl2IGNsYXNzPSJmb3VydGgiIHN0eWxlPSItd2Via2l0 LW9yZGVyOiA4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4OCI+PC9kaXY+ CisgIDxkaXYgY2xhc3M9InRoaXJkIiAgc3R5bGU9Ii13ZWJraXQtb3JkZXI6IDQwMDAwMDAwMDAi PjwvZGl2PgorICA8ZGl2IGNsYXNzPSJmb3VydGgiIHN0eWxlPSItd2Via2l0LW9yZGVyOiAzMDAw MDAwMDAwIj48L2Rpdj4KICAgPGRpdiBjbGFzcz0iZmlyc3QiICBzdHlsZT0iIj48L2Rpdj4KICAg PGRpdiBjbGFzcz0ic2Vjb25kIiBzdHlsZT0iLXdlYmtpdC1vcmRlcjogMjE0NzQ4MzY0NiI+PC9k aXY+CiA8L2Rpdj4KIAogPGRpdiBjbGFzcz0iaG9yaXpvbnRhbC1ib3giPgotICA8ZGl2IGNsYXNz PSJmb3VydGgiIHN0eWxlPSItd2Via2l0LW9yZGVyOiA0MDAwMDAwMDAwIj48L2Rpdj4KKyAgPGRp diBjbGFzcz0ic2Vjb25kIiBzdHlsZT0iLXdlYmtpdC1vcmRlcjogNDAwMDAwMDAwMCI+PC9kaXY+ CiAgIDxkaXYgY2xhc3M9InRoaXJkIiAgc3R5bGU9Ii13ZWJraXQtb3JkZXI6IDMwMDAwMDAwMDAi PjwvZGl2PgogICA8ZGl2IGNsYXNzPSJmaXJzdCIgIHN0eWxlPSIiPjwvZGl2PgotICA8ZGl2IGNs YXNzPSJzZWNvbmQiIHN0eWxlPSItd2Via2l0LW9yZGVyOiAyMTQ3NDgzNjQ3Ij48L2Rpdj4KKyAg PGRpdiBjbGFzcz0iZm91cnRoIiBzdHlsZT0iLXdlYmtpdC1vcmRlcjogMjE0NzQ4MzY0NyI+PC9k aXY+CiA8L2Rpdj4KIAogPGRpdiBjbGFzcz0iaG9yaXpvbnRhbC1ib3giPgotICA8ZGl2IGNsYXNz PSJmaXJzdCIgIHN0eWxlPSItd2Via2l0LW9yZGVyOiAtOTk5OTk5OTk5OTk5OTk5OTk5OTk5OTk5 OTk5OTk5OTk5OTk5OTk5OTkiPjwvZGl2PgotICA8ZGl2IGNsYXNzPSJzZWNvbmQiIHN0eWxlPSIt d2Via2l0LW9yZGVyOiAtODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODg4ODgi PjwvZGl2PgotICA8ZGl2IGNsYXNzPSJ0aGlyZCIgIHN0eWxlPSItd2Via2l0LW9yZGVyOiAtNzc3 Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3NzciPjwvZGl2PgorICA8ZGl2IGNs YXNzPSJ0aGlyZCIgIHN0eWxlPSItd2Via2l0LW9yZGVyOiAtMjE0NzQ4MzY0NSI+PC9kaXY+Cisg IDxkaXYgY2xhc3M9ImZpcnN0IiAgc3R5bGU9Ii13ZWJraXQtb3JkZXI6IC0yMTQ3NDgzNjQ2Ij48 L2Rpdj4KKyAgPGRpdiBjbGFzcz0ic2Vjb25kIiBzdHlsZT0iLXdlYmtpdC1vcmRlcjogLTIxNDc0 ODM2NDciPjwvZGl2PgogICA8ZGl2IGNsYXNzPSJmb3VydGgiIHN0eWxlPSIiPjwvZGl2PgogPC9k aXY+CiAK