92062 2012-07-23 21:17:42 -0700 Rename FocusScope to FocusNavigationScope. 2012-07-24 19:20:25 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hayato hayato dglazkov dominicc morrita shinyak tasak webkit.review.bot oldest_to_newest 676368 0 hayato 2012-07-23 21:17:42 -0700 FocusNavagationScope is better name than FocusScope since the class is only used for controlling focus navigation. 676374 1 153952 hayato 2012-07-23 21:29:42 -0700 Created attachment 153952 renaming 677525 2 153952 webkit.review.bot 2012-07-24 19:20:21 -0700 Comment on attachment 153952 renaming Clearing flags on attachment: 153952 Committed r123565: <http://trac.webkit.org/changeset/123565> 677526 3 webkit.review.bot 2012-07-24 19:20:25 -0700 All reviewed patches have been landed. Closing bug. 153952 2012-07-23 21:29:42 -0700 2012-07-24 19:20:21 -0700 renaming bug-92062-20120724132934.patch text/plain 13612 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjIzNTVmNjM3NzZmZmQz MjY0NWJmMzkyNWQ1N2UxZWIzOTU1YTdmNC4uZGFmY2NhYzliMzdmYjkxNDAyMjA0YWE2MDVjOGY1 MDMwMGM2N2MzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA3LTIzICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgRm9jdXNTY29w ZSB0byBGb2N1c05hdmlnYXRpb25TY29wZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTkyMDYyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRm9jdXNOYXZhZ2F0aW9uU2NvcGUgaXMgYmV0dGVyIG5hbWUgdGhh biBGb2N1c1Njb3BlIHNpbmNlIHRoZQorICAgICAgICBjbGFzcyBpcyBvbmx5IHVzZWQgZm9yIGNv bnRyb2xsaW5nIGZvY3VzIG5hdmlnYXRpb24uCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0gbm8g ZnVuY3Rpb25hbCBjaGFuZ2VzLgorCisgICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNOYXZpZ2F0aW9uU2NvcGU6OkZvY3VzTmF2aWdhdGlv blNjb3BlKToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzTmF2aWdhdGlvblNjb3BlOjpyb290Tm9k ZSk6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c05hdmlnYXRpb25TY29wZTo6b3duZXIpOgorICAg ICAgICAoV2ViQ29yZTo6Rm9jdXNOYXZpZ2F0aW9uU2NvcGU6OmZvY3VzTmF2aWdhdGlvblNjb3Bl T2YpOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNOYXZpZ2F0aW9uU2NvcGU6OmZvY3VzTmF2aWdh dGlvblNjb3BlT3duZWRCeVNoYWRvd0hvc3QpOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNOYXZp Z2F0aW9uU2NvcGU6OmZvY3VzTmF2aWdhdGlvblNjb3BlT3duZWRCeUlGcmFtZSk6CisgICAgICAg IChXZWJDb3JlOjpGb2N1c0NvbnRyb2xsZXI6OmZpbmRGb2N1c2FibGVOb2RlRGVjZW5kaW5nRG93 bkludG9GcmFtZURvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6 YWR2YW5jZUZvY3VzSW5Eb2N1bWVudE9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29u dHJvbGxlcjo6ZmluZEZvY3VzYWJsZU5vZGVBY3Jvc3NGb2N1c1Njb3BlKToKKyAgICAgICAgKFdl YkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6ZmluZEZvY3VzYWJsZU5vZGVSZWN1cnNpdmVseSk6Cisg ICAgICAgIChXZWJDb3JlOjpGb2N1c0NvbnRyb2xsZXI6OmZpbmRGb2N1c2FibGVOb2RlKToKKyAg ICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6bmV4dEZvY3VzYWJsZU5vZGUpOgorICAg ICAgICAoV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjpwcmV2aW91c0ZvY3VzYWJsZU5vZGUpOgor ICAgICAgICAqIHBhZ2UvRm9jdXNDb250cm9sbGVyLmg6CisgICAgICAgIChGb2N1c05hdmlnYXRp b25TY29wZSk6CisgICAgICAgIChGb2N1c0NvbnRyb2xsZXIpOgorCiAyMDEyLTA3LTIzICBEYXZl IFR1ICA8ZHR1QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEFkZCBkcm9wcGVk RnJhbWVDb3VudCB0byByZW5kZXJpbmdTdGF0cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250 cm9sbGVyLmNwcAppbmRleCA0ZjgxYjljODg4NGY5ZjdhM2YyMzlmYzUzMzE0ODRkYjkwZjE2YmJk Li5iZjU4MmI0NzM1YmYyNzQxNjdmNzA1ZDcwNzk5NDc2ZGQxYmE1Y2M4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCkBAIC05NCwxOSArOTQsMTkgQEAgc3RhdGljIGlu bGluZSBOb2RlKiBwcmV2aW91c05vZGUoY29uc3QgTm9kZSogbm9kZSkKICAgICByZXR1cm4gd2Fs a2VyRnJvbVByZXZpb3VzKG5vZGUpLmdldCgpOwogfQogCi1Gb2N1c1Njb3BlOjpGb2N1c1Njb3Bl KFRyZWVTY29wZSogdHJlZVNjb3BlKQorRm9jdXNOYXZpZ2F0aW9uU2NvcGU6OkZvY3VzTmF2aWdh dGlvblNjb3BlKFRyZWVTY29wZSogdHJlZVNjb3BlKQogICAgIDogbV9yb290VHJlZVNjb3BlKHRy ZWVTY29wZSkKIHsKICAgICBBU1NFUlQodHJlZVNjb3BlKTsKICAgICBBU1NFUlQoIXRyZWVTY29w ZS0+cm9vdE5vZGUoKS0+aXNTaGFkb3dSb290KCkgfHwgdG9TaGFkb3dSb290KHRyZWVTY29wZS0+ cm9vdE5vZGUoKSktPmlzWW91bmdlc3QoKSk7CiB9CiAKLU5vZGUqIEZvY3VzU2NvcGU6OnJvb3RO b2RlKCkgY29uc3QKK05vZGUqIEZvY3VzTmF2aWdhdGlvblNjb3BlOjpyb290Tm9kZSgpIGNvbnN0 CiB7CiAgICAgcmV0dXJuIG1fcm9vdFRyZWVTY29wZS0+cm9vdE5vZGUoKTsKIH0KIAotRWxlbWVu dCogRm9jdXNTY29wZTo6b3duZXIoKSBjb25zdAorRWxlbWVudCogRm9jdXNOYXZpZ2F0aW9uU2Nv cGU6Om93bmVyKCkgY29uc3QKIHsKICAgICBOb2RlKiByb290ID0gcm9vdE5vZGUoKTsKICAgICBp ZiAocm9vdC0+aXNTaGFkb3dSb290KCkpCkBAIC0xMTYsNyArMTE2LDcgQEAgRWxlbWVudCogRm9j dXNTY29wZTo6b3duZXIoKSBjb25zdAogICAgIHJldHVybiAwOwogfQogCi1Gb2N1c1Njb3BlIEZv Y3VzU2NvcGU6OmZvY3VzU2NvcGVPZihOb2RlKiBub2RlKQorRm9jdXNOYXZpZ2F0aW9uU2NvcGUg Rm9jdXNOYXZpZ2F0aW9uU2NvcGU6OmZvY3VzTmF2aWdhdGlvblNjb3BlT2YoTm9kZSogbm9kZSkK IHsKICAgICBBU1NFUlQobm9kZSk7CiAgICAgQ29tcG9zZWRTaGFkb3dUcmVlV2Fsa2VyIHdhbGtl cihub2RlLCBDb21wb3NlZFNoYWRvd1RyZWVXYWxrZXI6OkRvTm90Q3Jvc3NVcHBlckJvdW5kYXJ5 KTsKQEAgLTEyNywxOSArMTI3LDE5IEBAIEZvY3VzU2NvcGUgRm9jdXNTY29wZTo6Zm9jdXNTY29w ZU9mKE5vZGUqIG5vZGUpCiAgICAgfQogICAgIC8vIFRoZSByZXN1bHQgaXMgbm90IGFsd2F5cyBh IFNoYWRvd1Jvb3Qgbm9yIGEgRG9jdW1lbnROb2RlIHNpbmNlCiAgICAgLy8gYSBzdGFydGluZyBu b2RlIGlzIGluIGFuIG9ycGhhbmVkIHRyZWUgaW4gY29tcG9zZWQgc2hhZG93IHRyZWUuCi0gICAg cmV0dXJuIEZvY3VzU2NvcGUocm9vdC0+dHJlZVNjb3BlKCkpOworICAgIHJldHVybiBGb2N1c05h dmlnYXRpb25TY29wZShyb290LT50cmVlU2NvcGUoKSk7CiB9CiAKLUZvY3VzU2NvcGUgRm9jdXNT Y29wZTo6Zm9jdXNTY29wZU93bmVkQnlTaGFkb3dIb3N0KE5vZGUqIG5vZGUpCitGb2N1c05hdmln YXRpb25TY29wZSBGb2N1c05hdmlnYXRpb25TY29wZTo6Zm9jdXNOYXZpZ2F0aW9uU2NvcGVPd25l ZEJ5U2hhZG93SG9zdChOb2RlKiBub2RlKQogewogICAgIEFTU0VSVChpc1NoYWRvd0hvc3Qobm9k ZSkpOwotICAgIHJldHVybiBGb2N1c1Njb3BlKHRvRWxlbWVudChub2RlKS0+c2hhZG93KCktPnlv dW5nZXN0U2hhZG93Um9vdCgpKTsKKyAgICByZXR1cm4gRm9jdXNOYXZpZ2F0aW9uU2NvcGUodG9F bGVtZW50KG5vZGUpLT5zaGFkb3coKS0+eW91bmdlc3RTaGFkb3dSb290KCkpOwogfQogCi1Gb2N1 c1Njb3BlIEZvY3VzU2NvcGU6OmZvY3VzU2NvcGVPd25lZEJ5SUZyYW1lKEhUTUxGcmFtZU93bmVy RWxlbWVudCogZnJhbWUpCitGb2N1c05hdmlnYXRpb25TY29wZSBGb2N1c05hdmlnYXRpb25TY29w ZTo6Zm9jdXNOYXZpZ2F0aW9uU2NvcGVPd25lZEJ5SUZyYW1lKEhUTUxGcmFtZU93bmVyRWxlbWVu dCogZnJhbWUpCiB7CiAgICAgQVNTRVJUKGZyYW1lICYmIGZyYW1lLT5jb250ZW50RnJhbWUoKSk7 Ci0gICAgcmV0dXJuIEZvY3VzU2NvcGUoZnJhbWUtPmNvbnRlbnRGcmFtZSgpLT5kb2N1bWVudCgp KTsKKyAgICByZXR1cm4gRm9jdXNOYXZpZ2F0aW9uU2NvcGUoZnJhbWUtPmNvbnRlbnRGcmFtZSgp LT5kb2N1bWVudCgpKTsKIH0KIAogc3RhdGljIGlubGluZSB2b2lkIGRpc3BhdGNoRXZlbnRzT25X aW5kb3dBbmRGb2N1c2VkTm9kZShEb2N1bWVudCogZG9jdW1lbnQsIGJvb2wgZm9jdXNlZCkKQEAg LTI2OCw3ICsyNjgsNyBAQCBOb2RlKiBGb2N1c0NvbnRyb2xsZXI6OmZpbmRGb2N1c2FibGVOb2Rl RGVjZW5kaW5nRG93bkludG9GcmFtZURvY3VtZW50KEZvY3VzRGlyZQogICAgICAgICBIVE1MRnJh bWVPd25lckVsZW1lbnQqIG93bmVyID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lT3duZXJFbGVtZW50 Kj4obm9kZSk7CiAgICAgICAgIGlmICghb3duZXItPmNvbnRlbnRGcmFtZSgpKQogICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIE5vZGUqIGZvdW5kTm9kZSA9IGZpbmRGb2N1c2FibGVOb2RlKGRp cmVjdGlvbiwgRm9jdXNTY29wZTo6Zm9jdXNTY29wZU93bmVkQnlJRnJhbWUob3duZXIpLCAwLCBl dmVudCk7CisgICAgICAgIE5vZGUqIGZvdW5kTm9kZSA9IGZpbmRGb2N1c2FibGVOb2RlKGRpcmVj dGlvbiwgRm9jdXNOYXZpZ2F0aW9uU2NvcGU6OmZvY3VzTmF2aWdhdGlvblNjb3BlT3duZWRCeUlG cmFtZShvd25lciksIDAsIGV2ZW50KTsKICAgICAgICAgaWYgKCFmb3VuZE5vZGUpCiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgQVNTRVJUKG5vZGUgIT0gZm91bmROb2RlKTsKQEAgLTMyMyw3 ICszMjMsNyBAQCBib29sIEZvY3VzQ29udHJvbGxlcjo6YWR2YW5jZUZvY3VzSW5Eb2N1bWVudE9y ZGVyKEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiwgS2V5YgogCiAgICAgZG9jdW1lbnQtPnVwZGF0 ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwogCi0gICAgUmVmUHRyPE5vZGU+IG5v ZGUgPSBmaW5kRm9jdXNhYmxlTm9kZUFjcm9zc0ZvY3VzU2NvcGUoZGlyZWN0aW9uLCBGb2N1c1Nj b3BlOjpmb2N1c1Njb3BlT2YoY3VycmVudE5vZGUgPyBjdXJyZW50Tm9kZSA6IGRvY3VtZW50KSwg Y3VycmVudE5vZGUsIGV2ZW50KTsKKyAgICBSZWZQdHI8Tm9kZT4gbm9kZSA9IGZpbmRGb2N1c2Fi bGVOb2RlQWNyb3NzRm9jdXNTY29wZShkaXJlY3Rpb24sIEZvY3VzTmF2aWdhdGlvblNjb3BlOjpm b2N1c05hdmlnYXRpb25TY29wZU9mKGN1cnJlbnROb2RlID8gY3VycmVudE5vZGUgOiBkb2N1bWVu dCksIGN1cnJlbnROb2RlLCBldmVudCk7CiAKICAgICBpZiAoIW5vZGUpIHsKICAgICAgICAgLy8g V2UgZGlkbid0IGZpbmQgYSBub2RlIHRvIGZvY3VzLCBzbyB3ZSBzaG91bGQgdHJ5IHRvIHBhc3Mg Zm9jdXMgdG8gQ2hyb21lLgpAQCAtMzM1LDcgKzMzNSw3IEBAIGJvb2wgRm9jdXNDb250cm9sbGVy OjphZHZhbmNlRm9jdXNJbkRvY3VtZW50T3JkZXIoRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBL ZXliCiAgICAgICAgIH0KIAogICAgICAgICAvLyBDaHJvbWUgZG9lc24ndCB3YW50IGZvY3VzLCBz byB3ZSBzaG91bGQgd3JhcCBmb2N1cy4KLSAgICAgICAgbm9kZSA9IGZpbmRGb2N1c2FibGVOb2Rl UmVjdXJzaXZlbHkoZGlyZWN0aW9uLCBGb2N1c1Njb3BlOjpmb2N1c1Njb3BlT2YobV9wYWdlLT5t YWluRnJhbWUoKS0+ZG9jdW1lbnQoKSksIDAsIGV2ZW50KTsKKyAgICAgICAgbm9kZSA9IGZpbmRG b2N1c2FibGVOb2RlUmVjdXJzaXZlbHkoZGlyZWN0aW9uLCBGb2N1c05hdmlnYXRpb25TY29wZTo6 Zm9jdXNOYXZpZ2F0aW9uU2NvcGVPZihtX3BhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpKSwg MCwgZXZlbnQpOwogICAgICAgICBub2RlID0gZmluZEZvY3VzYWJsZU5vZGVEZWNlbmRpbmdEb3du SW50b0ZyYW1lRG9jdW1lbnQoZGlyZWN0aW9uLCBub2RlLmdldCgpLCBldmVudCk7CiAKICAgICAg ICAgaWYgKCFub2RlKQpAQCAtMzg4LDEyICszODgsMTIgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6 OmFkdmFuY2VGb2N1c0luRG9jdW1lbnRPcmRlcihGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEtl eWIKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotTm9kZSogRm9jdXNDb250cm9sbGVyOjpmaW5kRm9j dXNhYmxlTm9kZUFjcm9zc0ZvY3VzU2NvcGUoRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBGb2N1 c1Njb3BlIHNjb3BlLCBOb2RlKiBjdXJyZW50Tm9kZSwgS2V5Ym9hcmRFdmVudCogZXZlbnQpCitO b2RlKiBGb2N1c0NvbnRyb2xsZXI6OmZpbmRGb2N1c2FibGVOb2RlQWNyb3NzRm9jdXNTY29wZShG b2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZvY3VzTmF2aWdhdGlvblNjb3BlIHNjb3BlLCBOb2Rl KiBjdXJyZW50Tm9kZSwgS2V5Ym9hcmRFdmVudCogZXZlbnQpCiB7CiAgICAgQVNTRVJUKCFjdXJy ZW50Tm9kZSB8fCAhaXNOb25Gb2N1c2FibGVTaGFkb3dIb3N0KGN1cnJlbnROb2RlLCBldmVudCkp OwogICAgIE5vZGUqIGZvdW5kOwogICAgIGlmIChjdXJyZW50Tm9kZSAmJiBkaXJlY3Rpb24gPT0g Rm9jdXNEaXJlY3Rpb25Gb3J3YXJkICYmIGlzRm9jdXNhYmxlU2hhZG93SG9zdChjdXJyZW50Tm9k ZSwgZXZlbnQpKSB7Ci0gICAgICAgIE5vZGUqIGZvdW5kSW5Jbm5lckZvY3VzU2NvcGUgPSBmaW5k Rm9jdXNhYmxlTm9kZVJlY3Vyc2l2ZWx5KGRpcmVjdGlvbiwgRm9jdXNTY29wZTo6Zm9jdXNTY29w ZU93bmVkQnlTaGFkb3dIb3N0KGN1cnJlbnROb2RlKSwgMCwgZXZlbnQpOworICAgICAgICBOb2Rl KiBmb3VuZEluSW5uZXJGb2N1c1Njb3BlID0gZmluZEZvY3VzYWJsZU5vZGVSZWN1cnNpdmVseShk aXJlY3Rpb24sIEZvY3VzTmF2aWdhdGlvblNjb3BlOjpmb2N1c05hdmlnYXRpb25TY29wZU93bmVk QnlTaGFkb3dIb3N0KGN1cnJlbnROb2RlKSwgMCwgZXZlbnQpOwogICAgICAgICBmb3VuZCA9IGZv dW5kSW5Jbm5lckZvY3VzU2NvcGUgPyBmb3VuZEluSW5uZXJGb2N1c1Njb3BlIDogZmluZEZvY3Vz YWJsZU5vZGVSZWN1cnNpdmVseShkaXJlY3Rpb24sIHNjb3BlLCBjdXJyZW50Tm9kZSwgZXZlbnQp OwogICAgIH0gZWxzZQogICAgICAgICBmb3VuZCA9IGZpbmRGb2N1c2FibGVOb2RlUmVjdXJzaXZl bHkoZGlyZWN0aW9uLCBzY29wZSwgY3VycmVudE5vZGUsIGV2ZW50KTsKQEAgLTQwMyw3ICs0MDMs NyBAQCBOb2RlKiBGb2N1c0NvbnRyb2xsZXI6OmZpbmRGb2N1c2FibGVOb2RlQWNyb3NzRm9jdXNT Y29wZShGb2N1c0RpcmVjdGlvbiBkaXJlY3RpbwogICAgICAgICBOb2RlKiBvd25lciA9IHNjb3Bl Lm93bmVyKCk7CiAgICAgICAgIGlmICghb3duZXIpCiAgICAgICAgICAgICBicmVhazsKLSAgICAg ICAgc2NvcGUgPSBGb2N1c1Njb3BlOjpmb2N1c1Njb3BlT2Yob3duZXIpOworICAgICAgICBzY29w ZSA9IEZvY3VzTmF2aWdhdGlvblNjb3BlOjpmb2N1c05hdmlnYXRpb25TY29wZU9mKG93bmVyKTsK ICAgICAgICAgaWYgKGRpcmVjdGlvbiA9PSBGb2N1c0RpcmVjdGlvbkJhY2t3YXJkICYmIGlzRm9j dXNhYmxlU2hhZG93SG9zdChvd25lciwgZXZlbnQpKSB7CiAgICAgICAgICAgICBmb3VuZCA9IG93 bmVyOwogICAgICAgICAgICAgYnJlYWs7CkBAIC00MTQsNyArNDE0LDcgQEAgTm9kZSogRm9jdXND b250cm9sbGVyOjpmaW5kRm9jdXNhYmxlTm9kZUFjcm9zc0ZvY3VzU2NvcGUoRm9jdXNEaXJlY3Rp b24gZGlyZWN0aW8KICAgICByZXR1cm4gZm91bmQ7CiB9CiAKLU5vZGUqIEZvY3VzQ29udHJvbGxl cjo6ZmluZEZvY3VzYWJsZU5vZGVSZWN1cnNpdmVseShGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24s IEZvY3VzU2NvcGUgc2NvcGUsIE5vZGUqIHN0YXJ0LCBLZXlib2FyZEV2ZW50KiBldmVudCkKK05v ZGUqIEZvY3VzQ29udHJvbGxlcjo6ZmluZEZvY3VzYWJsZU5vZGVSZWN1cnNpdmVseShGb2N1c0Rp cmVjdGlvbiBkaXJlY3Rpb24sIEZvY3VzTmF2aWdhdGlvblNjb3BlIHNjb3BlLCBOb2RlKiBzdGFy dCwgS2V5Ym9hcmRFdmVudCogZXZlbnQpCiB7CiAgICAgLy8gU3RhcnRpbmcgbm9kZSBpcyBleGNs dXNpdmUuCiAgICAgTm9kZSogZm91bmQgPSBmaW5kRm9jdXNhYmxlTm9kZShkaXJlY3Rpb24sIHNj b3BlLCBzdGFydCwgZXZlbnQpOwpAQCAtNDIzLDIyICs0MjMsMjIgQEAgTm9kZSogRm9jdXNDb250 cm9sbGVyOjpmaW5kRm9jdXNhYmxlTm9kZVJlY3Vyc2l2ZWx5KEZvY3VzRGlyZWN0aW9uIGRpcmVj dGlvbiwgRm8KICAgICBpZiAoZGlyZWN0aW9uID09IEZvY3VzRGlyZWN0aW9uRm9yd2FyZCkgewog ICAgICAgICBpZiAoIWlzTm9uRm9jdXNhYmxlU2hhZG93SG9zdChmb3VuZCwgZXZlbnQpKQogICAg ICAgICAgICAgcmV0dXJuIGZvdW5kOwotICAgICAgICBOb2RlKiBmb3VuZEluSW5uZXJGb2N1c1Nj b3BlID0gZmluZEZvY3VzYWJsZU5vZGVSZWN1cnNpdmVseShkaXJlY3Rpb24sIEZvY3VzU2NvcGU6 OmZvY3VzU2NvcGVPd25lZEJ5U2hhZG93SG9zdChmb3VuZCksIDAsIGV2ZW50KTsKKyAgICAgICAg Tm9kZSogZm91bmRJbklubmVyRm9jdXNTY29wZSA9IGZpbmRGb2N1c2FibGVOb2RlUmVjdXJzaXZl bHkoZGlyZWN0aW9uLCBGb2N1c05hdmlnYXRpb25TY29wZTo6Zm9jdXNOYXZpZ2F0aW9uU2NvcGVP d25lZEJ5U2hhZG93SG9zdChmb3VuZCksIDAsIGV2ZW50KTsKICAgICAgICAgcmV0dXJuIGZvdW5k SW5Jbm5lckZvY3VzU2NvcGUgPyBmb3VuZEluSW5uZXJGb2N1c1Njb3BlIDogZmluZEZvY3VzYWJs ZU5vZGVSZWN1cnNpdmVseShkaXJlY3Rpb24sIHNjb3BlLCBmb3VuZCwgZXZlbnQpOwogICAgIH0K ICAgICBBU1NFUlQoZGlyZWN0aW9uID09IEZvY3VzRGlyZWN0aW9uQmFja3dhcmQpOwogICAgIGlm IChpc0ZvY3VzYWJsZVNoYWRvd0hvc3QoZm91bmQsIGV2ZW50KSkgewotICAgICAgICBOb2RlKiBm b3VuZEluSW5uZXJGb2N1c1Njb3BlID0gZmluZEZvY3VzYWJsZU5vZGVSZWN1cnNpdmVseShkaXJl Y3Rpb24sIEZvY3VzU2NvcGU6OmZvY3VzU2NvcGVPd25lZEJ5U2hhZG93SG9zdChmb3VuZCksIDAs IGV2ZW50KTsKKyAgICAgICAgTm9kZSogZm91bmRJbklubmVyRm9jdXNTY29wZSA9IGZpbmRGb2N1 c2FibGVOb2RlUmVjdXJzaXZlbHkoZGlyZWN0aW9uLCBGb2N1c05hdmlnYXRpb25TY29wZTo6Zm9j dXNOYXZpZ2F0aW9uU2NvcGVPd25lZEJ5U2hhZG93SG9zdChmb3VuZCksIDAsIGV2ZW50KTsKICAg ICAgICAgcmV0dXJuIGZvdW5kSW5Jbm5lckZvY3VzU2NvcGUgPyBmb3VuZEluSW5uZXJGb2N1c1Nj b3BlIDogZm91bmQ7CiAgICAgfQogICAgIGlmIChpc05vbkZvY3VzYWJsZVNoYWRvd0hvc3QoZm91 bmQsIGV2ZW50KSkgewotICAgICAgICBOb2RlKiBmb3VuZEluSW5uZXJGb2N1c1Njb3BlID0gZmlu ZEZvY3VzYWJsZU5vZGVSZWN1cnNpdmVseShkaXJlY3Rpb24sIEZvY3VzU2NvcGU6OmZvY3VzU2Nv cGVPd25lZEJ5U2hhZG93SG9zdChmb3VuZCksIDAsIGV2ZW50KTsKKyAgICAgICAgTm9kZSogZm91 bmRJbklubmVyRm9jdXNTY29wZSA9IGZpbmRGb2N1c2FibGVOb2RlUmVjdXJzaXZlbHkoZGlyZWN0 aW9uLCBGb2N1c05hdmlnYXRpb25TY29wZTo6Zm9jdXNOYXZpZ2F0aW9uU2NvcGVPd25lZEJ5U2hh ZG93SG9zdChmb3VuZCksIDAsIGV2ZW50KTsKICAgICAgICAgcmV0dXJuIGZvdW5kSW5Jbm5lckZv Y3VzU2NvcGUgPyBmb3VuZEluSW5uZXJGb2N1c1Njb3BlIDpmaW5kRm9jdXNhYmxlTm9kZVJlY3Vy c2l2ZWx5KGRpcmVjdGlvbiwgc2NvcGUsIGZvdW5kLCBldmVudCk7CiAgICAgfQogICAgIHJldHVy biBmb3VuZDsKIH0KIAotTm9kZSogRm9jdXNDb250cm9sbGVyOjpmaW5kRm9jdXNhYmxlTm9kZShG b2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZvY3VzU2NvcGUgc2NvcGUsIE5vZGUqIG5vZGUsIEtl eWJvYXJkRXZlbnQqIGV2ZW50KQorTm9kZSogRm9jdXNDb250cm9sbGVyOjpmaW5kRm9jdXNhYmxl Tm9kZShGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEZvY3VzTmF2aWdhdGlvblNjb3BlIHNjb3Bl LCBOb2RlKiBub2RlLCBLZXlib2FyZEV2ZW50KiBldmVudCkKIHsKICAgICByZXR1cm4gKGRpcmVj dGlvbiA9PSBGb2N1c0RpcmVjdGlvbkZvcndhcmQpCiAgICAgICAgID8gbmV4dEZvY3VzYWJsZU5v ZGUoc2NvcGUsIG5vZGUsIGV2ZW50KQpAQCAtNDg3LDcgKzQ4Nyw3IEBAIHN0YXRpYyBOb2RlKiBw cmV2aW91c05vZGVXaXRoTG93ZXJUYWJJbmRleChOb2RlKiBzdGFydCwgaW50IHRhYkluZGV4LCBL ZXlib2FyZEV2CiAgICAgcmV0dXJuIHdpbm5lcjsKIH0KIAotTm9kZSogRm9jdXNDb250cm9sbGVy OjpuZXh0Rm9jdXNhYmxlTm9kZShGb2N1c1Njb3BlIHNjb3BlLCBOb2RlKiBzdGFydCwgS2V5Ym9h cmRFdmVudCogZXZlbnQpCitOb2RlKiBGb2N1c0NvbnRyb2xsZXI6Om5leHRGb2N1c2FibGVOb2Rl KEZvY3VzTmF2aWdhdGlvblNjb3BlIHNjb3BlLCBOb2RlKiBzdGFydCwgS2V5Ym9hcmRFdmVudCog ZXZlbnQpCiB7CiAgICAgaWYgKHN0YXJ0KSB7CiAgICAgICAgIGludCB0YWJJbmRleCA9IGFkanVz dGVkVGFiSW5kZXgoc3RhcnQsIGV2ZW50KTsKQEAgLTUxOSw3ICs1MTksNyBAQCBOb2RlKiBGb2N1 c0NvbnRyb2xsZXI6Om5leHRGb2N1c2FibGVOb2RlKEZvY3VzU2NvcGUgc2NvcGUsIE5vZGUqIHN0 YXJ0LCBLZXlib2FyZAogICAgIHJldHVybiBmaW5kTm9kZVdpdGhFeGFjdFRhYkluZGV4KHNjb3Bl LnJvb3ROb2RlKCksIDAsIGV2ZW50LCBGb2N1c0RpcmVjdGlvbkZvcndhcmQpOwogfQogCi1Ob2Rl KiBGb2N1c0NvbnRyb2xsZXI6OnByZXZpb3VzRm9jdXNhYmxlTm9kZShGb2N1c1Njb3BlIHNjb3Bl LCBOb2RlKiBzdGFydCwgS2V5Ym9hcmRFdmVudCogZXZlbnQpCitOb2RlKiBGb2N1c0NvbnRyb2xs ZXI6OnByZXZpb3VzRm9jdXNhYmxlTm9kZShGb2N1c05hdmlnYXRpb25TY29wZSBzY29wZSwgTm9k ZSogc3RhcnQsIEtleWJvYXJkRXZlbnQqIGV2ZW50KQogewogICAgIE5vZGUqIGxhc3QgPSAwOwog ICAgIGZvciAoQ29tcG9zZWRTaGFkb3dUcmVlV2Fsa2VyIHdhbGtlciA9IHdhbGtlckZyb20oc2Nv cGUucm9vdE5vZGUoKSk7IHdhbGtlci5nZXQoKTsgd2Fsa2VyLmxhc3RDaGlsZCgpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgKaW5kZXggODkwODllNzEwN2I2NWZjZjM5ZDRkZDJm YjkwMDFjMDUwZWQwOWQ1NS4uMTFkMzJhZDE5NGRlNjNhMTRhZGUzYmRhMWUyYmUyNWQ1YTgwNmJm ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oCkBAIC00NSwxNiArNDUsMTYg QEAgY2xhc3MgTm9kZTsKIGNsYXNzIFBhZ2U7CiBjbGFzcyBUcmVlU2NvcGU7CiAKLWNsYXNzIEZv Y3VzU2NvcGUgeworY2xhc3MgRm9jdXNOYXZpZ2F0aW9uU2NvcGUgewogcHVibGljOgogICAgIE5v ZGUqIHJvb3ROb2RlKCkgY29uc3Q7CiAgICAgRWxlbWVudCogb3duZXIoKSBjb25zdDsKLSAgICBz dGF0aWMgRm9jdXNTY29wZSBmb2N1c1Njb3BlT2YoTm9kZSopOwotICAgIHN0YXRpYyBGb2N1c1Nj b3BlIGZvY3VzU2NvcGVPd25lZEJ5U2hhZG93SG9zdChOb2RlKik7Ci0gICAgc3RhdGljIEZvY3Vz U2NvcGUgZm9jdXNTY29wZU93bmVkQnlJRnJhbWUoSFRNTEZyYW1lT3duZXJFbGVtZW50Kik7Cisg ICAgc3RhdGljIEZvY3VzTmF2aWdhdGlvblNjb3BlIGZvY3VzTmF2aWdhdGlvblNjb3BlT2YoTm9k ZSopOworICAgIHN0YXRpYyBGb2N1c05hdmlnYXRpb25TY29wZSBmb2N1c05hdmlnYXRpb25TY29w ZU93bmVkQnlTaGFkb3dIb3N0KE5vZGUqKTsKKyAgICBzdGF0aWMgRm9jdXNOYXZpZ2F0aW9uU2Nv cGUgZm9jdXNOYXZpZ2F0aW9uU2NvcGVPd25lZEJ5SUZyYW1lKEhUTUxGcmFtZU93bmVyRWxlbWVu dCopOwogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IEZvY3VzU2NvcGUoVHJlZVNjb3BlKik7Cisg ICAgZXhwbGljaXQgRm9jdXNOYXZpZ2F0aW9uU2NvcGUoVHJlZVNjb3BlKik7CiAgICAgVHJlZVNj b3BlKiBtX3Jvb3RUcmVlU2NvcGU7CiB9OwogCkBAIC04Nyw4ICs4Nyw4IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBhZHZhbmNlRm9jdXNEaXJlY3Rpb25hbGx5KEZvY3VzRGlyZWN0aW9uLCBLZXlib2Fy ZEV2ZW50Kik7CiAgICAgYm9vbCBhZHZhbmNlRm9jdXNJbkRvY3VtZW50T3JkZXIoRm9jdXNEaXJl Y3Rpb24sIEtleWJvYXJkRXZlbnQqLCBib29sIGluaXRpYWxGb2N1cyk7CiAKLSAgICBOb2RlKiBm aW5kRm9jdXNhYmxlTm9kZUFjcm9zc0ZvY3VzU2NvcGUoRm9jdXNEaXJlY3Rpb24sIEZvY3VzU2Nv cGUgc3RhcnRTY29wZSwgTm9kZSogc3RhcnQsIEtleWJvYXJkRXZlbnQqKTsKLSAgICBOb2RlKiBm aW5kRm9jdXNhYmxlTm9kZVJlY3Vyc2l2ZWx5KEZvY3VzRGlyZWN0aW9uLCBGb2N1c1Njb3BlLCBO b2RlKiBzdGFydCwgS2V5Ym9hcmRFdmVudCopOworICAgIE5vZGUqIGZpbmRGb2N1c2FibGVOb2Rl QWNyb3NzRm9jdXNTY29wZShGb2N1c0RpcmVjdGlvbiwgRm9jdXNOYXZpZ2F0aW9uU2NvcGUgc3Rh cnRTY29wZSwgTm9kZSogc3RhcnQsIEtleWJvYXJkRXZlbnQqKTsKKyAgICBOb2RlKiBmaW5kRm9j dXNhYmxlTm9kZVJlY3Vyc2l2ZWx5KEZvY3VzRGlyZWN0aW9uLCBGb2N1c05hdmlnYXRpb25TY29w ZSwgTm9kZSogc3RhcnQsIEtleWJvYXJkRXZlbnQqKTsKICAgICBOb2RlKiBmaW5kRm9jdXNhYmxl Tm9kZURlY2VuZGluZ0Rvd25JbnRvRnJhbWVEb2N1bWVudChGb2N1c0RpcmVjdGlvbiwgTm9kZSos IEtleWJvYXJkRXZlbnQqKTsKIAogICAgIC8vIFNlYXJjaGVzIHRocm91Z2ggdGhlIGdpdmVuIHRy ZWUgc2NvcGUsIHN0YXJ0aW5nIGZyb20gc3RhcnQgbm9kZSwgZm9yIHRoZSBuZXh0L3ByZXZpb3Vz IHNlbGVjdGFibGUgZWxlbWVudCB0aGF0IGNvbWVzIGFmdGVyL2JlZm9yZSBzdGFydCBub2RlLgpA QCAtMTAwLDEwICsxMDAsMTAgQEAgcHJpdmF0ZToKICAgICAvLyBAcmV0dXJuIFRoZSBmb2N1cyBu b2RlIHRoYXQgY29tZXMgYWZ0ZXIvYmVmb3JlIHN0YXJ0IG5vZGUuCiAgICAgLy8KICAgICAvLyBT ZWUgaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvaW50ZXJhY3QvZm9ybXMuaHRtbCNoLTE3LjEx LjEKLSAgICBpbmxpbmUgTm9kZSogZmluZEZvY3VzYWJsZU5vZGUoRm9jdXNEaXJlY3Rpb24sIEZv Y3VzU2NvcGUsIE5vZGUqIHN0YXJ0LCBLZXlib2FyZEV2ZW50Kik7CisgICAgaW5saW5lIE5vZGUq IGZpbmRGb2N1c2FibGVOb2RlKEZvY3VzRGlyZWN0aW9uLCBGb2N1c05hdmlnYXRpb25TY29wZSwg Tm9kZSogc3RhcnQsIEtleWJvYXJkRXZlbnQqKTsKIAotICAgIE5vZGUqIG5leHRGb2N1c2FibGVO b2RlKEZvY3VzU2NvcGUsIE5vZGUqIHN0YXJ0LCBLZXlib2FyZEV2ZW50Kik7Ci0gICAgTm9kZSog cHJldmlvdXNGb2N1c2FibGVOb2RlKEZvY3VzU2NvcGUsIE5vZGUqIHN0YXJ0LCBLZXlib2FyZEV2 ZW50Kik7CisgICAgTm9kZSogbmV4dEZvY3VzYWJsZU5vZGUoRm9jdXNOYXZpZ2F0aW9uU2NvcGUs IE5vZGUqIHN0YXJ0LCBLZXlib2FyZEV2ZW50Kik7CisgICAgTm9kZSogcHJldmlvdXNGb2N1c2Fi bGVOb2RlKEZvY3VzTmF2aWdhdGlvblNjb3BlLCBOb2RlKiBzdGFydCwgS2V5Ym9hcmRFdmVudCop OwogCiAgICAgTm9kZSogZmluZE5vZGVXaXRoRXhhY3RUYWJJbmRleChOb2RlKiBzdGFydCwgaW50 IHRhYkluZGV4LCBLZXlib2FyZEV2ZW50KiwgRm9jdXNEaXJlY3Rpb24pOwogCg==