39516 2010-05-21 15:38:59 -0700 Add support for parsing the column-span property and getting it into computed style. 2010-05-25 13:45:52 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt abarth darin eric webkit.review.bot oldest_to_newest 229140 0 hyatt 2010-05-21 15:38:59 -0700 Back end support for column-span. 229141 1 56756 hyatt 2010-05-21 15:40:05 -0700 Created attachment 56756 Patch 229142 2 webkit.review.bot 2010-05-21 15:41:45 -0700 Attachment 56756 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/css/CSSParser.cpp:1489: One space before end of line comments [whitespace/comments] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 229144 3 56756 mitz 2010-05-21 15:43:14 -0700 Comment on attachment 56756 Patch WebCore/css/CSSParser.cpp:1493 + validPrimitive = validUnit(value, FNumber | FNonNeg, m_strict) && value->fValue == 1.0; Current style for this is “1” instead of “1.0”. r=me 229148 4 hyatt 2010-05-21 15:46:11 -0700 Fixed in r59968. 229161 5 webkit.review.bot 2010-05-21 16:24:32 -0700 http://trac.webkit.org/changeset/59968 might have broken GTK Linux 32-bit Release 230422 6 darin 2010-05-25 13:45:52 -0700 This patch didn’t include a ChangeLog for the LayoutTests directory and only updated the Mac-specific expected results for the getComputedStyle test. I am landing a fix for the rest. 56756 2010-05-21 15:40:05 -0700 2010-05-21 15:43:14 -0700 Patch patch.txt text/plain 10690 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTk2NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMDUtMjEgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTUxNiwgYmFjayBlbmQgc3VwcG9y dCBmb3IgY29sdW1uLXNwYW4gcHJvcGVydHkuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRT dHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oik6CisgICAgICAgIChXZWJD b3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUpOgor ICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2Vy OjpwYXJzZVZhbHVlKToKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAg ICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHls ZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpjb2x1bW5TcGFu KToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRDb2x1bW5TcGFuKToKKyAg ICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjppbml0aWFsQ29sdW1uU3Bhbik6CisgICAg ICAgICogcmVuZGVyaW5nL3N0eWxlL1N0eWxlTXVsdGlDb2xEYXRhLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlTXVsdGlDb2xEYXRhOjpTdHlsZU11bHRpQ29sRGF0YSk6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZU11bHRpQ29sRGF0YTo6b3BlcmF0b3I9PSk6CisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1N0eWxlTXVsdGlDb2xEYXRhLmg6CisKIDIwMTAtMDUtMjEgIEplciBOb2JsZSAg PGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxz c29uLgpJbmRleDogV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3Bw CShyZXZpc2lvbiA1OTk1NikKKysrIFdlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4Miw2ICsxODIsNyBAQCBzdGF0aWMgY29uc3Qg aW50IGNvbXB1dGVkUHJvcGVydGllc1tdID0gCiAgICAgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5S dWxlQ29sb3IsCiAgICAgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5SdWxlU3R5bGUsCiAgICAgQ1NT UHJvcGVydHlXZWJraXRDb2x1bW5SdWxlV2lkdGgsCisgICAgQ1NTUHJvcGVydHlXZWJraXRDb2x1 bW5TcGFuLAogICAgIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uV2lkdGgsCiAjaWYgRU5BQkxFKERB U0hCT0FSRF9TVVBQT1JUKQogICAgIENTU1Byb3BlcnR5V2Via2l0RGFzaGJvYXJkUmVnaW9uLApA QCAtODE0LDYgKzgxNSwxMCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxl RGVjCiAgICAgICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShzdHlsZS0+ Y29sdW1uUnVsZVN0eWxlKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1u UnVsZVdpZHRoOgogICAgICAgICAgICAgcmV0dXJuIENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUo c3R5bGUtPmNvbHVtblJ1bGVXaWR0aCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BYKTsKKyAg ICAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblNwYW46CisgICAgICAgICAgICBpZiAo c3R5bGUtPmNvbHVtblNwYW4oKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZl VmFsdWU6OmNyZWF0ZUlkZW50aWZpZXIoQ1NTVmFsdWVBbGwpOworICAgICAgICAgICAgcmV0dXJu IENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUoMSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1C RVIpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtBZnRlcjoKICAg ICAgICAgICAgIHJldHVybiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKHN0eWxlLT5jb2x1bW5C cmVha0FmdGVyKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uQnJlYWtC ZWZvcmU6CkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvY3NzL0NTU1BhcnNlci5jcHAJKHJldmlzaW9uIDU5OTUzKQorKysgV2ViQ29yZS9jc3Mv Q1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ4Niw2ICsxNDg2LDEyIEBAIGJvb2wg Q1NTUGFyc2VyOjpwYXJzZVZhbHVlKGludCBwcm9wSWQsIGIKICAgICAgICAgZWxzZQogICAgICAg ICAgICAgdmFsaWRQcmltaXRpdmUgPSB2YWxpZFVuaXQodmFsdWUsIEZMZW5ndGggfCBGTm9uTmVn LCBtX3N0cmljdCk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRD b2x1bW5TcGFuOiAgICAgICAgIC8vIGFsbCB8IDEKKyAgICAgICAgaWYgKGlkID09IENTU1ZhbHVl QWxsKQorICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVlOworICAgICAgICBlbHNlCisg ICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IHZhbGlkVW5pdCh2YWx1ZSwgRk51bWJlciB8IEZO b25OZWcsIG1fc3RyaWN0KSAmJiB2YWx1ZS0+ZlZhbHVlID09IDEuMDsKKyAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbldpZHRoOiAgICAgICAgIC8vIGF1dG8g fCA8bGVuZ3RoPgogICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVBdXRvKQogICAgICAgICAgICAg dmFsaWRQcmltaXRpdmUgPSB0cnVlOwpJbmRleDogV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1l cy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCShyZXZp c2lvbiA1OTk1MykKKysrIFdlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4JKHdvcmtpbmcg Y29weSkKQEAgLTIwMyw2ICsyMDMsNyBAQCB6LWluZGV4CiAtd2Via2l0LWNvbHVtbi1ydWxlLWNv bG9yCiAtd2Via2l0LWNvbHVtbi1ydWxlLXN0eWxlCiAtd2Via2l0LWNvbHVtbi1ydWxlLXdpZHRo Cistd2Via2l0LWNvbHVtbi1zcGFuCiAtd2Via2l0LWNvbHVtbi13aWR0aAogLXdlYmtpdC1jb2x1 bW5zCiAtd2Via2l0LWZvbnQtc2l6ZS1kZWx0YQpJbmRleDogV2ViQ29yZS9jc3MvQ1NTU3R5bGVT ZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHAJKHJldmlzaW9uIDU5OTUzKQorKysgV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ4NjQsNiArNDg2NCwxMSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0 b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIG1fc3R5bGUtPnNldENvbHVtbkdhcChwcmlt aXRpdmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aEZsb2F0KHN0eWxlKCksIG1fcm9vdEVsZW1lbnRTdHls ZSwgem9vbUZhY3RvcikpOwogICAgICAgICByZXR1cm47CiAgICAgfQorICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRDb2x1bW5TcGFuOiB7CisgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklU SUFMKGNvbHVtblNwYW4sIENvbHVtblNwYW4pCisgICAgICAgIG1fc3R5bGUtPnNldENvbHVtblNw YW4ocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NTVmFsdWVBbGwpOworICAgICAgICBy ZXR1cm47CisgICAgfQogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5XaWR0aDogewog ICAgICAgICBpZiAoaXNJbmhlcml0KSB7CiAgICAgICAgICAgICBpZiAobV9wYXJlbnRTdHlsZS0+ aGFzQXV0b0NvbHVtbldpZHRoKCkpCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlLmgJKHJldmlzaW9uIDU5OTYwKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjU5LDYgKzY1OSw3IEBAIHB1YmxpYzoKICAgICBF Qm9yZGVyU3R5bGUgY29sdW1uUnVsZVN0eWxlKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVy aXRlZERhdGEtPm1fbXVsdGlDb2wtPm1fcnVsZS5zdHlsZSgpOyB9CiAgICAgdW5zaWduZWQgc2hv cnQgY29sdW1uUnVsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEt Pm1fbXVsdGlDb2wtPnJ1bGVXaWR0aCgpOyB9CiAgICAgYm9vbCBjb2x1bW5SdWxlSXNUcmFuc3Bh cmVudCgpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX211bHRpQ29sLT5t X3J1bGUuaXNUcmFuc3BhcmVudCgpOyB9CisgICAgYm9vbCBjb2x1bW5TcGFuKCkgY29uc3QgeyBy ZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fbXVsdGlDb2wtPm1fY29sdW1uU3BhbjsgfQog ICAgIEVQYWdlQnJlYWsgY29sdW1uQnJlYWtCZWZvcmUoKSBjb25zdCB7IHJldHVybiBzdGF0aWNf Y2FzdDxFUGFnZUJyZWFrPihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9tdWx0aUNvbC0+bV9icmVh a0JlZm9yZSk7IH0KICAgICBFUGFnZUJyZWFrIGNvbHVtbkJyZWFrSW5zaWRlKCkgY29uc3QgeyBy ZXR1cm4gc3RhdGljX2Nhc3Q8RVBhZ2VCcmVhaz4ocmFyZU5vbkluaGVyaXRlZERhdGEtPm1fbXVs dGlDb2wtPm1fYnJlYWtJbnNpZGUpOyB9CiAgICAgRVBhZ2VCcmVhayBjb2x1bW5CcmVha0FmdGVy KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RVBhZ2VCcmVhaz4ocmFyZU5vbkluaGVyaXRl ZERhdGEtPm1fbXVsdGlDb2wtPm1fYnJlYWtBZnRlcik7IH0KQEAgLTk4OSw2ICs5OTAsNyBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRDb2x1bW5SdWxlU3R5bGUoRUJvcmRlclN0eWxlIGIpIHsgU0VU X1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9ydWxlLm1f c3R5bGUsIGIpOyB9CiAgICAgdm9pZCBzZXRDb2x1bW5SdWxlV2lkdGgodW5zaWduZWQgc2hvcnQg dykgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sLCBt X3J1bGUubV93aWR0aCwgdyk7IH0KICAgICB2b2lkIHJlc2V0Q29sdW1uUnVsZSgpIHsgU0VUX1ZB UihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9ydWxlLCBCb3Jk ZXJWYWx1ZSgpKSB9CisgICAgdm9pZCBzZXRDb2x1bW5TcGFuKGJvb2wgYikgeyBTRVRfVkFSKHJh cmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sLCBtX2NvbHVtblNwYW4sIGIp OyB9CiAgICAgdm9pZCBzZXRDb2x1bW5CcmVha0JlZm9yZShFUGFnZUJyZWFrIHApIHsgU0VUX1ZB UihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9icmVha0JlZm9y ZSwgcCk7IH0KICAgICB2b2lkIHNldENvbHVtbkJyZWFrSW5zaWRlKEVQYWdlQnJlYWsgcCkgeyBT RVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sLCBtX2JyZWFr SW5zaWRlLCBwKTsgfQogICAgIHZvaWQgc2V0Q29sdW1uQnJlYWtBZnRlcihFUGFnZUJyZWFrIHAp IHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9i cmVha0FmdGVyLCBwKTsgfQpAQCAtMTE4Myw2ICsxMTg1LDcgQEAgcHVibGljOgogICAgIHN0YXRp YyBib29sIGluaXRpYWxWaXN1YWxseU9yZGVyZWQoKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHN0 YXRpYyBmbG9hdCBpbml0aWFsVGV4dFN0cm9rZVdpZHRoKCkgeyByZXR1cm4gMDsgfQogICAgIHN0 YXRpYyB1bnNpZ25lZCBzaG9ydCBpbml0aWFsQ29sdW1uQ291bnQoKSB7IHJldHVybiAxOyB9Cisg ICAgc3RhdGljIGJvb2wgaW5pdGlhbENvbHVtblNwYW4oKSB7IHJldHVybiBmYWxzZTsgfQogICAg IHN0YXRpYyBjb25zdCBUcmFuc2Zvcm1PcGVyYXRpb25zJiBpbml0aWFsVHJhbnNmb3JtKCkgeyBE RUZJTkVfU1RBVElDX0xPQ0FMKFRyYW5zZm9ybU9wZXJhdGlvbnMsIG9wcywgKCkpOyByZXR1cm4g b3BzOyB9CiAgICAgc3RhdGljIExlbmd0aCBpbml0aWFsVHJhbnNmb3JtT3JpZ2luWCgpIHsgcmV0 dXJuIExlbmd0aCg1MC4wLCBQZXJjZW50KTsgfQogICAgIHN0YXRpYyBMZW5ndGggaW5pdGlhbFRy YW5zZm9ybU9yaWdpblkoKSB7IHJldHVybiBMZW5ndGgoNTAuMCwgUGVyY2VudCk7IH0KSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlTXVsdGlDb2xEYXRhLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZU11bHRpQ29sRGF0YS5jcHAJKHJldmlz aW9uIDU5OTUzKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVNdWx0aUNvbERhdGEu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBAIFN0eWxlTXVsdGlDb2xEYXRhOjpT dHlsZU11bHRpQ29sRGF0YSgpCiAgICAgLCBtX2F1dG9XaWR0aCh0cnVlKQogICAgICwgbV9hdXRv Q291bnQodHJ1ZSkKICAgICAsIG1fbm9ybWFsR2FwKHRydWUpCisgICAgLCBtX2NvbHVtblNwYW4o ZmFsc2UpCiAgICAgLCBtX2JyZWFrQmVmb3JlKFJlbmRlclN0eWxlOjppbml0aWFsUGFnZUJyZWFr KCkpCiAgICAgLCBtX2JyZWFrQWZ0ZXIoUmVuZGVyU3R5bGU6OmluaXRpYWxQYWdlQnJlYWsoKSkK ICAgICAsIG1fYnJlYWtJbnNpZGUoUmVuZGVyU3R5bGU6OmluaXRpYWxQYWdlQnJlYWsoKSkKQEAg LTQ4LDYgKzQ5LDcgQEAgU3R5bGVNdWx0aUNvbERhdGE6OlN0eWxlTXVsdGlDb2xEYXRhKGNvbgog ICAgICwgbV9hdXRvV2lkdGgoby5tX2F1dG9XaWR0aCkKICAgICAsIG1fYXV0b0NvdW50KG8ubV9h dXRvQ291bnQpCiAgICAgLCBtX25vcm1hbEdhcChvLm1fbm9ybWFsR2FwKQorICAgICwgbV9jb2x1 bW5TcGFuKG8ubV9jb2x1bW5TcGFuKQogICAgICwgbV9icmVha0JlZm9yZShvLm1fYnJlYWtCZWZv cmUpCiAgICAgLCBtX2JyZWFrQWZ0ZXIoby5tX2JyZWFrQWZ0ZXIpCiAgICAgLCBtX2JyZWFrSW5z aWRlKG8ubV9icmVha0luc2lkZSkKQEAgLTU2LDEwICs1OCwxMCBAQCBTdHlsZU11bHRpQ29sRGF0 YTo6U3R5bGVNdWx0aUNvbERhdGEoY29uCiAKIGJvb2wgU3R5bGVNdWx0aUNvbERhdGE6Om9wZXJh dG9yPT0oY29uc3QgU3R5bGVNdWx0aUNvbERhdGEmIG8pIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1f d2lkdGggPT0gby5tX3dpZHRoICYmIG1fY291bnQgPT0gby5tX2NvdW50ICYmIG1fZ2FwID09IG8u bV9nYXAgJiYKLSAgICAgICAgICAgbV9ydWxlID09IG8ubV9ydWxlICYmIG1fYnJlYWtCZWZvcmUg PT0gby5tX2JyZWFrQmVmb3JlICYmIAotICAgICAgICAgICBtX2F1dG9XaWR0aCA9PSBvLm1fYXV0 b1dpZHRoICYmIG1fYXV0b0NvdW50ID09IG8ubV9hdXRvQ291bnQgJiYgbV9ub3JtYWxHYXAgPT0g by5tX25vcm1hbEdhcCAmJgotICAgICAgICAgICBtX2JyZWFrQWZ0ZXIgPT0gby5tX2JyZWFrQWZ0 ZXIgJiYgbV9icmVha0luc2lkZSA9PSBvLm1fYnJlYWtJbnNpZGU7CisgICAgcmV0dXJuIG1fd2lk dGggPT0gby5tX3dpZHRoICYmIG1fY291bnQgPT0gby5tX2NvdW50ICYmIG1fZ2FwID09IG8ubV9n YXAKKyAgICAgICAgICAgJiYgbV9ydWxlID09IG8ubV9ydWxlICYmIG1fYnJlYWtCZWZvcmUgPT0g by5tX2JyZWFrQmVmb3JlCisgICAgICAgICAgICYmIG1fYXV0b1dpZHRoID09IG8ubV9hdXRvV2lk dGggJiYgbV9hdXRvQ291bnQgPT0gby5tX2F1dG9Db3VudCAmJiBtX25vcm1hbEdhcCA9PSBvLm1f bm9ybWFsR2FwCisgICAgICAgICAgICYmIG1fY29sdW1uU3BhbiA9PSBvLm1fY29sdW1uU3BhbiAm JiBtX2JyZWFrQWZ0ZXIgPT0gby5tX2JyZWFrQWZ0ZXIgJiYgbV9icmVha0luc2lkZSA9PSBvLm1f YnJlYWtJbnNpZGU7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1N0eWxlTXVsdGlDb2xEYXRhLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVNdWx0aUNvbERhdGEuaAkocmV2aXNpb24gNTk5NTMpCisr KyBXZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZU11bHRpQ29sRGF0YS5oCSh3b3JraW5nIGNv cHkpCkBAIC01NywxMCArNTcsMTEgQEAgcHVibGljOgogICAgIHVuc2lnbmVkIHNob3J0IG1fY291 bnQ7CiAgICAgZmxvYXQgbV9nYXA7CiAgICAgQm9yZGVyVmFsdWUgbV9ydWxlOwotICAgIAorCiAg ICAgYm9vbCBtX2F1dG9XaWR0aCA6IDE7CiAgICAgYm9vbCBtX2F1dG9Db3VudCA6IDE7CiAgICAg Ym9vbCBtX25vcm1hbEdhcCA6IDE7CisgICAgYm9vbCBtX2NvbHVtblNwYW4gOiAxOwogICAgIHVu c2lnbmVkIG1fYnJlYWtCZWZvcmUgOiAyOyAvLyBFUGFnZUJyZWFrCiAgICAgdW5zaWduZWQgbV9i cmVha0FmdGVyIDogMjsgLy8gRVBhZ2VCcmVhawogICAgIHVuc2lnbmVkIG1fYnJlYWtJbnNpZGUg OiAyOyAvLyBFUGFnZUJyZWFrCkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVk U3R5bGUtYmFzaWMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9j c3MvZ2V0Q29tcHV0ZWRTdHlsZS1iYXNpYy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDU5OTUzKQor KysgTGF5b3V0VGVzdHMvc3ZnL2Nzcy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMjYwLDYgKzI2MCw4IEBAIHJlY3Q6IHN0eWxlLmdldFByb3Bl cnR5VmFsdWUoLXdlYmtpdC1jb2wKIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdl YmtpdC1jb2x1bW4tcnVsZS1zdHlsZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVj dDogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1ydWxlLXdpZHRoKSA6IDBw eAogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1ydWxlLXdp ZHRoKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCityZWN0OiBzdHlsZS5nZXRQcm9wZXJ0 eVZhbHVlKC13ZWJraXQtY29sdW1uLXNwYW4pIDogMQorcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlD U1NWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVd CiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6IGF1 dG8KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4td2lkdGgp IDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFs dWUoLXdlYmtpdC1kYXNoYm9hcmQtcmVnaW9uKSA6IG51bGwKQEAgLTY3Niw2ICs2NzgsOCBAQCBn OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtY29sdW1uCiBnOiBzdHlsZS5nZXRQcm9w ZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXJ1bGUtc3R5bGUpIDogW29iamVjdCBDU1NQcmlt aXRpdmVWYWx1ZV0KIGc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1jb2x1bW4tcnVs ZS13aWR0aCkgOiAwcHgKIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1 bW4tcnVsZS13aWR0aCkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQorZzogc3R5bGUuZ2V0 UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi1zcGFuKSA6IDEKK2c6IHN0eWxlLmdldFByb3Bl cnR5Q1NTVmFsdWUoLXdlYmtpdC1jb2x1bW4tc3BhbikgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZh bHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Via2l0LWNvbHVtbi13aWR0aCkgOiBh dXRvCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtY29sdW1uLXdpZHRoKSA6 IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13 ZWJraXQtZGFzaGJvYXJkLXJlZ2lvbikgOiBudWxsCg==