83054 2012-04-03 12:14:13 -0700 Convert RootInlineBox to LayoutUnits in preparation for turning on subpixel layout 2012-04-04 11:54:58 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric leviw simon.fraser webkit.review.bot oldest_to_newest 594727 0 eae 2012-04-03 12:14:13 -0700 Convert RenderFrameSet to LayoutUnits in preparation for turning on subpixel layout 594731 1 135387 eae 2012-04-03 12:18:57 -0700 Created attachment 135387 Patch 594733 2 eae 2012-04-03 12:19:58 -0700 Argh, RootInlineBox not RenderFrameSet! 594737 3 135391 eae 2012-04-03 12:22:02 -0700 Created attachment 135391 Patch 595135 4 135391 eric 2012-04-03 19:06:13 -0700 Comment on attachment 135391 Patch Seems reasonable. 595763 5 135391 webkit.review.bot 2012-04-04 11:54:54 -0700 Comment on attachment 135391 Patch Clearing flags on attachment: 135391 Committed r113221: <http://trac.webkit.org/changeset/113221> 595764 6 webkit.review.bot 2012-04-04 11:54:58 -0700 All reviewed patches have been landed. Closing bug. 135387 2012-04-03 12:18:57 -0700 2012-04-03 12:21:59 -0700 Patch bug-83054-20120403121856.patch text/plain 7959 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzA2NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA0LTAzICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IFJlbmRlckZyYW1l U2V0IHRvIExheW91dFVuaXRzIGluIHByZXBhcmF0aW9uIGZvciB0dXJuaW5nIG9uIHN1YnBpeGVs IGxheW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODMwNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD b252ZXJ0IFJvb3RJbmxpbmVCb3ggb3ZlciB0byBMYXlvdXRVbml0cywgdGhpcyBtb3N0bHkgaW52 b2x2ZXMgdXBkYXRpbmcKKyAgICAgICAgdGhlIGFsaWdubWVudCBhbmQgYWRqdXN0bWVudCBjb2Rl IHRvIGJlIHN1YnBpeGVsIGF3YXJlLiAKKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5n ZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6YWxpZ25Cb3hlc0luQmxvY2tE aXJlY3Rpb24pOgorICAgICAgICBDaGFuZ2UgYmVmb3JlQW5ub3RhdGlvbnNBZGp1c3RtZW50IHRv IExheW91dFVuaXQuCisgICAgICAgIAorICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6 YmVmb3JlQW5ub3RhdGlvbnNBZGp1c3RtZW50KToKKyAgICAgICAgQ2hhbmdlIG1ldGhvZCB0byBy ZXR1cm4gTGF5b3V0VW5pdCBhcyBpdCBpcyBjb21wdXRlZCBmcm9tIHZhbHVlcyB3aXRoCisgICAg ICAgIHN1YnBpeGVsIHByZWNpc2lvbi4KKyAgICAgICAgCisgICAgICAgIChXZWJDb3JlOjpSb290 SW5saW5lQm94OjpsaW5lU25hcEFkanVzdG1lbnQpOgorICAgICAgICBSb3VuZCB2YWx1ZXMgYmVm b3JlIGNvbXB1dGluZyByZW1haW5kZXIuCisKKyAgICAgICAgKFdlYkNvcmU6OlJvb3RJbmxpbmVC b3g6OmFzY2VudEFuZERlc2NlbnRGb3JCb3gpOgorICAgICAgICBDaGFuZ2UgYXNjZW50IGFuZCBk ZWNlbnQgY2FsY3VsYXRpb24gdG8gdXNlIExheW91dFVuaXRzIGFzIHRoZXkgYXJlCisgICAgICAg IGNvbXB1dGVkIGZyb20gdmFsdWVzIHdpdGggc3VicGl4ZWwgcHJlY2lzaW9uLgorICAgICAgICAK KyAgICAgICAgKFdlYkNvcmU6OlJvb3RJbmxpbmVCb3g6OnZlcnRpY2FsUG9zaXRpb25Gb3JCb3gp OgorICAgICAgICBDaGFuZ2UgdmVydGljYWxQb3NpdGlvbiB0byBMYXlvdXRVbml0LgorICAgICAg ICAKKyAgICAgICAgKiByZW5kZXJpbmcvUm9vdElubGluZUJveC5oOgorICAgICAgICAoUm9vdElu bGluZUJveCk6CisKIDIwMTItMDQtMDMgIEppYSBQdSAgPGpwdUBhcHBsZS5jb20+CiAKICAgICAg ICAgUmVuYW1lIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoKSB0byBH cmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIoKQpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmNwcAkocmV2aXNpb24gMTEzMDQ0KQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yODgsNyArMjg4LDcgQEAgTGF5b3V0VW5pdCBSb290SW5saW5lQm94OjphbGlnbkJv eGVzSW5CbAogICAgIHNldExpbmVUb3BCb3R0b21Qb3NpdGlvbnMobGluZVRvcCwgbGluZUJvdHRv bSwgaGVpZ2h0T2ZCbG9jaywgaGVpZ2h0T2ZCbG9jayArIG1heEhlaWdodCk7CiAgICAgc2V0UGFn aW5hdGVkTGluZVdpZHRoKGJsb2NrKCktPmF2YWlsYWJsZUxvZ2ljYWxXaWR0aEZvckNvbnRlbnQo aGVpZ2h0T2ZCbG9jaykpOwogCi0gICAgaW50IGFubm90YXRpb25zQWRqdXN0bWVudCA9IGJlZm9y ZUFubm90YXRpb25zQWRqdXN0bWVudCgpOworICAgIExheW91dFVuaXQgYW5ub3RhdGlvbnNBZGp1 c3RtZW50ID0gYmVmb3JlQW5ub3RhdGlvbnNBZGp1c3RtZW50KCk7CiAgICAgaWYgKGFubm90YXRp b25zQWRqdXN0bWVudCkgewogICAgICAgICAvLyBGSVhNRTogTmVlZCB0byBoYW5kbGUgcGFnaW5h dGlvbiBoZXJlLiBXZSBtaWdodCBoYXZlIHRvIG1vdmUgdG8gdGhlIG5leHQgcGFnZS9jb2x1bW4g YXMgYSByZXN1bHQgb2YgdGhlCiAgICAgICAgIC8vIHJ1YnkgZXhwYW5zaW9uLgpAQCAtMzA1LDkg KzMwNSw5IEBAIExheW91dFVuaXQgUm9vdElubGluZUJveDo6YWxpZ25Cb3hlc0luQmwKICAgICBy ZXR1cm4gaGVpZ2h0T2ZCbG9jayArIG1heEhlaWdodDsKIH0KIAotaW50IFJvb3RJbmxpbmVCb3g6 OmJlZm9yZUFubm90YXRpb25zQWRqdXN0bWVudCgpIGNvbnN0CitMYXlvdXRVbml0IFJvb3RJbmxp bmVCb3g6OmJlZm9yZUFubm90YXRpb25zQWRqdXN0bWVudCgpIGNvbnN0CiB7Ci0gICAgaW50IHJl c3VsdCA9IDA7CisgICAgTGF5b3V0VW5pdCByZXN1bHQgPSAwOwogCiAgICAgaWYgKCFyZW5kZXJl cigpLT5zdHlsZSgpLT5pc0ZsaXBwZWRMaW5lc1dyaXRpbmdNb2RlKCkpIHsKICAgICAgICAgLy8g QW5ub3RhdGlvbnMgdW5kZXIgdGhlIHByZXZpb3VzIGxpbmUgbWF5IHB1c2ggdXMgZG93bi4KQEAg LTMxOCwxOCArMzE4LDE4IEBAIGludCBSb290SW5saW5lQm94OjpiZWZvcmVBbm5vdGF0aW9uc0Fk anUKICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAKICAgICAgICAgLy8gQW5ub3RhdGlvbnMg b3ZlciB0aGlzIGxpbmUgbWF5IHB1c2ggdXMgZnVydGhlciBkb3duLgotICAgICAgICBpbnQgaGln aGVzdEFsbG93ZWRQb3NpdGlvbiA9IHByZXZSb290Qm94KCkgPyBtaW4ocHJldlJvb3RCb3goKS0+ bGluZUJvdHRvbSgpLCBsaW5lVG9wKCkpICsgcmVzdWx0IDogYmxvY2soKS0+Ym9yZGVyQmVmb3Jl KCk7CisgICAgICAgIExheW91dFVuaXQgaGlnaGVzdEFsbG93ZWRQb3NpdGlvbiA9IHByZXZSb290 Qm94KCkgPyBtaW4ocHJldlJvb3RCb3goKS0+bGluZUJvdHRvbSgpLCBsaW5lVG9wKCkpICsgcmVz dWx0IDogc3RhdGljX2Nhc3Q8TGF5b3V0VW5pdD4oYmxvY2soKS0+Ym9yZGVyQmVmb3JlKCkpOwog ICAgICAgICByZXN1bHQgPSBjb21wdXRlT3ZlckFubm90YXRpb25BZGp1c3RtZW50KGhpZ2hlc3RB bGxvd2VkUG9zaXRpb24pOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIEFubm90YXRpb25zIHVu ZGVyIHRoaXMgbGluZSBtYXkgcHVzaCB1cyB1cC4KICAgICAgICAgaWYgKGhhc0Fubm90YXRpb25z QmVmb3JlKCkpCi0gICAgICAgICAgICByZXN1bHQgPSBjb21wdXRlVW5kZXJBbm5vdGF0aW9uQWRq dXN0bWVudChwcmV2Um9vdEJveCgpID8gcHJldlJvb3RCb3goKS0+bGluZUJvdHRvbSgpIDogYmxv Y2soKS0+Ym9yZGVyQmVmb3JlKCkpOworICAgICAgICAgICAgcmVzdWx0ID0gY29tcHV0ZVVuZGVy QW5ub3RhdGlvbkFkanVzdG1lbnQocHJldlJvb3RCb3goKSA/IHByZXZSb290Qm94KCktPmxpbmVC b3R0b20oKSA6IHN0YXRpY19jYXN0PExheW91dFVuaXQ+KGJsb2NrKCktPmJvcmRlckJlZm9yZSgp KSk7CiAKICAgICAgICAgaWYgKCFwcmV2Um9vdEJveCgpIHx8ICFwcmV2Um9vdEJveCgpLT5oYXNB bm5vdGF0aW9uc0FmdGVyKCkpCiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogCiAgICAgICAg IC8vIFdlIGhhdmUgdG8gY29tcHV0ZSB0aGUgZXhwYW5zaW9uIGZvciBhbm5vdGF0aW9ucyBvdmVy IHRoZSBwcmV2aW91cyBsaW5lIHRvIHNlZSBob3cgbXVjaCB3ZSBzaG91bGQgbW92ZS4KLSAgICAg ICAgaW50IGxvd2VzdEFsbG93ZWRQb3NpdGlvbiA9IG1heChwcmV2Um9vdEJveCgpLT5saW5lQm90 dG9tKCksIGxpbmVUb3AoKSkgLSByZXN1bHQ7CisgICAgICAgIExheW91dFVuaXQgbG93ZXN0QWxs b3dlZFBvc2l0aW9uID0gbWF4KHByZXZSb290Qm94KCktPmxpbmVCb3R0b20oKSwgbGluZVRvcCgp KSAtIHJlc3VsdDsKICAgICAgICAgcmVzdWx0ID0gcHJldlJvb3RCb3goKS0+Y29tcHV0ZU92ZXJB bm5vdGF0aW9uQWRqdXN0bWVudChsb3dlc3RBbGxvd2VkUG9zaXRpb24pOwogICAgIH0KIApAQCAt NDA5LDcgKzQwOSw3IEBAIExheW91dFVuaXQgUm9vdElubGluZUJveDo6bGluZVNuYXBBZGp1c3QK IAogICAgIC8vIE90aGVyd2lzZSB3ZSdyZSBpbiB0aGUgbWlkZGxlIG9mIHRoZSBncmlkIHNvbWV3 aGVyZS4gSnVzdCBwdXNoIHRvIHRoZSBuZXh0IGxpbmUuCiAgICAgTGF5b3V0VW5pdCBiYXNlbGlu ZU9mZnNldCA9IGN1cnJlbnRCYXNlbGluZVBvc2l0aW9uIC0gZmlyc3RCYXNlbGluZVBvc2l0aW9u OwotICAgIExheW91dFVuaXQgcmVtYWluZGVyID0gYmFzZWxpbmVPZmZzZXQgJSBncmlkTGluZUhl aWdodDsKKyAgICBMYXlvdXRVbml0IHJlbWFpbmRlciA9IHJvdW5kVG9JbnQoYmFzZWxpbmVPZmZz ZXQpICUgcm91bmRUb0ludChncmlkTGluZUhlaWdodCk7CiAgICAgTGF5b3V0VW5pdCByZXN1bHQg PSBkZWx0YTsKICAgICBpZiAocmVtYWluZGVyKQogICAgICAgICByZXN1bHQgKz0gZ3JpZExpbmVI ZWlnaHQgLSByZW1haW5kZXI7CkBAIC03NTYsOCArNzU2LDggQEAgdm9pZCBSb290SW5saW5lQm94 Ojphc2NlbnRBbmREZXNjZW50Rm9yQgogCiAgICAgLy8gSWYgbGVhZGluZyBpcyBpbmNsdWRlZCBm b3IgdGhlIGJveCwgdGhlbiB3ZSBjb21wdXRlIHRoYXQgYm94LgogICAgIGlmIChpbmNsdWRlTGVh ZGluZyAmJiAhc2V0VXNlZEZvbnRXaXRoTGVhZGluZykgewotICAgICAgICBpbnQgYXNjZW50V2l0 aExlYWRpbmcgPSBib3gtPmJhc2VsaW5lUG9zaXRpb24oYmFzZWxpbmVUeXBlKCkpOwotICAgICAg ICBpbnQgZGVzY2VudFdpdGhMZWFkaW5nID0gYm94LT5saW5lSGVpZ2h0KCkgLSBhc2NlbnRXaXRo TGVhZGluZzsKKyAgICAgICAgTGF5b3V0VW5pdCBhc2NlbnRXaXRoTGVhZGluZyA9IGJveC0+YmFz ZWxpbmVQb3NpdGlvbihiYXNlbGluZVR5cGUoKSk7CisgICAgICAgIExheW91dFVuaXQgZGVzY2Vu dFdpdGhMZWFkaW5nID0gYm94LT5saW5lSGVpZ2h0KCkgLSBhc2NlbnRXaXRoTGVhZGluZzsKICAg ICAgICAgc2V0QXNjZW50QW5kRGVzY2VudChhc2NlbnQsIGRlc2NlbnQsIGFzY2VudFdpdGhMZWFk aW5nLCBkZXNjZW50V2l0aExlYWRpbmcsIGFzY2VudERlc2NlbnRTZXQpOwogICAgICAgICAKICAg ICAgICAgLy8gRXhhbWluZSB0aGUgZm9udCBib3ggZm9yIGlubGluZSBmbG93cyBhbmQgdGV4dCBi b3hlcyB0byBzZWUgaWYgYW55IHBhcnQgb2YgaXQgaXMgYWJvdmUgdGhlIGJhc2VsaW5lLgpAQCAt NzY5LDggKzc2OSw4IEBAIHZvaWQgUm9vdElubGluZUJveDo6YXNjZW50QW5kRGVzY2VudEZvckIK ICAgICB9CiAgICAgCiAgICAgaWYgKGluY2x1ZGVGb250Rm9yQm94KGJveCkgJiYgIXNldFVzZWRG b250KSB7Ci0gICAgICAgIGludCBmb250QXNjZW50ID0gYm94LT5yZW5kZXJlcigpLT5zdHlsZShp c0ZpcnN0TGluZVN0eWxlKCkpLT5mb250TWV0cmljcygpLmFzY2VudCgpOwotICAgICAgICBpbnQg Zm9udERlc2NlbnQgPSBib3gtPnJlbmRlcmVyKCktPnN0eWxlKGlzRmlyc3RMaW5lU3R5bGUoKSkt PmZvbnRNZXRyaWNzKCkuZGVzY2VudCgpOworICAgICAgICBMYXlvdXRVbml0IGZvbnRBc2NlbnQg PSBib3gtPnJlbmRlcmVyKCktPnN0eWxlKGlzRmlyc3RMaW5lU3R5bGUoKSktPmZvbnRNZXRyaWNz KCkuYXNjZW50KCk7CisgICAgICAgIExheW91dFVuaXQgZm9udERlc2NlbnQgPSBib3gtPnJlbmRl cmVyKCktPnN0eWxlKGlzRmlyc3RMaW5lU3R5bGUoKSktPmZvbnRNZXRyaWNzKCkuZGVzY2VudCgp OwogICAgICAgICBzZXRBc2NlbnRBbmREZXNjZW50KGFzY2VudCwgZGVzY2VudCwgZm9udEFzY2Vu dCwgZm9udERlc2NlbnQsIGFzY2VudERlc2NlbnRTZXQpOwogICAgICAgICBhZmZlY3RzQXNjZW50 ID0gZm9udEFzY2VudCAtIGJveC0+bG9naWNhbFRvcCgpID4gMDsKICAgICAgICAgYWZmZWN0c0Rl c2NlbnQgPSBmb250RGVzY2VudCArIGJveC0+bG9naWNhbFRvcCgpID4gMDsgCkBAIC03ODUsOCAr Nzg1LDggQEAgdm9pZCBSb290SW5saW5lQm94Ojphc2NlbnRBbmREZXNjZW50Rm9yQgogICAgIH0K IAogICAgIGlmIChpbmNsdWRlTWFyZ2luRm9yQm94KGJveCkpIHsKLSAgICAgICAgaW50IGFzY2Vu dFdpdGhNYXJnaW4gPSBib3gtPnJlbmRlcmVyKCktPnN0eWxlKGlzRmlyc3RMaW5lU3R5bGUoKSkt PmZvbnRNZXRyaWNzKCkuYXNjZW50KCk7Ci0gICAgICAgIGludCBkZXNjZW50V2l0aE1hcmdpbiA9 IGJveC0+cmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udE1ldHJpY3Mo KS5kZXNjZW50KCk7CisgICAgICAgIExheW91dFVuaXQgYXNjZW50V2l0aE1hcmdpbiA9IGJveC0+ cmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udE1ldHJpY3MoKS5hc2Nl bnQoKTsKKyAgICAgICAgTGF5b3V0VW5pdCBkZXNjZW50V2l0aE1hcmdpbiA9IGJveC0+cmVuZGVy ZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udE1ldHJpY3MoKS5kZXNjZW50KCk7 CiAgICAgICAgIGlmIChib3gtPnBhcmVudCgpICYmICFib3gtPnJlbmRlcmVyKCktPmlzVGV4dCgp KSB7CiAgICAgICAgICAgICBhc2NlbnRXaXRoTWFyZ2luICs9IGJveC0+Ym94TW9kZWxPYmplY3Qo KS0+Ym9yZGVyQmVmb3JlKCkgKyBib3gtPmJveE1vZGVsT2JqZWN0KCktPnBhZGRpbmdCZWZvcmUo KSArIGJveC0+Ym94TW9kZWxPYmplY3QoKS0+bWFyZ2luQmVmb3JlKCk7CiAgICAgICAgICAgICBk ZXNjZW50V2l0aE1hcmdpbiArPSBib3gtPmJveE1vZGVsT2JqZWN0KCktPmJvcmRlckFmdGVyKCkg KyBib3gtPmJveE1vZGVsT2JqZWN0KCktPnBhZGRpbmdBZnRlcigpICsgYm94LT5ib3hNb2RlbE9i amVjdCgpLT5tYXJnaW5BZnRlcigpOwpAQCAtODIyLDcgKzgyMiw3IEBAIExheW91dFVuaXQgUm9v dElubGluZUJveDo6dmVydGljYWxQb3NpdGkKICAgICAgICAgICAgIHJldHVybiB2ZXJ0aWNhbFBv c2l0aW9uOwogICAgIH0KIAotICAgIGludCB2ZXJ0aWNhbFBvc2l0aW9uID0gMDsKKyAgICBMYXlv dXRVbml0IHZlcnRpY2FsUG9zaXRpb24gPSAwOwogICAgIEVWZXJ0aWNhbEFsaWduIHZlcnRpY2Fs QWxpZ24gPSByZW5kZXJlci0+c3R5bGUoKS0+dmVydGljYWxBbGlnbigpOwogICAgIGlmICh2ZXJ0 aWNhbEFsaWduID09IFRPUCB8fCB2ZXJ0aWNhbEFsaWduID09IEJPVFRPTSkKICAgICAgICAgcmV0 dXJuIDA7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmgJKHJl dmlzaW9uIDExMzA0NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94 LmgJKHdvcmtpbmcgY29weSkKQEAgLTE4NCw3ICsxODQsNyBAQCBwcml2YXRlOgogCiAgICAgTGF5 b3V0VW5pdCBsaW5lU25hcEFkanVzdG1lbnQoTGF5b3V0VW5pdCBkZWx0YSA9IDApIGNvbnN0Owog Ci0gICAgaW50IGJlZm9yZUFubm90YXRpb25zQWRqdXN0bWVudCgpIGNvbnN0OworICAgIExheW91 dFVuaXQgYmVmb3JlQW5ub3RhdGlvbnNBZGp1c3RtZW50KCkgY29uc3Q7CiAKICAgICAvLyBUaGlz IGZvbGRzIGludG8gdGhlIHBhZGRpbmcgYXQgdGhlIGVuZCBvZiBJbmxpbmVGbG93Qm94IG9uIDY0 LWJpdC4KICAgICB1bnNpZ25lZCBtX2xpbmVCcmVha1BvczsK 135391 2012-04-03 12:22:02 -0700 2012-04-04 11:54:54 -0700 Patch bug-83054-20120403122201.patch text/plain 7958 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzA2NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA0LTAzICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IFJvb3RJbmxpbmVC b3ggdG8gTGF5b3V0VW5pdHMgaW4gcHJlcGFyYXRpb24gZm9yIHR1cm5pbmcgb24gc3VicGl4ZWwg bGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MzA1NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENv bnZlcnQgUm9vdElubGluZUJveCBvdmVyIHRvIExheW91dFVuaXRzLCB0aGlzIG1vc3RseSBpbnZv bHZlcyB1cGRhdGluZworICAgICAgICB0aGUgYWxpZ25tZW50IGFuZCBhZGp1c3RtZW50IGNvZGUg dG8gYmUgc3VicGl4ZWwgYXdhcmUuIAorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gY2hhbmdl IGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUm9vdElubGluZUJveC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSb290SW5saW5lQm94OjphbGlnbkJveGVzSW5CbG9ja0Rp cmVjdGlvbik6CisgICAgICAgIENoYW5nZSBiZWZvcmVBbm5vdGF0aW9uc0FkanVzdG1lbnQgdG8g TGF5b3V0VW5pdC4KKyAgICAgICAgCisgICAgICAgIChXZWJDb3JlOjpSb290SW5saW5lQm94Ojpi ZWZvcmVBbm5vdGF0aW9uc0FkanVzdG1lbnQpOgorICAgICAgICBDaGFuZ2UgbWV0aG9kIHRvIHJl dHVybiBMYXlvdXRVbml0IGFzIGl0IGlzIGNvbXB1dGVkIGZyb20gdmFsdWVzIHdpdGgKKyAgICAg ICAgc3VicGl4ZWwgcHJlY2lzaW9uLgorICAgICAgICAKKyAgICAgICAgKFdlYkNvcmU6OlJvb3RJ bmxpbmVCb3g6OmxpbmVTbmFwQWRqdXN0bWVudCk6CisgICAgICAgIFJvdW5kIHZhbHVlcyBiZWZv cmUgY29tcHV0aW5nIHJlbWFpbmRlci4KKworICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJv eDo6YXNjZW50QW5kRGVzY2VudEZvckJveCk6CisgICAgICAgIENoYW5nZSBhc2NlbnQgYW5kIGRl Y2VudCBjYWxjdWxhdGlvbiB0byB1c2UgTGF5b3V0VW5pdHMgYXMgdGhleSBhcmUKKyAgICAgICAg Y29tcHV0ZWQgZnJvbSB2YWx1ZXMgd2l0aCBzdWJwaXhlbCBwcmVjaXNpb24uCisgICAgICAgIAor ICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6dmVydGljYWxQb3NpdGlvbkZvckJveCk6 CisgICAgICAgIENoYW5nZSB2ZXJ0aWNhbFBvc2l0aW9uIHRvIExheW91dFVuaXQuCisgICAgICAg IAorICAgICAgICAqIHJlbmRlcmluZy9Sb290SW5saW5lQm94Lmg6CisgICAgICAgIChSb290SW5s aW5lQm94KToKKwogMjAxMi0wNC0wMyAgSmlhIFB1ICA8anB1QGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW5hbWUgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2luZygpIHRvIEdy YXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcigpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guY3BwCShyZXZpc2lvbiAxMTMwNDQpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI4OCw3ICsyODgsNyBAQCBMYXlvdXRVbml0IFJvb3RJbmxpbmVCb3g6OmFsaWduQm94 ZXNJbkJsCiAgICAgc2V0TGluZVRvcEJvdHRvbVBvc2l0aW9ucyhsaW5lVG9wLCBsaW5lQm90dG9t LCBoZWlnaHRPZkJsb2NrLCBoZWlnaHRPZkJsb2NrICsgbWF4SGVpZ2h0KTsKICAgICBzZXRQYWdp bmF0ZWRMaW5lV2lkdGgoYmxvY2soKS0+YXZhaWxhYmxlTG9naWNhbFdpZHRoRm9yQ29udGVudCho ZWlnaHRPZkJsb2NrKSk7CiAKLSAgICBpbnQgYW5ub3RhdGlvbnNBZGp1c3RtZW50ID0gYmVmb3Jl QW5ub3RhdGlvbnNBZGp1c3RtZW50KCk7CisgICAgTGF5b3V0VW5pdCBhbm5vdGF0aW9uc0FkanVz dG1lbnQgPSBiZWZvcmVBbm5vdGF0aW9uc0FkanVzdG1lbnQoKTsKICAgICBpZiAoYW5ub3RhdGlv bnNBZGp1c3RtZW50KSB7CiAgICAgICAgIC8vIEZJWE1FOiBOZWVkIHRvIGhhbmRsZSBwYWdpbmF0 aW9uIGhlcmUuIFdlIG1pZ2h0IGhhdmUgdG8gbW92ZSB0byB0aGUgbmV4dCBwYWdlL2NvbHVtbiBh cyBhIHJlc3VsdCBvZiB0aGUKICAgICAgICAgLy8gcnVieSBleHBhbnNpb24uCkBAIC0zMDUsOSAr MzA1LDkgQEAgTGF5b3V0VW5pdCBSb290SW5saW5lQm94OjphbGlnbkJveGVzSW5CbAogICAgIHJl dHVybiBoZWlnaHRPZkJsb2NrICsgbWF4SGVpZ2h0OwogfQogCi1pbnQgUm9vdElubGluZUJveDo6 YmVmb3JlQW5ub3RhdGlvbnNBZGp1c3RtZW50KCkgY29uc3QKK0xheW91dFVuaXQgUm9vdElubGlu ZUJveDo6YmVmb3JlQW5ub3RhdGlvbnNBZGp1c3RtZW50KCkgY29uc3QKIHsKLSAgICBpbnQgcmVz dWx0ID0gMDsKKyAgICBMYXlvdXRVbml0IHJlc3VsdCA9IDA7CiAKICAgICBpZiAoIXJlbmRlcmVy KCktPnN0eWxlKCktPmlzRmxpcHBlZExpbmVzV3JpdGluZ01vZGUoKSkgewogICAgICAgICAvLyBB bm5vdGF0aW9ucyB1bmRlciB0aGUgcHJldmlvdXMgbGluZSBtYXkgcHVzaCB1cyBkb3duLgpAQCAt MzE4LDE4ICszMTgsMTggQEAgaW50IFJvb3RJbmxpbmVCb3g6OmJlZm9yZUFubm90YXRpb25zQWRq dQogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKIAogICAgICAgICAvLyBBbm5vdGF0aW9ucyBv dmVyIHRoaXMgbGluZSBtYXkgcHVzaCB1cyBmdXJ0aGVyIGRvd24uCi0gICAgICAgIGludCBoaWdo ZXN0QWxsb3dlZFBvc2l0aW9uID0gcHJldlJvb3RCb3goKSA/IG1pbihwcmV2Um9vdEJveCgpLT5s aW5lQm90dG9tKCksIGxpbmVUb3AoKSkgKyByZXN1bHQgOiBibG9jaygpLT5ib3JkZXJCZWZvcmUo KTsKKyAgICAgICAgTGF5b3V0VW5pdCBoaWdoZXN0QWxsb3dlZFBvc2l0aW9uID0gcHJldlJvb3RC b3goKSA/IG1pbihwcmV2Um9vdEJveCgpLT5saW5lQm90dG9tKCksIGxpbmVUb3AoKSkgKyByZXN1 bHQgOiBzdGF0aWNfY2FzdDxMYXlvdXRVbml0PihibG9jaygpLT5ib3JkZXJCZWZvcmUoKSk7CiAg ICAgICAgIHJlc3VsdCA9IGNvbXB1dGVPdmVyQW5ub3RhdGlvbkFkanVzdG1lbnQoaGlnaGVzdEFs bG93ZWRQb3NpdGlvbik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gQW5ub3RhdGlvbnMgdW5k ZXIgdGhpcyBsaW5lIG1heSBwdXNoIHVzIHVwLgogICAgICAgICBpZiAoaGFzQW5ub3RhdGlvbnNC ZWZvcmUoKSkKLSAgICAgICAgICAgIHJlc3VsdCA9IGNvbXB1dGVVbmRlckFubm90YXRpb25BZGp1 c3RtZW50KHByZXZSb290Qm94KCkgPyBwcmV2Um9vdEJveCgpLT5saW5lQm90dG9tKCkgOiBibG9j aygpLT5ib3JkZXJCZWZvcmUoKSk7CisgICAgICAgICAgICByZXN1bHQgPSBjb21wdXRlVW5kZXJB bm5vdGF0aW9uQWRqdXN0bWVudChwcmV2Um9vdEJveCgpID8gcHJldlJvb3RCb3goKS0+bGluZUJv dHRvbSgpIDogc3RhdGljX2Nhc3Q8TGF5b3V0VW5pdD4oYmxvY2soKS0+Ym9yZGVyQmVmb3JlKCkp KTsKIAogICAgICAgICBpZiAoIXByZXZSb290Qm94KCkgfHwgIXByZXZSb290Qm94KCktPmhhc0Fu bm90YXRpb25zQWZ0ZXIoKSkKICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAKICAgICAgICAg Ly8gV2UgaGF2ZSB0byBjb21wdXRlIHRoZSBleHBhbnNpb24gZm9yIGFubm90YXRpb25zIG92ZXIg dGhlIHByZXZpb3VzIGxpbmUgdG8gc2VlIGhvdyBtdWNoIHdlIHNob3VsZCBtb3ZlLgotICAgICAg ICBpbnQgbG93ZXN0QWxsb3dlZFBvc2l0aW9uID0gbWF4KHByZXZSb290Qm94KCktPmxpbmVCb3R0 b20oKSwgbGluZVRvcCgpKSAtIHJlc3VsdDsKKyAgICAgICAgTGF5b3V0VW5pdCBsb3dlc3RBbGxv d2VkUG9zaXRpb24gPSBtYXgocHJldlJvb3RCb3goKS0+bGluZUJvdHRvbSgpLCBsaW5lVG9wKCkp IC0gcmVzdWx0OwogICAgICAgICByZXN1bHQgPSBwcmV2Um9vdEJveCgpLT5jb21wdXRlT3ZlckFu bm90YXRpb25BZGp1c3RtZW50KGxvd2VzdEFsbG93ZWRQb3NpdGlvbik7CiAgICAgfQogCkBAIC00 MDksNyArNDA5LDcgQEAgTGF5b3V0VW5pdCBSb290SW5saW5lQm94OjpsaW5lU25hcEFkanVzdAog CiAgICAgLy8gT3RoZXJ3aXNlIHdlJ3JlIGluIHRoZSBtaWRkbGUgb2YgdGhlIGdyaWQgc29tZXdo ZXJlLiBKdXN0IHB1c2ggdG8gdGhlIG5leHQgbGluZS4KICAgICBMYXlvdXRVbml0IGJhc2VsaW5l T2Zmc2V0ID0gY3VycmVudEJhc2VsaW5lUG9zaXRpb24gLSBmaXJzdEJhc2VsaW5lUG9zaXRpb247 Ci0gICAgTGF5b3V0VW5pdCByZW1haW5kZXIgPSBiYXNlbGluZU9mZnNldCAlIGdyaWRMaW5lSGVp Z2h0OworICAgIExheW91dFVuaXQgcmVtYWluZGVyID0gcm91bmRUb0ludChiYXNlbGluZU9mZnNl dCkgJSByb3VuZFRvSW50KGdyaWRMaW5lSGVpZ2h0KTsKICAgICBMYXlvdXRVbml0IHJlc3VsdCA9 IGRlbHRhOwogICAgIGlmIChyZW1haW5kZXIpCiAgICAgICAgIHJlc3VsdCArPSBncmlkTGluZUhl aWdodCAtIHJlbWFpbmRlcjsKQEAgLTc1Niw4ICs3NTYsOCBAQCB2b2lkIFJvb3RJbmxpbmVCb3g6 OmFzY2VudEFuZERlc2NlbnRGb3JCCiAKICAgICAvLyBJZiBsZWFkaW5nIGlzIGluY2x1ZGVkIGZv ciB0aGUgYm94LCB0aGVuIHdlIGNvbXB1dGUgdGhhdCBib3guCiAgICAgaWYgKGluY2x1ZGVMZWFk aW5nICYmICFzZXRVc2VkRm9udFdpdGhMZWFkaW5nKSB7Ci0gICAgICAgIGludCBhc2NlbnRXaXRo TGVhZGluZyA9IGJveC0+YmFzZWxpbmVQb3NpdGlvbihiYXNlbGluZVR5cGUoKSk7Ci0gICAgICAg IGludCBkZXNjZW50V2l0aExlYWRpbmcgPSBib3gtPmxpbmVIZWlnaHQoKSAtIGFzY2VudFdpdGhM ZWFkaW5nOworICAgICAgICBMYXlvdXRVbml0IGFzY2VudFdpdGhMZWFkaW5nID0gYm94LT5iYXNl bGluZVBvc2l0aW9uKGJhc2VsaW5lVHlwZSgpKTsKKyAgICAgICAgTGF5b3V0VW5pdCBkZXNjZW50 V2l0aExlYWRpbmcgPSBib3gtPmxpbmVIZWlnaHQoKSAtIGFzY2VudFdpdGhMZWFkaW5nOwogICAg ICAgICBzZXRBc2NlbnRBbmREZXNjZW50KGFzY2VudCwgZGVzY2VudCwgYXNjZW50V2l0aExlYWRp bmcsIGRlc2NlbnRXaXRoTGVhZGluZywgYXNjZW50RGVzY2VudFNldCk7CiAgICAgICAgIAogICAg ICAgICAvLyBFeGFtaW5lIHRoZSBmb250IGJveCBmb3IgaW5saW5lIGZsb3dzIGFuZCB0ZXh0IGJv eGVzIHRvIHNlZSBpZiBhbnkgcGFydCBvZiBpdCBpcyBhYm92ZSB0aGUgYmFzZWxpbmUuCkBAIC03 NjksOCArNzY5LDggQEAgdm9pZCBSb290SW5saW5lQm94Ojphc2NlbnRBbmREZXNjZW50Rm9yQgog ICAgIH0KICAgICAKICAgICBpZiAoaW5jbHVkZUZvbnRGb3JCb3goYm94KSAmJiAhc2V0VXNlZEZv bnQpIHsKLSAgICAgICAgaW50IGZvbnRBc2NlbnQgPSBib3gtPnJlbmRlcmVyKCktPnN0eWxlKGlz Rmlyc3RMaW5lU3R5bGUoKSktPmZvbnRNZXRyaWNzKCkuYXNjZW50KCk7Ci0gICAgICAgIGludCBm b250RGVzY2VudCA9IGJveC0+cmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+ Zm9udE1ldHJpY3MoKS5kZXNjZW50KCk7CisgICAgICAgIExheW91dFVuaXQgZm9udEFzY2VudCA9 IGJveC0+cmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udE1ldHJpY3Mo KS5hc2NlbnQoKTsKKyAgICAgICAgTGF5b3V0VW5pdCBmb250RGVzY2VudCA9IGJveC0+cmVuZGVy ZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udE1ldHJpY3MoKS5kZXNjZW50KCk7 CiAgICAgICAgIHNldEFzY2VudEFuZERlc2NlbnQoYXNjZW50LCBkZXNjZW50LCBmb250QXNjZW50 LCBmb250RGVzY2VudCwgYXNjZW50RGVzY2VudFNldCk7CiAgICAgICAgIGFmZmVjdHNBc2NlbnQg PSBmb250QXNjZW50IC0gYm94LT5sb2dpY2FsVG9wKCkgPiAwOwogICAgICAgICBhZmZlY3RzRGVz Y2VudCA9IGZvbnREZXNjZW50ICsgYm94LT5sb2dpY2FsVG9wKCkgPiAwOyAKQEAgLTc4NSw4ICs3 ODUsOCBAQCB2b2lkIFJvb3RJbmxpbmVCb3g6OmFzY2VudEFuZERlc2NlbnRGb3JCCiAgICAgfQog CiAgICAgaWYgKGluY2x1ZGVNYXJnaW5Gb3JCb3goYm94KSkgewotICAgICAgICBpbnQgYXNjZW50 V2l0aE1hcmdpbiA9IGJveC0+cmVuZGVyZXIoKS0+c3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+ Zm9udE1ldHJpY3MoKS5hc2NlbnQoKTsKLSAgICAgICAgaW50IGRlc2NlbnRXaXRoTWFyZ2luID0g Ym94LT5yZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5mb250TWV0cmljcygp LmRlc2NlbnQoKTsKKyAgICAgICAgTGF5b3V0VW5pdCBhc2NlbnRXaXRoTWFyZ2luID0gYm94LT5y ZW5kZXJlcigpLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5mb250TWV0cmljcygpLmFzY2Vu dCgpOworICAgICAgICBMYXlvdXRVbml0IGRlc2NlbnRXaXRoTWFyZ2luID0gYm94LT5yZW5kZXJl cigpLT5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5mb250TWV0cmljcygpLmRlc2NlbnQoKTsK ICAgICAgICAgaWYgKGJveC0+cGFyZW50KCkgJiYgIWJveC0+cmVuZGVyZXIoKS0+aXNUZXh0KCkp IHsKICAgICAgICAgICAgIGFzY2VudFdpdGhNYXJnaW4gKz0gYm94LT5ib3hNb2RlbE9iamVjdCgp LT5ib3JkZXJCZWZvcmUoKSArIGJveC0+Ym94TW9kZWxPYmplY3QoKS0+cGFkZGluZ0JlZm9yZSgp ICsgYm94LT5ib3hNb2RlbE9iamVjdCgpLT5tYXJnaW5CZWZvcmUoKTsKICAgICAgICAgICAgIGRl c2NlbnRXaXRoTWFyZ2luICs9IGJveC0+Ym94TW9kZWxPYmplY3QoKS0+Ym9yZGVyQWZ0ZXIoKSAr IGJveC0+Ym94TW9kZWxPYmplY3QoKS0+cGFkZGluZ0FmdGVyKCkgKyBib3gtPmJveE1vZGVsT2Jq ZWN0KCktPm1hcmdpbkFmdGVyKCk7CkBAIC04MjIsNyArODIyLDcgQEAgTGF5b3V0VW5pdCBSb290 SW5saW5lQm94Ojp2ZXJ0aWNhbFBvc2l0aQogICAgICAgICAgICAgcmV0dXJuIHZlcnRpY2FsUG9z aXRpb247CiAgICAgfQogCi0gICAgaW50IHZlcnRpY2FsUG9zaXRpb24gPSAwOworICAgIExheW91 dFVuaXQgdmVydGljYWxQb3NpdGlvbiA9IDA7CiAgICAgRVZlcnRpY2FsQWxpZ24gdmVydGljYWxB bGlnbiA9IHJlbmRlcmVyLT5zdHlsZSgpLT52ZXJ0aWNhbEFsaWduKCk7CiAgICAgaWYgKHZlcnRp Y2FsQWxpZ24gPT0gVE9QIHx8IHZlcnRpY2FsQWxpZ24gPT0gQk9UVE9NKQogICAgICAgICByZXR1 cm4gMDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3guaAkocmV2 aXNpb24gMTEzMDQ0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jvb3RJbmxpbmVCb3gu aAkod29ya2luZyBjb3B5KQpAQCAtMTg0LDcgKzE4NCw3IEBAIHByaXZhdGU6CiAKICAgICBMYXlv dXRVbml0IGxpbmVTbmFwQWRqdXN0bWVudChMYXlvdXRVbml0IGRlbHRhID0gMCkgY29uc3Q7CiAK LSAgICBpbnQgYmVmb3JlQW5ub3RhdGlvbnNBZGp1c3RtZW50KCkgY29uc3Q7CisgICAgTGF5b3V0 VW5pdCBiZWZvcmVBbm5vdGF0aW9uc0FkanVzdG1lbnQoKSBjb25zdDsKIAogICAgIC8vIFRoaXMg Zm9sZHMgaW50byB0aGUgcGFkZGluZyBhdCB0aGUgZW5kIG9mIElubGluZUZsb3dCb3ggb24gNjQt Yml0LgogICAgIHVuc2lnbmVkIG1fbGluZUJyZWFrUG9zOwo=