13793 2007-05-20 23:18:38 -0700 RULES=groups overridden by border, colgroup=span not honored by border collapsing 2007-05-28 06:25:12 -0700 1 1 1 Unclassified WebKit Tables 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED http://www.htmlcodetutorial.com/tables/_TABLE_RULES_GROUPS.html P2 Normal --- 1 beidson hyatt ddkilzer mitz oldest_to_newest 9537 0 beidson 2007-05-20 23:18:38 -0700 Look at the url http://www.htmlcodetutorial.com/tables/_TABLE_RULES_GROUPS.html in both ToT WebKit and Firefox, scroll to the bottom. There is a discussion about colgroup with span. Firefox supports it properly, but ToT WebKit puts a border between each column instead of the specified groups 9534 1 beidson 2007-05-20 23:20:27 -0700 Reduction taken from that page - <TABLE BORDER=1 CELLPADDING=4 RULES=GROUPS FRAME=BOX> <COLGROUP></COLGROUP> <COLGROUP SPAN=3></COLGROUP> <TR> <TH>Weekday</TH> <TH>Date</TH> <TH>Manager</TH> <TH>Qty</TH> </TR> <TR> <TD>Monday</TD> <TD>09/11</TD> <TD>Kelsey</TD> <TD>639</TD> </TR> <TR> <TD>Tuesday</TD> <TD>09/12</TD> <TD>Lindsey</TD> <TD>596</TD> </TR> <TR> <TD>Wednesday</TD> <TD>09/13</TD> <TD>Randy</TD> <TD>1135</TD> </TR> <TR> <TD>Thursday</TD> <TD>09/14</TD> <TD>Susan</TD> <TD>1002</TD> </TR> <TR> <TD>Friday</TD> <TD>09/15</TD> <TD>Randy</TD> <TD>908</TD> </TR> <TR> <TD>Saturday</TD> <TD>09/16</TD> <TD>Lindsey</TD> <TD>371</TD> </TR> <TR> <TD>Sunday</TD> <TD>09/17</TD> <TD>Susan</TD> <TD>272</TD> </TR> </TABLE> 9523 2 hyatt 2007-05-20 23:32:58 -0700 I assume this is incorrect but will need to verify. The bug is that border= on table is causing every cell to get a border, without respect for the rules attribute. 9524 3 mitz 2007-05-20 23:35:05 -0700 Another thing that I notice here is that the default colgroup span in WebKit is 0, whereas in the spec and in Firefox it is 1 9525 4 hyatt 2007-05-20 23:44:28 -0700 There are two bugs here. RULES=groups is improperly being ignored by border= on a table. colgroup span is not honored when doing border collapsing. 9526 5 14639 hyatt 2007-05-20 23:47:01 -0700 Created attachment 14639 Patch to fix first issue. Two of the Mozilla tables tests in the expected failures directory now pass with this bug fix. No other tests are affected. 9527 6 14639 mitz 2007-05-20 23:50:18 -0700 Comment on attachment 14639 Patch to fix first issue. r=me 9529 7 14640 hyatt 2007-05-21 00:37:50 -0700 Created attachment 14640 Patch to fix second issue 9531 8 14640 mitz 2007-05-21 00:42:48 -0700 Comment on attachment 14640 Patch to fix second issue r=me. you can remove the {start,end}ColEdge = false; lines 9532 9 hyatt 2007-05-21 01:09:23 -0700 Fixed. 9515 10 ddkilzer 2007-05-21 07:21:54 -0700 (In reply to comment #5) > Created an attachment (id=14639) [edit] > Patch to fix first issue. > > Two of the Mozilla tables tests in the expected failures directory now pass > with this bug fix. No other tests are affected. Shouldn't these tests be svn-moved to the non-failing directory if they now pass? 9027 11 ddkilzer 2007-05-27 09:59:39 -0700 (In reply to comment #9) > Fixed. Code: r21614, r21615 Tests: r21616, r21617 9032 12 ddkilzer 2007-05-27 12:06:01 -0700 (In reply to comment #10) > (In reply to comment #5) > > Two of the Mozilla tables tests in the expected failures directory now pass > > with this bug fix. No other tests are affected. > Shouldn't these tests be svn-moved to the non-failing directory if they now > pass? Actually three tests now pass when compared to Firefox 2.0.0.3 and 3.0a5pre (from 27-May-2007 5:24 AM): LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_pct.html LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_px.html LayoutTests/tables/mozilla_expected_failures/marvin/x_colgroup_width_pct.xml 8960 13 ddkilzer 2007-05-28 06:25:12 -0700 $ svn commit LayoutTestResults LayoutTests/ChangeLog LayoutTests/tables Sending LayoutTestResults/ChangeLog Adding LayoutTestResults/qt/tables/mozilla/marvin/colgroup_width_pct-expected.txt Adding LayoutTestResults/qt/tables/mozilla/marvin/colgroup_width_px-expected.txt Adding LayoutTestResults/qt/tables/mozilla/marvin/x_colgroup_width_pct-expected.txt Deleting LayoutTestResults/qt/tables/mozilla_expected_failures/marvin/colgroup_width_pct-expected.txt Deleting LayoutTestResults/qt/tables/mozilla_expected_failures/marvin/colgroup_width_px-expected.txt Deleting LayoutTestResults/qt/tables/mozilla_expected_failures/marvin/x_colgroup_width_pct-expected.txt Sending LayoutTests/ChangeLog Adding LayoutTests/tables/mozilla/marvin/colgroup_width_pct-expected.checksum Adding (bin) LayoutTests/tables/mozilla/marvin/colgroup_width_pct-expected.png Adding LayoutTests/tables/mozilla/marvin/colgroup_width_pct-expected.txt Adding LayoutTests/tables/mozilla/marvin/colgroup_width_pct.html Adding LayoutTests/tables/mozilla/marvin/colgroup_width_px-expected.checksum Adding (bin) LayoutTests/tables/mozilla/marvin/colgroup_width_px-expected.png Adding LayoutTests/tables/mozilla/marvin/colgroup_width_px-expected.txt Adding LayoutTests/tables/mozilla/marvin/colgroup_width_px.html Adding LayoutTests/tables/mozilla/marvin/x_colgroup_width_pct-expected.checksum Adding (bin) LayoutTests/tables/mozilla/marvin/x_colgroup_width_pct-expected.png Adding LayoutTests/tables/mozilla/marvin/x_colgroup_width_pct-expected.txt Adding LayoutTests/tables/mozilla/marvin/x_colgroup_width_pct.xml Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_pct-expected.checksum Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_pct-expected.png Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_pct-expected.txt Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_pct.html Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_px-expected.checksum Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_px-expected.png Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_px-expected.txt Deleting LayoutTests/tables/mozilla_expected_failures/marvin/colgroup_width_px.html Deleting LayoutTests/tables/mozilla_expected_failures/marvin/x_colgroup_width_pct-expected.checksum Deleting LayoutTests/tables/mozilla_expected_failures/marvin/x_colgroup_width_pct-expected.png Deleting LayoutTests/tables/mozilla_expected_failures/marvin/x_colgroup_width_pct-expected.txt Deleting LayoutTests/tables/mozilla_expected_failures/marvin/x_colgroup_width_pct.xml Transmitting file data .. Committed revision 21835. 14639 2007-05-20 23:47:01 -0700 2007-05-20 23:50:18 -0700 Patch to fix first issue. patch.txt text/plain 1572 hyatt SW5kZXg6IGh0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gaHRtbC9IVE1M VGFibGVFbGVtZW50LmNwcAkocmV2aXNpb24gMjE1OTcpCisrKyBodG1sL0hUTUxUYWJsZUVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjYsNyArNTI2LDcgQEAgQ1NTTXV0YWJsZVN0eWxl RGVjbGFyYXRpb24qIEhUTUxUYWJsZUVsZQogewogICAgIE1hcHBlZEF0dHJpYnV0ZSBhdHRyKGNl bGxib3JkZXJBdHRyLCBtX3J1bGVzQXR0ciA9PSBBbGxSdWxlcyA/ICJzb2xpZC1hbGwiIDogCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtX3J1bGVzQXR0ciA9PSBD b2xzUnVsZXMgPyAic29saWQtY29scyIgOiAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKG1fcnVsZXNBdHRyID09IFJvd3NSdWxlcyA/ICJzb2xpZC1yb3dzIiA6ICgh bV9ib3JkZXJBdHRyID8gIm5vbmUiIDogKG1fYm9yZGVyQ29sb3JBdHRyID8gInNvbGlkIiA6ICJp bnNldCIpKSkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG1f cnVsZXNBdHRyID09IFJvd3NSdWxlcyA/ICJzb2xpZC1yb3dzIiA6ICghbV9ib3JkZXJBdHRyIHx8 IG1fcnVsZXNBdHRyID09IEdyb3Vwc1J1bGVzID8gIm5vbmUiIDogKG1fYm9yZGVyQ29sb3JBdHRy ID8gInNvbGlkIiA6ICJpbnNldCIpKSkpKTsKIAogICAgIENTU01hcHBlZEF0dHJpYnV0ZURlY2xh cmF0aW9uKiBkZWNsID0gZ2V0TWFwcGVkQXR0cmlidXRlRGVjbChlUGVyc2lzdGVudCwgJmF0dHIp OwogICAgIGlmICghZGVjbCkgewpAQCAtNTQ5LDcgKzU0OSw3IEBAIENTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uKiBIVE1MVGFibGVFbGUKICAgICAgICAgICAgIGRlY2wtPnNldFByb3BlcnR5KENT U19QUk9QX0JPUkRFUl9UT1BfU1RZTEUsIENTU19WQUxfU09MSUQsIGZhbHNlKTsKICAgICAgICAg ICAgIGRlY2wtPnNldFByb3BlcnR5KENTU19QUk9QX0JPUkRFUl9CT1RUT01fU1RZTEUsIENTU19W QUxfU09MSUQsIGZhbHNlKTsKICAgICAgICAgICAgIGRlY2wtPnNldFByb3BlcnR5KENTU19QUk9Q X0JPUkRFUl9DT0xPUiwgImluaGVyaXQiLCBmYWxzZSk7Ci0gICAgICAgIH0gZWxzZSBpZiAobV9i b3JkZXJBdHRyIHx8IG1fcnVsZXNBdHRyID09IEFsbFJ1bGVzKSB7CisgICAgICAgIH0gZWxzZSBp ZiAobV9ydWxlc0F0dHIgIT0gR3JvdXBzUnVsZXMgJiYgKG1fYm9yZGVyQXR0ciB8fCBtX3J1bGVz QXR0ciA9PSBBbGxSdWxlcykpIHsKICAgICAgICAgICAgIGRlY2wtPnNldFByb3BlcnR5KENTU19Q Uk9QX0JPUkRFUl9XSURUSCwgIjFweCIsIGZhbHNlKTsKICAgICAgICAgICAgICBpbnQgdiA9ICht X2JvcmRlckNvbG9yQXR0ciB8fCBtX3J1bGVzQXR0ciA9PSBBbGxSdWxlcykgPyBDU1NfVkFMX1NP TElEIDogQ1NTX1ZBTF9JTlNFVDsKICAgICAgICAgICAgIGRlY2wtPnNldFByb3BlcnR5KENTU19Q Uk9QX0JPUkRFUl9UT1BfU1RZTEUsIHYsIGZhbHNlKTsK 14640 2007-05-21 00:37:50 -0700 2007-05-21 00:42:48 -0700 Patch to fix second issue patch.txt text/plain 5055 hyatt SW5kZXg6IGh0bWwvSFRNTFRhYmxlQ29sRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gaHRtbC9I VE1MVGFibGVDb2xFbGVtZW50LmNwcAkocmV2aXNpb24gMjE1OTcpCisrKyBodG1sL0hUTUxUYWJs ZUNvbEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw3ICszOCw3IEBAIHVzaW5nIG5h bWVzcGFjZSBIVE1MTmFtZXM7CiBIVE1MVGFibGVDb2xFbGVtZW50OjpIVE1MVGFibGVDb2xFbGVt ZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05hbWUsIERvY3VtZW50ICpkb2MpCiAgICAgOiBI VE1MVGFibGVQYXJ0RWxlbWVudCh0YWdOYW1lLCBkb2MpCiB7Ci0gICAgX3NwYW4gPSAodGFnTmFt ZS5tYXRjaGVzKGNvbGdyb3VwVGFnKSA/IDAgOiAxKTsKKyAgICBfc3BhbiA9IDE7CiB9CiAKIEhU TUxUYWdTdGF0dXMgSFRNTFRhYmxlQ29sRWxlbWVudDo6ZW5kVGFnUmVxdWlyZW1lbnQoKSBjb25z dApJbmRleDogcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJp bmcvUmVuZGVyVGFibGUuY3BwCShyZXZpc2lvbiAyMTU5NykKKysrIHJlbmRlcmluZy9SZW5kZXJU YWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU3MCw3ICs1NzAsNyBAQCB2b2lkIFJlbmRlclRh YmxlOjphcHBlbmRDb2x1bW4oaW50IHNwYW4pCiAgICAgc2V0TmVlZHNMYXlvdXRBbmRQcmVmV2lk dGhzUmVjYWxjKCk7CiB9CiAKLVJlbmRlclRhYmxlQ29sKiBSZW5kZXJUYWJsZTo6Y29sRWxlbWVu dChpbnQgY29sKSBjb25zdAorUmVuZGVyVGFibGVDb2wqIFJlbmRlclRhYmxlOjpjb2xFbGVtZW50 KGludCBjb2wsIGJvb2wqIHN0YXJ0RWRnZSwgYm9vbCogZW5kRWRnZSkgY29uc3QKIHsKICAgICBp ZiAoIW1faGFzQ29sRWxlbWVudHMpCiAgICAgICAgIHJldHVybiAwOwpAQCAtNTgyLDkgKzU4Miwx NiBAQCBSZW5kZXJUYWJsZUNvbCogUmVuZGVyVGFibGU6OmNvbEVsZW1lbnQoCiAgICAgICAgICAg ICBSZW5kZXJUYWJsZUNvbCogY29sRWxlbSA9IHN0YXRpY19jYXN0PFJlbmRlclRhYmxlQ29sKj4o Y2hpbGQpOwogICAgICAgICAgICAgaW50IHNwYW4gPSBjb2xFbGVtLT5zcGFuKCk7CiAgICAgICAg ICAgICBpZiAoIWNvbEVsZW0tPmZpcnN0Q2hpbGQoKSkgeworICAgICAgICAgICAgICAgIGludCBz dGFydENvbCA9IGNDb2w7CisgICAgICAgICAgICAgICAgaW50IGVuZENvbCA9IGNDb2wgKyBzcGFu IC0gMTsKICAgICAgICAgICAgICAgICBjQ29sICs9IHNwYW47Ci0gICAgICAgICAgICAgICAgaWYg KGNDb2wgPiBjb2wpCisgICAgICAgICAgICAgICAgaWYgKGNDb2wgPiBjb2wpIHsKKyAgICAgICAg ICAgICAgICAgICAgaWYgKHN0YXJ0RWRnZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICpzdGFy dEVkZ2UgPSBzdGFydENvbCA9PSBjb2w7CisgICAgICAgICAgICAgICAgICAgIGlmIChlbmRFZGdl KQorICAgICAgICAgICAgICAgICAgICAgICAgKmVuZEVkZ2UgPSBlbmRDb2wgPT0gY29sOwogICAg ICAgICAgICAgICAgICAgICByZXR1cm4gY29sRWxlbTsKKyAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9CiAKICAgICAgICAgICAgIFJlbmRlck9iamVjdCogbmV4dCA9IGNoaWxkLT5maXJz dENoaWxkKCk7CkluZGV4OiByZW5kZXJpbmcvUmVuZGVyVGFibGUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBy ZW5kZXJpbmcvUmVuZGVyVGFibGUuaAkocmV2aXNpb24gMjE1OTcpCisrKyByZW5kZXJpbmcvUmVu ZGVyVGFibGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTYwLDcgKzE2MCw3IEBAIHB1YmxpYzoKICAg ICAgICAgICAgICAgIChjb2xsYXBzZUJvcmRlcnMoKSA/IDAgOiAocGFkZGluZ0xlZnQoKSArIHBh ZGRpbmdSaWdodCgpICsgKG51bUVmZkNvbHMoKSArIDEpICogaEJvcmRlclNwYWNpbmcoKSkpOwog ICAgIH0KIAotICAgIFJlbmRlclRhYmxlQ29sKiBjb2xFbGVtZW50KGludCBjb2wpIGNvbnN0Owor ICAgIFJlbmRlclRhYmxlQ29sKiBjb2xFbGVtZW50KGludCBjb2wsIGJvb2wqIGxlZnRFZGdlID0g MCwgYm9vbCogcmlnaHRFZGdlID0gMCkgY29uc3Q7CiAKICAgICBib29sIG5lZWRzU2VjdGlvblJl Y2FsYygpIGNvbnN0IHsgcmV0dXJuIG1fbmVlZHNTZWN0aW9uUmVjYWxjOyB9CiAgICAgdm9pZCBz ZXROZWVkc1NlY3Rpb25SZWNhbGMoKSB7IG1fbmVlZHNTZWN0aW9uUmVjYWxjID0gdHJ1ZTsgfQpJ bmRleDogcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcmVuZGVy aW5nL1JlbmRlclRhYmxlQ2VsbC5jcHAJKHJldmlzaW9uIDIxNTk3KQorKysgcmVuZGVyaW5nL1Jl bmRlclRhYmxlQ2VsbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyOSw4ICszMjksMTAgQEAgQ29s bGFwc2VkQm9yZGVyVmFsdWUgUmVuZGVyVGFibGVDZWxsOjpjbwogICAgIH0KICAgICAKICAgICAv LyAoNSkgT3VyIGNvbHVtbidzIGxlZnQgYm9yZGVyLgotICAgIFJlbmRlclRhYmxlQ29sKiBjb2xF bHQgPSB0YWJsZUVsdC0+Y29sRWxlbWVudChjb2woKSArIChydGwgPyBjb2xTcGFuKCkgLSAxIDog MCkpOwotICAgIGlmIChjb2xFbHQpIHsKKyAgICBib29sIHN0YXJ0Q29sRWRnZSA9IGZhbHNlOwor ICAgIGJvb2wgZW5kQ29sRWRnZSA9IGZhbHNlOworICAgIFJlbmRlclRhYmxlQ29sKiBjb2xFbHQg PSB0YWJsZUVsdC0+Y29sRWxlbWVudChjb2woKSArIChydGwgPyBjb2xTcGFuKCkgLSAxIDogMCks ICZzdGFydENvbEVkZ2UsICZlbmRDb2xFZGdlKTsKKyAgICBpZiAoY29sRWx0ICYmICghcnRsID8g c3RhcnRDb2xFZGdlIDogZW5kQ29sRWRnZSkpIHsKICAgICAgICAgcmVzdWx0ID0gY29tcGFyZUJv cmRlcnMocmVzdWx0LCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSgmY29sRWx0LT5zdHlsZSgpLT5ib3Jk ZXJMZWZ0KCksIEJDT0wpKTsKICAgICAgICAgaWYgKCFyZXN1bHQuZXhpc3RzKCkpCiAgICAgICAg ICAgICByZXR1cm4gcmVzdWx0OwpAQCAtMzM4LDggKzM0MCwxMCBAQCBDb2xsYXBzZWRCb3JkZXJW YWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvCiAgICAgCiAgICAgLy8gKDYpIFRoZSByaWdodCBib3Jk ZXIgb2YgdGhlIGNvbHVtbiB0byB0aGUgbGVmdC4KICAgICBpZiAoIWxlZnRtb3N0Q29sdW1uKSB7 Ci0gICAgICAgIGNvbEVsdCA9IHRhYmxlRWx0LT5jb2xFbGVtZW50KGNvbCgpICsgKHJ0bCA/IGNv bFNwYW4oKSA6IC0xKSk7Ci0gICAgICAgIGlmIChjb2xFbHQpIHsKKyAgICAgICAgc3RhcnRDb2xF ZGdlID0gZmFsc2U7CisgICAgICAgIGVuZENvbEVkZ2UgPSBmYWxzZTsKKyAgICAgICAgY29sRWx0 ID0gdGFibGVFbHQtPmNvbEVsZW1lbnQoY29sKCkgKyAocnRsID8gY29sU3BhbigpIDogLTEpLCAm c3RhcnRDb2xFZGdlLCAmZW5kQ29sRWRnZSk7CisgICAgICAgIGlmIChjb2xFbHQgJiYgKCFydGwg PyBlbmRDb2xFZGdlIDogc3RhcnRDb2xFZGdlKSkgewogICAgICAgICAgICAgcmVzdWx0ID0gY29t cGFyZUJvcmRlcnMocmVzdWx0LCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSgmY29sRWx0LT5zdHlsZSgp LT5ib3JkZXJSaWdodCgpLCBCQ09MKSk7CiAgICAgICAgICAgICBpZiAoIXJlc3VsdC5leGlzdHMo KSkKICAgICAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwpAQCAtMzkwLDggKzM5NCwxMCBAQCBD b2xsYXBzZWRCb3JkZXJWYWx1ZSBSZW5kZXJUYWJsZUNlbGw6OmNvCiAgICAgfQogICAgIAogICAg IC8vICg1KSBPdXIgY29sdW1uJ3MgcmlnaHQgYm9yZGVyLgotICAgIFJlbmRlclRhYmxlQ29sKiBj b2xFbHQgPSB0YWJsZUVsdC0+Y29sRWxlbWVudChjb2woKSArIChydGwgPyAwIDogY29sU3Bhbigp IC0gMSkpOwotICAgIGlmIChjb2xFbHQpIHsKKyAgICBib29sIHN0YXJ0Q29sRWRnZSA9IGZhbHNl OworICAgIGJvb2wgZW5kQ29sRWRnZSA9IGZhbHNlOworICAgIFJlbmRlclRhYmxlQ29sKiBjb2xF bHQgPSB0YWJsZUVsdC0+Y29sRWxlbWVudChjb2woKSArIChydGwgPyAwIDogY29sU3BhbigpIC0g MSksICZzdGFydENvbEVkZ2UsICZlbmRDb2xFZGdlKTsKKyAgICBpZiAoY29sRWx0ICYmICghcnRs ID8gZW5kQ29sRWRnZSA6IHN0YXJ0Q29sRWRnZSkpIHsKICAgICAgICAgcmVzdWx0ID0gY29tcGFy ZUJvcmRlcnMocmVzdWx0LCBDb2xsYXBzZWRCb3JkZXJWYWx1ZSgmY29sRWx0LT5zdHlsZSgpLT5i b3JkZXJSaWdodCgpLCBCQ09MKSk7CiAgICAgICAgIGlmICghcmVzdWx0LmV4aXN0cygpKQogICAg ICAgICAgICAgcmV0dXJuIHJlc3VsdDsKQEAgLTM5OSw4ICs0MDUsMTAgQEAgQ29sbGFwc2VkQm9y ZGVyVmFsdWUgUmVuZGVyVGFibGVDZWxsOjpjbwogICAgIAogICAgIC8vICg2KSBUaGUgbGVmdCBi b3JkZXIgb2YgdGhlIGNvbHVtbiB0byB0aGUgcmlnaHQuCiAgICAgaWYgKCFyaWdodG1vc3RDb2x1 bW4pIHsKLSAgICAgICAgY29sRWx0ID0gdGFibGVFbHQtPmNvbEVsZW1lbnQoY29sKCkgKyAocnRs ID8gLTEgOiBjb2xTcGFuKCkpKTsKLSAgICAgICAgaWYgKGNvbEVsdCkgeworICAgICAgICBzdGFy dENvbEVkZ2UgPSBmYWxzZTsKKyAgICAgICAgZW5kQ29sRWRnZSA9IGZhbHNlOworICAgICAgICBj b2xFbHQgPSB0YWJsZUVsdC0+Y29sRWxlbWVudChjb2woKSArIChydGwgPyAtMSA6IGNvbFNwYW4o KSksICZzdGFydENvbEVkZ2UsICZlbmRDb2xFZGdlKTsKKyAgICAgICAgaWYgKGNvbEVsdCAmJiAo IXJ0bCA/IHN0YXJ0Q29sRWRnZSA6IGVuZENvbEVkZ2UpKSB7CiAgICAgICAgICAgICByZXN1bHQg PSBjb21wYXJlQm9yZGVycyhyZXN1bHQsIENvbGxhcHNlZEJvcmRlclZhbHVlKCZjb2xFbHQtPnN0 eWxlKCktPmJvcmRlckxlZnQoKSwgQkNPTCkpOwogICAgICAgICAgICAgaWYgKCFyZXN1bHQuZXhp c3RzKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsK