50183 2010-11-29 14:09:35 -0800 Erroneously commented out code in RenderBlock::layoutPositionedObjects() 2010-11-30 11:48:52 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://trac.webkit.org/browser/trunk/WebCore/rendering/RenderBlock.cpp?annotate=blame&rev=40461#L1490 P2 Normal --- 1 simon.fraser hyatt oldest_to_newest 314630 0 simon.fraser 2010-11-29 14:09:35 -0800 It looks like this line: //if (relayoutChildren && (r->style()->paddingLeft().isPercent() || r->style()->paddingRight().isPercent())) was left commented by accident. http://trac.webkit.org/browser/trunk/WebCore/rendering/RenderBlock.cpp?annotate=blame&rev=40461#L1490 314649 1 75061 hyatt 2010-11-29 14:25:13 -0800 Created attachment 75061 Patch 315181 2 75172 hyatt 2010-11-30 11:18:52 -0800 Created attachment 75172 Patch 315186 3 75172 darin 2010-11-30 11:21:51 -0800 Comment on attachment 75172 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75172&action=review > WebCore/rendering/RenderLayer.cpp:1893 > + if (!m_vBar && renderer()->hasOverflowClip() && renderer()->style()->overflowY() == OSCROLL) > + setHasVerticalScrollbar(true); Adding this side effect to the width getter seems like a fragile way to structure the code; seems likely that callers will not realize this side effect exists. Is there a clearer way to do this? 315197 4 hyatt 2010-11-30 11:36:45 -0800 I could just patch the one call site and hope that's good enough. 315201 5 75176 hyatt 2010-11-30 11:44:23 -0800 Created attachment 75176 Patch 315203 6 75176 simon.fraser 2010-11-30 11:46:38 -0800 Comment on attachment 75176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75176&action=review > WebCore/rendering/RenderBlock.cpp:4734 > + if (!layer()->verticalScrollbar()) > + layer()->setHasVerticalScrollbar(true); You could call setHasVerticalScrollbar() unconditionally; it does no work if there's already a vertical scrollbar. > WebCore/rendering/RenderFlexibleBox.cpp:185 > + if (!layer()->verticalScrollbar()) > + layer()->setHasVerticalScrollbar(true); Ditto. 315204 7 hyatt 2010-11-30 11:48:52 -0800 Fixed in r72947. 75061 2010-11-29 14:25:13 -0800 2010-11-30 11:18:52 -0800 Patch patch.txt text/plain 1540 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjgzMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTEtMjkgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDE4MworICAgICAgICAKKyAgICAg ICAgQ29kZSBnb3QgY29tbWVudGVkIG91dCBieSBhY2NpZGVudCBkdXJpbmcgcmVuZGVyIHRyZWUg cmVmYWN0b3JpbmcgbGFzdCB5ZWFyLiAgUHV0IHRoZSBjb2RlIGJhY2sgaW4sIHNpbmNlCisgICAg ICAgIGl0IGh1cnRzIHBlcmZvcm1hbmNlIHRvIGhhdmUgdGhhdCBsaW5lIGNvbW1lbnRlZCBvdXQu CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2s6OmxheW91dFBvc2l0aW9uZWRPYmplY3RzKToKKwogMjAxMC0xMS0yOSAg SWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJl dmlzaW9uIDcyODE0KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMDIzLDcgKzIwMjMsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlvdXRQ b3NpdGlvbmVkT2JqZWN0CiAgICAgICAgICAgICAgICAgci0+c2V0Q2hpbGROZWVkc0xheW91dCh0 cnVlLCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAvLyBJZiByZWxheW91 dENoaWxkcmVuIGlzIHNldCBhbmQgd2UgaGF2ZSBwZXJjZW50YWdlIHBhZGRpbmcsIHdlIGFsc28g bmVlZCB0byBpbnZhbGlkYXRlIHRoZSBjaGlsZCdzIHByZWYgd2lkdGhzLgotICAgICAgICAgICAg Ly9pZiAocmVsYXlvdXRDaGlsZHJlbiAmJiAoci0+c3R5bGUoKS0+cGFkZGluZ0xlZnQoKS5pc1Bl cmNlbnQoKSB8fCByLT5zdHlsZSgpLT5wYWRkaW5nUmlnaHQoKS5pc1BlcmNlbnQoKSkpCisgICAg ICAgICAgICBpZiAocmVsYXlvdXRDaGlsZHJlbiAmJiAoci0+c3R5bGUoKS0+cGFkZGluZ1N0YXJ0 KCkuaXNQZXJjZW50KCkgfHwgci0+c3R5bGUoKS0+cGFkZGluZ0VuZCgpLmlzUGVyY2VudCgpKSkK ICAgICAgICAgICAgICAgICByLT5zZXRQcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkodHJ1ZSwg ZmFsc2UpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAoIXItPm5lZWRzTGF5b3V0KCkp Cg== 75172 2010-11-30 11:18:52 -0800 2010-11-30 11:44:23 -0800 Patch patch.txt text/plain 5896 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjkzNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMTAtMTEtMzAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDE4MworICAgICAgICAKKyAgICAg ICAgQ29kZSBnb3QgY29tbWVudGVkIG91dCBieSBhY2NpZGVudCBkdXJpbmcgcmVuZGVyIHRyZWUg cmVmYWN0b3JpbmcgbGFzdCB5ZWFyLiAgUHV0IHRoZSBjb2RlIGJhY2sgaW4sIHNpbmNlCisgICAg ICAgIGl0IGh1cnRzIHBlcmZvcm1hbmNlIHRvIGhhdmUgdGhhdCBsaW5lIGNvbW1lbnRlZCBvdXQu CisKKyAgICAgICAgSW4gb3JkZXIgdG8gcHV0IHRoaXMgY29kZSBiYWNrIGluLCBJIGhhZCB0byBm aXggc29tZSBidWdzIHdpdGggcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9ucyBhbmQKKyAgICAg ICAgb3ZlcmZsb3c6IHNjcm9sbC4gIE1ha2UgdmVydGljYWxTY3JvbGxiYXJXaWR0aCBhbmQgaG9y aXpvbnRhbFNjcm9sbGJhckhlaWdodCBhdXRvbWF0aWNhbGx5IGNyZWF0ZQorICAgICAgICB0aGUg c2Nyb2xsYmFycyBpZiBuZWVkZWQgd2hlbiBvdmVyZmxvdzpzY3JvbGwgaXMgc2V0LiAgVGhpcyBl bnN1cmVzIHRoZSBwcmVmIHdpZHRocyBjb21wdXRhdGlvbiB3aWxsIGluY2x1ZGUKKyAgICAgICAg dGhlIHNjcm9sbGJhciBzaXplIGxpa2UgaXQgc2hvdWxkLgorICAgICAgICAKKyAgICAgICAgTWFr ZSBzdXJlIHRoZSBzY3JvbGxiYXIgc2l6ZSBpcyBpbmNsdWRlZCBwcmlvciB0byBjaGVja2luZyBm b3IgZGVmaW5lZCB3aWR0aC9taW4td2lkdGgvbWF4LXdpZHRoIHZhbHVlcy4gIE90aGVyd2lzZQor ICAgICAgICB0aGUgc2Nyb2xsYmFyIGluZmxhdGVzIHRoZSB3aWR0aCBiZXlvbmQgdGhlIGZpeGVk IHNpemUgdGhhdCB3YXMgc3BlY2lmaWVkLgorICAgICAgICAKKyAgICAgICAgRm9yIHRhYmxlIGNl bGxzLCB0aGVyZSBpcyBhbiBhZGRpdGlvbmFsIHdyaW5rbGUuICBNYWtlIHN1cmUgbm90IHRvIGlu Y2x1ZGUgdGhlIHNjcm9sbGJhciBzaXplIGFzIHBhcnQgb2YgdGhlIG1pbmltdW0KKyAgICAgICAg aW50cmluc2ljIHdpZHRoIHNvIHRoYXQgd2UgZG9uJ3QgaW5jb3JyZWN0bHkgZ3Jvdy4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCbG9jazo6bGF5b3V0UG9zaXRpb25lZE9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnZl cnRpY2FsU2Nyb2xsYmFyV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Omhv cml6b250YWxTY3JvbGxiYXJIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXll ci5oOgorCiAyMDEwLTExLTMwICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAogICAg ICAgICBDbGVhbiB1cCBXZWJDb3JlLnZjcHJvaidzIGJpbmRpbmdzIGZpbHRlcgpJbmRleDogV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gNzI4MTQpCisrKyBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMjMsNyArMjAyMyw3IEBA IHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dFBvc2l0aW9uZWRPYmplY3QKICAgICAgICAgICAgICAg ICByLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUsIGZhbHNlKTsKICAgICAgICAgICAgICAgICAK ICAgICAgICAgICAgIC8vIElmIHJlbGF5b3V0Q2hpbGRyZW4gaXMgc2V0IGFuZCB3ZSBoYXZlIHBl cmNlbnRhZ2UgcGFkZGluZywgd2UgYWxzbyBuZWVkIHRvIGludmFsaWRhdGUgdGhlIGNoaWxkJ3Mg cHJlZiB3aWR0aHMuCi0gICAgICAgICAgICAvL2lmIChyZWxheW91dENoaWxkcmVuICYmIChyLT5z dHlsZSgpLT5wYWRkaW5nTGVmdCgpLmlzUGVyY2VudCgpIHx8IHItPnN0eWxlKCktPnBhZGRpbmdS aWdodCgpLmlzUGVyY2VudCgpKSkKKyAgICAgICAgICAgIGlmIChyZWxheW91dENoaWxkcmVuICYm IChyLT5zdHlsZSgpLT5wYWRkaW5nU3RhcnQoKS5pc1BlcmNlbnQoKSB8fCByLT5zdHlsZSgpLT5w YWRkaW5nRW5kKCkuaXNQZXJjZW50KCkpKQogICAgICAgICAgICAgICAgIHItPnNldFByZWZlcnJl ZExvZ2ljYWxXaWR0aHNEaXJ0eSh0cnVlLCBmYWxzZSk7CiAgICAgICAgICAgICAKICAgICAgICAg ICAgIGlmICghci0+bmVlZHNMYXlvdXQoKSkKQEAgLTQ3MjgsMTEgKzQ3MjgsMjEgQEAgdm9pZCBS ZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYQogICAgICAgICAgICAgICAgIG1fbWlu UHJlZmVycmVkTG9naWNhbFdpZHRoID0gMDsKICAgICAgICAgfQogCisgICAgICAgIGludCBzY3Jv bGxiYXJXaWR0aCA9IDA7CisgICAgICAgIGlmIChoYXNPdmVyZmxvd0NsaXAoKSAmJiBzdHlsZSgp LT5vdmVyZmxvd1koKSA9PSBPU0NST0xMKSB7CisgICAgICAgICAgICBzY3JvbGxiYXJXaWR0aCA9 IHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoKTsKKyAgICAgICAgICAgIG1fbWF4UHJlZmVycmVkTG9n aWNhbFdpZHRoICs9IHNjcm9sbGJhcldpZHRoOworICAgICAgICB9CisKICAgICAgICAgaWYgKGlz VGFibGVDZWxsKCkpIHsKICAgICAgICAgICAgIExlbmd0aCB3ID0gdG9SZW5kZXJUYWJsZUNlbGwo dGhpcyktPnN0eWxlT3JDb2xMb2dpY2FsV2lkdGgoKTsKLSAgICAgICAgICAgIGlmICh3LmlzRml4 ZWQoKSAmJiB3LnZhbHVlKCkgPiAwKQorICAgICAgICAgICAgaWYgKHcuaXNGaXhlZCgpICYmIHcu dmFsdWUoKSA+IDApIHsKICAgICAgICAgICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCA9IG1heChtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgY29tcHV0ZUNvbnRlbnRCb3hMb2dp Y2FsV2lkdGgody52YWx1ZSgpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsYmFyV2lkdGggPSAw OworICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIAorICAgICAgICBtX21pblByZWZl cnJlZExvZ2ljYWxXaWR0aCArPSBzY3JvbGxiYXJXaWR0aDsKICAgICB9CiAgICAgCiAgICAgaWYg KHN0eWxlKCktPmxvZ2ljYWxNaW5XaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZSgpLT5sb2dpY2Fs TWluV2lkdGgoKS52YWx1ZSgpID4gMCkgewpAQCAtNDc0NSwxNCArNDc1NSw5IEBAIHZvaWQgUmVu ZGVyQmxvY2s6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2EKICAgICAgICAgbV9taW5QcmVmZXJyZWRM b2dpY2FsV2lkdGggPSBtaW4obV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGNvbXB1dGVDb250 ZW50Qm94TG9naWNhbFdpZHRoKHN0eWxlKCktPmxvZ2ljYWxNYXhXaWR0aCgpLnZhbHVlKCkpKTsK ICAgICB9CiAKLSAgICBpbnQgdG9BZGQgPSAwOwotICAgIHRvQWRkID0gYm9yZGVyQW5kUGFkZGlu Z0xvZ2ljYWxXaWR0aCgpOwotCi0gICAgaWYgKGhhc092ZXJmbG93Q2xpcCgpICYmIHN0eWxlKCkt Pm92ZXJmbG93WSgpID09IE9TQ1JPTEwpCi0gICAgICAgIHRvQWRkICs9IHZlcnRpY2FsU2Nyb2xs YmFyV2lkdGgoKTsKLQotICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHRvQWRkOwot ICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHRvQWRkOworICAgIGludCBib3JkZXJB bmRQYWRkaW5nID0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxXaWR0aCgpOworICAgIG1fbWluUHJl ZmVycmVkTG9naWNhbFdpZHRoICs9IGJvcmRlckFuZFBhZGRpbmc7CisgICAgbV9tYXhQcmVmZXJy ZWRMb2dpY2FsV2lkdGggKz0gYm9yZGVyQW5kUGFkZGluZzsKIAogICAgIHNldFByZWZlcnJlZExv Z2ljYWxXaWR0aHNEaXJ0eShmYWxzZSk7CiB9CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCShyZXZpc2lvbiA3MjgxNCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTg4NywxOCArMTg4NywxOCBAQCB2b2lkIFJlbmRlckxheWVy OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhCiAjZW5kaWYKIH0KIAotaW50IFJlbmRlckxheWVyOjp2 ZXJ0aWNhbFNjcm9sbGJhcldpZHRoKCkgY29uc3QKK2ludCBSZW5kZXJMYXllcjo6dmVydGljYWxT Y3JvbGxiYXJXaWR0aCgpCiB7Ci0gICAgaWYgKCFtX3ZCYXIpCi0gICAgICAgIHJldHVybiAwOwot ICAgIHJldHVybiBtX3ZCYXItPndpZHRoKCk7CisgICAgaWYgKCFtX3ZCYXIgJiYgcmVuZGVyZXIo KS0+aGFzT3ZlcmZsb3dDbGlwKCkgJiYgcmVuZGVyZXIoKS0+c3R5bGUoKS0+b3ZlcmZsb3dZKCkg PT0gT1NDUk9MTCkKKyAgICAgICAgc2V0SGFzVmVydGljYWxTY3JvbGxiYXIodHJ1ZSk7CisgICAg cmV0dXJuIG1fdkJhciA/IG1fdkJhci0+d2lkdGgoKSA6IDA7CiB9CiAKLWludCBSZW5kZXJMYXll cjo6aG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpIGNvbnN0CitpbnQgUmVuZGVyTGF5ZXI6Omhv cml6b250YWxTY3JvbGxiYXJIZWlnaHQoKQogewotICAgIGlmICghbV9oQmFyKQotICAgICAgICBy ZXR1cm4gMDsKLSAgICByZXR1cm4gbV9oQmFyLT5oZWlnaHQoKTsKKyAgICBpZiAoIW1faEJhciAm JiByZW5kZXJlcigpLT5oYXNPdmVyZmxvd0NsaXAoKSAmJiByZW5kZXJlcigpLT5zdHlsZSgpLT5v dmVyZmxvd1goKSA9PSBPU0NST0xMKQorICAgICAgICBzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFy KHRydWUpOworICAgIHJldHVybiBtX2hCYXIgPyBtX2hCYXItPmhlaWdodCgpIDogMDsKIH0KIAog SW50U2l6ZSBSZW5kZXJMYXllcjo6b2Zmc2V0RnJvbVJlc2l6ZUNvcm5lcihjb25zdCBJbnRQb2lu dCYgYWJzb2x1dGVQb2ludCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAkocmV2 aXNpb24gNzI4MTQpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNTQsOCArMjU0LDggQEAgcHVibGljOgogICAgIFNjcm9sbGJhciogaG9yaXpv bnRhbFNjcm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIG1faEJhci5nZXQoKTsgfQogICAgIFNjcm9s bGJhciogdmVydGljYWxTY3JvbGxiYXIoKSBjb25zdCB7IHJldHVybiBtX3ZCYXIuZ2V0KCk7IH0K IAotICAgIGludCB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoKCkgY29uc3Q7Ci0gICAgaW50IGhvcml6 b250YWxTY3JvbGxiYXJIZWlnaHQoKSBjb25zdDsKKyAgICBpbnQgdmVydGljYWxTY3JvbGxiYXJX aWR0aCgpOworICAgIGludCBob3Jpem9udGFsU2Nyb2xsYmFySGVpZ2h0KCk7CiAKICAgICBib29s IGhhc092ZXJmbG93Q29udHJvbHMoKSBjb25zdDsKICAgICB2b2lkIHBvc2l0aW9uT3ZlcmZsb3dD b250cm9scyhpbnQgdHgsIGludCB0eSk7Cg== 75176 2010-11-30 11:44:23 -0800 2010-11-30 11:46:37 -0800 Patch patch.txt text/plain 5726 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3Mjk0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTAtMTEtMzAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDE4 MworICAgICAgICAKKyAgICAgICAgQ29kZSBnb3QgY29tbWVudGVkIG91dCBieSBhY2NpZGVudCBk dXJpbmcgcmVuZGVyIHRyZWUgcmVmYWN0b3JpbmcgbGFzdCB5ZWFyLiAgUHV0IHRoZSBjb2RlIGJh Y2sgaW4sIHNpbmNlCisgICAgICAgIGl0IGh1cnRzIHBlcmZvcm1hbmNlIHRvIGhhdmUgdGhhdCBs aW5lIGNvbW1lbnRlZCBvdXQuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gcHV0IHRoaXMgY29kZSBi YWNrIGluLCBJIGhhZCB0byBmaXggc29tZSBidWdzIHdpdGggcHJlZmVycmVkIHdpZHRoIGNvbXB1 dGF0aW9ucyBhbmQKKyAgICAgICAgb3ZlcmZsb3c6IHNjcm9sbC4gIE1ha2UgdGhlIHByZWYgd2lk dGhzIGNvbXB1dGF0aW9uIGNyZWF0ZSB0aGUgc2Nyb2xsYmFyIGlmIGl0IGRvZXNuJ3QgZXhpc3Qg eWV0LgorCisgICAgICAgIE1ha2Ugc3VyZSB0aGUgc2Nyb2xsYmFyIHNpemUgaXMgaW5jbHVkZWQg cHJpb3IgdG8gY2hlY2tpbmcgZm9yIGRlZmluZWQgd2lkdGgvbWluLXdpZHRoL21heC13aWR0aCB2 YWx1ZXMuICBPdGhlcndpc2UKKyAgICAgICAgdGhlIHNjcm9sbGJhciBpbmZsYXRlcyB0aGUgd2lk dGggYmV5b25kIHRoZSBmaXhlZCBzaXplIHRoYXQgd2FzIHNwZWNpZmllZC4KKyAgICAgICAgCisg ICAgICAgIEZvciB0YWJsZSBjZWxscywgdGhlcmUgaXMgYW4gYWRkaXRpb25hbCB3cmlua2xlLiAg TWFrZSBzdXJlIG5vdCB0byBpbmNsdWRlIHRoZSBzY3JvbGxiYXIgc2l6ZSBhcyBwYXJ0IG9mIHRo ZSBtaW5pbXVtCisgICAgICAgIGludHJpbnNpYyB3aWR0aCBzbyB0aGF0IHdlIGRvbid0IGluY29y cmVjdGx5IGdyb3cuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxheW91dFBvc2l0aW9uZWRPYmplY3RzKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRo cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRo cyk6CisKIDIwMTAtMTEtMzAgIFZpdGFseSBSZXBlc2hrbyAgPHZpdGFseXJAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQuCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CShyZXZpc2lvbiA3MjgxNCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjAyMyw3ICsyMDIzLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5 b3V0UG9zaXRpb25lZE9iamVjdAogICAgICAgICAgICAgICAgIHItPnNldENoaWxkTmVlZHNMYXlv dXQodHJ1ZSwgZmFsc2UpOwogICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgLy8gSWYgcmVs YXlvdXRDaGlsZHJlbiBpcyBzZXQgYW5kIHdlIGhhdmUgcGVyY2VudGFnZSBwYWRkaW5nLCB3ZSBh bHNvIG5lZWQgdG8gaW52YWxpZGF0ZSB0aGUgY2hpbGQncyBwcmVmIHdpZHRocy4KLSAgICAgICAg ICAgIC8vaWYgKHJlbGF5b3V0Q2hpbGRyZW4gJiYgKHItPnN0eWxlKCktPnBhZGRpbmdMZWZ0KCku aXNQZXJjZW50KCkgfHwgci0+c3R5bGUoKS0+cGFkZGluZ1JpZ2h0KCkuaXNQZXJjZW50KCkpKQor ICAgICAgICAgICAgaWYgKHJlbGF5b3V0Q2hpbGRyZW4gJiYgKHItPnN0eWxlKCktPnBhZGRpbmdT dGFydCgpLmlzUGVyY2VudCgpIHx8IHItPnN0eWxlKCktPnBhZGRpbmdFbmQoKS5pc1BlcmNlbnQo KSkpCiAgICAgICAgICAgICAgICAgci0+c2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KHRy dWUsIGZhbHNlKTsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKCFyLT5uZWVkc0xheW91 dCgpKQpAQCAtNDcyOCwxMSArNDcyOCwyMyBAQCB2b2lkIFJlbmRlckJsb2NrOjpjb21wdXRlUHJl ZmVycmVkTG9naWNhCiAgICAgICAgICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSAwOwogICAgICAgICB9CiAKKyAgICAgICAgaW50IHNjcm9sbGJhcldpZHRoID0gMDsKKyAgICAg ICAgaWYgKGhhc092ZXJmbG93Q2xpcCgpICYmIHN0eWxlKCktPm92ZXJmbG93WSgpID09IE9TQ1JP TEwpIHsKKyAgICAgICAgICAgIGlmICghbGF5ZXIoKS0+dmVydGljYWxTY3JvbGxiYXIoKSkKKyAg ICAgICAgICAgICAgICBsYXllcigpLT5zZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcih0cnVlKTsKKyAg ICAgICAgICAgIHNjcm9sbGJhcldpZHRoID0gdmVydGljYWxTY3JvbGxiYXJXaWR0aCgpOworICAg ICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gc2Nyb2xsYmFyV2lkdGg7Cisg ICAgICAgIH0KKwogICAgICAgICBpZiAoaXNUYWJsZUNlbGwoKSkgewogICAgICAgICAgICAgTGVu Z3RoIHcgPSB0b1JlbmRlclRhYmxlQ2VsbCh0aGlzKS0+c3R5bGVPckNvbExvZ2ljYWxXaWR0aCgp OwotICAgICAgICAgICAgaWYgKHcuaXNGaXhlZCgpICYmIHcudmFsdWUoKSA+IDApCisgICAgICAg ICAgICBpZiAody5pc0ZpeGVkKCkgJiYgdy52YWx1ZSgpID4gMCkgewogICAgICAgICAgICAgICAg IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gbWF4KG1fbWluUHJlZmVycmVkTG9naWNhbFdp ZHRoLCBjb21wdXRlQ29udGVudEJveExvZ2ljYWxXaWR0aCh3LnZhbHVlKCkpKTsKKyAgICAgICAg ICAgICAgICBzY3JvbGxiYXJXaWR0aCA9IDA7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KKyAg ICAgICAgCisgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHNjcm9sbGJhcldp ZHRoOwogICAgIH0KICAgICAKICAgICBpZiAoc3R5bGUoKS0+bG9naWNhbE1pbldpZHRoKCkuaXNG aXhlZCgpICYmIHN0eWxlKCktPmxvZ2ljYWxNaW5XaWR0aCgpLnZhbHVlKCkgPiAwKSB7CkBAIC00 NzQ1LDE0ICs0NzU3LDkgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29tcHV0ZVByZWZlcnJlZExvZ2lj YQogICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1pbihtX21pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCwgY29tcHV0ZUNvbnRlbnRCb3hMb2dpY2FsV2lkdGgoc3R5bGUoKS0+bG9n aWNhbE1heFdpZHRoKCkudmFsdWUoKSkpOwogICAgIH0KIAotICAgIGludCB0b0FkZCA9IDA7Ci0g ICAgdG9BZGQgPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7Ci0KLSAgICBpZiAoaGFz T3ZlcmZsb3dDbGlwKCkgJiYgc3R5bGUoKS0+b3ZlcmZsb3dZKCkgPT0gT1NDUk9MTCkKLSAgICAg ICAgdG9BZGQgKz0gdmVydGljYWxTY3JvbGxiYXJXaWR0aCgpOwotCi0gICAgbV9taW5QcmVmZXJy ZWRMb2dpY2FsV2lkdGggKz0gdG9BZGQ7Ci0gICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgg Kz0gdG9BZGQ7CisgICAgaW50IGJvcmRlckFuZFBhZGRpbmcgPSBib3JkZXJBbmRQYWRkaW5nTG9n aWNhbFdpZHRoKCk7CisgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gYm9yZGVyQW5k UGFkZGluZzsKKyAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRk aW5nOwogCiAgICAgc2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KGZhbHNlKTsKIH0KSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAJKHJldmlzaW9uIDcyODE0 KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xODAsNiArMTgwLDE0IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVQ cmVmZXJyZWQKICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtYXgobV9taW5Q cmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKICAgICB9 CiAKKyAgICBpZiAoaGFzT3ZlcmZsb3dDbGlwKCkgJiYgc3R5bGUoKS0+b3ZlcmZsb3dZKCkgPT0g T1NDUk9MTCkgeworICAgICAgICBpZiAoIWxheWVyKCktPnZlcnRpY2FsU2Nyb2xsYmFyKCkpCisg ICAgICAgICAgICBsYXllcigpLT5zZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcih0cnVlKTsKKyAgICAg ICAgaW50IHNjcm9sbGJhcldpZHRoID0gdmVydGljYWxTY3JvbGxiYXJXaWR0aCgpOworICAgICAg ICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSBzY3JvbGxiYXJXaWR0aDsKKyAgICAgICAg bV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gc2Nyb2xsYmFyV2lkdGg7CisgICAgfQorCiAg ICAgaWYgKHN0eWxlKCktPm1pbldpZHRoKCkuaXNGaXhlZCgpICYmIHN0eWxlKCktPm1pbldpZHRo KCkudmFsdWUoKSA+IDApIHsKICAgICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBt YXgobV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGNvbXB1dGVDb250ZW50Qm94TG9naWNhbFdp ZHRoKHN0eWxlKCktPm1pbldpZHRoKCkudmFsdWUoKSkpOwogICAgICAgICBtX21pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCA9IG1heChtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgY29tcHV0ZUNv bnRlbnRCb3hMb2dpY2FsV2lkdGgoc3R5bGUoKS0+bWluV2lkdGgoKS52YWx1ZSgpKSk7CkBAIC0x OTAsMTMgKzE5OCw5IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVQcmVmZXJyZWQK ICAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBtaW4obV9taW5QcmVmZXJyZWRM b2dpY2FsV2lkdGgsIGNvbXB1dGVDb250ZW50Qm94TG9naWNhbFdpZHRoKHN0eWxlKCktPm1heFdp ZHRoKCkudmFsdWUoKSkpOwogICAgIH0KIAotICAgIGludCB0b0FkZCA9IGJvcmRlckFuZFBhZGRp bmdXaWR0aCgpOwotICAgIAotICAgIGlmIChoYXNPdmVyZmxvd0NsaXAoKSAmJiBzdHlsZSgpLT5v dmVyZmxvd1koKSA9PSBPU0NST0xMKQotICAgICAgICB0b0FkZCArPSB2ZXJ0aWNhbFNjcm9sbGJh cldpZHRoKCk7Ci0KLSAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKLSAg ICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSB0b0FkZDsKKyAgICBpbnQgYm9yZGVyQW5k UGFkZGluZyA9IGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsV2lkdGgoKTsKKyAgICBtX21pblByZWZl cnJlZExvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRkaW5nOworICAgIG1fbWF4UHJlZmVycmVk TG9naWNhbFdpZHRoICs9IGJvcmRlckFuZFBhZGRpbmc7CiAKICAgICBzZXRQcmVmZXJyZWRMb2dp Y2FsV2lkdGhzRGlydHkoZmFsc2UpOwogfQo=