72926 2011-11-21 20:41:51 -0800 Implement vertical-align property in CSSStyleApplyProperty. 2011-11-27 23:08:56 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson eric kling koivisto macpherson webkit.review.bot oldest_to_newest 507395 0 macpherson 2011-11-21 20:41:51 -0800 Implement vertical-align property in CSSStyleApplyProperty. 507399 1 116173 macpherson 2011-11-21 20:46:52 -0800 Created attachment 116173 Patch 509196 2 116173 kling 2011-11-25 09:09:14 -0800 Comment on attachment 116173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116173&action=review r=me with some tweaks: > Source/WebCore/css/CSSPrimitiveValue.h:123 > + bool isPercent() const { return m_primitiveUnitType == CSSPrimitiveValue::CSS_PERCENTAGE; } This should be called isPercentage(). > Source/WebCore/css/CSSStyleApplyProperty.cpp:845 > + if (primitiveValue->getIdent()) > + return selector->style()->setVerticalAlign(*primitiveValue); I'm not sure this kind of "void return chaining" is allowed by the WebKit coding style. > Source/WebCore/rendering/style/RenderStyle.h:982 > - void setVerticalAlignLength(Length l) { SET_VAR(m_box, m_verticalAlign, l) } > + void setVerticalAlignLength(Length length) { setVerticalAlign(LENGTH); SET_VAR(m_box, m_verticalAlign, length) } While I agree with this change, I'd like to see it mentioned in the ChangeLog. 509506 3 116173 macpherson 2011-11-27 16:24:15 -0800 Comment on attachment 116173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116173&action=review >> Source/WebCore/css/CSSPrimitiveValue.h:123 >> + bool isPercent() const { return m_primitiveUnitType == CSSPrimitiveValue::CSS_PERCENTAGE; } > > This should be called isPercentage(). done. >> Source/WebCore/css/CSSStyleApplyProperty.cpp:845 >> + return selector->style()->setVerticalAlign(*primitiveValue); > > I'm not sure this kind of "void return chaining" is allowed by the WebKit coding style. I checked the style guide and it isn't mentioned anywhere. I don't think void should be treated differently to any other type from a style perspective, and it is still useful to denote that it is a tail call. >> Source/WebCore/rendering/style/RenderStyle.h:982 >> + void setVerticalAlignLength(Length length) { setVerticalAlign(LENGTH); SET_VAR(m_box, m_verticalAlign, length) } > > While I agree with this change, I'd like to see it mentioned in the ChangeLog. done. 509507 4 116685 macpherson 2011-11-27 16:29:03 -0800 Created attachment 116685 Patch for landing 509583 5 116685 webkit.review.bot 2011-11-27 23:08:52 -0800 Comment on attachment 116685 Patch for landing Clearing flags on attachment: 116685 Committed r101225: <http://trac.webkit.org/changeset/101225> 509585 6 webkit.review.bot 2011-11-27 23:08:56 -0800 All reviewed patches have been landed. Closing bug. 116173 2011-11-21 20:46:52 -0800 2011-11-27 16:28:57 -0800 Patch bug-72926-20111122154649.patch text/plain 7263 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDk3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDExLTExLTIxICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IHZlcnRpY2FsLWFsaWduIHByb3BlcnR5IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyOTI2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFydCBvZiB0aGUgb25n b2luZyByZWZhY3RvcmluZyBvZiBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5LgorCisg ICAgICAgIENvdmVyZWQgYnkgc2V2ZXJhbCB0ZXN0cyB1bmRlciBmYXN0L2Nzcy4KKworICAgICAg ICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0 aXZlVmFsdWU6OmlzUGVyY2VudCk6CisgICAgICAgICogY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0 eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5VmVydGljYWxBbGlnbjo6YXBw bHlWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5VmVydGljYWxBbGlnbjo6 Y3JlYXRlSGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZUFwcGx5UHJvcGVydHk6 OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3Iu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eSk6 CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgIChXZWJD b3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0VmVydGljYWxBbGlnbkxlbmd0aCk6CisKIDIwMTEtMTEt MjEgIERhdmlkIEJhcnIgIDxkYXZpZGJhcnJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JF U1NJT04ocjk4NTQyKTogQ2hyb21pdW06IENTUyB0ZXh0IGlzIHJlbmRlcmVkIG9uIHBhZ2UKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5oCShyZXZpc2lvbiAxMDA5NzIp CisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkod29ya2luZyBjb3B5 KQpAQCAtMTIwLDYgKzEyMCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB0eXBlID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1Nf UkVNUzsgfQogCiAgICAgYm9vbCBpc0xlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIGlzVW5pdFR5cGVM ZW5ndGgobV9wcmltaXRpdmVVbml0VHlwZSk7IH0KKyAgICBib29sIGlzUGVyY2VudCgpIGNvbnN0 IHsgcmV0dXJuIG1fcHJpbWl0aXZlVW5pdFR5cGUgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19Q RVJDRU5UQUdFOyB9CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4g Y3JlYXRlSWRlbnRpZmllcihpbnQgaWRlbnRpZmllcikgeyByZXR1cm4gYWRvcHRSZWYobmV3IENT U1ByaW1pdGl2ZVZhbHVlKGlkZW50aWZpZXIpKTsgfQogICAgIHN0YXRpYyBQYXNzUmVmUHRyPENT U1ByaW1pdGl2ZVZhbHVlPiBjcmVhdGVDb2xvcih1bnNpZ25lZCByZ2JWYWx1ZSkgeyByZXR1cm4g YWRvcHRSZWYobmV3IENTU1ByaW1pdGl2ZVZhbHVlKHJnYlZhbHVlKSk7IH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCShyZXZpc2lvbiAxMDA5 NzIpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkod29y a2luZyBjb3B5KQpAQCAtODMyLDYgKzgzMiwzNCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFByb3Bl cnR5SGFuZGxlciBjcmVhdGVIYW5kbGVyKCkgeyByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZhcHBs eUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7IH0KIH07CiAK K2NsYXNzIEFwcGx5UHJvcGVydHlWZXJ0aWNhbEFsaWduIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMg dm9pZCBhcHBseVZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yLCBDU1NWYWx1ZSogdmFs dWUpCisgICAgeworICAgICAgICBpZiAoIXZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZh bHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWx1ZSk7CisKKyAgICAgICAg aWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpKQorICAgICAgICAgICAgcmV0dXJuIHNlbGVj dG9yLT5zdHlsZSgpLT5zZXRWZXJ0aWNhbEFsaWduKCpwcmltaXRpdmVWYWx1ZSk7CisKKyAgICAg ICAgTGVuZ3RoIGxlbmd0aDsKKyAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc0xlbmd0aCgp KQorICAgICAgICAgICAgbGVuZ3RoID0gcHJpbWl0aXZlVmFsdWUtPmNvbXB1dGVMZW5ndGg8TGVu Z3RoPihzZWxlY3Rvci0+c3R5bGUoKSwgc2VsZWN0b3ItPnJvb3RFbGVtZW50U3R5bGUoKSwgc2Vs ZWN0b3ItPnN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKSk7CisgICAgICAgIGVsc2UgaWYgKHByaW1p dGl2ZVZhbHVlLT5pc1BlcmNlbnQoKSkKKyAgICAgICAgICAgIGxlbmd0aCA9IExlbmd0aChwcmlt aXRpdmVWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKSwgUGVyY2VudCk7CisKKyAgICAgICAgc2VsZWN0 b3ItPnN0eWxlKCktPnNldFZlcnRpY2FsQWxpZ25MZW5ndGgobGVuZ3RoKTsKKyAgICB9CisKKyAg ICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKQorICAgIHsKKyAgICAgICAg UHJvcGVydHlIYW5kbGVyIGhhbmRsZXIgPSBBcHBseVByb3BlcnR5RGVmYXVsdEJhc2U8RVZlcnRp Y2FsQWxpZ24sICZSZW5kZXJTdHlsZTo6dmVydGljYWxBbGlnbiwgRVZlcnRpY2FsQWxpZ24sICZS ZW5kZXJTdHlsZTo6c2V0VmVydGljYWxBbGlnbiwgRVZlcnRpY2FsQWxpZ24sICZSZW5kZXJTdHls ZTo6aW5pdGlhbFZlcnRpY2FsQWxpZ24+OjpjcmVhdGVIYW5kbGVyKCk7CisgICAgICAgIHJldHVy biBQcm9wZXJ0eUhhbmRsZXIoaGFuZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0 aWFsRnVuY3Rpb24oKSwgJmFwcGx5VmFsdWUpOworICAgIH0KK307CisKIGNsYXNzIEFwcGx5UHJv cGVydHlBc3BlY3RSYXRpbyB7CiBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0 VmFsdWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IpCkBAIC0xMDUxLDYgKzEwNzksOCBAQCBD U1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wCiAgICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5UGFkZGluZ0xlZnQsIEFwcGx5UHJvcGVydHlMZW5ndGg8JlJlbmRl clN0eWxlOjpwYWRkaW5nTGVmdCwgJlJlbmRlclN0eWxlOjpzZXRQYWRkaW5nTGVmdCwgJlJlbmRl clN0eWxlOjppbml0aWFsUGFkZGluZz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVy dHlIYW5kbGVyKENTU1Byb3BlcnR5UGFkZGluZywgQXBwbHlQcm9wZXJ0eUV4cGFuZGluZzxTdXBw cmVzc1ZhbHVlLCBDU1NQcm9wZXJ0eVBhZGRpbmdUb3AsIENTU1Byb3BlcnR5UGFkZGluZ1JpZ2h0 LCBDU1NQcm9wZXJ0eVBhZGRpbmdCb3R0b20sIENTU1Byb3BlcnR5UGFkZGluZ0xlZnQ+OjpjcmVh dGVIYW5kbGVyKCkpOwogCisgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5VmVydGlj YWxBbGlnbiwgQXBwbHlQcm9wZXJ0eVZlcnRpY2FsQWxpZ246OmNyZWF0ZUhhbmRsZXIoKSk7CisK ICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRQZXJzcGVjdGl2ZU9yaWdp blgsIEFwcGx5UHJvcGVydHlMZW5ndGg8JlJlbmRlclN0eWxlOjpwZXJzcGVjdGl2ZU9yaWdpblgs ICZSZW5kZXJTdHlsZTo6c2V0UGVyc3BlY3RpdmVPcmlnaW5YLCAmUmVuZGVyU3R5bGU6OmluaXRp YWxQZXJzcGVjdGl2ZU9yaWdpblg+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5 SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlT3JpZ2luWSwgQXBwbHlQcm9wZXJ0 eUxlbmd0aDwmUmVuZGVyU3R5bGU6OnBlcnNwZWN0aXZlT3JpZ2luWSwgJlJlbmRlclN0eWxlOjpz ZXRQZXJzcGVjdGl2ZU9yaWdpblksICZSZW5kZXJTdHlsZTo6aW5pdGlhbFBlcnNwZWN0aXZlT3Jp Z2luWT46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5V2Via2l0UGVyc3BlY3RpdmVPcmlnaW4sIEFwcGx5UHJvcGVydHlFeHBhbmRpbmc8U3VwcHJl c3NWYWx1ZSwgQ1NTUHJvcGVydHlXZWJraXRQZXJzcGVjdGl2ZU9yaWdpblgsIENTU1Byb3BlcnR5 V2Via2l0UGVyc3BlY3RpdmVPcmlnaW5ZPjo6Y3JlYXRlSGFuZGxlcigpKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDEwMDk3MikKKysrIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjY1NCwyOCArMjY1NCw2IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShp bnQKICAgICAgICAgbV9zdHlsZS0+c2V0UmVzaXplKHIpOwogICAgICAgICByZXR1cm47CiAgICAg fQotICAgIGNhc2UgQ1NTUHJvcGVydHlWZXJ0aWNhbEFsaWduOgotICAgIHsKLSAgICAgICAgSEFO RExFX0lOSEVSSVRfQU5EX0lOSVRJQUwodmVydGljYWxBbGlnbiwgVmVydGljYWxBbGlnbikKLSAg ICAgICAgaWYgKCFwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAg ICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkpIHsKLSAgICAgICAgICBtX3N0eWxlLT5z ZXRWZXJ0aWNhbEFsaWduKCpwcmltaXRpdmVWYWx1ZSk7Ci0gICAgICAgICAgcmV0dXJuOwotICAg ICAgICB9Ci0KLSAgICAgICAgaW50IHR5cGUgPSBwcmltaXRpdmVWYWx1ZS0+cHJpbWl0aXZlVHlw ZSgpOwotICAgICAgICBMZW5ndGggbGVuZ3RoOwotICAgICAgICBpZiAoQ1NTUHJpbWl0aXZlVmFs dWU6OmlzVW5pdFR5cGVMZW5ndGgodHlwZSkpCi0gICAgICAgICAgICBsZW5ndGggPSBwcmltaXRp dmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aDxMZW5ndGg+KHN0eWxlKCksIG1fcm9vdEVsZW1lbnRTdHls ZSwgem9vbUZhY3Rvcik7Ci0gICAgICAgIGVsc2UgaWYgKHR5cGUgPT0gQ1NTUHJpbWl0aXZlVmFs dWU6OkNTU19QRVJDRU5UQUdFKQotICAgICAgICAgICAgbGVuZ3RoID0gTGVuZ3RoKHByaW1pdGl2 ZVZhbHVlLT5nZXREb3VibGVWYWx1ZSgpLCBQZXJjZW50KTsKLQotICAgICAgICBtX3N0eWxlLT5z ZXRWZXJ0aWNhbEFsaWduKExFTkdUSCk7Ci0gICAgICAgIG1fc3R5bGUtPnNldFZlcnRpY2FsQWxp Z25MZW5ndGgobGVuZ3RoKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KICAgICBjYXNlIENTU1By b3BlcnR5Rm9udFNpemU6CiAgICAgewogICAgICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2Ny aXB0aW9uID0gbV9zdHlsZS0+Zm9udERlc2NyaXB0aW9uKCk7CkBAIC00MDI2LDYgKzQwMDQsNyBA QCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eU1heEhlaWdodDoKICAgICBjYXNlIENTU1Byb3BlcnR5SGVpZ2h0OgogICAgIGNhc2Ug Q1NTUHJvcGVydHlNaW5IZWlnaHQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVZlcnRpY2FsQWxpZ246 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybU9yaWdpblg6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdFRyYW5zZm9ybU9yaWdpblk6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdl YmtpdFRyYW5zZm9ybU9yaWdpblo6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gMTAwOTcyKQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTk3OSw3ICs5 NzksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRPdmVyZmxvd1koRU92ZXJmbG93IHYpIHsgbm9u aW5oZXJpdGVkX2ZsYWdzLl9vdmVyZmxvd1kgPSB2OyB9CiAgICAgdm9pZCBzZXRWaXNpYmlsaXR5 KEVWaXNpYmlsaXR5IHYpIHsgaW5oZXJpdGVkX2ZsYWdzLl92aXNpYmlsaXR5ID0gdjsgfQogICAg IHZvaWQgc2V0VmVydGljYWxBbGlnbihFVmVydGljYWxBbGlnbiB2KSB7IG5vbmluaGVyaXRlZF9m bGFncy5fdmVydGljYWxfYWxpZ24gPSB2OyB9Ci0gICAgdm9pZCBzZXRWZXJ0aWNhbEFsaWduTGVu Z3RoKExlbmd0aCBsKSB7IFNFVF9WQVIobV9ib3gsIG1fdmVydGljYWxBbGlnbiwgbCkgfQorICAg IHZvaWQgc2V0VmVydGljYWxBbGlnbkxlbmd0aChMZW5ndGggbGVuZ3RoKSB7IHNldFZlcnRpY2Fs QWxpZ24oTEVOR1RIKTsgU0VUX1ZBUihtX2JveCwgbV92ZXJ0aWNhbEFsaWduLCBsZW5ndGgpIH0K IAogICAgIHZvaWQgc2V0SGFzQ2xpcChib29sIGIgPSB0cnVlKSB7IFNFVF9WQVIodmlzdWFsLCBo YXNDbGlwLCBiKSB9CiAgICAgdm9pZCBzZXRDbGlwTGVmdChMZW5ndGggdikgeyBTRVRfVkFSKHZp c3VhbCwgY2xpcC5tX2xlZnQsIHYpIH0K 116685 2011-11-27 16:29:03 -0800 2011-11-27 23:08:52 -0800 Patch for landing bug-72926-20111128112901.patch text/plain 7348 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTIxNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDExLTExLTI3ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IHZlcnRpY2FsLWFsaWduIHByb3BlcnR5IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyOTI2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKworICAgICAgICBQYXJ0IG9mIHRoZSBvbmdv aW5nIHJlZmFjdG9yaW5nIG9mIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkuCisKKyAg ICAgICAgQ292ZXJlZCBieSBzZXZlcmFsIHRlc3RzIHVuZGVyIGZhc3QvY3NzLgorCisgICAgICAg ICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRp dmVWYWx1ZTo6aXNQZXJjZW50KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlWZXJ0aWNhbEFsaWduOjphcHBs eVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlWZXJ0aWNhbEFsaWduOjpj cmVhdGVIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6 Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToK KyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNv cmU6OkluaGVyaXRlZEZsYWdzOjpzZXRWZXJ0aWNhbEFsaWduTGVuZ3RoKToKKyAgICAgICAgQ2Fs bGluZyBzZXRWZXJ0aWNhbEFsaWduTGVuZ3RoIG5vdyBhdXRvbWF0aWNhbGx5IHNldHMgdmVydGlj YWxBbGlnbiB0byBMRU5HVEguCisKIDIwMTEtMTEtMjcgIEFubmEgQ2F2ZW5kZXIgIDxhbm5hY2NA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1vdmUgcmVhZHlTdGF0ZSBmcm9tIFRleHRUcmFjayB0 byBIVE1MVHJhY2tFbGVtZW50CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZl VmFsdWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWUuaAkocmV2aXNpb24gMTAxMjE0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2 ZVZhbHVlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw2ICsxMjAsNyBAQCBwdWJsaWM6CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHlwZSA9PSBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1JFTVM7IH0KIAogICAgIGJvb2wgaXNMZW5ndGgoKSBjb25z dCB7IHJldHVybiBpc1VuaXRUeXBlTGVuZ3RoKG1fcHJpbWl0aXZlVW5pdFR5cGUpOyB9CisgICAg Ym9vbCBpc1BlcmNlbnRhZ2UoKSBjb25zdCB7IHJldHVybiBtX3ByaW1pdGl2ZVVuaXRUeXBlID09 IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRTsgfQogCiAgICAgc3RhdGljIFBhc3NS ZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNyZWF0ZUlkZW50aWZpZXIoaW50IGlkZW50aWZpZXIp IHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDU1NQcmltaXRpdmVWYWx1ZShpZGVudGlmaWVyKSk7IH0K ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY3JlYXRlQ29sb3IodW5z aWduZWQgcmdiVmFsdWUpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDU1NQcmltaXRpdmVWYWx1ZShy Z2JWYWx1ZSkpOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3Bl cnR5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVBy b3BlcnR5LmNwcAkocmV2aXNpb24gMTAxMjE0KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlQXBwbHlQcm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg0NCw2ICs4NDQsMzQgQEAg cHVibGljOgogICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpIHsgcmV0 dXJuIFByb3BlcnR5SGFuZGxlcigmYXBwbHlJbmhlcml0VmFsdWUsICZhcHBseUluaXRpYWxWYWx1 ZSwgJmFwcGx5VmFsdWUpOyB9CiB9OwogCitjbGFzcyBBcHBseVByb3BlcnR5VmVydGljYWxBbGln biB7CitwdWJsaWM6CisgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShDU1NTdHlsZVNlbGVjdG9y KiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKQorICAgIHsKKyAgICAgICAgaWYgKCF2YWx1ZS0+ aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIENTU1By aW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZh bHVlKj4odmFsdWUpOworCisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSkK KyAgICAgICAgICAgIHJldHVybiBzZWxlY3Rvci0+c3R5bGUoKS0+c2V0VmVydGljYWxBbGlnbigq cHJpbWl0aXZlVmFsdWUpOworCisgICAgICAgIExlbmd0aCBsZW5ndGg7CisgICAgICAgIGlmIChw cmltaXRpdmVWYWx1ZS0+aXNMZW5ndGgoKSkKKyAgICAgICAgICAgIGxlbmd0aCA9IHByaW1pdGl2 ZVZhbHVlLT5jb21wdXRlTGVuZ3RoPExlbmd0aD4oc2VsZWN0b3ItPnN0eWxlKCksIHNlbGVjdG9y LT5yb290RWxlbWVudFN0eWxlKCksIHNlbGVjdG9yLT5zdHlsZSgpLT5lZmZlY3RpdmVab29tKCkp OworICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNQZXJjZW50YWdlKCkpCisgICAg ICAgICAgICBsZW5ndGggPSBMZW5ndGgocHJpbWl0aXZlVmFsdWUtPmdldERvdWJsZVZhbHVlKCks IFBlcmNlbnQpOworCisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRWZXJ0aWNhbEFsaWdu TGVuZ3RoKGxlbmd0aCk7CisgICAgfQorCisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVh dGVIYW5kbGVyKCkKKyAgICB7CisgICAgICAgIFByb3BlcnR5SGFuZGxlciBoYW5kbGVyID0gQXBw bHlQcm9wZXJ0eURlZmF1bHRCYXNlPEVWZXJ0aWNhbEFsaWduLCAmUmVuZGVyU3R5bGU6OnZlcnRp Y2FsQWxpZ24sIEVWZXJ0aWNhbEFsaWduLCAmUmVuZGVyU3R5bGU6OnNldFZlcnRpY2FsQWxpZ24s IEVWZXJ0aWNhbEFsaWduLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxWZXJ0aWNhbEFsaWduPjo6Y3Jl YXRlSGFuZGxlcigpOworICAgICAgICByZXR1cm4gUHJvcGVydHlIYW5kbGVyKGhhbmRsZXIuaW5o ZXJpdEZ1bmN0aW9uKCksIGhhbmRsZXIuaW5pdGlhbEZ1bmN0aW9uKCksICZhcHBseVZhbHVlKTsK KyAgICB9Cit9OworCiBjbGFzcyBBcHBseVByb3BlcnR5QXNwZWN0UmF0aW8gewogcHVibGljOgog ICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVj dG9yKQpAQCAtMTA2Myw2ICsxMDkxLDggQEAgQ1NTU3R5bGVBcHBseVByb3BlcnR5OjpDU1NTdHls ZUFwcGx5UHJvcAogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVBhZGRpbmdMZWZ0 LCBBcHBseVByb3BlcnR5TGVuZ3RoPCZSZW5kZXJTdHlsZTo6cGFkZGluZ0xlZnQsICZSZW5kZXJT dHlsZTo6c2V0UGFkZGluZ0xlZnQsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFBhZGRpbmc+OjpjcmVh dGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVBhZGRpbmcs IEFwcGx5UHJvcGVydHlFeHBhbmRpbmc8U3VwcHJlc3NWYWx1ZSwgQ1NTUHJvcGVydHlQYWRkaW5n VG9wLCBDU1NQcm9wZXJ0eVBhZGRpbmdSaWdodCwgQ1NTUHJvcGVydHlQYWRkaW5nQm90dG9tLCBD U1NQcm9wZXJ0eVBhZGRpbmdMZWZ0Pjo6Y3JlYXRlSGFuZGxlcigpKTsKIAorICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eVZlcnRpY2FsQWxpZ24sIEFwcGx5UHJvcGVydHlWZXJ0aWNh bEFsaWduOjpjcmVhdGVIYW5kbGVyKCkpOworCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1By b3BlcnR5V2Via2l0UGVyc3BlY3RpdmVPcmlnaW5YLCBBcHBseVByb3BlcnR5TGVuZ3RoPCZSZW5k ZXJTdHlsZTo6cGVyc3BlY3RpdmVPcmlnaW5YLCAmUmVuZGVyU3R5bGU6OnNldFBlcnNwZWN0aXZl T3JpZ2luWCwgJlJlbmRlclN0eWxlOjppbml0aWFsUGVyc3BlY3RpdmVPcmlnaW5YPjo6Y3JlYXRl SGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRQZXJz cGVjdGl2ZU9yaWdpblksIEFwcGx5UHJvcGVydHlMZW5ndGg8JlJlbmRlclN0eWxlOjpwZXJzcGVj dGl2ZU9yaWdpblksICZSZW5kZXJTdHlsZTo6c2V0UGVyc3BlY3RpdmVPcmlnaW5ZLCAmUmVuZGVy U3R5bGU6OmluaXRpYWxQZXJzcGVjdGl2ZU9yaWdpblk+OjpjcmVhdGVIYW5kbGVyKCkpOwogICAg IHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlT3JpZ2luLCBB cHBseVByb3BlcnR5RXhwYW5kaW5nPFN1cHByZXNzVmFsdWUsIENTU1Byb3BlcnR5V2Via2l0UGVy c3BlY3RpdmVPcmlnaW5YLCBDU1NQcm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlT3JpZ2luWT46OmNy ZWF0ZUhhbmRsZXIoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3Iu Y3BwCShyZXZpc2lvbiAxMDEyMTQpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2NTYsMjggKzI2NTYsNiBAQCB2b2lkIENTU1N0 eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgICAgIG1fc3R5bGUtPnNldFJlc2l6 ZShyKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBjYXNlIENTU1Byb3BlcnR5VmVydGlj YWxBbGlnbjoKLSAgICB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKHZlcnRp Y2FsQWxpZ24sIFZlcnRpY2FsQWxpZ24pCi0gICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUpCi0g ICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVu dCgpKSB7Ci0gICAgICAgICAgbV9zdHlsZS0+c2V0VmVydGljYWxBbGlnbigqcHJpbWl0aXZlVmFs dWUpOwotICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIGludCB0eXBlID0g cHJpbWl0aXZlVmFsdWUtPnByaW1pdGl2ZVR5cGUoKTsKLSAgICAgICAgTGVuZ3RoIGxlbmd0aDsK LSAgICAgICAgaWYgKENTU1ByaW1pdGl2ZVZhbHVlOjppc1VuaXRUeXBlTGVuZ3RoKHR5cGUpKQot ICAgICAgICAgICAgbGVuZ3RoID0gcHJpbWl0aXZlVmFsdWUtPmNvbXB1dGVMZW5ndGg8TGVuZ3Ro PihzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIHpvb21GYWN0b3IpOwotICAgICAgICBlbHNl IGlmICh0eXBlID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSkKLSAgICAgICAg ICAgIGxlbmd0aCA9IExlbmd0aChwcmltaXRpdmVWYWx1ZS0+Z2V0RG91YmxlVmFsdWUoKSwgUGVy Y2VudCk7Ci0KLSAgICAgICAgbV9zdHlsZS0+c2V0VmVydGljYWxBbGlnbihMRU5HVEgpOwotICAg ICAgICBtX3N0eWxlLT5zZXRWZXJ0aWNhbEFsaWduTGVuZ3RoKGxlbmd0aCk7Ci0gICAgICAgIHJl dHVybjsKLSAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTaXplOgogICAgIHsKICAgICAg ICAgRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbiA9IG1fc3R5bGUtPmZvbnREZXNjcmlw dGlvbigpOwpAQCAtNDAyOCw2ICs0MDA2LDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBs eVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlNYXhIZWlnaHQ6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eUhlaWdodDoKICAgICBjYXNlIENTU1Byb3BlcnR5TWluSGVpZ2h0OgorICAgIGNh c2UgQ1NTUHJvcGVydHlWZXJ0aWNhbEFsaWduOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRU cmFuc2Zvcm1PcmlnaW5YOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm1Pcmln aW5ZOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUcmFuc2Zvcm1PcmlnaW5aOgpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9u IDEwMTIxNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5o CSh3b3JraW5nIGNvcHkpCkBAIC05NzksNyArOTc5LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 T3ZlcmZsb3dZKEVPdmVyZmxvdyB2KSB7IG5vbmluaGVyaXRlZF9mbGFncy5fb3ZlcmZsb3dZID0g djsgfQogICAgIHZvaWQgc2V0VmlzaWJpbGl0eShFVmlzaWJpbGl0eSB2KSB7IGluaGVyaXRlZF9m bGFncy5fdmlzaWJpbGl0eSA9IHY7IH0KICAgICB2b2lkIHNldFZlcnRpY2FsQWxpZ24oRVZlcnRp Y2FsQWxpZ24gdikgeyBub25pbmhlcml0ZWRfZmxhZ3MuX3ZlcnRpY2FsX2FsaWduID0gdjsgfQot ICAgIHZvaWQgc2V0VmVydGljYWxBbGlnbkxlbmd0aChMZW5ndGggbCkgeyBTRVRfVkFSKG1fYm94 LCBtX3ZlcnRpY2FsQWxpZ24sIGwpIH0KKyAgICB2b2lkIHNldFZlcnRpY2FsQWxpZ25MZW5ndGgo TGVuZ3RoIGxlbmd0aCkgeyBzZXRWZXJ0aWNhbEFsaWduKExFTkdUSCk7IFNFVF9WQVIobV9ib3gs IG1fdmVydGljYWxBbGlnbiwgbGVuZ3RoKSB9CiAKICAgICB2b2lkIHNldEhhc0NsaXAoYm9vbCBi ID0gdHJ1ZSkgeyBTRVRfVkFSKHZpc3VhbCwgaGFzQ2xpcCwgYikgfQogICAgIHZvaWQgc2V0Q2xp cExlZnQoTGVuZ3RoIHYpIHsgU0VUX1ZBUih2aXN1YWwsIGNsaXAubV9sZWZ0LCB2KSB9Cg==