122591 2013-10-10 01:49:25 -0700 Make all functions of EventDispatcher static local 2013-10-10 14:09:41 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa andersca benjamin commit-queue darin eflews.bot esprehn+autocc gyuyoung.kim kangil.han kling koivisto sam oldest_to_newest 938248 0 rniwa 2013-10-10 01:49:25 -0700 Make all functions of EventDispatcher static local 938249 1 213859 rniwa 2013-10-10 01:54:55 -0700 Created attachment 213859 Cleanup 938250 2 213859 koivisto 2013-10-10 02:09:45 -0700 Comment on attachment 213859 Cleanup View in context: https://bugs.webkit.org/attachment.cgi?id=213859&action=review > Source/WebCore/ChangeLog:11 > + We can convert it to a namespace or whatever later. Namespace might be good. 938251 3 213859 eflews.bot 2013-10-10 02:18:09 -0700 Comment on attachment 213859 Cleanup Attachment 213859 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/3485197 938252 4 213860 rniwa 2013-10-10 02:20:37 -0700 Created attachment 213860 Patch for landing 938253 5 213860 rniwa 2013-10-10 02:20:56 -0700 Comment on attachment 213860 Patch for landing Wait for EWS. 938536 6 rniwa 2013-10-10 14:09:41 -0700 Committed r157250: <http://trac.webkit.org/changeset/157250> 213859 2013-10-10 01:54:55 -0700 2013-10-10 02:20:34 -0700 Cleanup bug-122591-20131010015454.patch text/plain 8939 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzIxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTEwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgYWxsIGZ1bmN0aW9ucyBv ZiBFdmVudERpc3BhdGNoZXIgc3RhdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjI1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBOb3cgdGhhdCBFdmVudERpc3BhdGNoTWVkaWF0b3IgaXMgZ29uZSwg d2UgZG9uJ3QgaGF2ZSB0byBoYXZlIGFuIEV2ZW50RGlzcGF0Y2hlciBvYmplY3QuCisgICAgICAg IFR1cm4gRXZlbnREaXNwYXRjaGVyIGludG8gYW4gZW1wdHkgY2xhc3Mgd2l0aCBhIGJ1bmNoIG9m IHN0YXRpYyBmdW5jdGlvbnMuCisKKyAgICAgICAgV2UgY2FuIGNvbnZlcnQgaXQgdG8gYSBuYW1l c3BhY2Ugb3Igd2hhdGV2ZXIgbGF0ZXIuCisKKyAgICAgICAgKiBkb20vRXZlbnREaXNwYXRjaGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hTaW11bGF0 ZWRDbGljayk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZl bnQpOgorICAgICAgICAqIGRvbS9FdmVudERpc3BhdGNoZXIuaDoKKwogMjAxMy0xMC0wOCAgU2Vy Z2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbQ1NTIEdy aWQgTGF5b3V0XSBJbXBsZW1lbnQgc3VwcG9ydCBmb3IgZ3JpZC10ZW1wbGF0ZQpJbmRleDogU291 cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAJKHJldmlzaW9uIDE1NzIxMCkKKysrIFNv dXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 NCwyOSArNDQsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWJvb2wgRXZlbnREaXNwYXRj aGVyOjpkaXNwYXRjaEV2ZW50KE5vZGUqIG5vZGUsIFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQot ewotICAgIEFTU0VSVCghTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hG b3JiaWRkZW4oKSk7Ci0gICAgaWYgKCFldmVudCkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg RXZlbnREaXNwYXRjaGVyIGRpc3BhdGNoZXIobm9kZSwgZXZlbnQpOwotICAgIHJldHVybiBkaXNw YXRjaGVyLmRpc3BhdGNoKCk7Ci19Ci0KLUV2ZW50RGlzcGF0Y2hlcjo6RXZlbnREaXNwYXRjaGVy KE5vZGUqIG5vZGUsIFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQotICAgIDogbV9ldmVudFBhdGgo Km5vZGUsICpldmVudCkKLSAgICAsIG1fbm9kZShub2RlKQotICAgICwgbV9ldmVudChldmVudCkK LSNpZm5kZWYgTkRFQlVHCi0gICAgLCBtX2V2ZW50RGlzcGF0Y2hlZChmYWxzZSkKLSNlbmRpZgot ewotICAgIEFTU0VSVChtX25vZGUpOwotICAgIEFTU0VSVChtX2V2ZW50KTsKLSAgICBBU1NFUlQo IW1fZXZlbnQtPnR5cGUoKS5pc051bGwoKSk7IC8vIEphdmFTY3JpcHQgY29kZSBjYW4gY3JlYXRl IGFuIGV2ZW50IHdpdGggYW4gZW1wdHkgbmFtZSwgYnV0IG5vdCBudWxsLgotICAgIG1fdmlldyA9 IG5vZGUtPmRvY3VtZW50KCkudmlldygpOwotfQotCiB2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6ZGlz cGF0Y2hTY29wZWRFdmVudChOb2RlJiBub2RlLCBQYXNzUmVmUHRyPEV2ZW50PiBldmVudCkKIHsK ICAgICAvLyBXZSBuZWVkIHRvIHNldCB0aGUgdGFyZ2V0IGhlcmUgYmVjYXVzZSBpdCBjYW4gZ28g YXdheSBieSB0aGUgdGltZSB3ZSBhY3R1YWxseSBmaXJlIHRoZSBldmVudC4KQEAgLTg0LDE3ICs2 MSwxNyBAQCB2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hTaW11bGF0ZWRDCiAgICAgICAg IHJldHVybjsKIAogICAgIGlmIChtb3VzZUV2ZW50T3B0aW9ucyA9PSBTZW5kTW91c2VPdmVyVXBE b3duRXZlbnRzKQotICAgICAgICBFdmVudERpc3BhdGNoZXIoZWxlbWVudCwgU2ltdWxhdGVkTW91 c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCwgZWxlbWVudC0+ZG9j dW1lbnQoKS5kZWZhdWx0VmlldygpLCB1bmRlcmx5aW5nRXZlbnQpKS5kaXNwYXRjaCgpOworICAg ICAgICBkaXNwYXRjaEV2ZW50KGVsZW1lbnQsIFNpbXVsYXRlZE1vdXNlRXZlbnQ6OmNyZWF0ZShl dmVudE5hbWVzKCkubW91c2VvdmVyRXZlbnQsIGVsZW1lbnQtPmRvY3VtZW50KCkuZGVmYXVsdFZp ZXcoKSwgdW5kZXJseWluZ0V2ZW50KSk7CiAKICAgICBpZiAobW91c2VFdmVudE9wdGlvbnMgIT0g U2VuZE5vRXZlbnRzKQotICAgICAgICBFdmVudERpc3BhdGNoZXIoZWxlbWVudCwgU2ltdWxhdGVk TW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCwgZWxlbWVudC0+ ZG9jdW1lbnQoKS5kZWZhdWx0VmlldygpLCB1bmRlcmx5aW5nRXZlbnQpKS5kaXNwYXRjaCgpOwor ICAgICAgICBkaXNwYXRjaEV2ZW50KGVsZW1lbnQsIFNpbXVsYXRlZE1vdXNlRXZlbnQ6OmNyZWF0 ZShldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQsIGVsZW1lbnQtPmRvY3VtZW50KCkuZGVmYXVs dFZpZXcoKSwgdW5kZXJseWluZ0V2ZW50KSk7CiAgICAgZWxlbWVudC0+c2V0QWN0aXZlKHRydWUs IHZpc3VhbE9wdGlvbnMgPT0gU2hvd1ByZXNzZWRMb29rKTsKICAgICBpZiAobW91c2VFdmVudE9w dGlvbnMgIT0gU2VuZE5vRXZlbnRzKQotICAgICAgICBFdmVudERpc3BhdGNoZXIoZWxlbWVudCwg U2ltdWxhdGVkTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQsIGVs ZW1lbnQtPmRvY3VtZW50KCkuZGVmYXVsdFZpZXcoKSwgdW5kZXJseWluZ0V2ZW50KSkuZGlzcGF0 Y2goKTsKKyAgICAgICAgZGlzcGF0Y2hFdmVudChlbGVtZW50LCBTaW11bGF0ZWRNb3VzZUV2ZW50 OjpjcmVhdGUoZXZlbnROYW1lcygpLm1vdXNldXBFdmVudCwgZWxlbWVudC0+ZG9jdW1lbnQoKS5k ZWZhdWx0VmlldygpLCB1bmRlcmx5aW5nRXZlbnQpKTsKICAgICBlbGVtZW50LT5zZXRBY3RpdmUo ZmFsc2UpOwogCiAgICAgLy8gYWx3YXlzIHNlbmQgY2xpY2sKLSAgICBFdmVudERpc3BhdGNoZXIo ZWxlbWVudCwgU2ltdWxhdGVkTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5jbGlja0V2 ZW50LCBlbGVtZW50LT5kb2N1bWVudCgpLmRlZmF1bHRWaWV3KCksIHVuZGVybHlpbmdFdmVudCkp LmRpc3BhdGNoKCk7CisgICAgZGlzcGF0Y2hFdmVudChlbGVtZW50LCBTaW11bGF0ZWRNb3VzZUV2 ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIGVsZW1lbnQtPmRvY3VtZW50KCku ZGVmYXVsdFZpZXcoKSwgdW5kZXJseWluZ0V2ZW50KSk7CiAKICAgICBlbGVtZW50c0Rpc3BhdGNo aW5nU2ltdWxhdGVkQ2xpY2tzLnJlbW92ZShlbGVtZW50KTsKIH0KQEAgLTE1OSw2MCArMTM2LDYw IEBAIHN0YXRpYyB2b2lkIGRpc3BhdGNoRXZlbnRJbkRPTShFdmVudCYgZXYKICAgICB9CiB9CiAK LWJvb2wgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaCgpCitib29sIEV2ZW50RGlzcGF0Y2hlcjo6 ZGlzcGF0Y2hFdmVudChOb2RlKiBvcmlnaW4sIFBhc3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50KQog ewotICAgIGlmIChFdmVudFRhcmdldCogcmVsYXRlZFRhcmdldCA9IG1fZXZlbnQtPnJlbGF0ZWRU YXJnZXQoKSkKLSAgICAgICAgbV9ldmVudFBhdGguc2V0UmVsYXRlZFRhcmdldCgqcmVsYXRlZFRh cmdldCk7CisgICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNw YXRjaEZvcmJpZGRlbigpKTsKKyAgICBpZiAoIXBycEV2ZW50KQorICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgIEFTU0VSVChvcmlnaW4pOworICAgIFJlZlB0cjxOb2RlPiBub2RlKG9yaWdpbik7 CisgICAgUmVmUHRyPEV2ZW50PiBldmVudChwcnBFdmVudCk7CisgICAgUmVmUHRyPEZyYW1lVmll dz4gdmlldyA9IG5vZGUtPmRvY3VtZW50KCkudmlldygpOworICAgIEV2ZW50UGF0aCBldmVudFBh dGgoKm5vZGUsICpldmVudCk7CisKKyAgICBpZiAoRXZlbnRUYXJnZXQqIHJlbGF0ZWRUYXJnZXQg PSBldmVudC0+cmVsYXRlZFRhcmdldCgpKQorICAgICAgICBldmVudFBhdGguc2V0UmVsYXRlZFRh cmdldCgqcmVsYXRlZFRhcmdldCk7CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKLSAgICBpZiAo bV9ldmVudC0+aXNUb3VjaEV2ZW50KCkpCi0gICAgICAgIEV2ZW50UmV0YXJnZXRlcjo6YWRqdXN0 Rm9yVG91Y2hFdmVudChtX25vZGUuZ2V0KCksICp0b1RvdWNoRXZlbnQobV9ldmVudC5nZXQoKSks IG1fZXZlbnRQYXRoKTsgCisgICAgaWYgKGV2ZW50LT5pc1RvdWNoRXZlbnQoKSkKKyAgICAgICAg RXZlbnRSZXRhcmdldGVyOjphZGp1c3RGb3JUb3VjaEV2ZW50KG5vZGUuZ2V0KCksICp0b1RvdWNo RXZlbnQoZXZlbnQuZ2V0KCkpLCBtX2V2ZW50UGF0aCk7IAogI2VuZGlmCiAKLSNpZm5kZWYgTkRF QlVHCi0gICAgQVNTRVJUKCFtX2V2ZW50RGlzcGF0Y2hlZCk7Ci0gICAgbV9ldmVudERpc3BhdGNo ZWQgPSB0cnVlOwotI2VuZGlmCiAgICAgQ2hpbGROb2Rlc0xhenlTbmFwc2hvdDo6dGFrZUNoaWxk Tm9kZXNMYXp5U25hcHNob3QoKTsKIAotICAgIEFTU0VSVChtX25vZGUpOwotICAgIG1fZXZlbnQt PnNldFRhcmdldCgmRXZlbnRSZXRhcmdldGVyOjpldmVudFRhcmdldFJlc3BlY3RpbmdUYXJnZXRS dWxlcygqbV9ub2RlKSk7CisgICAgZXZlbnQtPnNldFRhcmdldCgmRXZlbnRSZXRhcmdldGVyOjpl dmVudFRhcmdldFJlc3BlY3RpbmdUYXJnZXRSdWxlcygqbm9kZSkpOwogICAgIEFTU0VSVCghTm9F dmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hGb3JiaWRkZW4oKSk7Ci0gICAg QVNTRVJUKG1fZXZlbnQtPnRhcmdldCgpKTsKLSAgICBXaW5kb3dFdmVudENvbnRleHQgd2luZG93 RXZlbnRDb250ZXh0KG1fZXZlbnQuZ2V0KCksIG1fbm9kZS5nZXQoKSwgdG9wRXZlbnRDb250ZXh0 KCkpOwotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OndpbGxEaXNwYXRjaEV2ZW50KCZtX25vZGUtPmRvY3VtZW50KCks ICptX2V2ZW50LCB3aW5kb3dFdmVudENvbnRleHQud2luZG93KCksIG1fbm9kZS5nZXQoKSwgbV9l dmVudFBhdGgpOworICAgIEFTU0VSVChldmVudC0+dGFyZ2V0KCkpOworICAgIFdpbmRvd0V2ZW50 Q29udGV4dCB3aW5kb3dFdmVudENvbnRleHQoZXZlbnQuZ2V0KCksIG5vZGUuZ2V0KCksIGV2ZW50 UGF0aC5sYXN0Q29udGV4dElmRXhpc3RzKCkpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxEaXNwYXRjaEV2 ZW50KCZub2RlLT5kb2N1bWVudCgpLCAqZXZlbnQsIHdpbmRvd0V2ZW50Q29udGV4dC53aW5kb3co KSwgbm9kZS5nZXQoKSwgZXZlbnRQYXRoKTsKIAogICAgIElucHV0RWxlbWVudENsaWNrU3RhdGUg Y2xpY2tIYW5kbGluZ1N0YXRlOwotICAgIGlmIChpc0hUTUxJbnB1dEVsZW1lbnQobV9ub2RlLmdl dCgpKSkKLSAgICAgICAgdG9IVE1MSW5wdXRFbGVtZW50KCptX25vZGUpLndpbGxEaXNwYXRjaEV2 ZW50KCptX2V2ZW50LCBjbGlja0hhbmRsaW5nU3RhdGUpOworICAgIGlmIChpc0hUTUxJbnB1dEVs ZW1lbnQobm9kZS5nZXQoKSkpCisgICAgICAgIHRvSFRNTElucHV0RWxlbWVudCgqbm9kZSkud2ls bERpc3BhdGNoRXZlbnQoKmV2ZW50LCBjbGlja0hhbmRsaW5nU3RhdGUpOwogCi0gICAgaWYgKCFt X2V2ZW50LT5wcm9wYWdhdGlvblN0b3BwZWQoKSAmJiAhbV9ldmVudFBhdGguaXNFbXB0eSgpKQot ICAgICAgICBkaXNwYXRjaEV2ZW50SW5ET00oKm1fZXZlbnQsIG1fZXZlbnRQYXRoLCB3aW5kb3dF dmVudENvbnRleHQpOworICAgIGlmICghZXZlbnQtPnByb3BhZ2F0aW9uU3RvcHBlZCgpICYmICFl dmVudFBhdGguaXNFbXB0eSgpKQorICAgICAgICBkaXNwYXRjaEV2ZW50SW5ET00oKmV2ZW50LCBl dmVudFBhdGgsIHdpbmRvd0V2ZW50Q29udGV4dCk7CiAKLSAgICBtX2V2ZW50LT5zZXRUYXJnZXQo JkV2ZW50UmV0YXJnZXRlcjo6ZXZlbnRUYXJnZXRSZXNwZWN0aW5nVGFyZ2V0UnVsZXMoKm1fbm9k ZSkpOwotICAgIG1fZXZlbnQtPnNldEN1cnJlbnRUYXJnZXQoMCk7Ci0gICAgbV9ldmVudC0+c2V0 RXZlbnRQaGFzZSgwKTsKKyAgICBldmVudC0+c2V0VGFyZ2V0KCZFdmVudFJldGFyZ2V0ZXI6OmV2 ZW50VGFyZ2V0UmVzcGVjdGluZ1RhcmdldFJ1bGVzKCpub2RlKSk7CisgICAgZXZlbnQtPnNldEN1 cnJlbnRUYXJnZXQoMCk7CisgICAgZXZlbnQtPnNldEV2ZW50UGhhc2UoMCk7CiAKICAgICBpZiAo Y2xpY2tIYW5kbGluZ1N0YXRlLnN0YXRlZnVsKQotICAgICAgICB0b0hUTUxJbnB1dEVsZW1lbnQo Km1fbm9kZSkuZGlkRGlzcGF0Y2hDbGlja0V2ZW50KCptX2V2ZW50LCBjbGlja0hhbmRsaW5nU3Rh dGUpOworICAgICAgICB0b0hUTUxJbnB1dEVsZW1lbnQoKm5vZGUpLmRpZERpc3BhdGNoQ2xpY2tF dmVudCgqZXZlbnQsIGNsaWNrSGFuZGxpbmdTdGF0ZSk7CiAKICAgICAvLyBDYWxsIGRlZmF1bHQg ZXZlbnQgaGFuZGxlcnMuIFdoaWxlIHRoZSBET00gZG9lcyBoYXZlIGEgY29uY2VwdCBvZiBwcmV2 ZW50aW5nCiAgICAgLy8gZGVmYXVsdCBoYW5kbGluZywgdGhlIGRldGFpbCBvZiB3aGljaCBoYW5k bGVycyBhcmUgY2FsbGVkIGlzIGFuIGludGVybmFsCiAgICAgLy8gaW1wbGVtZW50YXRpb24gZGV0 YWlsIGFuZCBub3QgcGFydCBvZiB0aGUgRE9NLgotICAgIGlmICghbV9ldmVudC0+ZGVmYXVsdFBy ZXZlbnRlZCgpICYmICFtX2V2ZW50LT5kZWZhdWx0SGFuZGxlZCgpKQotICAgICAgICBjYWxsRGVm YXVsdEV2ZW50SGFuZGxlcnNJblRoZUJ1YmJsaW5nT3JkZXIoKm1fZXZlbnQsIG1fZXZlbnRQYXRo KTsKKyAgICBpZiAoIWV2ZW50LT5kZWZhdWx0UHJldmVudGVkKCkgJiYgIWV2ZW50LT5kZWZhdWx0 SGFuZGxlZCgpKQorICAgICAgICBjYWxsRGVmYXVsdEV2ZW50SGFuZGxlcnNJblRoZUJ1YmJsaW5n T3JkZXIoKmV2ZW50LCBldmVudFBhdGgpOwogCiAgICAgLy8gRW5zdXJlIHRoYXQgYWZ0ZXIgZXZl bnQgZGlzcGF0Y2gsIHRoZSBldmVudCdzIHRhcmdldCBvYmplY3QgaXMgdGhlCiAgICAgLy8gb3V0 ZXJtb3N0IHNoYWRvdyBET00gYm91bmRhcnkuCi0gICAgbV9ldmVudC0+c2V0VGFyZ2V0KHdpbmRv d0V2ZW50Q29udGV4dC50YXJnZXQoKSk7Ci0gICAgbV9ldmVudC0+c2V0Q3VycmVudFRhcmdldCgw KTsKKyAgICBldmVudC0+c2V0VGFyZ2V0KHdpbmRvd0V2ZW50Q29udGV4dC50YXJnZXQoKSk7Cisg ICAgZXZlbnQtPnNldEN1cnJlbnRUYXJnZXQoMCk7CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjpkaWREaXNwYXRjaEV2ZW50KGNvb2tpZSk7CiAKLSAgICByZXR1cm4gIW1fZXZlbnQtPmRl ZmF1bHRQcmV2ZW50ZWQoKTsKLX0KLQotY29uc3QgRXZlbnRDb250ZXh0KiBFdmVudERpc3BhdGNo ZXI6OnRvcEV2ZW50Q29udGV4dCgpCi17Ci0gICAgcmV0dXJuIG1fZXZlbnRQYXRoLmxhc3RDb250 ZXh0SWZFeGlzdHMoKTsKKyAgICByZXR1cm4gIWV2ZW50LT5kZWZhdWx0UHJldmVudGVkKCk7CiB9 CiAKIGJvb2wgRXZlbnRQYXRoOjpoYXNFdmVudExpc3RlbmVycyhjb25zdCBBdG9taWNTdHJpbmcm IGV2ZW50VHlwZSkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNo ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmgJ KHJldmlzaW9uIDE1NzIxMCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIu aAkod29ya2luZyBjb3B5KQpAQCAtNzgsMjUgKzc4LDcgQEAgY2xhc3MgRXZlbnREaXNwYXRjaGVy IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBkaXNwYXRjaEV2ZW50KE5vZGUqLCBQYXNzUmVm UHRyPEV2ZW50Pik7CiAgICAgc3RhdGljIHZvaWQgZGlzcGF0Y2hTY29wZWRFdmVudChOb2RlJiwg UGFzc1JlZlB0cjxFdmVudD4pOwotCiAgICAgc3RhdGljIHZvaWQgZGlzcGF0Y2hTaW11bGF0ZWRD bGljayhFbGVtZW50KiwgRXZlbnQqIHVuZGVybHlpbmdFdmVudCwgU2ltdWxhdGVkQ2xpY2tNb3Vz ZUV2ZW50T3B0aW9ucywgU2ltdWxhdGVkQ2xpY2tWaXN1YWxPcHRpb25zKTsKLQotICAgIGJvb2wg ZGlzcGF0Y2goKTsKLSAgICBOb2RlKiBub2RlKCkgY29uc3QgeyByZXR1cm4gbV9ub2RlLmdldCgp OyB9Ci0gICAgRXZlbnQqIGV2ZW50KCkgY29uc3QgeyByZXR1cm4gbV9ldmVudC5nZXQoKTsgfQot ICAgIEV2ZW50UGF0aCYgZXZlbnRQYXRoKCkgeyByZXR1cm4gbV9ldmVudFBhdGg7IH0KLQotcHJp dmF0ZToKLSAgICBFdmVudERpc3BhdGNoZXIoTm9kZSosIFBhc3NSZWZQdHI8RXZlbnQ+KTsKLSAg ICBjb25zdCBFdmVudENvbnRleHQqIHRvcEV2ZW50Q29udGV4dCgpOwotCi0gICAgRXZlbnRQYXRo IG1fZXZlbnRQYXRoOwotICAgIFJlZlB0cjxOb2RlPiBtX25vZGU7Ci0gICAgUmVmUHRyPEV2ZW50 PiBtX2V2ZW50OwotICAgIFJlZlB0cjxGcmFtZVZpZXc+IG1fdmlldzsKLSNpZm5kZWYgTkRFQlVH Ci0gICAgYm9vbCBtX2V2ZW50RGlzcGF0Y2hlZDsKLSNlbmRpZgogfTsKIAogfQo= 213860 2013-10-10 02:20:37 -0700 2013-10-10 02:20:56 -0700 Patch for landing bug-122591-20131010022037.patch text/plain 8937 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzIxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEwLTEwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgYWxsIGZ1bmN0aW9ucyBv ZiBFdmVudERpc3BhdGNoZXIgc3RhdGljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjI1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2 aXN0by4KKworICAgICAgICBOb3cgdGhhdCBFdmVudERpc3BhdGNoTWVkaWF0b3IgaXMgZ29uZSwg d2UgZG9uJ3QgaGF2ZSB0byBoYXZlIGFuIEV2ZW50RGlzcGF0Y2hlciBvYmplY3QuCisgICAgICAg IFR1cm4gRXZlbnREaXNwYXRjaGVyIGludG8gYW4gZW1wdHkgY2xhc3Mgd2l0aCBhIGJ1bmNoIG9m IHN0YXRpYyBmdW5jdGlvbnMuCisKKyAgICAgICAgV2UgY2FuIGNvbnZlcnQgaXQgdG8gYSBuYW1l c3BhY2Ugb3Igd2hhdGV2ZXIgbGF0ZXIuCisKKyAgICAgICAgKiBkb20vRXZlbnREaXNwYXRjaGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hTaW11bGF0 ZWRDbGljayk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZl bnQpOgorICAgICAgICAqIGRvbS9FdmVudERpc3BhdGNoZXIuaDoKKwogMjAxMy0xMC0wOCAgU2Vy Z2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbQ1NTIEdy aWQgTGF5b3V0XSBJbXBsZW1lbnQgc3VwcG9ydCBmb3IgZ3JpZC10ZW1wbGF0ZQpJbmRleDogU291 cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAJKHJldmlzaW9uIDE1NzIxMCkKKysrIFNv dXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 NCwyOSArNDQsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWJvb2wgRXZlbnREaXNwYXRj aGVyOjpkaXNwYXRjaEV2ZW50KE5vZGUqIG5vZGUsIFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQot ewotICAgIEFTU0VSVCghTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50RGlzcGF0Y2hG b3JiaWRkZW4oKSk7Ci0gICAgaWYgKCFldmVudCkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg RXZlbnREaXNwYXRjaGVyIGRpc3BhdGNoZXIobm9kZSwgZXZlbnQpOwotICAgIHJldHVybiBkaXNw YXRjaGVyLmRpc3BhdGNoKCk7Ci19Ci0KLUV2ZW50RGlzcGF0Y2hlcjo6RXZlbnREaXNwYXRjaGVy KE5vZGUqIG5vZGUsIFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50KQotICAgIDogbV9ldmVudFBhdGgo Km5vZGUsICpldmVudCkKLSAgICAsIG1fbm9kZShub2RlKQotICAgICwgbV9ldmVudChldmVudCkK LSNpZm5kZWYgTkRFQlVHCi0gICAgLCBtX2V2ZW50RGlzcGF0Y2hlZChmYWxzZSkKLSNlbmRpZgot ewotICAgIEFTU0VSVChtX25vZGUpOwotICAgIEFTU0VSVChtX2V2ZW50KTsKLSAgICBBU1NFUlQo IW1fZXZlbnQtPnR5cGUoKS5pc051bGwoKSk7IC8vIEphdmFTY3JpcHQgY29kZSBjYW4gY3JlYXRl IGFuIGV2ZW50IHdpdGggYW4gZW1wdHkgbmFtZSwgYnV0IG5vdCBudWxsLgotICAgIG1fdmlldyA9 IG5vZGUtPmRvY3VtZW50KCkudmlldygpOwotfQotCiB2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6ZGlz cGF0Y2hTY29wZWRFdmVudChOb2RlJiBub2RlLCBQYXNzUmVmUHRyPEV2ZW50PiBldmVudCkKIHsK ICAgICAvLyBXZSBuZWVkIHRvIHNldCB0aGUgdGFyZ2V0IGhlcmUgYmVjYXVzZSBpdCBjYW4gZ28g YXdheSBieSB0aGUgdGltZSB3ZSBhY3R1YWxseSBmaXJlIHRoZSBldmVudC4KQEAgLTg0LDE3ICs2 MSwxNyBAQCB2b2lkIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hTaW11bGF0ZWRDCiAgICAgICAg IHJldHVybjsKIAogICAgIGlmIChtb3VzZUV2ZW50T3B0aW9ucyA9PSBTZW5kTW91c2VPdmVyVXBE b3duRXZlbnRzKQotICAgICAgICBFdmVudERpc3BhdGNoZXIoZWxlbWVudCwgU2ltdWxhdGVkTW91 c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5tb3VzZW92ZXJFdmVudCwgZWxlbWVudC0+ZG9j dW1lbnQoKS5kZWZhdWx0VmlldygpLCB1bmRlcmx5aW5nRXZlbnQpKS5kaXNwYXRjaCgpOworICAg ICAgICBkaXNwYXRjaEV2ZW50KGVsZW1lbnQsIFNpbXVsYXRlZE1vdXNlRXZlbnQ6OmNyZWF0ZShl dmVudE5hbWVzKCkubW91c2VvdmVyRXZlbnQsIGVsZW1lbnQtPmRvY3VtZW50KCkuZGVmYXVsdFZp ZXcoKSwgdW5kZXJseWluZ0V2ZW50KSk7CiAKICAgICBpZiAobW91c2VFdmVudE9wdGlvbnMgIT0g U2VuZE5vRXZlbnRzKQotICAgICAgICBFdmVudERpc3BhdGNoZXIoZWxlbWVudCwgU2ltdWxhdGVk TW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudCwgZWxlbWVudC0+ ZG9jdW1lbnQoKS5kZWZhdWx0VmlldygpLCB1bmRlcmx5aW5nRXZlbnQpKS5kaXNwYXRjaCgpOwor ICAgICAgICBkaXNwYXRjaEV2ZW50KGVsZW1lbnQsIFNpbXVsYXRlZE1vdXNlRXZlbnQ6OmNyZWF0 ZShldmVudE5hbWVzKCkubW91c2Vkb3duRXZlbnQsIGVsZW1lbnQtPmRvY3VtZW50KCkuZGVmYXVs dFZpZXcoKSwgdW5kZXJseWluZ0V2ZW50KSk7CiAgICAgZWxlbWVudC0+c2V0QWN0aXZlKHRydWUs IHZpc3VhbE9wdGlvbnMgPT0gU2hvd1ByZXNzZWRMb29rKTsKICAgICBpZiAobW91c2VFdmVudE9w dGlvbnMgIT0gU2VuZE5vRXZlbnRzKQotICAgICAgICBFdmVudERpc3BhdGNoZXIoZWxlbWVudCwg U2ltdWxhdGVkTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQsIGVs ZW1lbnQtPmRvY3VtZW50KCkuZGVmYXVsdFZpZXcoKSwgdW5kZXJseWluZ0V2ZW50KSkuZGlzcGF0 Y2goKTsKKyAgICAgICAgZGlzcGF0Y2hFdmVudChlbGVtZW50LCBTaW11bGF0ZWRNb3VzZUV2ZW50 OjpjcmVhdGUoZXZlbnROYW1lcygpLm1vdXNldXBFdmVudCwgZWxlbWVudC0+ZG9jdW1lbnQoKS5k ZWZhdWx0VmlldygpLCB1bmRlcmx5aW5nRXZlbnQpKTsKICAgICBlbGVtZW50LT5zZXRBY3RpdmUo ZmFsc2UpOwogCiAgICAgLy8gYWx3YXlzIHNlbmQgY2xpY2sKLSAgICBFdmVudERpc3BhdGNoZXIo ZWxlbWVudCwgU2ltdWxhdGVkTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5jbGlja0V2 ZW50LCBlbGVtZW50LT5kb2N1bWVudCgpLmRlZmF1bHRWaWV3KCksIHVuZGVybHlpbmdFdmVudCkp LmRpc3BhdGNoKCk7CisgICAgZGlzcGF0Y2hFdmVudChlbGVtZW50LCBTaW11bGF0ZWRNb3VzZUV2 ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLmNsaWNrRXZlbnQsIGVsZW1lbnQtPmRvY3VtZW50KCku ZGVmYXVsdFZpZXcoKSwgdW5kZXJseWluZ0V2ZW50KSk7CiAKICAgICBlbGVtZW50c0Rpc3BhdGNo aW5nU2ltdWxhdGVkQ2xpY2tzLnJlbW92ZShlbGVtZW50KTsKIH0KQEAgLTE1OSw2MCArMTM2LDYw IEBAIHN0YXRpYyB2b2lkIGRpc3BhdGNoRXZlbnRJbkRPTShFdmVudCYgZXYKICAgICB9CiB9CiAK LWJvb2wgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaCgpCitib29sIEV2ZW50RGlzcGF0Y2hlcjo6 ZGlzcGF0Y2hFdmVudChOb2RlKiBvcmlnaW4sIFBhc3NSZWZQdHI8RXZlbnQ+IHBycEV2ZW50KQog ewotICAgIGlmIChFdmVudFRhcmdldCogcmVsYXRlZFRhcmdldCA9IG1fZXZlbnQtPnJlbGF0ZWRU YXJnZXQoKSkKLSAgICAgICAgbV9ldmVudFBhdGguc2V0UmVsYXRlZFRhcmdldCgqcmVsYXRlZFRh cmdldCk7CisgICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNw YXRjaEZvcmJpZGRlbigpKTsKKyAgICBpZiAoIXBycEV2ZW50KQorICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgIEFTU0VSVChvcmlnaW4pOworICAgIFJlZlB0cjxOb2RlPiBub2RlKG9yaWdpbik7 CisgICAgUmVmUHRyPEV2ZW50PiBldmVudChwcnBFdmVudCk7CisgICAgUmVmUHRyPEZyYW1lVmll dz4gdmlldyA9IG5vZGUtPmRvY3VtZW50KCkudmlldygpOworICAgIEV2ZW50UGF0aCBldmVudFBh dGgoKm5vZGUsICpldmVudCk7CisKKyAgICBpZiAoRXZlbnRUYXJnZXQqIHJlbGF0ZWRUYXJnZXQg PSBldmVudC0+cmVsYXRlZFRhcmdldCgpKQorICAgICAgICBldmVudFBhdGguc2V0UmVsYXRlZFRh cmdldCgqcmVsYXRlZFRhcmdldCk7CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKLSAgICBpZiAo bV9ldmVudC0+aXNUb3VjaEV2ZW50KCkpCi0gICAgICAgIEV2ZW50UmV0YXJnZXRlcjo6YWRqdXN0 Rm9yVG91Y2hFdmVudChtX25vZGUuZ2V0KCksICp0b1RvdWNoRXZlbnQobV9ldmVudC5nZXQoKSks IG1fZXZlbnRQYXRoKTsgCisgICAgaWYgKGV2ZW50LT5pc1RvdWNoRXZlbnQoKSkKKyAgICAgICAg RXZlbnRSZXRhcmdldGVyOjphZGp1c3RGb3JUb3VjaEV2ZW50KG5vZGUuZ2V0KCksICp0b1RvdWNo RXZlbnQoZXZlbnQuZ2V0KCkpLCBldmVudFBhdGgpOyAKICNlbmRpZgogCi0jaWZuZGVmIE5ERUJV RwotICAgIEFTU0VSVCghbV9ldmVudERpc3BhdGNoZWQpOwotICAgIG1fZXZlbnREaXNwYXRjaGVk ID0gdHJ1ZTsKLSNlbmRpZgogICAgIENoaWxkTm9kZXNMYXp5U25hcHNob3Q6OnRha2VDaGlsZE5v ZGVzTGF6eVNuYXBzaG90KCk7CiAKLSAgICBBU1NFUlQobV9ub2RlKTsKLSAgICBtX2V2ZW50LT5z ZXRUYXJnZXQoJkV2ZW50UmV0YXJnZXRlcjo6ZXZlbnRUYXJnZXRSZXNwZWN0aW5nVGFyZ2V0UnVs ZXMoKm1fbm9kZSkpOworICAgIGV2ZW50LT5zZXRUYXJnZXQoJkV2ZW50UmV0YXJnZXRlcjo6ZXZl bnRUYXJnZXRSZXNwZWN0aW5nVGFyZ2V0UnVsZXMoKm5vZGUpKTsKICAgICBBU1NFUlQoIU5vRXZl bnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOwotICAgIEFT U0VSVChtX2V2ZW50LT50YXJnZXQoKSk7Ci0gICAgV2luZG93RXZlbnRDb250ZXh0IHdpbmRvd0V2 ZW50Q29udGV4dChtX2V2ZW50LmdldCgpLCBtX25vZGUuZ2V0KCksIHRvcEV2ZW50Q29udGV4dCgp KTsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgY29va2llID0gSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjp3aWxsRGlzcGF0Y2hFdmVudCgmbV9ub2RlLT5kb2N1bWVudCgpLCAq bV9ldmVudCwgd2luZG93RXZlbnRDb250ZXh0LndpbmRvdygpLCBtX25vZGUuZ2V0KCksIG1fZXZl bnRQYXRoKTsKKyAgICBBU1NFUlQoZXZlbnQtPnRhcmdldCgpKTsKKyAgICBXaW5kb3dFdmVudENv bnRleHQgd2luZG93RXZlbnRDb250ZXh0KGV2ZW50LmdldCgpLCBub2RlLmdldCgpLCBldmVudFBh dGgubGFzdENvbnRleHRJZkV4aXN0cygpKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsRGlzcGF0Y2hFdmVu dCgmbm9kZS0+ZG9jdW1lbnQoKSwgKmV2ZW50LCB3aW5kb3dFdmVudENvbnRleHQud2luZG93KCks IG5vZGUuZ2V0KCksIGV2ZW50UGF0aCk7CiAKICAgICBJbnB1dEVsZW1lbnRDbGlja1N0YXRlIGNs aWNrSGFuZGxpbmdTdGF0ZTsKLSAgICBpZiAoaXNIVE1MSW5wdXRFbGVtZW50KG1fbm9kZS5nZXQo KSkpCi0gICAgICAgIHRvSFRNTElucHV0RWxlbWVudCgqbV9ub2RlKS53aWxsRGlzcGF0Y2hFdmVu dCgqbV9ldmVudCwgY2xpY2tIYW5kbGluZ1N0YXRlKTsKKyAgICBpZiAoaXNIVE1MSW5wdXRFbGVt ZW50KG5vZGUuZ2V0KCkpKQorICAgICAgICB0b0hUTUxJbnB1dEVsZW1lbnQoKm5vZGUpLndpbGxE aXNwYXRjaEV2ZW50KCpldmVudCwgY2xpY2tIYW5kbGluZ1N0YXRlKTsKIAotICAgIGlmICghbV9l dmVudC0+cHJvcGFnYXRpb25TdG9wcGVkKCkgJiYgIW1fZXZlbnRQYXRoLmlzRW1wdHkoKSkKLSAg ICAgICAgZGlzcGF0Y2hFdmVudEluRE9NKCptX2V2ZW50LCBtX2V2ZW50UGF0aCwgd2luZG93RXZl bnRDb250ZXh0KTsKKyAgICBpZiAoIWV2ZW50LT5wcm9wYWdhdGlvblN0b3BwZWQoKSAmJiAhZXZl bnRQYXRoLmlzRW1wdHkoKSkKKyAgICAgICAgZGlzcGF0Y2hFdmVudEluRE9NKCpldmVudCwgZXZl bnRQYXRoLCB3aW5kb3dFdmVudENvbnRleHQpOwogCi0gICAgbV9ldmVudC0+c2V0VGFyZ2V0KCZF dmVudFJldGFyZ2V0ZXI6OmV2ZW50VGFyZ2V0UmVzcGVjdGluZ1RhcmdldFJ1bGVzKCptX25vZGUp KTsKLSAgICBtX2V2ZW50LT5zZXRDdXJyZW50VGFyZ2V0KDApOwotICAgIG1fZXZlbnQtPnNldEV2 ZW50UGhhc2UoMCk7CisgICAgZXZlbnQtPnNldFRhcmdldCgmRXZlbnRSZXRhcmdldGVyOjpldmVu dFRhcmdldFJlc3BlY3RpbmdUYXJnZXRSdWxlcygqbm9kZSkpOworICAgIGV2ZW50LT5zZXRDdXJy ZW50VGFyZ2V0KDApOworICAgIGV2ZW50LT5zZXRFdmVudFBoYXNlKDApOwogCiAgICAgaWYgKGNs aWNrSGFuZGxpbmdTdGF0ZS5zdGF0ZWZ1bCkKLSAgICAgICAgdG9IVE1MSW5wdXRFbGVtZW50KCpt X25vZGUpLmRpZERpc3BhdGNoQ2xpY2tFdmVudCgqbV9ldmVudCwgY2xpY2tIYW5kbGluZ1N0YXRl KTsKKyAgICAgICAgdG9IVE1MSW5wdXRFbGVtZW50KCpub2RlKS5kaWREaXNwYXRjaENsaWNrRXZl bnQoKmV2ZW50LCBjbGlja0hhbmRsaW5nU3RhdGUpOwogCiAgICAgLy8gQ2FsbCBkZWZhdWx0IGV2 ZW50IGhhbmRsZXJzLiBXaGlsZSB0aGUgRE9NIGRvZXMgaGF2ZSBhIGNvbmNlcHQgb2YgcHJldmVu dGluZwogICAgIC8vIGRlZmF1bHQgaGFuZGxpbmcsIHRoZSBkZXRhaWwgb2Ygd2hpY2ggaGFuZGxl cnMgYXJlIGNhbGxlZCBpcyBhbiBpbnRlcm5hbAogICAgIC8vIGltcGxlbWVudGF0aW9uIGRldGFp bCBhbmQgbm90IHBhcnQgb2YgdGhlIERPTS4KLSAgICBpZiAoIW1fZXZlbnQtPmRlZmF1bHRQcmV2 ZW50ZWQoKSAmJiAhbV9ldmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKLSAgICAgICAgY2FsbERlZmF1 bHRFdmVudEhhbmRsZXJzSW5UaGVCdWJibGluZ09yZGVyKCptX2V2ZW50LCBtX2V2ZW50UGF0aCk7 CisgICAgaWYgKCFldmVudC0+ZGVmYXVsdFByZXZlbnRlZCgpICYmICFldmVudC0+ZGVmYXVsdEhh bmRsZWQoKSkKKyAgICAgICAgY2FsbERlZmF1bHRFdmVudEhhbmRsZXJzSW5UaGVCdWJibGluZ09y ZGVyKCpldmVudCwgZXZlbnRQYXRoKTsKIAogICAgIC8vIEVuc3VyZSB0aGF0IGFmdGVyIGV2ZW50 IGRpc3BhdGNoLCB0aGUgZXZlbnQncyB0YXJnZXQgb2JqZWN0IGlzIHRoZQogICAgIC8vIG91dGVy bW9zdCBzaGFkb3cgRE9NIGJvdW5kYXJ5LgotICAgIG1fZXZlbnQtPnNldFRhcmdldCh3aW5kb3dF dmVudENvbnRleHQudGFyZ2V0KCkpOwotICAgIG1fZXZlbnQtPnNldEN1cnJlbnRUYXJnZXQoMCk7 CisgICAgZXZlbnQtPnNldFRhcmdldCh3aW5kb3dFdmVudENvbnRleHQudGFyZ2V0KCkpOworICAg IGV2ZW50LT5zZXRDdXJyZW50VGFyZ2V0KDApOwogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkRGlzcGF0Y2hFdmVudChjb29raWUpOwogCi0gICAgcmV0dXJuICFtX2V2ZW50LT5kZWZh dWx0UHJldmVudGVkKCk7Ci19Ci0KLWNvbnN0IEV2ZW50Q29udGV4dCogRXZlbnREaXNwYXRjaGVy Ojp0b3BFdmVudENvbnRleHQoKQotewotICAgIHJldHVybiBtX2V2ZW50UGF0aC5sYXN0Q29udGV4 dElmRXhpc3RzKCk7CisgICAgcmV0dXJuICFldmVudC0+ZGVmYXVsdFByZXZlbnRlZCgpOwogfQog CiBib29sIEV2ZW50UGF0aDo6aGFzRXZlbnRMaXN0ZW5lcnMoY29uc3QgQXRvbWljU3RyaW5nJiBl dmVudFR5cGUpIGNvbnN0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5oCShy ZXZpc2lvbiAxNTcyMTApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTc4LDI1ICs3OCw3IEBAIGNsYXNzIEV2ZW50RGlzcGF0Y2hlciB7 CiBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgZGlzcGF0Y2hFdmVudChOb2RlKiwgUGFzc1JlZlB0 cjxFdmVudD4pOwogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2NvcGVkRXZlbnQoTm9kZSYsIFBh c3NSZWZQdHI8RXZlbnQ+KTsKLQogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2ltdWxhdGVkQ2xp Y2soRWxlbWVudCosIEV2ZW50KiB1bmRlcmx5aW5nRXZlbnQsIFNpbXVsYXRlZENsaWNrTW91c2VF dmVudE9wdGlvbnMsIFNpbXVsYXRlZENsaWNrVmlzdWFsT3B0aW9ucyk7Ci0KLSAgICBib29sIGRp c3BhdGNoKCk7Ci0gICAgTm9kZSogbm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fbm9kZS5nZXQoKTsg fQotICAgIEV2ZW50KiBldmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZXZlbnQuZ2V0KCk7IH0KLSAg ICBFdmVudFBhdGgmIGV2ZW50UGF0aCgpIHsgcmV0dXJuIG1fZXZlbnRQYXRoOyB9Ci0KLXByaXZh dGU6Ci0gICAgRXZlbnREaXNwYXRjaGVyKE5vZGUqLCBQYXNzUmVmUHRyPEV2ZW50Pik7Ci0gICAg Y29uc3QgRXZlbnRDb250ZXh0KiB0b3BFdmVudENvbnRleHQoKTsKLQotICAgIEV2ZW50UGF0aCBt X2V2ZW50UGF0aDsKLSAgICBSZWZQdHI8Tm9kZT4gbV9ub2RlOwotICAgIFJlZlB0cjxFdmVudD4g bV9ldmVudDsKLSAgICBSZWZQdHI8RnJhbWVWaWV3PiBtX3ZpZXc7Ci0jaWZuZGVmIE5ERUJVRwot ICAgIGJvb2wgbV9ldmVudERpc3BhdGNoZWQ7Ci0jZW5kaWYKIH07CiAKIH0K