60246 2011-05-04 21:47:10 -0700 Move burden of checking for BJustify box alignment into RenderStyle 2011-05-06 01:17:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned bdakin commit-queue dglazkov eric hyatt macpherson oldest_to_newest 398536 0 macpherson 2011-05-04 21:47:10 -0700 Move burden of checking for BJustify box alignment into RenderStyle 398539 1 92372 macpherson 2011-05-04 21:51:01 -0700 Created attachment 92372 Patch 398543 2 92372 dglazkov 2011-05-04 21:54:57 -0700 Comment on attachment 92372 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92372&action=review > Source/WebCore/rendering/style/RenderStyle.h:1029 > + void setBoxAlign(EBoxAlignment a) This guy now wants to be inlined like http://codesearch.google.com/codesearch/p#OAMlx_jo-ck/src/third_party/WebKit/Source/WebCore/dom/Node.h&l=727&exact_package=chromium 398544 3 macpherson 2011-05-04 22:02:48 -0700 Last I checked the compiler was smart enough to inline these by default where it had access to the method body (which it always does here since it is in a header file.) I didn't check it in this instance, but have checked it previously for equivalent code on OSX. Moreover, observe that this function (which is not new) did not previously require the inline keyword. 398545 4 dglazkov 2011-05-04 22:10:22 -0700 (In reply to comment #3) > Last I checked the compiler was smart enough to inline these by default where it had access to the method body (which it always does here since it is in a header file.) > > I didn't check it in this instance, but have checked it previously for equivalent code on OSX. > > Moreover, observe that this function (which is not new) did not previously require the inline keyword. Yep, it will inline them. But this is somewhat of a preferred style. Granted, newer style, but still. 398572 5 92372 eric 2011-05-04 23:15:11 -0700 Comment on attachment 92372 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92372&action=review >> Source/WebCore/rendering/style/RenderStyle.h:1029 >> + void setBoxAlign(EBoxAlignment a) > > This guy now wants to be inlined like http://codesearch.google.com/codesearch/p#OAMlx_jo-ck/src/third_party/WebKit/Source/WebCore/dom/Node.h&l=727&exact_package=chromium I don't understand why we want this logic in RenderStyle. Why should it be impossible to set BJUSTIFY? 398575 6 92381 macpherson 2011-05-04 23:28:46 -0700 Created attachment 92381 Patch 398576 7 macpherson 2011-05-04 23:35:58 -0700 (In reply to comment #5) > (From update of attachment 92372 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=92372&action=review > > >> Source/WebCore/rendering/style/RenderStyle.h:1029 > >> + void setBoxAlign(EBoxAlignment a) > > > > This guy now wants to be inlined like http://codesearch.google.com/codesearch/p#OAMlx_jo-ck/src/third_party/WebKit/Source/WebCore/dom/Node.h&l=727&exact_package=chromium > > I don't understand why we want this logic in RenderStyle. Why should it be impossible to set BJUSTIFY? These special cases are arising because one enum is being used as a superset of the possible values for multiple properties. In this instance, the EBoxAlignment enum is used for both the BoxPack and BoxAlignment properties, even though they appear to support different but overlapping sets of values. There are numerous other examples of similar enums in this code. It could be that a better solution is to have two separate enums, though that would require a lot more digging to ensure correctness of the refactoring. 398581 8 eric 2011-05-04 23:44:54 -0700 We should definitely add comments explaining such next to each of these strange ifs. Also, shouldn't these just be ASSERTs? 399246 9 92514 macpherson 2011-05-05 17:52:19 -0700 Created attachment 92514 Patch 399249 10 92514 eric 2011-05-05 17:55:58 -0700 Comment on attachment 92514 Patch This is strictly better than the current code, but could still be better with use of a comment and possible white-list. Thanks again for taking this on. 399297 11 92533 macpherson 2011-05-05 20:14:37 -0700 Created attachment 92533 Patch 399416 12 92533 commit-queue 2011-05-06 01:17:39 -0700 Comment on attachment 92533 Patch Clearing flags on attachment: 92533 Committed r85935: <http://trac.webkit.org/changeset/85935> 399417 13 commit-queue 2011-05-06 01:17:45 -0700 All reviewed patches have been landed. Closing bug. 92372 2011-05-04 21:51:01 -0700 2011-05-04 23:28:34 -0700 Patch bug-60246-20110505145058.patch text/plain 2918 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODMwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDQgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGJ1cmRlbiBvZiBjaGVja2luZyBmb3Ig Qkp1c3RpZnkgYm94IGFsaWdubWVudCBpbnRvIFJlbmRlclN0eWxlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDI0NgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBhZGRlZCBhcyBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuCisKKyAgICAgICAgKiBjc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9y OjphcHBseVByb3BlcnR5KToKKyAgICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBsb2dpYyBjaGVj a2luZyBmb3IgQkpVU1RJRlkgYW5kIHVzZSBleGlzdGluZyBtYWNyby4KKyAgICAgICAgKiByZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZs YWdzOjpzZXRCb3hBbGlnbik6CisgICAgICAgIENoZWNrIGZvciBCSlVTVElGWSBhbmQgaWdub3Jl LgorCiAyMDExLTA1LTA0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gODU4MjYpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5NDQsMTUgKzQ5NDQsOCBA QCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIG1fc3R5 bGUtPnNldE9wYWNpdHkobWluKDEuMGYsIG1heCgwLjBmLCBwcmltaXRpdmVWYWx1ZS0+Z2V0Rmxv YXRWYWx1ZSgpKSkpOwogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dEJveEFsaWduOgotICAgIHsKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwoYm94 QWxpZ24sIEJveEFsaWduKQotICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgICAgICBFQm94QWxpZ25tZW50IGJveEFsaWdubWVudCA9ICpwcmltaXRp dmVWYWx1ZTsKLSAgICAgICAgaWYgKGJveEFsaWdubWVudCAhPSBCSlVTVElGWSkKLSAgICAgICAg ICAgIG1fc3R5bGUtPnNldEJveEFsaWduKGJveEFsaWdubWVudCk7CisgICAgICAgIEhBTkRMRV9J TkhFUklUX0FORF9JTklUSUFMX0FORF9QUklNSVRJVkUoYm94QWxpZ24sIEJveEFsaWduKQogICAg ICAgICByZXR1cm47Ci0gICAgfQogICAgIGNhc2UgQ1NTUHJvcGVydHlTcmM6IC8vIE9ubHkgdXNl ZCBpbiBAZm9udC1mYWNlIHJ1bGVzLgogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVVuaWNvZGVSYW5nZTogLy8gT25seSB1c2VkIGluIEBmb250LWZhY2UgcnVsZXMuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNp b24gODU4MjYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aAkod29ya2luZyBjb3B5KQpAQCAtMTAyNiw3ICsxMDI2LDExIEBAIHB1YmxpYzoKICAgICB2b2lk IHNldENvbG9yU3BhY2UoQ29sb3JTcGFjZSBzcGFjZSkgeyBTRVRfVkFSKHJhcmVJbmhlcml0ZWRE YXRhLCBjb2xvclNwYWNlLCBzcGFjZSkgfQogICAgIHZvaWQgc2V0T3BhY2l0eShmbG9hdCBmKSB7 IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEsIG9wYWNpdHksIGYpOyB9CiAgICAgdm9pZCBz ZXRBcHBlYXJhbmNlKENvbnRyb2xQYXJ0IGEpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0 YSwgbV9hcHBlYXJhbmNlLCBhKTsgfQotICAgIHZvaWQgc2V0Qm94QWxpZ24oRUJveEFsaWdubWVu dCBhKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPmZsZXhpYmxlQm94 LCBhbGlnbiwgYSk7IH0KKyAgICB2b2lkIHNldEJveEFsaWduKEVCb3hBbGlnbm1lbnQgYSkKKyAg ICB7CisgICAgICAgIGlmIChhICE9IEJKVVNUSUZZKQorICAgICAgICAgICAgU0VUX1ZBUihyYXJl Tm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ZmxleGlibGVCb3gsIGFsaWduLCBhKTsKKyAgICB9 CiAgICAgdm9pZCBzZXRCb3hEaXJlY3Rpb24oRUJveERpcmVjdGlvbiBkKSB7IGluaGVyaXRlZF9m bGFncy5fYm94X2RpcmVjdGlvbiA9IGQ7IH0KICAgICB2b2lkIHNldEJveEZsZXgoZmxvYXQgZikg eyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5mbGV4aWJsZUJveCwgZmxl eCwgZik7IH0KICAgICB2b2lkIHNldEJveEZsZXhHcm91cCh1bnNpZ25lZCBpbnQgZmcpIHsgU0VU X1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ZmxleGlibGVCb3gsIGZsZXhfZ3Jv dXAsIGZnKTsgfQo= 92381 2011-05-04 23:28:46 -0700 2011-05-05 17:52:07 -0700 Patch bug-60246-20110505162843.patch text/plain 2942 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1ODM0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDQgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGJ1cmRlbiBvZiBjaGVja2luZyBmb3Ig Qkp1c3RpZnkgYm94IGFsaWdubWVudCBpbnRvIFJlbmRlclN0eWxlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDI0NgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBhZGRlZCBhcyBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuCisKKyAgICAgICAgKiBjc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9y OjphcHBseVByb3BlcnR5KToKKyAgICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBsb2dpYyBjaGVj a2luZyBmb3IgQkpVU1RJRlkgYW5kIHVzZSBleGlzdGluZyBtYWNyby4KKyAgICAgICAgKiByZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZs YWdzOjpzZXRCb3hBbGlnbik6CisgICAgICAgIENoZWNrIGZvciBCSlVTVElGWSBhbmQgaWdub3Jl LgorCiAyMDExLTA1LTA0ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByODU3ODguCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA4NTgzNCkKKysrIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDg5MiwxNSArNDg5Miw4IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShp bnQKICAgICAgICAgbV9zdHlsZS0+c2V0T3BhY2l0eShtaW4oMS4wZiwgbWF4KDAuMGYsIHByaW1p dGl2ZVZhbHVlLT5nZXRGbG9hdFZhbHVlKCkpKSk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0Qm94QWxpZ246Ci0gICAgewotICAgICAgICBIQU5ETEVfSU5IRVJJ VF9BTkRfSU5JVElBTChib3hBbGlnbiwgQm94QWxpZ24pCi0gICAgICAgIGlmICghcHJpbWl0aXZl VmFsdWUpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIEVCb3hBbGlnbm1lbnQgYm94QWxp Z25tZW50ID0gKnByaW1pdGl2ZVZhbHVlOwotICAgICAgICBpZiAoYm94QWxpZ25tZW50ICE9IEJK VVNUSUZZKQotICAgICAgICAgICAgbV9zdHlsZS0+c2V0Qm94QWxpZ24oYm94QWxpZ25tZW50KTsK KyAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShib3hBbGln biwgQm94QWxpZ24pCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVNyYzogLy8gT25seSB1c2VkIGluIEBmb250LWZhY2UgcnVsZXMuCiAgICAgICAgIHJldHVybjsK ICAgICBjYXNlIENTU1Byb3BlcnR5VW5pY29kZVJhbmdlOiAvLyBPbmx5IHVzZWQgaW4gQGZvbnQt ZmFjZSBydWxlcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZS5oCShyZXZpc2lvbiA4NTgzNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDI2LDcgKzEwMjYsMTEgQEAg cHVibGljOgogICAgIHZvaWQgc2V0Q29sb3JTcGFjZShDb2xvclNwYWNlIHNwYWNlKSB7IFNFVF9W QVIocmFyZUluaGVyaXRlZERhdGEsIGNvbG9yU3BhY2UsIHNwYWNlKSB9CiAgICAgdm9pZCBzZXRP cGFjaXR5KGZsb2F0IGYpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YSwgb3BhY2l0eSwg Zik7IH0KICAgICB2b2lkIHNldEFwcGVhcmFuY2UoQ29udHJvbFBhcnQgYSkgeyBTRVRfVkFSKHJh cmVOb25Jbmhlcml0ZWREYXRhLCBtX2FwcGVhcmFuY2UsIGEpOyB9Ci0gICAgdm9pZCBzZXRCb3hB bGlnbihFQm94QWxpZ25tZW50IGEpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nl c3MoKS0+ZmxleGlibGVCb3gsIGFsaWduLCBhKTsgfQorICAgIGlubGluZSB2b2lkIHNldEJveEFs aWduKEVCb3hBbGlnbm1lbnQgYSkKKyAgICB7CisgICAgICAgIGlmIChhICE9IEJKVVNUSUZZKQor ICAgICAgICAgICAgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ZmxleGli bGVCb3gsIGFsaWduLCBhKTsKKyAgICB9CiAgICAgdm9pZCBzZXRCb3hEaXJlY3Rpb24oRUJveERp cmVjdGlvbiBkKSB7IGluaGVyaXRlZF9mbGFncy5fYm94X2RpcmVjdGlvbiA9IGQ7IH0KICAgICB2 b2lkIHNldEJveEZsZXgoZmxvYXQgZikgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFj Y2VzcygpLT5mbGV4aWJsZUJveCwgZmxleCwgZik7IH0KICAgICB2b2lkIHNldEJveEZsZXhHcm91 cCh1bnNpZ25lZCBpbnQgZmcpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3Mo KS0+ZmxleGlibGVCb3gsIGZsZXhfZ3JvdXAsIGZnKTsgfQo= 92514 2011-05-05 17:52:19 -0700 2011-05-05 20:14:26 -0700 Patch bug-60246-20110506105216.patch text/plain 2882 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTA0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGJ1cmRlbiBvZiBjaGVja2luZyBmb3Ig Qkp1c3RpZnkgYm94IGFsaWdubWVudCBpbnRvIFJlbmRlclN0eWxlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDI0NgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyBhZGRlZCBhcyBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuCisKKyAgICAgICAgKiBjc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9y OjphcHBseVByb3BlcnR5KToKKyAgICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBsb2dpYyBjaGVj a2luZyBmb3IgQkpVU1RJRlkgYW5kIHVzZSBleGlzdGluZyBtYWNyby4KKyAgICAgICAgKiByZW5k ZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZs YWdzOjpzZXRCb3hBbGlnbik6CisgICAgICAgIEFzc2VydCBCSlVTVElGWSBub3QgdXNlZC4KKwog MjAxMS0wNS0wNSAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVT ZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwCShyZXZpc2lvbiA4NTkwNCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDg5MiwxNSArNDg5Miw4IEBAIHZvaWQg Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgbV9zdHlsZS0+c2V0 T3BhY2l0eShtaW4oMS4wZiwgbWF4KDAuMGYsIHByaW1pdGl2ZVZhbHVlLT5nZXRGbG9hdFZhbHVl KCkpKSk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm94QWxp Z246Ci0gICAgewotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTChib3hBbGlnbiwg Qm94QWxpZ24pCi0gICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIEVCb3hBbGlnbm1lbnQgYm94QWxpZ25tZW50ID0gKnByaW1pdGl2ZVZhbHVl OwotICAgICAgICBpZiAoYm94QWxpZ25tZW50ICE9IEJKVVNUSUZZKQotICAgICAgICAgICAgbV9z dHlsZS0+c2V0Qm94QWxpZ24oYm94QWxpZ25tZW50KTsKKyAgICAgICAgSEFORExFX0lOSEVSSVRf QU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShib3hBbGlnbiwgQm94QWxpZ24pCiAgICAgICAgIHJl dHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVNyYzogLy8gT25seSB1c2VkIGluIEBm b250LWZhY2UgcnVsZXMuCiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIENTU1Byb3BlcnR5VW5p Y29kZVJhbmdlOiAvLyBPbmx5IHVzZWQgaW4gQGZvbnQtZmFjZSBydWxlcy4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lvbiA4NTkw NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDI2LDcgKzEwMjYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb2xv clNwYWNlKENvbG9yU3BhY2Ugc3BhY2UpIHsgU0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0YSwgY29s b3JTcGFjZSwgc3BhY2UpIH0KICAgICB2b2lkIHNldE9wYWNpdHkoZmxvYXQgZikgeyBTRVRfVkFS KHJhcmVOb25Jbmhlcml0ZWREYXRhLCBvcGFjaXR5LCBmKTsgfQogICAgIHZvaWQgc2V0QXBwZWFy YW5jZShDb250cm9sUGFydCBhKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEsIG1fYXBw ZWFyYW5jZSwgYSk7IH0KLSAgICB2b2lkIHNldEJveEFsaWduKEVCb3hBbGlnbm1lbnQgYSkgeyBT RVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5mbGV4aWJsZUJveCwgYWxpZ24s IGEpOyB9CisgICAgdm9pZCBzZXRCb3hBbGlnbihFQm94QWxpZ25tZW50IGEpIHsgQVNTRVJUKGEg IT0gQkpVU1RJRlkpOyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5mbGV4 aWJsZUJveCwgYWxpZ24sIGEpOyB9CiAgICAgdm9pZCBzZXRCb3hEaXJlY3Rpb24oRUJveERpcmVj dGlvbiBkKSB7IGluaGVyaXRlZF9mbGFncy5fYm94X2RpcmVjdGlvbiA9IGQ7IH0KICAgICB2b2lk IHNldEJveEZsZXgoZmxvYXQgZikgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2Vz cygpLT5mbGV4aWJsZUJveCwgZmxleCwgZik7IH0KICAgICB2b2lkIHNldEJveEZsZXhHcm91cCh1 bnNpZ25lZCBpbnQgZmcpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ ZmxleGlibGVCb3gsIGZsZXhfZ3JvdXAsIGZnKTsgfQo= 92533 2011-05-05 20:14:37 -0700 2011-05-06 01:17:39 -0700 Patch bug-60246-20110506131434.patch text/plain 3054 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTExKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBFcmljIFNlaWRlbC4KKworICAgICAgICBNb3ZlIGJ1cmRlbiBvZiBjaGVja2luZyBmb3IgQkp1 c3RpZnkgYm94IGFsaWdubWVudCBpbnRvIFJlbmRlclN0eWxlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDI0NgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyBhZGRlZCBhcyBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuCisKKyAgICAgICAgKiBjc3MvQ1NT U3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjph cHBseVByb3BlcnR5KToKKyAgICAgICAgUmVtb3ZlIHNwZWNpYWwtY2FzZSBsb2dpYyBjaGVja2lu ZyBmb3IgQkpVU1RJRlkgYW5kIHVzZSBleGlzdGluZyBtYWNyby4KKyAgICAgICAgKiByZW5kZXJp bmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdz OjpzZXRCb3hBbGlnbik6CisgICAgICAgIEFzc2VydCB2YWxpZCB2YWx1ZXMgYXJlIHVzZWQuCisK IDIwMTEtMDUtMDUgIEpheSBDaXZlbGxpICA8amNpdmVsbGlAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NT U3R5bGVTZWxlY3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuY3BwCShyZXZpc2lvbiA4NTkxMSkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDg5MiwxNSArNDg5Miw4IEBA IHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgbV9zdHls ZS0+c2V0T3BhY2l0eShtaW4oMS4wZiwgbWF4KDAuMGYsIHByaW1pdGl2ZVZhbHVlLT5nZXRGbG9h dFZhbHVlKCkpKSk7CiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 Qm94QWxpZ246Ci0gICAgewotICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTChib3hB bGlnbiwgQm94QWxpZ24pCi0gICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCi0gICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgIEVCb3hBbGlnbm1lbnQgYm94QWxpZ25tZW50ID0gKnByaW1pdGl2 ZVZhbHVlOwotICAgICAgICBpZiAoYm94QWxpZ25tZW50ICE9IEJKVVNUSUZZKQotICAgICAgICAg ICAgbV9zdHlsZS0+c2V0Qm94QWxpZ24oYm94QWxpZ25tZW50KTsKKyAgICAgICAgSEFORExFX0lO SEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShib3hBbGlnbiwgQm94QWxpZ24pCiAgICAg ICAgIHJldHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVNyYzogLy8gT25seSB1c2Vk IGluIEBmb250LWZhY2UgcnVsZXMuCiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIENTU1Byb3Bl cnR5VW5pY29kZVJhbmdlOiAvLyBPbmx5IHVzZWQgaW4gQGZvbnQtZmFjZSBydWxlcy4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lv biA4NTkxMSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMDI2LDcgKzEwMjYsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBz ZXRDb2xvclNwYWNlKENvbG9yU3BhY2Ugc3BhY2UpIHsgU0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0 YSwgY29sb3JTcGFjZSwgc3BhY2UpIH0KICAgICB2b2lkIHNldE9wYWNpdHkoZmxvYXQgZikgeyBT RVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLCBvcGFjaXR5LCBmKTsgfQogICAgIHZvaWQgc2V0 QXBwZWFyYW5jZShDb250cm9sUGFydCBhKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEs IG1fYXBwZWFyYW5jZSwgYSk7IH0KLSAgICB2b2lkIHNldEJveEFsaWduKEVCb3hBbGlnbm1lbnQg YSkgeyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5mbGV4aWJsZUJveCwg YWxpZ24sIGEpOyB9CisgICAgLy8gRm9yIHZhbGlkIHZhbHVlcyBvZiBib3gtYWxpZ24gc2VlIGh0 dHA6Ly93d3cudzMub3JnL1RSLzIwMDkvV0QtY3NzMy1mbGV4Ym94LTIwMDkwNzIzLyNhbGlnbm1l bnQKKyAgICB2b2lkIHNldEJveEFsaWduKEVCb3hBbGlnbm1lbnQgYSkgeyBBU1NFUlQoYSA9PSBC U1RSRVRDSCB8fCBhID09IEJTVEFSVCB8fCBhID09IEJDRU5URVIgfHwgYSA9PSBCRU5EIHx8IGEg PT0gQkJBU0VMSU5FKTsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+Zmxl eGlibGVCb3gsIGFsaWduLCBhKTsgfQogICAgIHZvaWQgc2V0Qm94RGlyZWN0aW9uKEVCb3hEaXJl Y3Rpb24gZCkgeyBpbmhlcml0ZWRfZmxhZ3MuX2JveF9kaXJlY3Rpb24gPSBkOyB9CiAgICAgdm9p ZCBzZXRCb3hGbGV4KGZsb2F0IGYpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nl c3MoKS0+ZmxleGlibGVCb3gsIGZsZXgsIGYpOyB9CiAgICAgdm9pZCBzZXRCb3hGbGV4R3JvdXAo dW5zaWduZWQgaW50IGZnKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCkt PmZsZXhpYmxlQm94LCBmbGV4X2dyb3VwLCBmZyk7IH0K