51121 2010-12-15 11:34:28 -0800 [v8] The last portion of CSS GC work: fixing fast/dom/StyleSheet/gc-stylesheet-wrapper.html 2010-12-17 06:39:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 antonm antonm abarth ager commit-queue dglazkov eric japhet jorlow levin oldest_to_newest 322716 0 antonm 2010-12-15 11:34:28 -0800 [v8] The last portion of CSS GC work: fixing fast/dom/StyleSheet/gc-stylesheet-wrapper.html 322840 1 76691 antonm 2010-12-15 15:13:01 -0800 Created attachment 76691 Patch 322847 2 76691 eric 2010-12-15 15:17:09 -0800 Comment on attachment 76691 Patch WebCore uses 4 space indent. I'm not sure how this passed the style queue. 322848 3 76691 eric 2010-12-15 15:17:30 -0800 Comment on attachment 76691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76691&action=review > WebCore/bindings/v8/V8GCController.cpp:371 > + if (object) { Early return is strongly preferred in WebKit. 322889 4 76701 antonm 2010-12-15 15:39:49 -0800 Created attachment 76701 Patch 322890 5 antonm 2010-12-15 15:41:54 -0800 (In reply to comment #2) > (From update of attachment 76691 [details]) > WebCore uses 4 space indent. I'm not sure how this passed the style queue. Thanks a lot, Eric, fixed. I am surprised as well 322893 6 antonm 2010-12-15 15:42:47 -0800 Fixed too, but webkit-patch upload takes a lot of time on my MBP, please, wait for 3rd patch (In reply to comment #3) > (From update of attachment 76691 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=76691&action=review > > > WebCore/bindings/v8/V8GCController.cpp:371 > > + if (object) { > > Early return is strongly preferred in WebKit. 322909 7 76705 antonm 2010-12-15 16:04:15 -0800 Created attachment 76705 Patch 322919 8 levin 2010-12-15 16:17:17 -0800 (In reply to comment #5) > (In reply to comment #2) > > (From update of attachment 76691 [details] [details]) > > WebCore uses 4 space indent. I'm not sure how this passed the style queue. > > Thanks a lot, Eric, fixed. I am surprised as well check-webkit-style doesn't check indents really. It requires a bit of "intelligence" to do this correctly even at a simple level. For example, a(b, c d); Would be indented correctly even though d would not be indented at a multiple of 4. You need to detect a statement end basically and then check to see that the indent is a multiple of 4. (To check that it is the correct multiple of 4 is more complicated because there are special rules for switch (for example).) 323447 9 76705 eric 2010-12-16 15:09:42 -0800 Comment on attachment 76705 Patch Don't you need to remove it from the skipped list? Looks sane enough to me, but I don't fully understand the consequences of this change not being particularly well versed in V8. 323666 10 jorlow 2010-12-17 02:13:31 -0800 Mads, can you do an unofficial review of this please? 323694 11 ager 2010-12-17 03:35:00 -0800 This looks good to me. 323734 12 antonm 2010-12-17 05:59:33 -0800 Thanks a lot, Mads. Guys, may I get r+, land this thing and finish CSS GC cleanup? (In reply to comment #11) > This looks good to me. 323746 13 76705 commit-queue 2010-12-17 06:39:33 -0800 Comment on attachment 76705 Patch Clearing flags on attachment: 76705 Committed r74260: <http://trac.webkit.org/changeset/74260> 323747 14 commit-queue 2010-12-17 06:39:39 -0800 All reviewed patches have been landed. Closing bug. 76691 2010-12-15 15:13:01 -0800 2010-12-15 15:39:41 -0800 Patch bug-51121-20101216021258.patch text/plain 3559 antonm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDEzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTItMTUgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb djhdIFRoZSBsYXN0IHBvcnRpb24gb2YgQ1NTIEdDIHdvcms6IGZpeGluZyBmYXN0L2RvbS9TdHls ZVNoZWV0L2djLXN0eWxlc2hlZXQtd3JhcHBlci5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTEyMQorCisgICAgICAgIFByb3Blcmx5IGdyb3Vw IHN0eWxlIGVsZW1lbnRzIG9mIEhUTUwgbGlua3MsIHN0eWxlIGVsZW1lbnRzIGFuZCBwcm9jZXNz aW5nIGluc3RydWN0aW9ucy4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4R0NDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVHcm91cGVyVmlzaXRvcjo6dmlzaXRET01XcmFw cGVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVHcm91cGVyVmlzaXRvcjo6YWRkRE9NT2JqZWN0 VG9Hcm91cCk6CisKIDIwMTAtMTItMTUgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNzQxMjIpCisrKyBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsMTAg QEAKICNpbmNsdWRlICJWOENTU1N0eWxlUnVsZS5oIgogI2luY2x1ZGUgIlY4Q1NTU3R5bGVTaGVl dC5oIgogI2luY2x1ZGUgIlY4RE9NTWFwLmgiCisjaW5jbHVkZSAiVjhIVE1MTGlua0VsZW1lbnQu aCIKKyNpbmNsdWRlICJWOEhUTUxTdHlsZUVsZW1lbnQuaCIKICNpbmNsdWRlICJWOE1lc3NhZ2VQ b3J0LmgiCisjaW5jbHVkZSAiVjhQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uaCIKICNpbmNsdWRlICJW OFByb3h5LmgiCiAjaW5jbHVkZSAiVjhTdHlsZVNoZWV0TGlzdC5oIgogI2luY2x1ZGUgIldyYXBw ZXJUeXBlSW5mby5oIgpAQCAtMzI5LDE5ICszMzIsMjkgQEAgcHVibGljOgogICAgICAgICAvLyB3 cmFwcGVyIGFsaXZlIGFzIHdlbGwsIHNvIHdlIGFkZCBpdCB0byB0aGUgb2JqZWN0IGdyb3VwLgog ICAgICAgICBpZiAobm9kZS0+aXNTdHlsZWRFbGVtZW50KCkpIHsKICAgICAgICAgICAgIFN0eWxl ZEVsZW1lbnQqIGVsZW1lbnQgPSByZWludGVycHJldF9jYXN0PFN0eWxlZEVsZW1lbnQqPihub2Rl KTsKLSAgICAgICAgICAgIENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlID0gZWxlbWVudC0+aW5s aW5lU3R5bGVEZWNsKCk7Ci0gICAgICAgICAgICBpZiAoc3R5bGUpIHsKLSAgICAgICAgICAgICAg ICB3cmFwcGVyID0gc3RvcmUtPmRvbU9iamVjdE1hcCgpLmdldChzdHlsZSk7Ci0gICAgICAgICAg ICAgICAgaWYgKCF3cmFwcGVyLklzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgbV9ncm91 cGVyLmFwcGVuZChHcm91cGVySXRlbShncm91cElkLCB3cmFwcGVyKSk7Ci0gICAgICAgICAgICB9 CisgICAgICAgICAgICBhZGRET01PYmplY3RUb0dyb3VwKHN0b3JlLCBncm91cElkLCBlbGVtZW50 LT5pbmxpbmVTdHlsZURlY2woKSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAobm9kZS0+aXNE b2N1bWVudE5vZGUoKSkgewogICAgICAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gcmVpbnRl cnByZXRfY2FzdDxEb2N1bWVudCo+KG5vZGUpOwotICAgICAgICAgICAgd3JhcHBlciA9IHN0b3Jl LT5kb21PYmplY3RNYXAoKS5nZXQoZG9jdW1lbnQtPnN0eWxlU2hlZXRzKCkpOwotICAgICAgICAg ICAgaWYgKCF3cmFwcGVyLklzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBtX2dyb3VwZXIuYXBw ZW5kKEdyb3VwZXJJdGVtKGdyb3VwSWQsIHdyYXBwZXIpKTsKKyAgICAgICAgICAgIGFkZERPTU9i amVjdFRvR3JvdXAoc3RvcmUsIGdyb3VwSWQsIGRvY3VtZW50LT5zdHlsZVNoZWV0cygpKTsKKyAg ICAgICAgfQorCisgICAgICAgIFdyYXBwZXJUeXBlSW5mbyogdHlwZUluZm8gPSBWOERPTVdyYXBw ZXI6OmRvbVdyYXBwZXJUeXBlKHdyYXBwZXIpOworCisgICAgICAgIGlmIChWOEhUTUxMaW5rRWxl bWVudDo6aW5mby5lcXVhbHModHlwZUluZm8pKSB7CisgICAgICAgICAgSFRNTExpbmtFbGVtZW50 KiBodG1sTGlua0VsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MTGlua0VsZW1lbnQqPihub2RlKTsK KyAgICAgICAgICBhZGRET01PYmplY3RUb0dyb3VwKHN0b3JlLCBncm91cElkLCBodG1sTGlua0Vs ZW1lbnQtPnNoZWV0KCkpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKFY4SFRNTFN0eWxlRWxl bWVudDo6aW5mby5lcXVhbHModHlwZUluZm8pKSB7CisgICAgICAgICAgSFRNTFN0eWxlRWxlbWVu dCogaHRtbFN0eWxlRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxTdHlsZUVsZW1lbnQqPihub2Rl KTsKKyAgICAgICAgICBhZGRET01PYmplY3RUb0dyb3VwKHN0b3JlLCBncm91cElkLCBodG1sU3R5 bGVFbGVtZW50LT5zaGVldCgpKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChWOFByb2Nlc3Np bmdJbnN0cnVjdGlvbjo6aW5mby5lcXVhbHModHlwZUluZm8pKSB7CisgICAgICAgICAgUHJvY2Vz c2luZ0luc3RydWN0aW9uKiBwcm9jZXNzaW5nSW5zdHJ1Y3Rpb24gPSBzdGF0aWNfY2FzdDxQcm9j ZXNzaW5nSW5zdHJ1Y3Rpb24qPihub2RlKTsKKyAgICAgICAgICBhZGRET01PYmplY3RUb0dyb3Vw KHN0b3JlLCBncm91cElkLCBwcm9jZXNzaW5nSW5zdHJ1Y3Rpb24tPnNoZWV0KCkpOwogICAgICAg ICB9CiAgICAgfQogCkBAIC0zNTIsNiArMzY1LDE1IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAg ICBHcm91cGVyTGlzdCBtX2dyb3VwZXI7CisKKyAgICB2b2lkIGFkZERPTU9iamVjdFRvR3JvdXAo RE9NRGF0YVN0b3JlKiBzdG9yZSwgdWludHB0cl90IGdyb3VwSWQsIHZvaWQqIG9iamVjdCkKKyAg ICB7CisgICAgICAgIGlmIChvYmplY3QpIHsKKyAgICAgICAgICAgIHY4OjpQZXJzaXN0ZW50PHY4 OjpPYmplY3Q+IHdyYXBwZXIgPSBzdG9yZS0+ZG9tT2JqZWN0TWFwKCkuZ2V0KG9iamVjdCk7Cisg ICAgICAgICAgICBpZiAoIXdyYXBwZXIuSXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIG1fZ3Jv dXBlci5hcHBlbmQoR3JvdXBlckl0ZW0oZ3JvdXBJZCwgd3JhcHBlcikpOworICAgICAgICB9Cisg ICAgfQogfTsKIAogY2xhc3MgRE9NT2JqZWN0R3JvdXBlclZpc2l0b3IgOiBwdWJsaWMgRE9NV3Jh cHBlck1hcDx2b2lkPjo6VmlzaXRvciB7Cg== 76701 2010-12-15 15:39:49 -0800 2010-12-15 16:04:08 -0800 Patch bug-51121-20101216023946.patch text/plain 3571 antonm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDEzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTItMTUgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb djhdIFRoZSBsYXN0IHBvcnRpb24gb2YgQ1NTIEdDIHdvcms6IGZpeGluZyBmYXN0L2RvbS9TdHls ZVNoZWV0L2djLXN0eWxlc2hlZXQtd3JhcHBlci5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTEyMQorCisgICAgICAgIFByb3Blcmx5IGdyb3Vw IHN0eWxlIGVsZW1lbnRzIG9mIEhUTUwgbGlua3MsIHN0eWxlIGVsZW1lbnRzIGFuZCBwcm9jZXNz aW5nIGluc3RydWN0aW9ucy4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4R0NDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVHcm91cGVyVmlzaXRvcjo6dmlzaXRET01XcmFw cGVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVHcm91cGVyVmlzaXRvcjo6YWRkRE9NT2JqZWN0 VG9Hcm91cCk6CisKIDIwMTAtMTItMTUgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNzQxMjIpCisrKyBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsMTAg QEAKICNpbmNsdWRlICJWOENTU1N0eWxlUnVsZS5oIgogI2luY2x1ZGUgIlY4Q1NTU3R5bGVTaGVl dC5oIgogI2luY2x1ZGUgIlY4RE9NTWFwLmgiCisjaW5jbHVkZSAiVjhIVE1MTGlua0VsZW1lbnQu aCIKKyNpbmNsdWRlICJWOEhUTUxTdHlsZUVsZW1lbnQuaCIKICNpbmNsdWRlICJWOE1lc3NhZ2VQ b3J0LmgiCisjaW5jbHVkZSAiVjhQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uaCIKICNpbmNsdWRlICJW OFByb3h5LmgiCiAjaW5jbHVkZSAiVjhTdHlsZVNoZWV0TGlzdC5oIgogI2luY2x1ZGUgIldyYXBw ZXJUeXBlSW5mby5oIgpAQCAtMzI5LDE5ICszMzIsMjkgQEAgcHVibGljOgogICAgICAgICAvLyB3 cmFwcGVyIGFsaXZlIGFzIHdlbGwsIHNvIHdlIGFkZCBpdCB0byB0aGUgb2JqZWN0IGdyb3VwLgog ICAgICAgICBpZiAobm9kZS0+aXNTdHlsZWRFbGVtZW50KCkpIHsKICAgICAgICAgICAgIFN0eWxl ZEVsZW1lbnQqIGVsZW1lbnQgPSByZWludGVycHJldF9jYXN0PFN0eWxlZEVsZW1lbnQqPihub2Rl KTsKLSAgICAgICAgICAgIENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlID0gZWxlbWVudC0+aW5s aW5lU3R5bGVEZWNsKCk7Ci0gICAgICAgICAgICBpZiAoc3R5bGUpIHsKLSAgICAgICAgICAgICAg ICB3cmFwcGVyID0gc3RvcmUtPmRvbU9iamVjdE1hcCgpLmdldChzdHlsZSk7Ci0gICAgICAgICAg ICAgICAgaWYgKCF3cmFwcGVyLklzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgbV9ncm91 cGVyLmFwcGVuZChHcm91cGVySXRlbShncm91cElkLCB3cmFwcGVyKSk7Ci0gICAgICAgICAgICB9 CisgICAgICAgICAgICBhZGRET01PYmplY3RUb0dyb3VwKHN0b3JlLCBncm91cElkLCBlbGVtZW50 LT5pbmxpbmVTdHlsZURlY2woKSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAobm9kZS0+aXNE b2N1bWVudE5vZGUoKSkgewogICAgICAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gcmVpbnRl cnByZXRfY2FzdDxEb2N1bWVudCo+KG5vZGUpOwotICAgICAgICAgICAgd3JhcHBlciA9IHN0b3Jl LT5kb21PYmplY3RNYXAoKS5nZXQoZG9jdW1lbnQtPnN0eWxlU2hlZXRzKCkpOwotICAgICAgICAg ICAgaWYgKCF3cmFwcGVyLklzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBtX2dyb3VwZXIuYXBw ZW5kKEdyb3VwZXJJdGVtKGdyb3VwSWQsIHdyYXBwZXIpKTsKKyAgICAgICAgICAgIGFkZERPTU9i amVjdFRvR3JvdXAoc3RvcmUsIGdyb3VwSWQsIGRvY3VtZW50LT5zdHlsZVNoZWV0cygpKTsKKyAg ICAgICAgfQorCisgICAgICAgIFdyYXBwZXJUeXBlSW5mbyogdHlwZUluZm8gPSBWOERPTVdyYXBw ZXI6OmRvbVdyYXBwZXJUeXBlKHdyYXBwZXIpOworCisgICAgICAgIGlmIChWOEhUTUxMaW5rRWxl bWVudDo6aW5mby5lcXVhbHModHlwZUluZm8pKSB7CisgICAgICAgICAgICBIVE1MTGlua0VsZW1l bnQqIGh0bWxMaW5rRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxMaW5rRWxlbWVudCo+KG5vZGUp OworICAgICAgICAgICAgYWRkRE9NT2JqZWN0VG9Hcm91cChzdG9yZSwgZ3JvdXBJZCwgaHRtbExp bmtFbGVtZW50LT5zaGVldCgpKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChWOEhUTUxTdHls ZUVsZW1lbnQ6OmluZm8uZXF1YWxzKHR5cGVJbmZvKSkgeworICAgICAgICAgICAgSFRNTFN0eWxl RWxlbWVudCogaHRtbFN0eWxlRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxTdHlsZUVsZW1lbnQq Pihub2RlKTsKKyAgICAgICAgICAgIGFkZERPTU9iamVjdFRvR3JvdXAoc3RvcmUsIGdyb3VwSWQs IGh0bWxTdHlsZUVsZW1lbnQtPnNoZWV0KCkpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKFY4 UHJvY2Vzc2luZ0luc3RydWN0aW9uOjppbmZvLmVxdWFscyh0eXBlSW5mbykpIHsKKyAgICAgICAg ICAgIFByb2Nlc3NpbmdJbnN0cnVjdGlvbiogcHJvY2Vzc2luZ0luc3RydWN0aW9uID0gc3RhdGlj X2Nhc3Q8UHJvY2Vzc2luZ0luc3RydWN0aW9uKj4obm9kZSk7CisgICAgICAgICAgICBhZGRET01P YmplY3RUb0dyb3VwKHN0b3JlLCBncm91cElkLCBwcm9jZXNzaW5nSW5zdHJ1Y3Rpb24tPnNoZWV0 KCkpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0zNTIsNiArMzY1LDE1IEBAIHB1YmxpYzoKIAog cHJpdmF0ZToKICAgICBHcm91cGVyTGlzdCBtX2dyb3VwZXI7CisKKyAgICB2b2lkIGFkZERPTU9i amVjdFRvR3JvdXAoRE9NRGF0YVN0b3JlKiBzdG9yZSwgdWludHB0cl90IGdyb3VwSWQsIHZvaWQq IG9iamVjdCkKKyAgICB7CisgICAgICAgIGlmIChvYmplY3QpIHsKKyAgICAgICAgICAgIHY4OjpQ ZXJzaXN0ZW50PHY4OjpPYmplY3Q+IHdyYXBwZXIgPSBzdG9yZS0+ZG9tT2JqZWN0TWFwKCkuZ2V0 KG9iamVjdCk7CisgICAgICAgICAgICBpZiAoIXdyYXBwZXIuSXNFbXB0eSgpKQorICAgICAgICAg ICAgICAgIG1fZ3JvdXBlci5hcHBlbmQoR3JvdXBlckl0ZW0oZ3JvdXBJZCwgd3JhcHBlcikpOwor ICAgICAgICB9CisgICAgfQogfTsKIAogY2xhc3MgRE9NT2JqZWN0R3JvdXBlclZpc2l0b3IgOiBw dWJsaWMgRE9NV3JhcHBlck1hcDx2b2lkPjo6VmlzaXRvciB7Cg== 76705 2010-12-15 16:04:15 -0800 2010-12-17 06:39:32 -0800 Patch bug-51121-20101216030413.patch text/plain 3568 antonm SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDEzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTItMTUgIEFudG9uIE11aGluICA8YW50b25tQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb djhdIFRoZSBsYXN0IHBvcnRpb24gb2YgQ1NTIEdDIHdvcms6IGZpeGluZyBmYXN0L2RvbS9TdHls ZVNoZWV0L2djLXN0eWxlc2hlZXQtd3JhcHBlci5odG1sCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTEyMQorCisgICAgICAgIFByb3Blcmx5IGdyb3Vw IHN0eWxlIGVsZW1lbnRzIG9mIEhUTUwgbGlua3MsIHN0eWxlIGVsZW1lbnRzIGFuZCBwcm9jZXNz aW5nIGluc3RydWN0aW9ucy4KKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4R0NDb250cm9sbGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVHcm91cGVyVmlzaXRvcjo6dmlzaXRET01XcmFw cGVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVHcm91cGVyVmlzaXRvcjo6YWRkRE9NT2JqZWN0 VG9Hcm91cCk6CisKIDIwMTAtMTItMTUgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdz L3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNzQxMjIpCisrKyBXZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4R0NDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsMTAg QEAKICNpbmNsdWRlICJWOENTU1N0eWxlUnVsZS5oIgogI2luY2x1ZGUgIlY4Q1NTU3R5bGVTaGVl dC5oIgogI2luY2x1ZGUgIlY4RE9NTWFwLmgiCisjaW5jbHVkZSAiVjhIVE1MTGlua0VsZW1lbnQu aCIKKyNpbmNsdWRlICJWOEhUTUxTdHlsZUVsZW1lbnQuaCIKICNpbmNsdWRlICJWOE1lc3NhZ2VQ b3J0LmgiCisjaW5jbHVkZSAiVjhQcm9jZXNzaW5nSW5zdHJ1Y3Rpb24uaCIKICNpbmNsdWRlICJW OFByb3h5LmgiCiAjaW5jbHVkZSAiVjhTdHlsZVNoZWV0TGlzdC5oIgogI2luY2x1ZGUgIldyYXBw ZXJUeXBlSW5mby5oIgpAQCAtMzI5LDE5ICszMzIsMjkgQEAgcHVibGljOgogICAgICAgICAvLyB3 cmFwcGVyIGFsaXZlIGFzIHdlbGwsIHNvIHdlIGFkZCBpdCB0byB0aGUgb2JqZWN0IGdyb3VwLgog ICAgICAgICBpZiAobm9kZS0+aXNTdHlsZWRFbGVtZW50KCkpIHsKICAgICAgICAgICAgIFN0eWxl ZEVsZW1lbnQqIGVsZW1lbnQgPSByZWludGVycHJldF9jYXN0PFN0eWxlZEVsZW1lbnQqPihub2Rl KTsKLSAgICAgICAgICAgIENTU1N0eWxlRGVjbGFyYXRpb24qIHN0eWxlID0gZWxlbWVudC0+aW5s aW5lU3R5bGVEZWNsKCk7Ci0gICAgICAgICAgICBpZiAoc3R5bGUpIHsKLSAgICAgICAgICAgICAg ICB3cmFwcGVyID0gc3RvcmUtPmRvbU9iamVjdE1hcCgpLmdldChzdHlsZSk7Ci0gICAgICAgICAg ICAgICAgaWYgKCF3cmFwcGVyLklzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICAgICAgbV9ncm91 cGVyLmFwcGVuZChHcm91cGVySXRlbShncm91cElkLCB3cmFwcGVyKSk7Ci0gICAgICAgICAgICB9 CisgICAgICAgICAgICBhZGRET01PYmplY3RUb0dyb3VwKHN0b3JlLCBncm91cElkLCBlbGVtZW50 LT5pbmxpbmVTdHlsZURlY2woKSk7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAobm9kZS0+aXNE b2N1bWVudE5vZGUoKSkgewogICAgICAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gcmVpbnRl cnByZXRfY2FzdDxEb2N1bWVudCo+KG5vZGUpOwotICAgICAgICAgICAgd3JhcHBlciA9IHN0b3Jl LT5kb21PYmplY3RNYXAoKS5nZXQoZG9jdW1lbnQtPnN0eWxlU2hlZXRzKCkpOwotICAgICAgICAg ICAgaWYgKCF3cmFwcGVyLklzRW1wdHkoKSkKLSAgICAgICAgICAgICAgICBtX2dyb3VwZXIuYXBw ZW5kKEdyb3VwZXJJdGVtKGdyb3VwSWQsIHdyYXBwZXIpKTsKKyAgICAgICAgICAgIGFkZERPTU9i amVjdFRvR3JvdXAoc3RvcmUsIGdyb3VwSWQsIGRvY3VtZW50LT5zdHlsZVNoZWV0cygpKTsKKyAg ICAgICAgfQorCisgICAgICAgIFdyYXBwZXJUeXBlSW5mbyogdHlwZUluZm8gPSBWOERPTVdyYXBw ZXI6OmRvbVdyYXBwZXJUeXBlKHdyYXBwZXIpOworCisgICAgICAgIGlmIChWOEhUTUxMaW5rRWxl bWVudDo6aW5mby5lcXVhbHModHlwZUluZm8pKSB7CisgICAgICAgICAgICBIVE1MTGlua0VsZW1l bnQqIGh0bWxMaW5rRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxMaW5rRWxlbWVudCo+KG5vZGUp OworICAgICAgICAgICAgYWRkRE9NT2JqZWN0VG9Hcm91cChzdG9yZSwgZ3JvdXBJZCwgaHRtbExp bmtFbGVtZW50LT5zaGVldCgpKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChWOEhUTUxTdHls ZUVsZW1lbnQ6OmluZm8uZXF1YWxzKHR5cGVJbmZvKSkgeworICAgICAgICAgICAgSFRNTFN0eWxl RWxlbWVudCogaHRtbFN0eWxlRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxTdHlsZUVsZW1lbnQq Pihub2RlKTsKKyAgICAgICAgICAgIGFkZERPTU9iamVjdFRvR3JvdXAoc3RvcmUsIGdyb3VwSWQs IGh0bWxTdHlsZUVsZW1lbnQtPnNoZWV0KCkpOworICAgICAgICB9CisKKyAgICAgICAgaWYgKFY4 UHJvY2Vzc2luZ0luc3RydWN0aW9uOjppbmZvLmVxdWFscyh0eXBlSW5mbykpIHsKKyAgICAgICAg ICAgIFByb2Nlc3NpbmdJbnN0cnVjdGlvbiogcHJvY2Vzc2luZ0luc3RydWN0aW9uID0gc3RhdGlj X2Nhc3Q8UHJvY2Vzc2luZ0luc3RydWN0aW9uKj4obm9kZSk7CisgICAgICAgICAgICBhZGRET01P YmplY3RUb0dyb3VwKHN0b3JlLCBncm91cElkLCBwcm9jZXNzaW5nSW5zdHJ1Y3Rpb24tPnNoZWV0 KCkpOwogICAgICAgICB9CiAgICAgfQogCkBAIC0zNTIsNiArMzY1LDE1IEBAIHB1YmxpYzoKIAog cHJpdmF0ZToKICAgICBHcm91cGVyTGlzdCBtX2dyb3VwZXI7CisKKyAgICB2b2lkIGFkZERPTU9i amVjdFRvR3JvdXAoRE9NRGF0YVN0b3JlKiBzdG9yZSwgdWludHB0cl90IGdyb3VwSWQsIHZvaWQq IG9iamVjdCkKKyAgICB7CisgICAgICAgIGlmICghb2JqZWN0KQorICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB2ODo6UGVyc2lzdGVudDx2ODo6T2JqZWN0PiB3cmFwcGVyID0gc3RvcmUtPmRv bU9iamVjdE1hcCgpLmdldChvYmplY3QpOworICAgICAgICBpZiAoIXdyYXBwZXIuSXNFbXB0eSgp KQorICAgICAgICAgICAgbV9ncm91cGVyLmFwcGVuZChHcm91cGVySXRlbShncm91cElkLCB3cmFw cGVyKSk7CisgICAgfQogfTsKIAogY2xhc3MgRE9NT2JqZWN0R3JvdXBlclZpc2l0b3IgOiBwdWJs aWMgRE9NV3JhcHBlck1hcDx2b2lkPjo6VmlzaXRvciB7Cg==