60235 2011-05-04 18:25:36 -0700 Make RenderStyle::setPageBreakInside() reject unsupported enum values. 2011-05-06 01:28:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned commit-queue dglazkov eric macpherson oldest_to_newest 398464 0 macpherson 2011-05-04 18:25:36 -0700 Make RenderStyle::setPageBreakInside() reject unsupported enum values. 398468 1 92355 macpherson 2011-05-04 18:29:40 -0700 Created attachment 92355 Patch 398469 2 macpherson 2011-05-04 18:31:53 -0700 See http://www.w3.org/TR/CSS21/page.html#page-break-props for context. 398567 3 92379 macpherson 2011-05-04 23:10:26 -0700 Created attachment 92379 Patch 398568 4 macpherson 2011-05-04 23:10:42 -0700 Added inline keyword. 399147 5 92379 eric 2011-05-05 16:13:42 -0700 Comment on attachment 92379 Patch Still need to understand why PBAlways is not a valid value here. You mentioned in another bug that the enums were "too loose". Is it possible to ever call this with PBALWAYS? or should we ASSERT not? In either case we should have a comment her to explain why this check is needed/wanted. I don't think you actually need the inline. The compiler implicitly adds inline to all declaration-inline definitions was my understanding. (But I'm not a c++ expert!) 399162 6 macpherson 2011-05-05 16:30:01 -0700 (In reply to comment #5) > (From update of attachment 92379 [details]) > Still need to understand why PBAlways is not a valid value here. You mentioned in another bug that the enums were "too loose". Is it possible to ever call this with PBALWAYS? or should we ASSERT not? In either case we should have a comment her to explain why this check is needed/wanted. If you look at the spec I linked earlier you'll see that this is not a valid value for this property. It is used for 'page-break-after' and 'page-break-before' properties, but not 'page-break-inside'. To answer the question of whether to ASSERT or not, I'll need to see what the parser does, as it is possible the parser accepts the full set of enum values. In that case a user could put page-break-inline: always to trigger the assertion. > I don't think you actually need the inline. The compiler implicitly adds inline to all declaration-inline definitions was my understanding. (But I'm not a c++ expert!) dglazkov seems pretty adamant about it on 60246, though I think more for expression of intent than because it will change the compiler behavior. I haven't been around long enough to take a stand on issues of accepted style, so I'm just trying to do what I'm told. 399180 7 macpherson 2011-05-05 16:48:38 -0700 I checked the parser code, and indeed it looks like the parser considers these values invalid, so they can be safely changed to assertions. Expect another patch shortly :) 399184 8 eric 2011-05-05 16:50:47 -0700 (In reply to comment #6) > > I don't think you actually need the inline. The compiler implicitly adds inline to all declaration-inline definitions was my understanding. (But I'm not a c++ expert!) > > dglazkov seems pretty adamant about it on 60246, though I think more for expression of intent than because it will change the compiler behavior. I haven't been around long enough to take a stand on issues of accepted style, so I'm just trying to do what I'm told. Thanks! I'm certainly not trying to argue with dglazkov through you. :) Just seeking to share what I know about compiler behavior. :) 399223 9 92509 macpherson 2011-05-05 17:20:42 -0700 Created attachment 92509 Patch 399244 10 92509 eric 2011-05-05 17:49:11 -0700 Comment on attachment 92509 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92509&action=review > Source/WebCore/rendering/style/RenderStyle.h:1016 > + void setPageBreakInside(EPageBreak b) { ASSERT(b != PBALWAYS); noninherited_flags._page_break_inside = b; } So now I ask myself: "self, how many other values for EPageBreak are there? Why are we blacklisting a single one, instead of whitelisting the supported ones?" I still think this deserves a comment. something as simple as: // EPageBreak supports more values than page-break-inside allows, make sure we're only ever setting valid values. or something like that. Thank you for leading this difficult cleanup task! 399286 11 92529 macpherson 2011-05-05 19:12:17 -0700 Created attachment 92529 Patch 399424 12 92529 commit-queue 2011-05-06 01:28:05 -0700 Comment on attachment 92529 Patch Clearing flags on attachment: 92529 Committed r85936: <http://trac.webkit.org/changeset/85936> 399425 13 commit-queue 2011-05-06 01:28:11 -0700 All reviewed patches have been landed. Closing bug. 92355 2011-05-04 18:29:40 -0700 2011-05-04 23:10:16 -0700 Patch bug-60235-20110505112937.patch text/plain 2804 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDQgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRQYWdlQnJl YWtJbnNpZGUoKSByZWplY3QgdW5zdXBwb3J0ZWQgZW51bSB2YWx1ZXMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDIzNQorCisgICAgICAgIE5vIHRl c3RzIGFkZGVkIGFzIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGNzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6 OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBSZW1vdmUgc3BlY2lhbC1jYXNlIGNvZGUgYW5kIHVz ZSBhcHByb3ByaWF0ZSBtYWNyby4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRQYWdlQnJlYWtJbnNp ZGUpOgorICAgICAgICBDaGVjayBmb3IgdW5zdXBwb3J0ZWQgdmFsdWVzIGFuZCBpZ25vcmUgdGhl bS4KKwogMjAxMS0wNS0wNCAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291cmNlL1dlYkNvcmUv Y3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gODU4MDIpCisrKyBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3ODIsMTYgKzM3 ODIsOSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2Fz ZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0FmdGVyOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRf SU5JVElBTF9BTkRfUFJJTUlUSVZFX1dJVEhfVkFMVUUocGFnZUJyZWFrQWZ0ZXIsIFBhZ2VCcmVh a0FmdGVyLCBQYWdlQnJlYWspCiAgICAgICAgIHJldHVybjsKLSAgICBjYXNlIENTU1Byb3BlcnR5 UGFnZUJyZWFrSW5zaWRlOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX1dJ VEhfVkFMVUUocGFnZUJyZWFrSW5zaWRlLCBQYWdlQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykKLSAg ICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg RVBhZ2VCcmVhayBwYWdlQnJlYWsgPSAqcHJpbWl0aXZlVmFsdWU7Ci0gICAgICAgIGlmIChwYWdl QnJlYWsgIT0gUEJBTFdBWVMpCi0gICAgICAgICAgICBtX3N0eWxlLT5zZXRQYWdlQnJlYWtJbnNp ZGUocGFnZUJyZWFrKTsKKyAgICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrSW5zaWRlOgorICAg ICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFX1dJVEhfVkFMVUUo cGFnZUJyZWFrSW5zaWRlLCBQYWdlQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykKICAgICAgICAgcmV0 dXJuOwotICAgIH0KLSAgICAgICAgCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVBvc2l0aW9uOgogICAg ICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKHBvc2l0aW9uLCBQ b3NpdGlvbikKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDg1ODAyKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMTMs NyArMTAxMywxMSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFdpZG93cyhzaG9ydCB3KSB7IFNF VF9WQVIocmFyZUluaGVyaXRlZERhdGEsIHdpZG93cywgdyk7IH0KICAgICB2b2lkIHNldE9ycGhh bnMoc2hvcnQgbykgeyBTRVRfVkFSKHJhcmVJbmhlcml0ZWREYXRhLCBvcnBoYW5zLCBvKTsgfQot ICAgIHZvaWQgc2V0UGFnZUJyZWFrSW5zaWRlKEVQYWdlQnJlYWsgYikgeyBub25pbmhlcml0ZWRf ZmxhZ3MuX3BhZ2VfYnJlYWtfaW5zaWRlID0gYjsgfQorICAgIHZvaWQgc2V0UGFnZUJyZWFrSW5z aWRlKEVQYWdlQnJlYWsgYikKKyAgICB7CisgICAgICAgIGlmIChiICE9IFBCQUxXQVlTKQorICAg ICAgICAgICAgbm9uaW5oZXJpdGVkX2ZsYWdzLl9wYWdlX2JyZWFrX2luc2lkZSA9IGI7CisgICAg fQogICAgIHZvaWQgc2V0UGFnZUJyZWFrQmVmb3JlKEVQYWdlQnJlYWsgYikgeyBub25pbmhlcml0 ZWRfZmxhZ3MuX3BhZ2VfYnJlYWtfYmVmb3JlID0gYjsgfQogICAgIHZvaWQgc2V0UGFnZUJyZWFr QWZ0ZXIoRVBhZ2VCcmVhayBiKSB7IG5vbmluaGVyaXRlZF9mbGFncy5fcGFnZV9icmVha19hZnRl ciA9IGI7IH0KIAo= 92379 2011-05-04 23:10:26 -0700 2011-05-05 17:20:31 -0700 Patch bug-60235-20110505161024.patch text/plain 2806 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODMzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDQgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRQYWdlQnJl YWtJbnNpZGUoKSByZWplY3QgdW5zdXBwb3J0ZWQgZW51bSB2YWx1ZXMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDIzNQorCisgICAgICAgIE5vIHRl c3RzIGFkZGVkIGFzIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGNzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6 OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBSZW1vdmUgc3BlY2lhbC1jYXNlIGNvZGUgYW5kIHVz ZSBhcHByb3ByaWF0ZSBtYWNyby4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRQYWdlQnJlYWtJbnNp ZGUpOgorICAgICAgICBDaGVjayBmb3IgdW5zdXBwb3J0ZWQgdmFsdWVzIGFuZCBpZ25vcmUgdGhl bS4KKwogMjAxMS0wNS0wNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT U3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDg1ODMzKQorKysgU291cmNlL1dlYkNvcmUvY3Nz L0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzg4LDE2ICszNzg4LDkg QEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NT UHJvcGVydHlQYWdlQnJlYWtBZnRlcjoKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJ QUxfQU5EX1BSSU1JVElWRV9XSVRIX1ZBTFVFKHBhZ2VCcmVha0FmdGVyLCBQYWdlQnJlYWtBZnRl ciwgUGFnZUJyZWFrKQogICAgICAgICByZXR1cm47Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VC cmVha0luc2lkZTogewotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9XSVRIX1ZB TFVFKHBhZ2VCcmVha0luc2lkZSwgUGFnZUJyZWFrSW5zaWRlLCBQYWdlQnJlYWspCi0gICAgICAg IGlmICghcHJpbWl0aXZlVmFsdWUpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIEVQYWdl QnJlYWsgcGFnZUJyZWFrID0gKnByaW1pdGl2ZVZhbHVlOwotICAgICAgICBpZiAocGFnZUJyZWFr ICE9IFBCQUxXQVlTKQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0UGFnZUJyZWFrSW5zaWRlKHBh Z2VCcmVhayk7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0luc2lkZToKKyAgICAgICAg SEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRV9XSVRIX1ZBTFVFKHBhZ2VC cmVha0luc2lkZSwgUGFnZUJyZWFrSW5zaWRlLCBQYWdlQnJlYWspCiAgICAgICAgIHJldHVybjsK LSAgICB9Ci0gICAgICAgIAogICAgIGNhc2UgQ1NTUHJvcGVydHlQb3NpdGlvbjoKICAgICAgICAg SEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShwb3NpdGlvbiwgUG9zaXRp b24pCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lvbiA4NTgzMykKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDEzLDcgKzEw MTMsMTEgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRXaWRvd3Moc2hvcnQgdykgeyBTRVRfVkFS KHJhcmVJbmhlcml0ZWREYXRhLCB3aWRvd3MsIHcpOyB9CiAgICAgdm9pZCBzZXRPcnBoYW5zKHNo b3J0IG8pIHsgU0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0YSwgb3JwaGFucywgbyk7IH0KLSAgICB2 b2lkIHNldFBhZ2VCcmVha0luc2lkZShFUGFnZUJyZWFrIGIpIHsgbm9uaW5oZXJpdGVkX2ZsYWdz Ll9wYWdlX2JyZWFrX2luc2lkZSA9IGI7IH0KKyAgICBpbmxpbmUgdm9pZCBzZXRQYWdlQnJlYWtJ bnNpZGUoRVBhZ2VCcmVhayBiKQorICAgIHsKKyAgICAgICAgaWYgKGIgIT0gUEJBTFdBWVMpCisg ICAgICAgICAgICBub25pbmhlcml0ZWRfZmxhZ3MuX3BhZ2VfYnJlYWtfaW5zaWRlID0gYjsKKyAg ICB9CiAgICAgdm9pZCBzZXRQYWdlQnJlYWtCZWZvcmUoRVBhZ2VCcmVhayBiKSB7IG5vbmluaGVy aXRlZF9mbGFncy5fcGFnZV9icmVha19iZWZvcmUgPSBiOyB9CiAgICAgdm9pZCBzZXRQYWdlQnJl YWtBZnRlcihFUGFnZUJyZWFrIGIpIHsgbm9uaW5oZXJpdGVkX2ZsYWdzLl9wYWdlX2JyZWFrX2Fm dGVyID0gYjsgfQogCg== 92509 2011-05-05 17:20:42 -0700 2011-05-05 19:12:06 -0700 Patch bug-60235-20110506102040.patch text/plain 2778 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODk4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRQYWdlQnJl YWtJbnNpZGUoKSByZWplY3QgdW5zdXBwb3J0ZWQgZW51bSB2YWx1ZXMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDIzNQorCisgICAgICAgIE5vIHRl c3RzIGFkZGVkIGFzIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGNzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6 OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBSZW1vdmUgc3BlY2lhbC1jYXNlIGNvZGUgYW5kIHVz ZSBhcHByb3ByaWF0ZSBtYWNyby4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRQYWdlQnJlYWtJbnNp ZGUpOgorICAgICAgICBDaGVjayBmb3IgdW5zdXBwb3J0ZWQgdmFsdWVzIGFuZCBpZ25vcmUgdGhl bS4KKwogMjAxMS0wNS0wNSAgSnVzdGluIE5vdm9zYWQgIDxqdW5vdkBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgpJbmRleDogU291cmNlL1dlYkNv cmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gODU4OTgpCisrKyBTb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3MzYsMTYg KzM3MzYsOSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eVBhZ2VCcmVha0FmdGVyOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9B TkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFX1dJVEhfVkFMVUUocGFnZUJyZWFrQWZ0ZXIsIFBhZ2VC cmVha0FmdGVyLCBQYWdlQnJlYWspCiAgICAgICAgIHJldHVybjsKLSAgICBjYXNlIENTU1Byb3Bl cnR5UGFnZUJyZWFrSW5zaWRlOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFM X1dJVEhfVkFMVUUocGFnZUJyZWFrSW5zaWRlLCBQYWdlQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykK LSAgICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAgRVBhZ2VCcmVhayBwYWdlQnJlYWsgPSAqcHJpbWl0aXZlVmFsdWU7Ci0gICAgICAgIGlmIChw YWdlQnJlYWsgIT0gUEJBTFdBWVMpCi0gICAgICAgICAgICBtX3N0eWxlLT5zZXRQYWdlQnJlYWtJ bnNpZGUocGFnZUJyZWFrKTsKKyAgICBjYXNlIENTU1Byb3BlcnR5UGFnZUJyZWFrSW5zaWRlOgor ICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFX1dJVEhfVkFM VUUocGFnZUJyZWFrSW5zaWRlLCBQYWdlQnJlYWtJbnNpZGUsIFBhZ2VCcmVhaykKICAgICAgICAg cmV0dXJuOwotICAgIH0KLSAgICAgICAgCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVBvc2l0aW9uOgog ICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKHBvc2l0aW9u LCBQb3NpdGlvbikKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDg1ODk4KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEw MTMsNyArMTAxMyw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0V2lkb3dzKHNob3J0IHcpIHsg U0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0YSwgd2lkb3dzLCB3KTsgfQogICAgIHZvaWQgc2V0T3Jw aGFucyhzaG9ydCBvKSB7IFNFVF9WQVIocmFyZUluaGVyaXRlZERhdGEsIG9ycGhhbnMsIG8pOyB9 Ci0gICAgdm9pZCBzZXRQYWdlQnJlYWtJbnNpZGUoRVBhZ2VCcmVhayBiKSB7IG5vbmluaGVyaXRl ZF9mbGFncy5fcGFnZV9icmVha19pbnNpZGUgPSBiOyB9CisgICAgdm9pZCBzZXRQYWdlQnJlYWtJ bnNpZGUoRVBhZ2VCcmVhayBiKSB7IEFTU0VSVChiICE9IFBCQUxXQVlTKTsgbm9uaW5oZXJpdGVk X2ZsYWdzLl9wYWdlX2JyZWFrX2luc2lkZSA9IGI7IH0KICAgICB2b2lkIHNldFBhZ2VCcmVha0Jl Zm9yZShFUGFnZUJyZWFrIGIpIHsgbm9uaW5oZXJpdGVkX2ZsYWdzLl9wYWdlX2JyZWFrX2JlZm9y ZSA9IGI7IH0KICAgICB2b2lkIHNldFBhZ2VCcmVha0FmdGVyKEVQYWdlQnJlYWsgYikgeyBub25p bmhlcml0ZWRfZmxhZ3MuX3BhZ2VfYnJlYWtfYWZ0ZXIgPSBiOyB9CiAK 92529 2011-05-05 19:12:17 -0700 2011-05-06 01:28:05 -0700 Patch bug-60235-20110506121215.patch text/plain 2889 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTEwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlbmRlclN0eWxlOjpzZXRQYWdlQnJl YWtJbnNpZGUoKSByZWplY3QgdW5zdXBwb3J0ZWQgZW51bSB2YWx1ZXMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDIzNQorCisgICAgICAgIE5vIHRl c3RzIGFkZGVkIGFzIG5vIGZ1bmN0aW9uYWxpdHkgY2hhbmdlZC4KKworICAgICAgICAqIGNzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6 OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBSZW1vdmUgc3BlY2lhbC1jYXNlIGNvZGUgYW5kIHVz ZSBhcHByb3ByaWF0ZSBtYWNyby4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRQYWdlQnJlYWtJbnNp ZGUpOgorICAgICAgICBBc3NlcnQgdGhhdCBvbmx5IHN1cHBvcnRlZCB2YWx1ZXMgYXJlIHVzZWQu CisKIDIwMTEtMDUtMDUgIEpheSBDaXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA4NTkxMCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzczNiwxNiArMzczNiw5 IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENT U1Byb3BlcnR5UGFnZUJyZWFrQWZ0ZXI6CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklU SUFMX0FORF9QUklNSVRJVkVfV0lUSF9WQUxVRShwYWdlQnJlYWtBZnRlciwgUGFnZUJyZWFrQWZ0 ZXIsIFBhZ2VCcmVhaykKICAgICAgICAgcmV0dXJuOwotICAgIGNhc2UgQ1NTUHJvcGVydHlQYWdl QnJlYWtJbnNpZGU6IHsKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfV0lUSF9W QUxVRShwYWdlQnJlYWtJbnNpZGUsIFBhZ2VCcmVha0luc2lkZSwgUGFnZUJyZWFrKQotICAgICAg ICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBFUGFn ZUJyZWFrIHBhZ2VCcmVhayA9ICpwcmltaXRpdmVWYWx1ZTsKLSAgICAgICAgaWYgKHBhZ2VCcmVh ayAhPSBQQkFMV0FZUykKLSAgICAgICAgICAgIG1fc3R5bGUtPnNldFBhZ2VCcmVha0luc2lkZShw YWdlQnJlYWspOworICAgIGNhc2UgQ1NTUHJvcGVydHlQYWdlQnJlYWtJbnNpZGU6CisgICAgICAg IEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkVfV0lUSF9WQUxVRShwYWdl QnJlYWtJbnNpZGUsIFBhZ2VCcmVha0luc2lkZSwgUGFnZUJyZWFrKQogICAgICAgICByZXR1cm47 Ci0gICAgfQotICAgICAgICAKICAgICBjYXNlIENTU1Byb3BlcnR5UG9zaXRpb246CiAgICAgICAg IEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkUocG9zaXRpb24sIFBvc2l0 aW9uKQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gODU5MTApCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTAxMyw3ICsx MDEzLDggQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRXaWRvd3Moc2hvcnQgdykgeyBTRVRfVkFS KHJhcmVJbmhlcml0ZWREYXRhLCB3aWRvd3MsIHcpOyB9CiAgICAgdm9pZCBzZXRPcnBoYW5zKHNo b3J0IG8pIHsgU0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0YSwgb3JwaGFucywgbyk7IH0KLSAgICB2 b2lkIHNldFBhZ2VCcmVha0luc2lkZShFUGFnZUJyZWFrIGIpIHsgbm9uaW5oZXJpdGVkX2ZsYWdz Ll9wYWdlX2JyZWFrX2luc2lkZSA9IGI7IH0KKyAgICAvLyBGb3IgdmFsaWQgdmFsdWVzIG9mIHBh Z2UtYnJlYWstaW5zaWRlIHNlZSBodHRwOi8vd3d3LnczLm9yZy9UUi9DU1MyMS9wYWdlLmh0bWwj cGFnZS1icmVhay1wcm9wcworICAgIHZvaWQgc2V0UGFnZUJyZWFrSW5zaWRlKEVQYWdlQnJlYWsg YikgeyBBU1NFUlQoYiA9PSBQQkFVVE8gfHwgYiA9PSBQQkFWT0lEKTsgbm9uaW5oZXJpdGVkX2Zs YWdzLl9wYWdlX2JyZWFrX2luc2lkZSA9IGI7IH0KICAgICB2b2lkIHNldFBhZ2VCcmVha0JlZm9y ZShFUGFnZUJyZWFrIGIpIHsgbm9uaW5oZXJpdGVkX2ZsYWdzLl9wYWdlX2JyZWFrX2JlZm9yZSA9 IGI7IH0KICAgICB2b2lkIHNldFBhZ2VCcmVha0FmdGVyKEVQYWdlQnJlYWsgYikgeyBub25pbmhl cml0ZWRfZmxhZ3MuX3BhZ2VfYnJlYWtfYWZ0ZXIgPSBiOyB9CiAK