85222 2012-04-30 11:57:32 -0700 [gtk, qt, chromium, win] Fix usage of LayoutUnits and rounding in platform code 2012-04-30 14:49:03 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric leviw oldest_to_newest 612826 0 eae 2012-04-30 11:57:32 -0700 There are a handful of places left in the platform code that needs to be updated to use the right unit. 612866 1 139502 eae 2012-04-30 12:18:15 -0700 Created attachment 139502 Patch 612869 2 139502 eric 2012-04-30 12:22:07 -0700 Comment on attachment 139502 Patch LGTM. 612970 3 eae 2012-04-30 14:44:25 -0700 Committed r115672: <http://trac.webkit.org/changeset/115672> 139502 2012-04-30 12:18:15 -0700 2012-04-30 14:49:03 -0700 Patch bug-85222-20120430121814.patch text/plain 11478 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTY1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTMwICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBbZ3RrLCBxdCwgY2hyb21pdW0s IHdpbl0gRml4IHVzYWdlIG9mIExheW91dFVuaXRzIGFuZCByb3VuZGluZyBpbiBwbGF0Zm9ybSBj b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTIy MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 ZSBwbGF0Zm9ybSBjb2RlIHRvIHVzZSB0aGUgcGl4ZWwgc25hcHBlZCB2YWx1ZXMgZm9yIHBhaW50 aW5nIHJlY3RzCisgICAgICAgIHRvIGxpbmUgdXAgd2l0aCBkZXZpY2UgcGl4ZWxzIGFuZCBjaGFu Z2UgcGxhdGZvcm0gc3BlY2lmaWMgaGl0IHRlc3RpbmcKKyAgICAgICAgY29kZSB0byB1c2Ugcm91 bmRlZFBvaW50IGFzIGhpdCB0ZXN0aW5nIGlzIHN0aWxsIG1vc3RseSBkb25lIG9uIGludGVnZXIK KyAgICAgICAgYm91bmRzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gY2hhbmdlIGluIGZ1 bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lUXQ6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJU cmFjayk6CisgICAgICAgICogcGxhdGZvcm0vd2luL1BvcHVwTWVudVdpbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQb3B1cE1lbnVXaW46OnBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVGhlbWVDaHJvbWl1bVNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVD aHJvbWl1bVNraWE6OnBhaW50U2VhcmNoRmllbGRDYW5jZWxCdXR0b24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVDaHJvbWl1bVNraWE6OnBhaW50U2VhcmNoRmllbGRSZXN1bHRzRGVj b3JhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVtU2tpYTo6cGFp bnRTZWFyY2hGaWVsZFJlc3VsdHNCdXR0b24pOgorCiAyMDEyLTA0LTMwICBOYXRlIENoYXBpbiAg PGphcGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTW92ZSBtb3JlIG9mIGNvbW1pdHRpbmcg YW5kIHN0YXJ0aW5nIHRvIHdyaXRlIGEgRG9jdW1lbnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3F0L1JlbmRlclRoZW1lUXQuY3BwCShyZXZpc2lvbiAxMTU2NDcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9SZW5kZXJUaGVtZVF0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzM3LDcgKzczNyw3IEBAIGJvb2wgUmVuZGVyVGhlbWVRdDo6cGFpbnRNZWRpYVZvbHVtZVNs aWQKICAgICBpZiAoIW8tPmlzU2xpZGVyKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IEludFJlY3QgYiA9IHRvUmVuZGVyQm94KG8pLT5jb250ZW50Qm94UmVjdCgpOworICAgIEludFJl Y3QgYiA9IHBpeGVsU25hcHBlZEludFJlY3QodG9SZW5kZXJCb3gobyktPmNvbnRlbnRCb3hSZWN0 KCkpOwogCiAgICAgLy8gUG9zaXRpb24gdGhlIG91dGVyIHJlY3RhbmdsZQogICAgIGludCB0b3Ag PSByLnkoKSArIGIueSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1BvcHVw TWVudVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1Bv cHVwTWVudVdpbi5jcHAJKHJldmlzaW9uIDExNTY0NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3dpbi9Qb3B1cE1lbnVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NTUsNyArNjU1LDcg QEAgdm9pZCBQb3B1cE1lbnVXaW46OnBhaW50KGNvbnN0IEludFJlY3QmIAogICAgICAgICBpZiAo aXRlbVN0eWxlLmlzVmlzaWJsZSgpKSB7CiAgICAgICAgICAgICBpbnQgdGV4dFggPSBtYXg8aW50 PigwLCBjbGllbnQoKS0+Y2xpZW50UGFkZGluZ0xlZnQoKSAtIGNsaWVudCgpLT5jbGllbnRJbnNl dExlZnQoKSk7CiAgICAgICAgICAgICBpZiAoUmVuZGVyVGhlbWU6OmRlZmF1bHRUaGVtZSgpLT5w b3B1cE9wdGlvblN1cHBvcnRzVGV4dEluZGVudCgpICYmIGl0ZW1TdHlsZS50ZXh0RGlyZWN0aW9u KCkgPT0gTFRSKQotICAgICAgICAgICAgICAgIHRleHRYICs9IG1pbmltdW1WYWx1ZUZvckxlbmd0 aChpdGVtU3R5bGUudGV4dEluZGVudCgpLCBpdGVtUmVjdC53aWR0aCgpKTsKKyAgICAgICAgICAg ICAgICB0ZXh0WCArPSBtaW5pbXVtSW50VmFsdWVGb3JMZW5ndGgoaXRlbVN0eWxlLnRleHRJbmRl bnQoKSwgaXRlbVJlY3Qud2lkdGgoKSk7CiAgICAgICAgICAgICBpbnQgdGV4dFkgPSBpdGVtUmVj dC55KCkgKyBpdGVtRm9udC5mb250TWV0cmljcygpLmFzY2VudCgpICsgKGl0ZW1SZWN0LmhlaWdo dCgpIC0gaXRlbUZvbnQuZm9udE1ldHJpY3MoKS5oZWlnaHQoKSkgLyAyOwogICAgICAgICAgICAg Y29udGV4dC5kcmF3QmlkaVRleHQoaXRlbUZvbnQsIHRleHRSdW4sIEludFBvaW50KHRleHRYLCB0 ZXh0WSkpOwogICAgICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVDaHJvbWl1bVNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHAJKHJldmlzaW9uIDExNTY0NykKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtU2tpYS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI4Myw3ICsyODMsNyBAQCBib29sIFJlbmRlclRoZW1lQ2hyb21pdW1Ta2lh OjpwYWludFNlYXJjCiAgICAgTGF5b3V0UmVjdCBpbnB1dENvbnRlbnRCb3ggPSBpbnB1dFJlbmRl ckJveC0+Y29udGVudEJveFJlY3QoKTsKIAogICAgIC8vIE1ha2Ugc3VyZSB0aGUgc2NhbGVkIGJ1 dHRvbiBzdGF5cyBzcXVhcmUgYW5kIHdpbGwgZml0IGluIGl0cyBwYXJlbnQncyBib3guCi0gICAg TGF5b3V0VW5pdCBjYW5jZWxCdXR0b25TaXplID0gc3RkOjptaW4oaW5wdXRDb250ZW50Qm94Lndp ZHRoKCksIHN0ZDo6bWluKGlucHV0Q29udGVudEJveC5oZWlnaHQoKSwgci5oZWlnaHQoKSkpOwor ICAgIExheW91dFVuaXQgY2FuY2VsQnV0dG9uU2l6ZSA9IHN0ZDo6bWluKGlucHV0Q29udGVudEJv eC53aWR0aCgpLCBzdGQ6Om1pbjxMYXlvdXRVbml0PihpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCks IHIuaGVpZ2h0KCkpKTsKICAgICAvLyBDYWxjdWxhdGUgY2FuY2VsIGJ1dHRvbidzIGNvb3JkaW5h dGVzIHJlbGF0aXZlIHRvIHRoZSBpbnB1dCBlbGVtZW50LgogICAgIC8vIENlbnRlciB0aGUgYnV0 dG9uIHZlcnRpY2FsbHkuICBSb3VuZCB1cCB0aG91Z2gsIHNvIGlmIGl0IGhhcyB0byBiZSBvbmUg cGl4ZWwgb2ZmLWNlbnRlciwgaXQgd2lsbAogICAgIC8vIGJlIG9uZSBwaXhlbCBjbG9zZXIgdG8g dGhlIGJvdHRvbSBvZiB0aGUgZmllbGQuICBUaGlzIHRlbmRzIHRvIGxvb2sgYmV0dGVyIHdpdGgg dGhlIHRleHQuCkBAIC0zMjYsNyArMzI2LDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtU2tp YTo6cGFpbnRTZWFyYwogICAgIExheW91dFJlY3QgaW5wdXRDb250ZW50Qm94ID0gaW5wdXRSZW5k ZXJCb3gtPmNvbnRlbnRCb3hSZWN0KCk7CiAKICAgICAvLyBNYWtlIHN1cmUgdGhlIHNjYWxlZCBk ZWNvcmF0aW9uIHN0YXlzIHNxdWFyZSBhbmQgd2lsbCBmaXQgaW4gaXRzIHBhcmVudCdzIGJveC4K LSAgICBMYXlvdXRVbml0IG1hZ25pZmllclNpemUgPSBzdGQ6Om1pbihpbnB1dENvbnRlbnRCb3gu d2lkdGgoKSwgc3RkOjptaW4oaW5wdXRDb250ZW50Qm94LmhlaWdodCgpLCByLmhlaWdodCgpKSk7 CisgICAgTGF5b3V0VW5pdCBtYWduaWZpZXJTaXplID0gc3RkOjptaW4oaW5wdXRDb250ZW50Qm94 LndpZHRoKCksIHN0ZDo6bWluPExheW91dFVuaXQ+KGlucHV0Q29udGVudEJveC5oZWlnaHQoKSwg ci5oZWlnaHQoKSkpOwogICAgIC8vIENhbGN1bGF0ZSBkZWNvcmF0aW9uJ3MgY29vcmRpbmF0ZXMg cmVsYXRpdmUgdG8gdGhlIGlucHV0IGVsZW1lbnQuCiAgICAgLy8gQ2VudGVyIHRoZSBkZWNvcmF0 aW9uIHZlcnRpY2FsbHkuICBSb3VuZCB1cCB0aG91Z2gsIHNvIGlmIGl0IGhhcyB0byBiZSBvbmUg cGl4ZWwgb2ZmLWNlbnRlciwgaXQgd2lsbAogICAgIC8vIGJlIG9uZSBwaXhlbCBjbG9zZXIgdG8g dGhlIGJvdHRvbSBvZiB0aGUgZmllbGQuICBUaGlzIHRlbmRzIHRvIGxvb2sgYmV0dGVyIHdpdGgg dGhlIHRleHQuCkBAIC0zNjEsNyArMzYxLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUNocm9taXVtU2tp YTo6cGFpbnRTZWFyYwogICAgIExheW91dFJlY3QgaW5wdXRDb250ZW50Qm94ID0gaW5wdXRSZW5k ZXJCb3gtPmNvbnRlbnRCb3hSZWN0KCk7CiAKICAgICAvLyBNYWtlIHN1cmUgdGhlIHNjYWxlZCBk ZWNvcmF0aW9uIHdpbGwgZml0IGluIGl0cyBwYXJlbnQncyBib3guCi0gICAgTGF5b3V0VW5pdCBt YWduaWZpZXJIZWlnaHQgPSBzdGQ6Om1pbihpbnB1dENvbnRlbnRCb3guaGVpZ2h0KCksIHIuaGVp Z2h0KCkpOworICAgIExheW91dFVuaXQgbWFnbmlmaWVySGVpZ2h0ID0gc3RkOjptaW48TGF5b3V0 VW5pdD4oaW5wdXRDb250ZW50Qm94LmhlaWdodCgpLCByLmhlaWdodCgpKTsKICAgICBMYXlvdXRV bml0IG1hZ25pZmllcldpZHRoID0gc3RkOjptaW48TGF5b3V0VW5pdD4oaW5wdXRDb250ZW50Qm94 LndpZHRoKCksIG1hZ25pZmllckhlaWdodCAqIGRlZmF1bHRTZWFyY2hGaWVsZFJlc3VsdHNCdXR0 b25XaWR0aCAvIGRlZmF1bHRTZWFyY2hGaWVsZFJlc3VsdHNEZWNvcmF0aW9uU2l6ZSk7CiAgICAg TGF5b3V0UmVjdCBtYWduaWZpZXJSZWN0KG1hZ25pZmllck9iamVjdC0+b2Zmc2V0RnJvbUFuY2Vz dG9yQ29udGFpbmVyKGlucHV0UmVuZGVyQm94KS53aWR0aCgpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBpbnB1dENvbnRlbnRCb3gueSgpICsgKGlucHV0Q29udGVudEJveC5oZWlnaHQo KSAtIG1hZ25pZmllckhlaWdodCArIDEpIC8gMiwKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEx NTY1NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDEyLTA0LTMwICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4K KworICAgICAgICBbZ3RrLCBxdCwgY2hyb21pdW0sIHdpbl0gRml4IHVzYWdlIG9mIExheW91dFVu aXRzIGFuZCByb3VuZGluZyBpbiBwbGF0Zm9ybSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBwbGF0Zm9ybSBjb2RlIHRvIHVzZSB0aGUg cGl4ZWwgc25hcHBlZCB2YWx1ZXMgZm9yIHBhaW50aW5nIHJlY3RzCisgICAgICAgIHRvIGxpbmUg dXAgd2l0aCBkZXZpY2UgcGl4ZWxzIGFuZCBjaGFuZ2UgcGxhdGZvcm0gc3BlY2lmaWMgaGl0IHRl c3RpbmcKKyAgICAgICAgY29kZSB0byB1c2Ugcm91bmRlZFBvaW50IGFzIGhpdCB0ZXN0aW5nIGlz IHN0aWxsIG1vc3RseSBkb25lIG9uIGludGVnZXIKKyAgICAgICAgYm91bmRzLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC93aW4vV2ViUG9wdXBNZW51V2luLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUG9wdXBNZW51OjpzZXRVcFBsYXRmb3JtRGF0YSk6CisKIDIwMTIt MDQtMzAgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgVmFs aWRhdGUga2V5cHJlc3MgY29tbWFuZCBuYW1lcwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC93aW4vV2ViUG9wdXBNZW51V2luLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L3dpbi9XZWJQb3B1cE1l bnVXaW4uY3BwCShyZXZpc2lvbiAxMTU2NDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L3dpbi9XZWJQb3B1cE1lbnVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMzYsNyArMTM2LDcgQEAgdm9pZCBXZWJQb3B1cE1lbnU6OnNldFVwUGxhdGZvcm1EYXRhKGNv bgogICAgICAgICBpZiAoaXRlbVN0eWxlLmlzVmlzaWJsZSgpKSB7CiAgICAgICAgICAgICBpbnQg dGV4dFggPSBzdGQ6Om1heCgwLCBkYXRhLm1fY2xpZW50UGFkZGluZ0xlZnQgLSBkYXRhLm1fY2xp ZW50SW5zZXRMZWZ0KTsKICAgICAgICAgICAgIGlmIChSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1l KCktPnBvcHVwT3B0aW9uU3VwcG9ydHNUZXh0SW5kZW50KCkgJiYgaXRlbVN0eWxlLnRleHREaXJl Y3Rpb24oKSA9PSBMVFIpCi0gICAgICAgICAgICAgICAgdGV4dFggKz0gbWluaW11bVZhbHVlRm9y TGVuZ3RoKGl0ZW1TdHlsZS50ZXh0SW5kZW50KCksIGl0ZW1SZWN0LndpZHRoKCkpOworICAgICAg ICAgICAgICAgIHRleHRYICs9IG1pbmltdW1JbnRWYWx1ZUZvckxlbmd0aChpdGVtU3R5bGUudGV4 dEluZGVudCgpLCBpdGVtUmVjdC53aWR0aCgpKTsKICAgICAgICAgICAgIGludCB0ZXh0WSA9IGl0 ZW1SZWN0LnkoKSArIGl0ZW1Gb250LmZvbnRNZXRyaWNzKCkuYXNjZW50KCkgKyAoaXRlbVJlY3Qu aGVpZ2h0KCkgLSBpdGVtRm9udC5mb250TWV0cmljcygpLmhlaWdodCgpKSAvIDI7CiAKICAgICAg ICAgICAgIG5vdFNlbGVjdGVkQmFja2luZ1N0b3JlQ29udGV4dC0+ZHJhd0JpZGlUZXh0KGl0ZW1G b250LCB0ZXh0UnVuLCBJbnRQb2ludCh0ZXh0WCwgdGV4dFkpKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQvZ3RrL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VM b2cJKHJldmlzaW9uIDExNTY1NCkKKysrIFNvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA0LTMwICBFbWlsIEEgRWtsdW5kICA8 ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBbZ3RrLCBxdCwgY2hyb21pdW0sIHdpbl0gRml4 IHVzYWdlIG9mIExheW91dFVuaXRzIGFuZCByb3VuZGluZyBpbiBwbGF0Zm9ybSBjb2RlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTIyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBwbGF0Zm9y bSBjb2RlIHRvIHVzZSB0aGUgcGl4ZWwgc25hcHBlZCB2YWx1ZXMgZm9yIHBhaW50aW5nIHJlY3Rz CisgICAgICAgIHRvIGxpbmUgdXAgd2l0aCBkZXZpY2UgcGl4ZWxzIGFuZCBjaGFuZ2UgcGxhdGZv cm0gc3BlY2lmaWMgaGl0IHRlc3RpbmcKKyAgICAgICAgY29kZSB0byB1c2Ugcm91bmRlZFBvaW50 IGFzIGhpdCB0ZXN0aW5nIGlzIHN0aWxsIG1vc3RseSBkb25lIG9uIGludGVnZXIKKyAgICAgICAg Ym91bmRzLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcDoK KyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50Ojptb3VzZURpZE1vdmVPdmVyRWxlbWVudCk6 CisgICAgICAgICogd2Via2l0L3dlYmtpdGhpdHRlc3RyZXN1bHQuY3BwOgorICAgICAgICAoV2Vi S2l0OjpraXQpOgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAg KGdldExvY2F0aW9uRm9yS2V5Ym9hcmRHZW5lcmF0ZWRDb250ZXh0TWVudSk6CisgICAgICAgICh3 ZWJraXRfd2ViX3ZpZXdfcXVlcnlfdG9vbHRpcCk6CisKIDIwMTItMDQtMzAgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFVwZGF0ZSBO RVdTIGFuZCBjb25maWd1cmUuYWMgZm9yIDEuOS4xIHJlbGVhc2UKSW5kZXg6IFNvdXJjZS9XZWJL aXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcAkocmV2 aXNpb24gMTE1NjQ3KQorKysgU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21l Q2xpZW50R3RrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzUwLDcgKzc1MCw3IEBAIHZvaWQgQ2hy b21lQ2xpZW50Ojptb3VzZURpZE1vdmVPdmVyRWxlbWUKICAgICBpZiAoTm9kZSogbm9kZSA9IGhp dC5pbm5lck5vblNoYXJlZE5vZGUoKSkgewogICAgICAgICBGcmFtZSogZnJhbWUgPSBub2RlLT5k b2N1bWVudCgpLT5mcmFtZSgpOwogICAgICAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZSA/IGZy YW1lLT52aWV3KCkgOiAwOwotICAgICAgICBtX3dlYlZpZXctPnByaXYtPnRvb2x0aXBBcmVhID0g dmlldyA/IHZpZXctPmNvbnRlbnRzVG9XaW5kb3cobm9kZS0+Z2V0UmVjdCgpKSA6IEludFJlY3Qo KTsKKyAgICAgICAgbV93ZWJWaWV3LT5wcml2LT50b29sdGlwQXJlYSA9IHZpZXcgPyB2aWV3LT5j b250ZW50c1RvV2luZG93KG5vZGUtPmdldFBpeGVsU25hcHBlZFJlY3QoKSkgOiBJbnRSZWN0KCk7 CiAgICAgfSBlbHNlCiAgICAgICAgIG1fd2ViVmlldy0+cHJpdi0+dG9vbHRpcEFyZWEgPSBJbnRS ZWN0KCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0aGl0dGVzdHJl c3VsdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGhp dHRlc3RyZXN1bHQuY3BwCShyZXZpc2lvbiAxMTU2NDcpCisrKyBTb3VyY2UvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0aGl0dGVzdHJlc3VsdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxOCw5ICsz MTgsOSBAQCBXZWJLaXRIaXRUZXN0UmVzdWx0KiBraXQoY29uc3QgV2ViQ29yZTo6CiAgICAgdGFy Z2V0RnJhbWUgPSByZXN1bHQudGFyZ2V0RnJhbWUoKTsKICAgICBpZiAodGFyZ2V0RnJhbWUgJiYg dGFyZ2V0RnJhbWUtPnZpZXcoKSkgewogICAgICAgICAvLyBDb252ZXJ0IGRvY3VtZW50IGNvb3Jk cyB0byB3aWRnZXQgY29vcmRzLgotICAgICAgICBwb2ludCA9IHRhcmdldEZyYW1lLT52aWV3KCkt PmNvbnRlbnRzVG9XaW5kb3cocmVzdWx0LnBvaW50KCkpOworICAgICAgICBwb2ludCA9IHRhcmdl dEZyYW1lLT52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3cocmVzdWx0LnJvdW5kZWRQb2ludCgpKTsK ICAgICB9IGVsc2UKLSAgICAgICAgcG9pbnQgPSByZXN1bHQucG9pbnQoKTsKKyAgICAgICAgcG9p bnQgPSByZXN1bHQucm91bmRlZFBvaW50KCk7CiAKICAgICByZXR1cm4gV0VCS0lUX0hJVF9URVNU X1JFU1VMVChnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfSElUX1RFU1RfUkVTVUxULAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibGluay11cmkiLCBsaW5r VVJJLmdldCgpLApJbmRleDogU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3 LmNwcAkocmV2aXNpb24gMTE1NjQ3KQorKysgU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MzMsNyArNDMzLDcgQEAgc3RhdGljIElu dFBvaW50IGdldExvY2F0aW9uRm9yS2V5Ym9hcmRHZQogICAgIGlmICghc2VsZWN0aW9uLT5zZWxl Y3Rpb24oKS5pc05vbk9ycGhhbmVkQ2FyZXRPclJhbmdlKCkKICAgICAgICAgIHx8IChzZWxlY3Rp b24tPnNlbGVjdGlvbigpLmlzQ2FyZXQoKSAmJiAhc2VsZWN0aW9uLT5zZWxlY3Rpb24oKS5pc0Nv bnRlbnRFZGl0YWJsZSgpKSkgewogICAgICAgICBpZiAoTm9kZSogZm9jdXNlZE5vZGUgPSBnZXRG b2N1c2VkTm9kZShmcmFtZSkpCi0gICAgICAgICAgICByZXR1cm4gZm9jdXNlZE5vZGUtPmdldFJl Y3QoKS5sb2NhdGlvbigpOworICAgICAgICAgICAgcmV0dXJuIGZvY3VzZWROb2RlLT5nZXRQaXhl bFNuYXBwZWRSZWN0KCkubG9jYXRpb24oKTsKIAogICAgICAgICAvLyBUaGVyZSB3YXMgbm8gc2Vs ZWN0aW9uIGFuZCBubyBmb2N1c2VkIG5vZGUsIHNvIGp1c3QgcHV0IHRoZSBjb250ZXh0CiAgICAg ICAgIC8vIG1lbnUgaW50byB0aGUgY29ybmVyIG9mIHRoZSB2aWV3LCBvZmZzZXQgc2xpZ2h0bHku CkBAIC0xNjA0LDcgKzE2MDQsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X3F1 ZXJ5X3RvCiAgICAgICAgICAgICAgICAgU3RyaW5nIHRpdGxlID0gc3RhdGljX2Nhc3Q8RWxlbWVu dCo+KHRpdGxlTm9kZSktPnRpdGxlKCk7CiAgICAgICAgICAgICAgICAgaWYgKCF0aXRsZS5pc0Vt cHR5KCkpIHsKICAgICAgICAgICAgICAgICAgICAgaWYgKEZyYW1lVmlldyogdmlldyA9IGNvcmVG cmFtZS0+dmlldygpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBHZGtSZWN0YW5nbGUgYXJl YSA9IHZpZXctPmNvbnRlbnRzVG9XaW5kb3cobm9kZS0+Z2V0UmVjdCgpKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIEdka1JlY3RhbmdsZSBhcmVhID0gdmlldy0+Y29udGVudHNUb1dpbmRvdyhu b2RlLT5nZXRQaXhlbFNuYXBwZWRSZWN0KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZ3Rr X3Rvb2x0aXBfc2V0X3RpcF9hcmVhKHRvb2x0aXAsICZhcmVhKTsKICAgICAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgICAgICBndGtfdG9vbHRpcF9zZXRfdGV4dCh0b29sdGlwLCB0 aXRsZS51dGY4KCkuZGF0YSgpKTsK