66250 2011-08-15 13:39:07 -0700 Switch RenderTextControl* to new layout types 2011-08-18 12:28:52 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 leviw leviw darin eae eric simon.fraser webkit.review.bot oldest_to_newest 451251 0 leviw 2011-08-15 13:39:07 -0700 Ongoing conversion. 451252 1 103947 leviw 2011-08-15 13:42:55 -0700 Created attachment 103947 Patch 452412 2 103947 eric 2011-08-17 11:32:00 -0700 Comment on attachment 103947 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103947&action=review > Source/WebCore/rendering/LayoutTypes.h:97 > +inline LayoutUnit layoutMod(const LayoutUnit& numerator, const LayoutUnit& denominator) > +{ > + return numerator % denominator; > +} Otherwise the compiler gets sad about mis-matched types? 452413 3 eric 2011-08-17 11:32:23 -0700 I'm confused that we need that layoutMod function, but I believe you. 452414 4 103947 leviw 2011-08-17 11:33:30 -0700 Comment on attachment 103947 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103947&action=review Thanks! >> Source/WebCore/rendering/LayoutTypes.h:97 >> +} > > Otherwise the compiler gets sad about mis-matched types? % doesn't act as modulo for Float/Fixed types. This will be replaced with the proper equivalent for those :) 452526 5 103947 webkit.review.bot 2011-08-17 13:45:03 -0700 Comment on attachment 103947 Patch Rejecting attachment 103947 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: ools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 Source/WebCore: Crash in Document::recalcStyleSelector When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 146. Full output: http://queues.webkit.org/results/9421093 452718 6 103947 webkit.review.bot 2011-08-17 16:37:01 -0700 Comment on attachment 103947 Patch Rejecting attachment 103947 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: g Tools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 Accessibility stack exhaustion using role attribute When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 146. Full output: http://queues.webkit.org/results/9419269 453244 7 103947 webkit.review.bot 2011-08-18 12:28:47 -0700 Comment on attachment 103947 Patch Clearing flags on attachment: 103947 Committed r93334: <http://trac.webkit.org/changeset/93334> 453245 8 webkit.review.bot 2011-08-18 12:28:52 -0700 All reviewed patches have been landed. Closing bug. 103947 2011-08-15 13:42:55 -0700 2011-08-18 12:28:47 -0700 Patch bug-66250-20110815134254.patch text/plain 12210 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzMDU3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDgtMTUgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBSZW5kZXJUZXh0 Q29udHJvbCogdG8gbmV3IGxheW91dCB0eXBlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYyNTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0aWtuZyB0aGUgUmVuZGVyVGV4dENvbnRyb2wqIGNs YXNzZXMgdG8gdXNlIHRoZSBMYXlvdXRVbml0IGFic3RyYWN0aW9uLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cyBhcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcv TGF5b3V0VHlwZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OmxheW91dE1vZCk6IEFkZGVkIGEgZnVu Y3Rpb24gdG8gcGVyZm9ybSB0aGUgbW9kdWxvIG9wZXJhdGlvbiBvbiBMYXlvdXRVbml0cy4KKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGV4dENvbnRyb2w6OmhpdElubmVyVGV4dEVsZW1lbnQpOgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU ZXh0Q29udHJvbE11bHRpTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29u dHJvbE11bHRpTGluZTo6cHJlZmVycmVkQ29udGVudFdpZHRoKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRleHRDb250cm9sTXVsdGlMaW5lOjpiYXNlbGluZVBvc2l0aW9uKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Y29udHJvbENsaXBSZWN0KToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6cHJlZmVycmVkQ29udGVudFdp ZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6c2Ny b2xsV2lkdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5l OjpzY3JvbGxIZWlnaHQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaW5lOjpzY3JvbGxMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9s U2luZ2xlTGluZTo6c2Nyb2xsVG9wKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZTo6c2V0U2Nyb2xsTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJU ZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNldFNjcm9sbFRvcCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5oOgorCiAyMDExLTA4LTE1ICBDYXJ5IENsYXJr ICA8Y2FyeWNsYXJrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aXNlIFNraWEgb24gQ2hyb21l IE1hYyB0byByZXR1cm4gZmFsbGJhY2sgZm9udHMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvTGF5b3V0VHlwZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvTGF5b3V0VHlwZXMuaAkocmV2aXNpb24gOTMwNDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvTGF5b3V0VHlwZXMuaAkod29ya2luZyBjb3B5KQpAQCAtOTEsNiArOTEsMTEgQEAgaW5s aW5lIExheW91dFBvaW50IHRvTGF5b3V0UG9pbnQoY29uc3QgTAogICAgIHJldHVybiBMYXlvdXRQ b2ludChwLndpZHRoKCksIHAuaGVpZ2h0KCkpOwogfQogCitpbmxpbmUgTGF5b3V0VW5pdCBsYXlv dXRNb2QoY29uc3QgTGF5b3V0VW5pdCYgbnVtZXJhdG9yLCBjb25zdCBMYXlvdXRVbml0JiBkZW5v bWluYXRvcikKK3sKKyAgICByZXR1cm4gbnVtZXJhdG9yICUgZGVub21pbmF0b3I7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIExheW91dFR5cGVzX2gKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcAkocmV2aXNp b24gOTMwNDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTksNyArMjk5LDcgQEAgdm9pZCBSZW5kZXJUZXh0Q29u dHJvbDo6Y29tcHV0ZUxvZ2ljYWxIZQogCiB2b2lkIFJlbmRlclRleHRDb250cm9sOjpoaXRJbm5l clRleHRFbGVtZW50KEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgTGF5b3V0UG9pbnQmIHBv aW50SW5Db250YWluZXIsIGNvbnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCkKIHsK LSAgICBJbnRQb2ludCBhZGp1c3RlZExvY2F0aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyBsb2Nh dGlvbigpOworICAgIExheW91dFBvaW50IGFkanVzdGVkTG9jYXRpb24gPSBhY2N1bXVsYXRlZE9m ZnNldCArIGxvY2F0aW9uKCk7CiAgICAgSFRNTEVsZW1lbnQqIGlubmVyVGV4dCA9IGlubmVyVGV4 dEVsZW1lbnQoKTsKICAgICByZXN1bHQuc2V0SW5uZXJOb2RlKGlubmVyVGV4dCk7CiAgICAgcmVz dWx0LnNldElubmVyTm9uU2hhcmVkTm9kZShpbm5lclRleHQpOwpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmgJKHJldmlzaW9uIDkzMDQ2KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmgJKHdvcmtpbmcgY29w eSkKQEAgLTYzLDcgKzYzLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgc3RhdGljIGJvb2wgaGFzVmFs aWRBdmdDaGFyV2lkdGgoQXRvbWljU3RyaW5nIGZhbWlseSk7CiAgICAgdmlydHVhbCBmbG9hdCBn ZXRBdmdDaGFyV2lkdGgoQXRvbWljU3RyaW5nIGZhbWlseSk7Ci0gICAgdmlydHVhbCBpbnQgcHJl ZmVycmVkQ29udGVudFdpZHRoKGZsb2F0IGNoYXJXaWR0aCkgY29uc3QgPSAwOworICAgIHZpcnR1 YWwgTGF5b3V0VW5pdCBwcmVmZXJyZWRDb250ZW50V2lkdGgoZmxvYXQgY2hhcldpZHRoKSBjb25z dCA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGFkanVzdENvbnRyb2xIZWlnaHRCYXNlZE9uTGluZUhl aWdodChMYXlvdXRVbml0IGxpbmVIZWlnaHQpID0gMDsKICAgICB2aXJ0dWFsIFJlbmRlclN0eWxl KiB0ZXh0QmFzZVN0eWxlKCkgY29uc3QgPSAwOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xNdWx0aUxpbmUuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZS5jcHAJKHJldmlz aW9uIDkzMDQ2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9s TXVsdGlMaW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQsMTAgKzY0LDEwIEBAIGZsb2F0IFJl bmRlclRleHRDb250cm9sTXVsdGlMaW5lOjpnZXRBdmcKICAgICByZXR1cm4gUmVuZGVyVGV4dENv bnRyb2w6OmdldEF2Z0NoYXJXaWR0aChmYW1pbHkpOwogfQogCi1pbnQgUmVuZGVyVGV4dENvbnRy b2xNdWx0aUxpbmU6OnByZWZlcnJlZENvbnRlbnRXaWR0aChmbG9hdCBjaGFyV2lkdGgpIGNvbnN0 CitMYXlvdXRVbml0IFJlbmRlclRleHRDb250cm9sTXVsdGlMaW5lOjpwcmVmZXJyZWRDb250ZW50 V2lkdGgoZmxvYXQgY2hhcldpZHRoKSBjb25zdAogewogICAgIGludCBmYWN0b3IgPSBzdGF0aWNf Y2FzdDxIVE1MVGV4dEFyZWFFbGVtZW50Kj4obm9kZSgpKS0+Y29scygpOwotICAgIHJldHVybiBz dGF0aWNfY2FzdDxpbnQ+KGNlaWxmKGNoYXJXaWR0aCAqIGZhY3RvcikpICsgc2Nyb2xsYmFyVGhp Y2tuZXNzKCk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PExheW91dFVuaXQ+KGNlaWxmKGNoYXJX aWR0aCAqIGZhY3RvcikpICsgc2Nyb2xsYmFyVGhpY2tuZXNzKCk7CiB9CiAKIHZvaWQgUmVuZGVy VGV4dENvbnRyb2xNdWx0aUxpbmU6OmFkanVzdENvbnRyb2xIZWlnaHRCYXNlZE9uTGluZUhlaWdo dChMYXlvdXRVbml0IGxpbmVIZWlnaHQpCkBAIC03NSw3ICs3NSw3IEBAIHZvaWQgUmVuZGVyVGV4 dENvbnRyb2xNdWx0aUxpbmU6OmFkanVzdEMKICAgICBzZXRIZWlnaHQoaGVpZ2h0KCkgKyBsaW5l SGVpZ2h0ICogc3RhdGljX2Nhc3Q8SFRNTFRleHRBcmVhRWxlbWVudCo+KG5vZGUoKSktPnJvd3Mo KSk7CiB9CiAKLWludCBSZW5kZXJUZXh0Q29udHJvbE11bHRpTGluZTo6YmFzZWxpbmVQb3NpdGlv bihGb250QmFzZWxpbmUgYmFzZWxpbmVUeXBlLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlv bk1vZGUgZGlyZWN0aW9uLCBMaW5lUG9zaXRpb25Nb2RlIGxpbmVQb3NpdGlvbk1vZGUpIGNvbnN0 CitMYXlvdXRVbml0IFJlbmRlclRleHRDb250cm9sTXVsdGlMaW5lOjpiYXNlbGluZVBvc2l0aW9u KEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUsIGJvb2wgZmlyc3RMaW5lLCBMaW5lRGlyZWN0aW9u TW9kZSBkaXJlY3Rpb24sIExpbmVQb3NpdGlvbk1vZGUgbGluZVBvc2l0aW9uTW9kZSkgY29uc3QK IHsKICAgICByZXR1cm4gUmVuZGVyQm94OjpiYXNlbGluZVBvc2l0aW9uKGJhc2VsaW5lVHlwZSwg Zmlyc3RMaW5lLCBkaXJlY3Rpb24sIGxpbmVQb3NpdGlvbk1vZGUpOwogfQpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5lLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sTXVsdGlMaW5l LmgJKHJldmlzaW9uIDkzMDQ2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRl eHRDb250cm9sTXVsdGlMaW5lLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDkgKzM3LDkgQEAgcHJp dmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgbm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3Qm LCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNv bnN0IExheW91dFBvaW50JiBhY2N1bXVsYXRlZE9mZnNldCwgSGl0VGVzdEFjdGlvbik7CiAKICAg ICB2aXJ0dWFsIGZsb2F0IGdldEF2Z0NoYXJXaWR0aChBdG9taWNTdHJpbmcgZmFtaWx5KTsKLSAg ICB2aXJ0dWFsIGludCBwcmVmZXJyZWRDb250ZW50V2lkdGgoZmxvYXQgY2hhcldpZHRoKSBjb25z dDsKLSAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0Q29udHJvbEhlaWdodEJhc2VkT25MaW5lSGVpZ2h0 KGludCBsaW5lSGVpZ2h0KTsKLSAgICB2aXJ0dWFsIGludCBiYXNlbGluZVBvc2l0aW9uKEZvbnRC YXNlbGluZSwgYm9vbCBmaXJzdExpbmUsIExpbmVEaXJlY3Rpb25Nb2RlLCBMaW5lUG9zaXRpb25N b2RlID0gUG9zaXRpb25PbkNvbnRhaW5pbmdMaW5lKSBjb25zdDsKKyAgICB2aXJ0dWFsIExheW91 dFVuaXQgcHJlZmVycmVkQ29udGVudFdpZHRoKGZsb2F0IGNoYXJXaWR0aCkgY29uc3Q7CisgICAg dmlydHVhbCB2b2lkIGFkanVzdENvbnRyb2xIZWlnaHRCYXNlZE9uTGluZUhlaWdodChMYXlvdXRV bml0IGxpbmVIZWlnaHQpOworICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBiYXNlbGluZVBvc2l0aW9u KEZvbnRCYXNlbGluZSwgYm9vbCBmaXJzdExpbmUsIExpbmVEaXJlY3Rpb25Nb2RlLCBMaW5lUG9z aXRpb25Nb2RlID0gUG9zaXRpb25PbkNvbnRhaW5pbmdMaW5lKSBjb25zdDsKIAogICAgIHZpcnR1 YWwgdm9pZCB1cGRhdGVGcm9tRWxlbWVudCgpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAkocmV2 aXNpb24gOTMwNDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY1LDEyICsyNjUsMTIgQEAgdm9p ZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmxheW91dAogICAgIGN1cnJlbnRIZWlnaHQg PSBpbm5lclRleHRSZW5kZXJlci0+aGVpZ2h0KCk7CiAgICAgaWYgKCFjb250YWluZXIgJiYgY3Vy cmVudEhlaWdodCAhPSBjb250ZW50SGVpZ2h0KCkpIHsKICAgICAgICAgTGF5b3V0VW5pdCBoZWln aHREaWZmID0gY3VycmVudEhlaWdodCAtIGNvbnRlbnRIZWlnaHQoKTsKLSAgICAgICAgaW5uZXJU ZXh0UmVuZGVyZXItPnNldFkoaW5uZXJUZXh0UmVuZGVyZXItPnkoKSAtIChoZWlnaHREaWZmIC8g MiArIGhlaWdodERpZmYgJSAyKSk7CisgICAgICAgIGlubmVyVGV4dFJlbmRlcmVyLT5zZXRZKGlu bmVyVGV4dFJlbmRlcmVyLT55KCkgLSAoaGVpZ2h0RGlmZiAvIDIgKyBsYXlvdXRNb2QoaGVpZ2h0 RGlmZiwgMikpKTsKICAgICB9IGVsc2UgaWYgKGlucHV0RWxlbWVudCgpLT5pc1NlYXJjaEZpZWxk KCkgJiYgY29udGFpbmVyUmVuZGVyZXIgJiYgY29udGFpbmVyUmVuZGVyZXItPmhlaWdodCgpID4g Y29udGVudEhlaWdodCgpKSB7CiAgICAgICAgIC8vIEEgcXVpcmsgZm9yIGZpbmQtaW4tcGFnZSBi b3ggb24gU2FmYXJpIFdpbmRvd3MuCiAgICAgICAgIC8vIGh0dHA6Ly93ZWJraXQub3JnL2IvNjMx NTcKICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHREaWZmID0gY29udGFpbmVyUmVuZGVyZXItPmhl aWdodCgpIC0gY29udGVudEhlaWdodCgpOwotICAgICAgICBjb250YWluZXJSZW5kZXJlci0+c2V0 WShjb250YWluZXJSZW5kZXJlci0+eSgpIC0gKGhlaWdodERpZmYgLyAyICsgaGVpZ2h0RGlmZiAl IDIpKTsKKyAgICAgICAgY29udGFpbmVyUmVuZGVyZXItPnNldFkoY29udGFpbmVyUmVuZGVyZXIt PnkoKSAtIChoZWlnaHREaWZmIC8gMiArIGxheW91dE1vZChoZWlnaHREaWZmLCAyKSkpOwogICAg IH0KIAogICAgIC8vIElnbm9yZXMgdGhlIHBhZGRpbmdzIGZvciB0aGUgaW5uZXIgc3BpbiBidXR0 b24uCkBAIC0zNzAsMTAgKzM3MCwxMCBAQCBib29sIFJlbmRlclRleHRDb250cm9sU2luZ2xlTGlu ZTo6aGFzQ29uCiAgICAgcmV0dXJuICEhY29udGFpbmVyRWxlbWVudCgpOwogfQogCi1JbnRSZWN0 IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Y29udHJvbENsaXBSZWN0KGNvbnN0IEludFBv aW50JiBhZGRpdGlvbmFsT2Zmc2V0KSBjb25zdAorTGF5b3V0UmVjdCBSZW5kZXJUZXh0Q29udHJv bFNpbmdsZUxpbmU6OmNvbnRyb2xDbGlwUmVjdChjb25zdCBMYXlvdXRQb2ludCYgYWRkaXRpb25h bE9mZnNldCkgY29uc3QKIHsKICAgICBBU1NFUlQoaGFzQ29udHJvbENsaXAoKSk7Ci0gICAgSW50 UmVjdCBjbGlwUmVjdCA9IEludFJlY3QoY29udGFpbmVyRWxlbWVudCgpLT5yZW5kZXJCb3goKS0+ ZnJhbWVSZWN0KCkpOworICAgIExheW91dFJlY3QgY2xpcFJlY3QgPSBMYXlvdXRSZWN0KGNvbnRh aW5lckVsZW1lbnQoKS0+cmVuZGVyQm94KCktPmZyYW1lUmVjdCgpKTsKICAgICBjbGlwUmVjdC5t b3ZlQnkoYWRkaXRpb25hbE9mZnNldCk7CiAgICAgcmV0dXJuIGNsaXBSZWN0OwogfQpAQCAtMzkw LDE0ICszOTAsMTQgQEAgZmxvYXQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpnZXRBdgog ICAgIHJldHVybiBSZW5kZXJUZXh0Q29udHJvbDo6Z2V0QXZnQ2hhcldpZHRoKGZhbWlseSk7CiB9 CiAKLWludCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnByZWZlcnJlZENvbnRlbnRXaWR0 aChmbG9hdCBjaGFyV2lkdGgpIGNvbnN0CitMYXlvdXRVbml0IFJlbmRlclRleHRDb250cm9sU2lu Z2xlTGluZTo6cHJlZmVycmVkQ29udGVudFdpZHRoKGZsb2F0IGNoYXJXaWR0aCkgY29uc3QKIHsK ICAgICBpbnQgZmFjdG9yOwogICAgIGJvb2wgaW5jbHVkZXNEZWNvcmF0aW9uID0gaW5wdXRFbGVt ZW50KCktPnNpemVTaG91bGRJbmNsdWRlRGVjb3JhdGlvbihmYWN0b3IpOwogICAgIGlmIChmYWN0 b3IgPD0gMCkKICAgICAgICAgZmFjdG9yID0gMjA7CiAKLSAgICBpbnQgcmVzdWx0ID0gc3RhdGlj X2Nhc3Q8aW50PihjZWlsZihjaGFyV2lkdGggKiBmYWN0b3IpKTsKKyAgICBMYXlvdXRVbml0IHJl c3VsdCA9IHN0YXRpY19jYXN0PExheW91dFVuaXQ+KGNlaWxlZExheW91dFVuaXQoY2hhcldpZHRo ICogZmFjdG9yKSk7CiAKICAgICBmbG9hdCBtYXhDaGFyV2lkdGggPSAwLmY7CiAgICAgQXRvbWlj U3RyaW5nIGZhbWlseSA9IHN0eWxlKCktPmZvbnQoKS5mYW1pbHkoKS5mYW1pbHkoKTsKQEAgLTcx OSw0MSArNzE5LDQxIEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjphdXRvc2MK ICAgICAgICAgbGF5ZXItPmF1dG9zY3JvbGwoKTsKIH0KIAotaW50IFJlbmRlclRleHRDb250cm9s U2luZ2xlTGluZTo6c2Nyb2xsV2lkdGgoKSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29u dHJvbFNpbmdsZUxpbmU6OnNjcm9sbFdpZHRoKCkgY29uc3QKIHsKICAgICBpZiAoaW5uZXJUZXh0 RWxlbWVudCgpKQogICAgICAgICByZXR1cm4gaW5uZXJUZXh0RWxlbWVudCgpLT5zY3JvbGxXaWR0 aCgpOwogICAgIHJldHVybiBSZW5kZXJCbG9jazo6c2Nyb2xsV2lkdGgoKTsKIH0KIAotaW50IFJl bmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6c2Nyb2xsSGVpZ2h0KCkgY29uc3QKK0xheW91dFVu aXQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzY3JvbGxIZWlnaHQoKSBjb25zdAogewog ICAgIGlmIChpbm5lclRleHRFbGVtZW50KCkpCiAgICAgICAgIHJldHVybiBpbm5lclRleHRFbGVt ZW50KCktPnNjcm9sbEhlaWdodCgpOwogICAgIHJldHVybiBSZW5kZXJCbG9jazo6c2Nyb2xsSGVp Z2h0KCk7CiB9CiAKLWludCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNjcm9sbExlZnQo KSBjb25zdAorTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNjcm9sbExl ZnQoKSBjb25zdAogewogICAgIGlmIChpbm5lclRleHRFbGVtZW50KCkpCiAgICAgICAgIHJldHVy biBpbm5lclRleHRFbGVtZW50KCktPnNjcm9sbExlZnQoKTsKICAgICByZXR1cm4gUmVuZGVyQmxv Y2s6OnNjcm9sbExlZnQoKTsKIH0KIAotaW50IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6 c2Nyb2xsVG9wKCkgY29uc3QKK0xheW91dFVuaXQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5l OjpzY3JvbGxUb3AoKSBjb25zdAogewogICAgIGlmIChpbm5lclRleHRFbGVtZW50KCkpCiAgICAg ICAgIHJldHVybiBpbm5lclRleHRFbGVtZW50KCktPnNjcm9sbFRvcCgpOwogICAgIHJldHVybiBS ZW5kZXJCbG9jazo6c2Nyb2xsVG9wKCk7CiB9CiAKLXZvaWQgUmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaW5lOjpzZXRTY3JvbGxMZWZ0KGludCBuZXdMZWZ0KQordm9pZCBSZW5kZXJUZXh0Q29udHJv bFNpbmdsZUxpbmU6OnNldFNjcm9sbExlZnQoTGF5b3V0VW5pdCBuZXdMZWZ0KQogewogICAgIGlm IChpbm5lclRleHRFbGVtZW50KCkpCiAgICAgICAgIGlubmVyVGV4dEVsZW1lbnQoKS0+c2V0U2Ny b2xsTGVmdChuZXdMZWZ0KTsKIH0KIAotdm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6 OnNldFNjcm9sbFRvcChpbnQgbmV3VG9wKQordm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxp bmU6OnNldFNjcm9sbFRvcChMYXlvdXRVbml0IG5ld1RvcCkKIHsKICAgICBpZiAoaW5uZXJUZXh0 RWxlbWVudCgpKQogICAgICAgICBpbm5lclRleHRFbGVtZW50KCktPnNldFNjcm9sbFRvcChuZXdU b3ApOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2lu Z2xlTGluZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0Q29udHJvbFNpbmdsZUxpbmUuaAkocmV2aXNpb24gOTMwNDYpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmgJKHdvcmtpbmcgY29weSkK QEAgLTUxLDcgKzUxLDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBo YXNDb250cm9sQ2xpcCgpIGNvbnN0OwotICAgIHZpcnR1YWwgSW50UmVjdCBjb250cm9sQ2xpcFJl Y3QoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKKyAgICB2aXJ0dWFsIExheW91dFJlY3QgY29udHJv bENsaXBSZWN0KGNvbnN0IExheW91dFBvaW50JikgY29uc3Q7CiAgICAgdmlydHVhbCBib29sIGlz VGV4dEZpZWxkKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgdmlydHVhbCB2b2lkIHBh aW50KFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50Jik7CkBAIC02MiwxOCArNjIsMTggQEAg cHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgYXV0b3Njcm9sbCgpOwogCiAgICAgLy8gU3ViY2xh c3NlZCB0byBmb3J3YXJkIHRvIG91ciBpbm5lciBkaXYuCi0gICAgdmlydHVhbCBpbnQgc2Nyb2xs TGVmdCgpIGNvbnN0OwotICAgIHZpcnR1YWwgaW50IHNjcm9sbFRvcCgpIGNvbnN0OwotICAgIHZp cnR1YWwgaW50IHNjcm9sbFdpZHRoKCkgY29uc3Q7Ci0gICAgdmlydHVhbCBpbnQgc2Nyb2xsSGVp Z2h0KCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIHNldFNjcm9sbExlZnQoaW50KTsKLSAgICB2 aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsVG9wKGludCk7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IHNj cm9sbExlZnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgc2Nyb2xsVG9wKCkgY29u c3Q7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IHNjcm9sbFdpZHRoKCkgY29uc3Q7CisgICAgdmly dHVhbCBMYXlvdXRVbml0IHNjcm9sbEhlaWdodCgpIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBz ZXRTY3JvbGxMZWZ0KExheW91dFVuaXQpOworICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxUb3Ao TGF5b3V0VW5pdCk7CiAgICAgdmlydHVhbCBib29sIHNjcm9sbChTY3JvbGxEaXJlY3Rpb24sIFNj cm9sbEdyYW51bGFyaXR5LCBmbG9hdCBtdWx0aXBsaWVyID0gMSwgTm9kZSoqIHN0b3BOb2RlID0g MCk7CiAgICAgdmlydHVhbCBib29sIGxvZ2ljYWxTY3JvbGwoU2Nyb2xsTG9naWNhbERpcmVjdGlv biwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRpcGxpZXIgPSAxLCBOb2RlKiogc3RvcE5v ZGUgPSAwKTsKIAogICAgIGludCB0ZXh0QmxvY2tXaWR0aCgpIGNvbnN0OwogICAgIHZpcnR1YWwg ZmxvYXQgZ2V0QXZnQ2hhcldpZHRoKEF0b21pY1N0cmluZyBmYW1pbHkpOwotICAgIHZpcnR1YWwg aW50IHByZWZlcnJlZENvbnRlbnRXaWR0aChmbG9hdCBjaGFyV2lkdGgpIGNvbnN0OworICAgIHZp cnR1YWwgTGF5b3V0VW5pdCBwcmVmZXJyZWRDb250ZW50V2lkdGgoZmxvYXQgY2hhcldpZHRoKSBj b25zdDsKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0Q29udHJvbEhlaWdodEJhc2VkT25MaW5lSGVp Z2h0KExheW91dFVuaXQgbGluZUhlaWdodCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJv bUVsZW1lbnQoKTsK