72840 2011-11-20 17:10:28 -0800 Implement Zoom Property in CSSSStyleApplyProperty. 2011-11-30 05:48:46 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson eric kling koivisto webkit.review.bot oldest_to_newest 506623 0 macpherson 2011-11-20 17:10:28 -0800 Implement Zoom Property in CSSSStyleApplyProperty. 506625 1 116013 macpherson 2011-11-20 17:12:33 -0800 Created attachment 116013 Patch 507892 2 macpherson 2011-11-22 18:17:42 -0800 Could someone please review? 509430 3 116013 kling 2011-11-27 05:23:29 -0800 Comment on attachment 116013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116013&action=review > Source/WebCore/css/CSSStyleApplyProperty.cpp:911 > + } else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_PERCENTAGE) { > + if (float percent = primitiveValue->getFloatValue()) { > + resetEffectiveZoom(selector); > + selector->setZoom(percent / 100.0f); > + } The applyProperty() version of this code would always reset the effective zoom, even if getFloatValue() returns 0. > Source/WebCore/css/CSSStyleApplyProperty.cpp:916 > + } else if (primitiveValue->primitiveType() == CSSPrimitiveValue::CSS_NUMBER) { > + if (float number = primitiveValue->getFloatValue()) { > + resetEffectiveZoom(selector); > + selector->setZoom(number); > + } Same here. 509492 4 116013 macpherson 2011-11-27 14:45:14 -0800 Comment on attachment 116013 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=116013&action=review >> Source/WebCore/css/CSSStyleApplyProperty.cpp:911 >> + } > > The applyProperty() version of this code would always reset the effective zoom, even if getFloatValue() returns 0. Hi Andreas, thanks for the review. I understand that's the case in order to exactly match the existing behavior, but is the existing behavior sensible? To my eyes this code treats any zoom of 0 as invalid and does not apply the property on RenderStyle. In that case, do we want zoom: 0; to have a side-effect of resetting the effectiveZoom? 511118 5 kling 2011-11-29 14:40:41 -0800 (In reply to comment #4) > (From update of attachment 116013 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116013&action=review > > >> Source/WebCore/css/CSSStyleApplyProperty.cpp:911 > >> + } > > > > The applyProperty() version of this code would always reset the effective zoom, even if getFloatValue() returns 0. > > Hi Andreas, thanks for the review. > I understand that's the case in order to exactly match the existing behavior, but is the existing behavior sensible? > To my eyes this code treats any zoom of 0 as invalid and does not apply the property on RenderStyle. In that case, do we want zoom: 0; to have a side-effect of resetting the effectiveZoom? Is this behavior change detectable by a layout test? If so, we should add one. In general I prefer refactorings to be "stand-alone" and free from behavior changes. A change like this could be pushed as a follow-up patch. 511181 6 117066 macpherson 2011-11-29 16:09:55 -0800 Created attachment 117066 Patch 511670 7 117066 webkit.review.bot 2011-11-30 05:48:42 -0800 Comment on attachment 117066 Patch Clearing flags on attachment: 117066 Committed r101499: <http://trac.webkit.org/changeset/101499> 511671 8 webkit.review.bot 2011-11-30 05:48:46 -0800 All reviewed patches have been landed. Closing bug. 116013 2011-11-20 17:12:33 -0800 2011-11-29 16:09:47 -0800 Patch bug-72840-20111121121230.patch text/plain 7593 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDg3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDExLTExLTIwICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IFpvb20gUHJvcGVydHkgaW4gQ1NTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODQwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBmYXN0L2Nzcy8qem9v bSouaHRtbAorCisgICAgICAgICogY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6CisgICAg ICAgIEFkZCBuZXcgaGFuZGxlciBmb3Igem9vbSBwcm9wZXJ0eSAoYmFzZWQgb24gZXhpc3Rpbmcg Y29kZSBmcm9tIENTU1N0eWxlU2VsZWN0b3IuY3BwKQorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQ cm9wZXJ0eVpvb206OnJlc2V0RWZmZWN0aXZlWm9vbSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBs eVByb3BlcnR5Wm9vbTo6YXBwbHlJbmhlcml0VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBw bHlQcm9wZXJ0eVpvb206OmFwcGx5SW5pdGlhbFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFw cGx5UHJvcGVydHlab29tOjphcHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlab29tOjpjcmVhdGVIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBw bHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIFJlbW92ZSBleGlzdGluZyBpbXBsZW1lbnRhdGlvbi4K KyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOgorICAg ICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHls ZVNlbGVjdG9yOjpkb2N1bWVudCk6CisgICAgICAgIEFkZCBnZXR0ZXIgZm9yIERvY3VtZW50Lgor CiAyMDExLTEwLTE3ICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CiAKICAgICAgICAg UGFzcyBhIEZyYW1lKiBwYXJhbWV0ZXIgaW4gRWRpdG9yQ2xpZW50OjpyZXNwb25kVG9DaGFuZ2Vk U2VsZWN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3Bl cnR5LmNwcAkocmV2aXNpb24gMTAwODcyKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxl QXBwbHlQcm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNs dWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkVsZW1lbnQuaCIKICNpbmNsdWRlICJQYWlyLmgi CisjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKICNp bmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+ CkBAIC04NjcsNiArODY4LDYxIEBAIHB1YmxpYzoKICAgICB9CiB9OwogCitjbGFzcyBBcHBseVBy b3BlcnR5Wm9vbSB7Citwcml2YXRlOgorICAgIHN0YXRpYyB2b2lkIHJlc2V0RWZmZWN0aXZlWm9v bShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvcikKKyAgICB7CisgICAgICAgIC8vIFJlc2V0IHRo ZSB6b29tIGluIGVmZmVjdC4gVGhpcyBhbGxvd3MgdGhlIHNldFpvb20gbWV0aG9kIHRvIGFjY3Vy YXRlbHkgY29tcHV0ZSBhIG5ldyB6b29tIGluIGVmZmVjdC4KKyAgICAgICAgc2VsZWN0b3ItPnNl dEVmZmVjdGl2ZVpvb20oc2VsZWN0b3ItPnBhcmVudFN0eWxlKCkgPyBzZWxlY3Rvci0+cGFyZW50 U3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpIDogUmVuZGVyU3R5bGU6OmluaXRpYWxab29tKCkpOwor ICAgIH0KKworcHVibGljOgorICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdFZhbHVlKENTU1N0 eWxlU2VsZWN0b3IqIHNlbGVjdG9yKQorICAgIHsKKyAgICAgICAgcmVzZXRFZmZlY3RpdmVab29t KHNlbGVjdG9yKTsKKyAgICAgICAgc2VsZWN0b3ItPnNldFpvb20oc2VsZWN0b3ItPnBhcmVudFN0 eWxlKCktPnpvb20oKSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsVmFs dWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IpCisgICAgeworICAgICAgICByZXNldEVmZmVj dGl2ZVpvb20oc2VsZWN0b3IpOworICAgICAgICBzZWxlY3Rvci0+c2V0Wm9vbShSZW5kZXJTdHls ZTo6aW5pdGlhbFpvb20oKSk7CisgICAgfQorCisgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZShD U1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgQ1NTVmFsdWUqIHZhbHVlKQorICAgIHsKKyAgICAg ICAgQVNTRVJUKHZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpOworICAgICAgICBDU1NQcmltaXRp dmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+ KHZhbHVlKTsKKworICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NT VmFsdWVOb3JtYWwpIHsKKyAgICAgICAgICAgIHJlc2V0RWZmZWN0aXZlWm9vbShzZWxlY3Rvcik7 CisgICAgICAgICAgICBzZWxlY3Rvci0+c2V0Wm9vbShSZW5kZXJTdHlsZTo6aW5pdGlhbFpvb20o KSk7CisgICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkgPT0gQ1NT VmFsdWVSZXNldCkgeworICAgICAgICAgICAgc2VsZWN0b3ItPnNldEVmZmVjdGl2ZVpvb20oUmVu ZGVyU3R5bGU6OmluaXRpYWxab29tKCkpOworICAgICAgICAgICAgc2VsZWN0b3ItPnNldFpvb20o UmVuZGVyU3R5bGU6OmluaXRpYWxab29tKCkpOworICAgICAgICB9IGVsc2UgaWYgKHByaW1pdGl2 ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlRG9jdW1lbnQpIHsKKyAgICAgICAgICAgIGZs b2F0IGRvY1pvb20gPSBzZWxlY3Rvci0+ZG9jdW1lbnQoKS0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+ em9vbSgpOworICAgICAgICAgICAgc2VsZWN0b3ItPnNldEVmZmVjdGl2ZVpvb20oZG9jWm9vbSk7 CisgICAgICAgICAgICBzZWxlY3Rvci0+c2V0Wm9vbShkb2Nab29tKTsKKyAgICAgICAgfSBlbHNl IGlmIChwcmltaXRpdmVWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVl OjpDU1NfUEVSQ0VOVEFHRSkgeworICAgICAgICAgICAgaWYgKGZsb2F0IHBlcmNlbnQgPSBwcmlt aXRpdmVWYWx1ZS0+Z2V0RmxvYXRWYWx1ZSgpKSB7CisgICAgICAgICAgICAgICAgcmVzZXRFZmZl Y3RpdmVab29tKHNlbGVjdG9yKTsKKyAgICAgICAgICAgICAgICBzZWxlY3Rvci0+c2V0Wm9vbShw ZXJjZW50IC8gMTAwLjBmKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChwcmlt aXRpdmVWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVN QkVSKSB7CisgICAgICAgICAgICBpZiAoZmxvYXQgbnVtYmVyID0gcHJpbWl0aXZlVmFsdWUtPmdl dEZsb2F0VmFsdWUoKSkgeworICAgICAgICAgICAgICAgIHJlc2V0RWZmZWN0aXZlWm9vbShzZWxl Y3Rvcik7CisgICAgICAgICAgICAgICAgc2VsZWN0b3ItPnNldFpvb20obnVtYmVyKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRsZXIg Y3JlYXRlSGFuZGxlcigpCisgICAgeworICAgICAgICByZXR1cm4gUHJvcGVydHlIYW5kbGVyKCZh cHBseUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAmYXBwbHlWYWx1ZSk7CisgICAg fQorfTsKKwogY29uc3QgQ1NTU3R5bGVBcHBseVByb3BlcnR5JiBDU1NTdHlsZUFwcGx5UHJvcGVy dHk6OnNoYXJlZENTU1N0eWxlQXBwbHlQcm9wZXJ0eSgpCiB7CiAgICAgREVGSU5FX1NUQVRJQ19M T0NBTChDU1NTdHlsZUFwcGx5UHJvcGVydHksIGNzc1N0eWxlQXBwbHlQcm9wZXJ0eUluc3RhbmNl LCAoKSk7CkBAIC0xMDg5LDYgKzExNDUsNyBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0 eWxlQXBwbHlQcm9wCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0V3Jh cFBhZGRpbmcsIEFwcGx5UHJvcGVydHlMZW5ndGg8JlJlbmRlclN0eWxlOjp3cmFwUGFkZGluZywg JlJlbmRlclN0eWxlOjpzZXRXcmFwUGFkZGluZywgJlJlbmRlclN0eWxlOjppbml0aWFsV3JhcFBh ZGRpbmc+OjpjcmVhdGVIYW5kbGVyKCkpOwogCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1By b3BlcnR5WkluZGV4LCBBcHBseVByb3BlcnR5QXV0bzxpbnQsICZSZW5kZXJTdHlsZTo6ekluZGV4 LCAmUmVuZGVyU3R5bGU6OnNldFpJbmRleCwgJlJlbmRlclN0eWxlOjpoYXNBdXRvWkluZGV4LCAm UmVuZGVyU3R5bGU6OnNldEhhc0F1dG9aSW5kZXg+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNl dFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVpvb20sIEFwcGx5UHJvcGVydHlab29tOjpjcmVh dGVIYW5kbGVyKCkpOwogfQogCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAJKHJldmlzaW9uIDEwMDg3MikKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzA3NywzMyArMzA3Nyw2IEBAIHZvaWQg Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgbV9zdHlsZS0+c2V0 VGV4dERlY29yYXRpb24odCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0KLSAgICBjYXNlIENT U1Byb3BlcnR5Wm9vbToKLSAgICB7Ci0gICAgICAgIC8vIFJlc2V0IHRoZSB6b29tIGluIGVmZmVj dCBiZWZvcmUgd2UgZG8gYW55dGhpbmcuICBUaGlzIGFsbG93cyB0aGUgc2V0Wm9vbSBtZXRob2Qg dG8gYWNjdXJhdGVseSBjb21wdXRlIGEgbmV3Ci0gICAgICAgIC8vIHpvb20gaW4gZWZmZWN0Lgot ICAgICAgICBzZXRFZmZlY3RpdmVab29tKG1fcGFyZW50U3R5bGUgPyBtX3BhcmVudFN0eWxlLT5l ZmZlY3RpdmVab29tKCkgOiBSZW5kZXJTdHlsZTo6aW5pdGlhbFpvb20oKSk7Ci0KLSAgICAgICAg aWYgKGlzSW5oZXJpdCkKLSAgICAgICAgICAgIHNldFpvb20obV9wYXJlbnRTdHlsZS0+em9vbSgp KTsKLSAgICAgICAgZWxzZSBpZiAoaXNJbml0aWFsIHx8IHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVu dCgpID09IENTU1ZhbHVlTm9ybWFsKQotICAgICAgICAgICAgc2V0Wm9vbShSZW5kZXJTdHlsZTo6 aW5pdGlhbFpvb20oKSk7Ci0gICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVu dCgpID09IENTU1ZhbHVlUmVzZXQpIHsKLSAgICAgICAgICAgIHNldEVmZmVjdGl2ZVpvb20oUmVu ZGVyU3R5bGU6OmluaXRpYWxab29tKCkpOwotICAgICAgICAgICAgc2V0Wm9vbShSZW5kZXJTdHls ZTo6aW5pdGlhbFpvb20oKSk7Ci0gICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmdl dElkZW50KCkgPT0gQ1NTVmFsdWVEb2N1bWVudCkgewotICAgICAgICAgICAgZmxvYXQgZG9jWm9v bSA9IG1fY2hlY2tlci5kb2N1bWVudCgpLT5yZW5kZXJlcigpLT5zdHlsZSgpLT56b29tKCk7Ci0g ICAgICAgICAgICBzZXRFZmZlY3RpdmVab29tKGRvY1pvb20pOwotICAgICAgICAgICAgc2V0Wm9v bShkb2Nab29tKTsKLSAgICAgICAgfSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+cHJpbWl0aXZl VHlwZSgpID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSkgewotICAgICAgICAg ICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRGbG9hdFZhbHVlKCkpCi0gICAgICAgICAgICAgICAg c2V0Wm9vbShwcmltaXRpdmVWYWx1ZS0+Z2V0RmxvYXRWYWx1ZSgpIC8gMTAwLjBmKTsKLSAgICAg ICAgfSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+cHJpbWl0aXZlVHlwZSgpID09IENTU1ByaW1p dGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSB7Ci0gICAgICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUt PmdldEZsb2F0VmFsdWUoKSkKLSAgICAgICAgICAgICAgICBzZXRab29tKHByaW1pdGl2ZVZhbHVl LT5nZXRGbG9hdFZhbHVlKCkpOwotICAgICAgICB9Ci0gICAgICAgIHJldHVybjsKLSAgICB9CiAv LyBzaG9ydGhhbmQgcHJvcGVydGllcwogICAgIGNhc2UgQ1NTUHJvcGVydHlCYWNrZ3JvdW5kOgog ICAgICAgICBpZiAoaXNJbml0aWFsKSB7CkBAIC00MDYwLDYgKzQwMzMsNyBAQCB2b2lkIENTU1N0 eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dFdyYXBNYXJnaW46CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFdyYXBQYWRkaW5nOgogICAg IGNhc2UgQ1NTUHJvcGVydHlaSW5kZXg6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVpvb206CiAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm47CiAjaWYgRU5BQkxFKFNW RykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAkocmV2aXNpb24gMTAw ODcyKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAkod29ya2luZyBj b3B5KQpAQCAtMTE4LDYgKzExOCw3IEBAIHB1YmxpYzoKICAgICBSZW5kZXJTdHlsZSogcGFyZW50 U3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudFN0eWxlOyB9CiAgICAgUmVuZGVyU3R5bGUq IHJvb3RFbGVtZW50U3R5bGUoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RFbGVtZW50U3R5bGU7IH0K ICAgICBFbGVtZW50KiBlbGVtZW50KCkgY29uc3QgeyByZXR1cm4gbV9lbGVtZW50OyB9CisgICAg RG9jdW1lbnQqIGRvY3VtZW50KCkgY29uc3QgeyByZXR1cm4gbV9jaGVja2VyLmRvY3VtZW50KCk7 IH0KICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uKCkgeyByZXR1cm4gc3R5bGUo KS0+Zm9udERlc2NyaXB0aW9uKCk7IH0KICAgICBGb250RGVzY3JpcHRpb24gcGFyZW50Rm9udERl c2NyaXB0aW9uKCkge3JldHVybiBwYXJlbnRTdHlsZSgpLT5mb250RGVzY3JpcHRpb24oKTsgfQog ICAgIHZvaWQgc2V0Rm9udERlc2NyaXB0aW9uKEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRp b24pIHsgbV9mb250RGlydHkgfD0gc3R5bGUoKS0+c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNj cmlwdGlvbik7IH0K 117066 2011-11-29 16:09:55 -0800 2011-11-30 05:48:41 -0800 Patch bug-72840-20111130110952.patch text/plain 7532 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTQyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDExLTExLTI5ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IFpvb20gUHJvcGVydHkgaW4gQ1NTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyODQwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBmYXN0L2Nzcy8qem9v bSouaHRtbAorCisgICAgICAgICogY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6CisgICAg ICAgIEFkZCBuZXcgaGFuZGxlciBmb3Igem9vbSBwcm9wZXJ0eSAoYmFzZWQgb24gZXhpc3Rpbmcg Y29kZSBmcm9tIENTU1N0eWxlU2VsZWN0b3IuY3BwKQorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQ cm9wZXJ0eVpvb206OnJlc2V0RWZmZWN0aXZlWm9vbSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBs eVByb3BlcnR5Wm9vbTo6YXBwbHlJbmhlcml0VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6QXBw bHlQcm9wZXJ0eVpvb206OmFwcGx5SW5pdGlhbFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFw cGx5UHJvcGVydHlab29tOjphcHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlab29tOjpjcmVhdGVIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlQXBw bHlQcm9wZXJ0eTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIFJlbW92ZSBleGlzdGluZyBpbXBsZW1lbnRhdGlvbi4K KyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOgorICAg ICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHls ZVNlbGVjdG9yOjpkb2N1bWVudCk6CisgICAgICAgIEFkZCBnZXR0ZXIgZm9yIERvY3VtZW50Lgor CiAyMDExLTExLTI5ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAg QWxsb3cgV2ViQ29yZSB0byBkZXNjcmliZSB0eXBlZCBhcnJheXMgdG8gSlNDCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkocmV2aXNpb24gMTAx NDI2KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2lu Y2x1ZGUgIkVsZW1lbnQuaCIKICNpbmNsdWRlICJQYWlyLmgiCisjaW5jbHVkZSAiUmVuZGVyT2Jq ZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyU3R5bGUuaCIKICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0 cmFzLmg+CiAjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CkBAIC0xMTIwLDYgKzExMjEsNTkg QEAgcHVibGljOgogICAgIH0KIH07CiAKK2NsYXNzIEFwcGx5UHJvcGVydHlab29tIHsKK3ByaXZh dGU6CisgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZlY3RpdmVab29tKENTU1N0eWxlU2VsZWN0b3Iq IHNlbGVjdG9yKQorICAgIHsKKyAgICAgICAgLy8gUmVzZXQgdGhlIHpvb20gaW4gZWZmZWN0LiBU aGlzIGFsbG93cyB0aGUgc2V0Wm9vbSBtZXRob2QgdG8gYWNjdXJhdGVseSBjb21wdXRlIGEgbmV3 IHpvb20gaW4gZWZmZWN0LgorICAgICAgICBzZWxlY3Rvci0+c2V0RWZmZWN0aXZlWm9vbShzZWxl Y3Rvci0+cGFyZW50U3R5bGUoKSA/IHNlbGVjdG9yLT5wYXJlbnRTdHlsZSgpLT5lZmZlY3RpdmVa b29tKCkgOiBSZW5kZXJTdHlsZTo6aW5pdGlhbFpvb20oKSk7CisgICAgfQorCitwdWJsaWM6Cisg ICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0VmFsdWUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0 b3IpCisgICAgeworICAgICAgICByZXNldEVmZmVjdGl2ZVpvb20oc2VsZWN0b3IpOworICAgICAg ICBzZWxlY3Rvci0+c2V0Wm9vbShzZWxlY3Rvci0+cGFyZW50U3R5bGUoKS0+em9vbSgpKTsKKyAg ICB9CisKKyAgICBzdGF0aWMgdm9pZCBhcHBseUluaXRpYWxWYWx1ZShDU1NTdHlsZVNlbGVjdG9y KiBzZWxlY3RvcikKKyAgICB7CisgICAgICAgIHJlc2V0RWZmZWN0aXZlWm9vbShzZWxlY3Rvcik7 CisgICAgICAgIHNlbGVjdG9yLT5zZXRab29tKFJlbmRlclN0eWxlOjppbml0aWFsWm9vbSgpKTsK KyAgICB9CisKKyAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNl bGVjdG9yLCBDU1NWYWx1ZSogdmFsdWUpCisgICAgeworICAgICAgICBBU1NFUlQodmFsdWUtPmlz UHJpbWl0aXZlVmFsdWUoKSk7CisgICAgICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVW YWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odmFsdWUpOworCisgICAgICAg IGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZU5vcm1hbCkgeworICAg ICAgICAgICAgcmVzZXRFZmZlY3RpdmVab29tKHNlbGVjdG9yKTsKKyAgICAgICAgICAgIHNlbGVj dG9yLT5zZXRab29tKFJlbmRlclN0eWxlOjppbml0aWFsWm9vbSgpKTsKKyAgICAgICAgfSBlbHNl IGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZVJlc2V0KSB7CisgICAg ICAgICAgICBzZWxlY3Rvci0+c2V0RWZmZWN0aXZlWm9vbShSZW5kZXJTdHlsZTo6aW5pdGlhbFpv b20oKSk7CisgICAgICAgICAgICBzZWxlY3Rvci0+c2V0Wm9vbShSZW5kZXJTdHlsZTo6aW5pdGlh bFpvb20oKSk7CisgICAgICAgIH0gZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElkZW50KCkg PT0gQ1NTVmFsdWVEb2N1bWVudCkgeworICAgICAgICAgICAgZmxvYXQgZG9jWm9vbSA9IHNlbGVj dG9yLT5kb2N1bWVudCgpLT5yZW5kZXJlcigpLT5zdHlsZSgpLT56b29tKCk7CisgICAgICAgICAg ICBzZWxlY3Rvci0+c2V0RWZmZWN0aXZlWm9vbShkb2Nab29tKTsKKyAgICAgICAgICAgIHNlbGVj dG9yLT5zZXRab29tKGRvY1pvb20pOworICAgICAgICB9IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVl LT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKSB7 CisgICAgICAgICAgICByZXNldEVmZmVjdGl2ZVpvb20oc2VsZWN0b3IpOworICAgICAgICAgICAg aWYgKGZsb2F0IHBlcmNlbnQgPSBwcmltaXRpdmVWYWx1ZS0+Z2V0RmxvYXRWYWx1ZSgpKQorICAg ICAgICAgICAgICAgIHNlbGVjdG9yLT5zZXRab29tKHBlcmNlbnQgLyAxMDAuMGYpOworICAgICAg ICB9IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJpbWl0 aXZlVmFsdWU6OkNTU19OVU1CRVIpIHsKKyAgICAgICAgICAgIHJlc2V0RWZmZWN0aXZlWm9vbShz ZWxlY3Rvcik7CisgICAgICAgICAgICBpZiAoZmxvYXQgbnVtYmVyID0gcHJpbWl0aXZlVmFsdWUt PmdldEZsb2F0VmFsdWUoKSkKKyAgICAgICAgICAgICAgICBzZWxlY3Rvci0+c2V0Wm9vbShudW1i ZXIpOworICAgICAgICB9CisgICAgfQorCisgICAgc3RhdGljIFByb3BlcnR5SGFuZGxlciBjcmVh dGVIYW5kbGVyKCkKKyAgICB7CisgICAgICAgIHJldHVybiBQcm9wZXJ0eUhhbmRsZXIoJmFwcGx5 SW5oZXJpdFZhbHVlLCAmYXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsKKyAgICB9Cit9 OworCiBjb25zdCBDU1NTdHlsZUFwcGx5UHJvcGVydHkmIENTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6 c2hhcmVkQ1NTU3R5bGVBcHBseVByb3BlcnR5KCkKIHsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FM KENTU1N0eWxlQXBwbHlQcm9wZXJ0eSwgY3NzU3R5bGVBcHBseVByb3BlcnR5SW5zdGFuY2UsICgp KTsKQEAgLTEzNjcsNiArMTQyMSw3IEBAIENTU1N0eWxlQXBwbHlQcm9wZXJ0eTo6Q1NTU3R5bGVB cHBseVByb3AKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRXcmFwLCBB cHBseVByb3BlcnR5RXhwYW5kaW5nPFN1cHByZXNzVmFsdWUsIENTU1Byb3BlcnR5V2Via2l0V3Jh cEZsb3csIENTU1Byb3BlcnR5V2Via2l0V3JhcE1hcmdpbiwgQ1NTUHJvcGVydHlXZWJraXRXcmFw UGFkZGluZz46OmNyZWF0ZUhhbmRsZXIoKSk7CiAKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NT UHJvcGVydHlaSW5kZXgsIEFwcGx5UHJvcGVydHlBdXRvPGludCwgJlJlbmRlclN0eWxlOjp6SW5k ZXgsICZSZW5kZXJTdHlsZTo6c2V0WkluZGV4LCAmUmVuZGVyU3R5bGU6Omhhc0F1dG9aSW5kZXgs ICZSZW5kZXJTdHlsZTo6c2V0SGFzQXV0b1pJbmRleD46OmNyZWF0ZUhhbmRsZXIoKSk7CisgICAg c2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Wm9vbSwgQXBwbHlQcm9wZXJ0eVpvb206OmNy ZWF0ZUhhbmRsZXIoKSk7CiB9CiAKIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAkocmV2aXNpb24gMTAxNDI2KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDA5LDMzICszMDA5LDYgQEAgdm9p ZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICBtX3N0eWxlLT5z ZXRUZXh0RGVjb3JhdGlvbih0KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLQotICAgIGNhc2Ug Q1NTUHJvcGVydHlab29tOgotICAgIHsKLSAgICAgICAgLy8gUmVzZXQgdGhlIHpvb20gaW4gZWZm ZWN0IGJlZm9yZSB3ZSBkbyBhbnl0aGluZy4gIFRoaXMgYWxsb3dzIHRoZSBzZXRab29tIG1ldGhv ZCB0byBhY2N1cmF0ZWx5IGNvbXB1dGUgYSBuZXcKLSAgICAgICAgLy8gem9vbSBpbiBlZmZlY3Qu Ci0gICAgICAgIHNldEVmZmVjdGl2ZVpvb20obV9wYXJlbnRTdHlsZSA/IG1fcGFyZW50U3R5bGUt PmVmZmVjdGl2ZVpvb20oKSA6IFJlbmRlclN0eWxlOjppbml0aWFsWm9vbSgpKTsKLQotICAgICAg ICBpZiAoaXNJbmhlcml0KQotICAgICAgICAgICAgc2V0Wm9vbShtX3BhcmVudFN0eWxlLT56b29t KCkpOwotICAgICAgICBlbHNlIGlmIChpc0luaXRpYWwgfHwgcHJpbWl0aXZlVmFsdWUtPmdldElk ZW50KCkgPT0gQ1NTVmFsdWVOb3JtYWwpCi0gICAgICAgICAgICBzZXRab29tKFJlbmRlclN0eWxl Ojppbml0aWFsWm9vbSgpKTsKLSAgICAgICAgZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmdldElk ZW50KCkgPT0gQ1NTVmFsdWVSZXNldCkgewotICAgICAgICAgICAgc2V0RWZmZWN0aXZlWm9vbShS ZW5kZXJTdHlsZTo6aW5pdGlhbFpvb20oKSk7Ci0gICAgICAgICAgICBzZXRab29tKFJlbmRlclN0 eWxlOjppbml0aWFsWm9vbSgpKTsKLSAgICAgICAgfSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+ Z2V0SWRlbnQoKSA9PSBDU1NWYWx1ZURvY3VtZW50KSB7Ci0gICAgICAgICAgICBmbG9hdCBkb2Na b29tID0gbV9jaGVja2VyLmRvY3VtZW50KCktPnJlbmRlcmVyKCktPnN0eWxlKCktPnpvb20oKTsK LSAgICAgICAgICAgIHNldEVmZmVjdGl2ZVpvb20oZG9jWm9vbSk7Ci0gICAgICAgICAgICBzZXRa b29tKGRvY1pvb20pOwotICAgICAgICB9IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5wcmltaXRp dmVUeXBlKCkgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKSB7Ci0gICAgICAg ICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmdldEZsb2F0VmFsdWUoKSkKLSAgICAgICAgICAgICAg ICBzZXRab29tKHByaW1pdGl2ZVZhbHVlLT5nZXRGbG9hdFZhbHVlKCkgLyAxMDAuMGYpOwotICAg ICAgICB9IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5wcmltaXRpdmVUeXBlKCkgPT0gQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpIHsKLSAgICAgICAgICAgIGlmIChwcmltaXRpdmVWYWx1 ZS0+Z2V0RmxvYXRWYWx1ZSgpKQotICAgICAgICAgICAgICAgIHNldFpvb20ocHJpbWl0aXZlVmFs dWUtPmdldEZsb2F0VmFsdWUoKSk7Ci0gICAgICAgIH0KLSAgICAgICAgcmV0dXJuOwotICAgIH0K IC8vIHNob3J0aGFuZCBwcm9wZXJ0aWVzCiAgICAgY2FzZSBDU1NQcm9wZXJ0eUJhY2tncm91bmQ6 CiAgICAgICAgIGlmIChpc0luaXRpYWwpIHsKQEAgLTM5NDMsNiArMzkxNiw3IEBAIHZvaWQgQ1NT U3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1Byb3BlcnR5V2Vi a2l0V3JhcFRocm91Z2g6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFdyYXA6CiAgICAgY2Fz ZSBDU1NQcm9wZXJ0eVpJbmRleDoKKyAgICBjYXNlIENTU1Byb3BlcnR5Wm9vbToKICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsKICNpZiBFTkFCTEUoU1ZHKQpJ bmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCShyZXZpc2lvbiAxMDE0MjYp CisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCSh3b3JraW5nIGNvcHkp CkBAIC0xMTgsNiArMTE4LDcgQEAgcHVibGljOgogICAgIFJlbmRlclN0eWxlKiBwYXJlbnRTdHls ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50U3R5bGU7IH0KICAgICBSZW5kZXJTdHlsZSogcm9v dEVsZW1lbnRTdHlsZSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdEVsZW1lbnRTdHlsZTsgfQogICAg IEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2VsZW1lbnQ7IH0KKyAgICBEb2N1 bWVudCogZG9jdW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2NoZWNrZXIuZG9jdW1lbnQoKTsgfQog ICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24oKSB7IHJldHVybiBzdHlsZSgpLT5m b250RGVzY3JpcHRpb24oKTsgfQogICAgIEZvbnREZXNjcmlwdGlvbiBwYXJlbnRGb250RGVzY3Jp cHRpb24oKSB7cmV0dXJuIHBhcmVudFN0eWxlKCktPmZvbnREZXNjcmlwdGlvbigpOyB9CiAgICAg dm9pZCBzZXRGb250RGVzY3JpcHRpb24oRm9udERlc2NyaXB0aW9uIGZvbnREZXNjcmlwdGlvbikg eyBtX2ZvbnREaXJ0eSB8PSBzdHlsZSgpLT5zZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0 aW9uKTsgfQo=