129263 2014-02-24 11:48:40 -0800 WebKitFindOptions shouldn't expose WEBKIT_FIND_OPTIONS_SHOW_{OVERLAY,FIND_INDICATOR,HIGHLIGHT} 2014-02-26 05:46:06 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eocanha webkit-unassigned berto cgarcia commit-queue gustavo mrobinson svillar oldest_to_newest 983989 0 eocanha 2014-02-24 11:48:40 -0800 The values mentioned in the summary are used only for internal operations and shouldn't be available to API users in Source/WebKit2/UIProcess/API/gtk/WebKitFindController.h 983991 1 225079 eocanha 2014-02-24 12:05:23 -0800 Created attachment 225079 Patch 983992 2 commit-queue 2014-02-24 12:07:30 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 984297 3 eocanha 2014-02-25 06:26:56 -0800 Sergio and I talked yesterday about trying to convert early from WebKitFindOptions to WebKit::FindOptions in webKitFindControllerPerform(), store the result in the uint32_t temporary variable and then operate on it using WebKit::FindOptions values. However, I've realized that some functions such as webkit_find_controller_search_next() store values from the WebKit::FindOptions domain in WebKitFindController->priv->findOptions. This made me think that the only reasonable way to address this issue is to change the semantics of WebKitFindController->priv->findOptions: Before, it was considered to be in the WebKitFindOptions domain. Now, it's considered to be in the WebKit::FindOptions domain. This means that now we need an additional toWebKitFindOptions() method to perform the conversion in the WebKit::FindOptions --> WebKitFindOptions way, so that we car return the value in webkit_find_controller_get_options(). I've renamed the old method that converted WebKitFindOptions --> WebKit::FindOptions as toFindOptions(). I hope this justification to be useful for the review process. 984339 4 225079 svillar 2014-02-25 09:11:18 -0800 Comment on attachment 225079 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225079&action=review Almost there. I'd suggest some changes tough. > Source/WebKit2/ChangeLog:7 > + You still need a short description of the problem/fix here even if you add specific comments per file. > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:99 > + I don't see the point of having two functions. Let's just have the one receiving a uint32_t and let it do all the conversion, we don't need an extra cast and a function call (even if it's inline) > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:112 > } Same here, I think we only use the second one, so let's keep that and move the implementation of the conversion there. > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:433 > + webKitFindControllerSetSearchData(findController, searchText, toFindOptions(static_cast<WebKitFindOptions>(findOptions)), maxMatchCount); Just call the uint32_t version, you don't need the cast. > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:490 > + webKitFindControllerSetSearchData(findController, searchText, toFindOptions(static_cast<WebKitFindOptions>(findOptions)), maxMatchCount); Ditto. 984404 5 225163 eocanha 2014-02-25 11:10:20 -0800 Created attachment 225163 Patch 984704 6 225163 svillar 2014-02-26 03:38:52 -0800 Comment on attachment 225163 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225163&action=review r=me provided you fix the issues I mention. > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:86 > +namespace FindOptions { Let's use a different function name instead of adding another namespace, see bellow. > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:88 > +static inline WebKit::FindOptions toFindOptions(uint32_t type) I'd suggest toWebFindOptions for example. BTW, I spot this in the previous review but forgot to add a comment. Let's change the name of the argument, "type" does not mean anything, we need a more meaningful name like findOptions for example. > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:97 > +static inline WebKitFindOptions toWebKitFindOptions(uint32_t type) Same thing about the name of the argument. > Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp:106 > +} // namespace WebKitFindController We can remove this then. 984713 7 225248 eocanha 2014-02-26 05:03:13 -0800 Created attachment 225248 Patch 984716 8 225248 commit-queue 2014-02-26 05:46:03 -0800 Comment on attachment 225248 Patch Clearing flags on attachment: 225248 Committed r164715: <http://trac.webkit.org/changeset/164715> 984717 9 commit-queue 2014-02-26 05:46:06 -0800 All reviewed patches have been landed. Closing bug. 225079 2014-02-24 12:05:23 -0800 2014-02-25 11:10:11 -0800 Patch bug-129263-20140224200521.patch text/plain 8961 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTE1NzAzZDFiYjVlYzU2 M2E5ZDk1NDI0NWQyZTJlZDAzN2QxYWU5Yy4uMjNhODhhNWFjY2JkMjgwZjk2MGQyYWY4ZTMzY2Y3 MDNmZTFkYWE2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAyLTI0ICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgV2Vi S2l0RmluZE9wdGlvbnMgc2hvdWxkbid0IGV4cG9zZSBXRUJLSVRfRklORF9PUFRJT05TX1NIT1df e09WRVJMQVksRklORF9JTkRJQ0FUT1IsSElHSExJR0hUfQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5k Q29udHJvbGxlci5jcHA6IE5vdyAKKyAgICAgICAgX1dlYktpdEZpbmRDb250cm9sbGVyUHJpdmF0 ZS5maW5kT3B0aW9ucyBpcyBpbnRlcnByZXRlZCBhcyBXZWJLaXQ6OkZpbmRPcHRpb25zCisgICAg ICAgIGluc3RlYWQgb2YgV2ViS2l0RmluZE9wdGlvbnMgbGlrZSBiZWZvcmUuIE5vdyB0aGUgY29u dmVyc2lvbiBoYXMgdG8gYmUgZG9uZSBpbgorICAgICAgICBib3RoIHdheXMuCisgICAgICAgICh0 b0ZpbmRPcHRpb25zKTogUmVuYW1lZCBjb252ZXJzaW9uIGZ1bmN0aW9uLgorICAgICAgICAodG9X ZWJLaXRGaW5kT3B0aW9ucyk6IEFkZGVkIGNvbnZlcnNpb24gZnVuY3Rpb24gZnJvbSBXZWJLaXQ6 OkZpbmRPcHRpb25zIHRvCisgICAgICAgIFdlYktpdEZpbmRPcHRpb25zLgorICAgICAgICAod2Vi a2l0X2ZpbmRfY29udHJvbGxlcl9nZXRfb3B0aW9ucyk6CisgICAgICAgICh3ZWJLaXRGaW5kQ29u dHJvbGxlclBlcmZvcm0pOgorICAgICAgICAod2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFyY2gp OgorICAgICAgICAod2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFyY2hfbmV4dCk6CisgICAgICAg ICh3ZWJraXRfZmluZF9jb250cm9sbGVyX3NlYXJjaF9wcmV2aW91cyk6CisgICAgICAgICh3ZWJr aXRfZmluZF9jb250cm9sbGVyX2NvdW50X21hdGNoZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmg6IFJlbW92ZWQgdmFsdWVzIHRoYXQgc2hvdWxk bid0IGJlCisgICAgICAgIGV4cG9zZWQuCisKIDIwMTQtMDItMjQgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MDU5ODk0PiBV cGRhdGUgQXBwbGVDb25uZWN0IHNhbmRib3ggcHJvZmlsZSBmb3IgWFBDIHByb2Nlc3MgbmFtZXMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5k Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRG aW5kQ29udHJvbGxlci5jcHAKaW5kZXggNmU3MTQxZTRlODNkODUxMGZlMzg0YWUwN2E1ZDcyMDc3 OGE5YzMwYS4uYzA5NTc0Njg1NWFlOWFkNmNhNjVkYzBhZjY4OTY5OTVlNDY0ZjZlNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRD b250cm9sbGVyLmNwcApAQCAtNzMsNiArNzMsNyBAQCB0eXBlZGVmIGVudW0gewogCiBzdHJ1Y3Qg X1dlYktpdEZpbmRDb250cm9sbGVyUHJpdmF0ZSB7CiAgICAgQ1N0cmluZyBzZWFyY2hUZXh0Owor ICAgIC8vIEludGVycHJldGVkIGFzIFdlYktpdDo6RmluZE9wdGlvbnMuCiAgICAgdWludDMyX3Qg ZmluZE9wdGlvbnM7CiAgICAgdW5zaWduZWQgbWF4TWF0Y2hDb3VudDsKICAgICBXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3OwpAQCAtODIsMjEgKzgzLDMyIEBAIHN0YXRpYyBndWludCBzaWduYWxzW0xB U1RfU0lHTkFMXSA9IHsgMCwgfTsKIAogV0VCS0lUX0RFRklORV9UWVBFKFdlYktpdEZpbmRDb250 cm9sbGVyLCB3ZWJraXRfZmluZF9jb250cm9sbGVyLCBHX1RZUEVfT0JKRUNUKQogCi1zdGF0aWMg aW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9XZWJLaXRGaW5kT3B0aW9ucyhXZWJLaXRGaW5k T3B0aW9ucyB0eXBlKQorc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmluZE9w dGlvbnMoV2ViS2l0RmluZE9wdGlvbnMgdHlwZSkKIHsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 V2ViS2l0OjpGaW5kT3B0aW9ucz4oKHR5cGUgJiBXRUJLSVRfRklORF9PUFRJT05TX0NBU0VfSU5T RU5TSVRJVkUgPyBGaW5kT3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZSA6IDApCiAgICAgICAgIHwgKHR5 cGUgJiBXRUJLSVRfRklORF9PUFRJT05TX0FUX1dPUkRfU1RBUlRTID8gRmluZE9wdGlvbnNBdFdv cmRTdGFydHMgOiAwKQogICAgICAgICB8ICh0eXBlICYgV0VCS0lUX0ZJTkRfT1BUSU9OU19UUkVB VF9NRURJQUxfQ0FQSVRBTF9BU19XT1JEX1NUQVJUID8gRmluZE9wdGlvbnNUcmVhdE1lZGlhbENh cGl0YWxBc1dvcmRTdGFydCA6IDApCiAgICAgICAgIHwgKHR5cGUgJiBXRUJLSVRfRklORF9PUFRJ T05TX0JBQ0tXQVJEUyA/IEZpbmRPcHRpb25zQmFja3dhcmRzIDogMCkKLSAgICAgICAgfCAodHlw ZSAmIFdFQktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgPyBGaW5kT3B0aW9uc1dyYXBBcm91 bmQgOiAwKQotICAgICAgICB8ICh0eXBlICYgV0VCS0lUX0ZJTkRfT1BUSU9OU19TSE9XX09WRVJM QVkgPyBGaW5kT3B0aW9uc1Nob3dPdmVybGF5IDogMCkKLSAgICAgICAgfCAodHlwZSAmIFdFQktJ VF9GSU5EX09QVElPTlNfU0hPV19GSU5EX0lORElDQVRPUiA/IEZpbmRPcHRpb25zU2hvd0ZpbmRJ bmRpY2F0b3IgOiAwKQotICAgICAgICB8ICh0eXBlICYgV0VCS0lUX0ZJTkRfT1BUSU9OU19TSE9X X0hJR0hMSUdIVCA/IEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodCA6IDApKTsKKyAgICAgICAgfCAo dHlwZSAmIFdFQktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgPyBGaW5kT3B0aW9uc1dyYXBB cm91bmQgOiAwKSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0aW9ucyB0b1dl YktpdEZpbmRPcHRpb25zKHVpbnQzMl90IHR5cGUpCitzdGF0aWMgaW5saW5lIFdlYktpdDo6Rmlu ZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyh1aW50MzJfdCB0eXBlKQogewotICAgIHJldHVybiB0b1dl YktpdEZpbmRPcHRpb25zKHN0YXRpY19jYXN0PFdlYktpdEZpbmRPcHRpb25zPih0eXBlKSk7Cisg ICAgcmV0dXJuIHRvRmluZE9wdGlvbnMoc3RhdGljX2Nhc3Q8V2ViS2l0RmluZE9wdGlvbnM+KHR5 cGUpKTsKK30KKworc3RhdGljIGlubGluZSBXZWJLaXRGaW5kT3B0aW9ucyB0b1dlYktpdEZpbmRP cHRpb25zKFdlYktpdDo6RmluZE9wdGlvbnMgdHlwZSkKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8V2ViS2l0RmluZE9wdGlvbnM+KCh0eXBlICYgRmluZE9wdGlvbnNDYXNlSW5zZW5zaXRpdmUg PyBXRUJLSVRfRklORF9PUFRJT05TX0NBU0VfSU5TRU5TSVRJVkUgOiAwKQorICAgICAgICB8ICh0 eXBlICYgRmluZE9wdGlvbnNBdFdvcmRTdGFydHMgPyBXRUJLSVRfRklORF9PUFRJT05TX0FUX1dP UkRfU1RBUlRTIDogMCkKKyAgICAgICAgfCAodHlwZSAmIEZpbmRPcHRpb25zVHJlYXRNZWRpYWxD YXBpdGFsQXNXb3JkU3RhcnQgPyBXRUJLSVRfRklORF9PUFRJT05TX1RSRUFUX01FRElBTF9DQVBJ VEFMX0FTX1dPUkRfU1RBUlQgOiAwKQorICAgICAgICB8ICh0eXBlICYgRmluZE9wdGlvbnNCYWNr d2FyZHMgPyBXRUJLSVRfRklORF9PUFRJT05TX0JBQ0tXQVJEUyA6IDApCisgICAgICAgIHwgKHR5 cGUgJiBGaW5kT3B0aW9uc1dyYXBBcm91bmQgPyBXRUJLSVRfRklORF9PUFRJT05TX1dSQVBfQVJP VU5EIDogMCkpOworfQorCitzdGF0aWMgaW5saW5lIFdlYktpdEZpbmRPcHRpb25zIHRvV2ViS2l0 RmluZE9wdGlvbnModWludDMyX3QgdHlwZSkKK3sKKyAgICByZXR1cm4gdG9XZWJLaXRGaW5kT3B0 aW9ucyhzdGF0aWNfY2FzdDxXZWJLaXQ6OkZpbmRPcHRpb25zPih0eXBlKSk7CiB9CiAKIHN0YXRp YyB2b2lkIGRpZEZpbmRTdHJpbmcoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHN0cmluZywg dW5zaWduZWQgbWF0Y2hDb3VudCwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKQEAgLTMxNyw3ICsz MjksNyBAQCBndWludDMyIHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfZ2V0X29wdGlvbnMoV2ViS2l0 RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyKQogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9m YWlsKFdFQktJVF9JU19GSU5EX0NPTlRST0xMRVIoZmluZENvbnRyb2xsZXIpLCBXRUJLSVRfRklO RF9PUFRJT05TX05PTkUpOwogCi0gICAgcmV0dXJuIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5k T3B0aW9uczsKKyAgICByZXR1cm4gdG9XZWJLaXRGaW5kT3B0aW9ucyhmaW5kQ29udHJvbGxlci0+ cHJpdi0+ZmluZE9wdGlvbnMpOwogfQogCiAvKioKQEAgLTM2MCw3ICszNzIsNyBAQCBzdGF0aWMg dm9pZCB3ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0oV2ViS2l0RmluZENvbnRyb2xsZXIqIGZp bmRDb250cm9sbGVyLCBXZQogICAgIFdlYktpdEZpbmRDb250cm9sbGVyUHJpdmF0ZSogcHJpdiA9 IGZpbmRDb250cm9sbGVyLT5wcml2OwogICAgIGlmIChvcGVyYXRpb24gPT0gQ291bnRPcGVyYXRp b24pIHsKICAgICAgICAgZ2V0UGFnZShmaW5kQ29udHJvbGxlciktPmNvdW50U3RyaW5nTWF0Y2hl cyhTdHJpbmc6OmZyb21VVEY4KHByaXYtPnNlYXJjaFRleHQuZGF0YSgpKSwKLSAgICAgICAgICAg IHRvV2ViS2l0RmluZE9wdGlvbnMocHJpdi0+ZmluZE9wdGlvbnMpLCBwcml2LT5tYXhNYXRjaENv dW50KTsKKyAgICAgICAgICAgIHN0YXRpY19jYXN0PFdlYktpdDo6RmluZE9wdGlvbnM+KHByaXYt PmZpbmRPcHRpb25zKSwgcHJpdi0+bWF4TWF0Y2hDb3VudCk7CiAgICAgICAgIHJldHVybjsKICAg ICB9CiAKQEAgLTM3Myw5ICszODUsOSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRGaW5kQ29udHJvbGxl clBlcmZvcm0oV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyLCBXZQogICAgICAg ICAvLyB1bmNvbmRpdGlvbmFsbHkgc2hvdyBoaWdobGlnaHRzLiBCb3RoIHNlYXJjaF9uZXh0KCkg YW5kCiAgICAgICAgIC8vIHNlYXJjaF9wcmV2KCkgc2hvdWxkIG5vdCBlbmFibGUgaGlnaGxpZ2h0 aW5nIHRvIGF2b2lkIGFuCiAgICAgICAgIC8vIGV4dHJhIHVubWFya0FsbFRleHRNYXRjaGVzKCkg KyBtYXJrQWxsVGV4dE1hdGNoZXMoKQotICAgICAgICBmaW5kT3B0aW9ucyB8PSBXRUJLSVRfRklO RF9PUFRJT05TX1NIT1dfSElHSExJR0hUOworICAgICAgICBmaW5kT3B0aW9ucyB8PSBGaW5kT3B0 aW9uc1Nob3dIaWdobGlnaHQ7CiAKLSAgICBnZXRQYWdlKGZpbmRDb250cm9sbGVyKS0+ZmluZFN0 cmluZyhTdHJpbmc6OmZyb21VVEY4KHByaXYtPnNlYXJjaFRleHQuZGF0YSgpKSwgdG9XZWJLaXRG aW5kT3B0aW9ucyhmaW5kT3B0aW9ucyksCisgICAgZ2V0UGFnZShmaW5kQ29udHJvbGxlciktPmZp bmRTdHJpbmcoU3RyaW5nOjpmcm9tVVRGOChwcml2LT5zZWFyY2hUZXh0LmRhdGEoKSksIHN0YXRp Y19jYXN0PFdlYktpdDo6RmluZE9wdGlvbnM+KGZpbmRPcHRpb25zKSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBwcml2LT5tYXhNYXRjaENvdW50KTsKIH0KIApAQCAt NDE4LDcgKzQzMCw3IEBAIHZvaWQgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFyY2goV2ViS2l0 RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyLCBjb25zdCBnCiAgICAgZ19yZXR1cm5faWZf ZmFpbChXRUJLSVRfSVNfRklORF9DT05UUk9MTEVSKGZpbmRDb250cm9sbGVyKSk7CiAgICAgZ19y ZXR1cm5faWZfZmFpbChzZWFyY2hUZXh0KTsKIAotICAgIHdlYktpdEZpbmRDb250cm9sbGVyU2V0 U2VhcmNoRGF0YShmaW5kQ29udHJvbGxlciwgc2VhcmNoVGV4dCwgZmluZE9wdGlvbnMsIG1heE1h dGNoQ291bnQpOworICAgIHdlYktpdEZpbmRDb250cm9sbGVyU2V0U2VhcmNoRGF0YShmaW5kQ29u dHJvbGxlciwgc2VhcmNoVGV4dCwgdG9GaW5kT3B0aW9ucyhzdGF0aWNfY2FzdDxXZWJLaXRGaW5k T3B0aW9ucz4oZmluZE9wdGlvbnMpKSwgbWF4TWF0Y2hDb3VudCk7CiAgICAgd2ViS2l0RmluZENv bnRyb2xsZXJQZXJmb3JtKGZpbmRDb250cm9sbGVyLCBGaW5kT3BlcmF0aW9uKTsKIH0KIApAQCAt NDM1LDggKzQ0Nyw4IEBAIHZvaWQgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFyY2hfbmV4dChX ZWJLaXRGaW5kQ29udHJvbGxlciogZmluZENvbnRyb2xsZXIpCiB7CiAgICAgZ19yZXR1cm5faWZf ZmFpbChXRUJLSVRfSVNfRklORF9DT05UUk9MTEVSKGZpbmRDb250cm9sbGVyKSk7CiAKLSAgICBm aW5kQ29udHJvbGxlci0+cHJpdi0+ZmluZE9wdGlvbnMgJj0gfldFQktJVF9GSU5EX09QVElPTlNf QkFDS1dBUkRTOwotICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyAmPSB+V0VC S0lUX0ZJTkRfT1BUSU9OU19TSE9XX0hJR0hMSUdIVDsKKyAgICBmaW5kQ29udHJvbGxlci0+cHJp di0+ZmluZE9wdGlvbnMgJj0gfkZpbmRPcHRpb25zQmFja3dhcmRzOworICAgIGZpbmRDb250cm9s bGVyLT5wcml2LT5maW5kT3B0aW9ucyAmPSB+RmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0OwogICAg IHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9ybShmaW5kQ29udHJvbGxlciwgRmluZE5leHRQcmV2 T3BlcmF0aW9uKTsKIH0KIApAQCAtNDUzLDggKzQ2NSw4IEBAIHZvaWQgd2Via2l0X2ZpbmRfY29u dHJvbGxlcl9zZWFyY2hfcHJldmlvdXMoV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9s bGVyCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfRklORF9DT05UUk9MTEVSKGZp bmRDb250cm9sbGVyKSk7CiAKLSAgICBmaW5kQ29udHJvbGxlci0+cHJpdi0+ZmluZE9wdGlvbnMg fD0gV0VCS0lUX0ZJTkRfT1BUSU9OU19CQUNLV0FSRFM7Ci0gICAgZmluZENvbnRyb2xsZXItPnBy aXYtPmZpbmRPcHRpb25zICY9IH5XRUJLSVRfRklORF9PUFRJT05TX1NIT1dfSElHSExJR0hUOwor ICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyB8PSBGaW5kT3B0aW9uc0JhY2t3 YXJkczsKKyAgICBmaW5kQ29udHJvbGxlci0+cHJpdi0+ZmluZE9wdGlvbnMgJj0gfkZpbmRPcHRp b25zU2hvd0hpZ2hsaWdodDsKICAgICB3ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0oZmluZENv bnRyb2xsZXIsIEZpbmROZXh0UHJldk9wZXJhdGlvbik7CiB9CiAKQEAgLTQ3NSw3ICs0ODcsNyBA QCB2b2lkIHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfY291bnRfbWF0Y2hlcyhXZWJLaXRGaW5kQ29u dHJvbGxlciogZmluZENvbnRyb2xsZXIsCiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNf RklORF9DT05UUk9MTEVSKGZpbmRDb250cm9sbGVyKSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChz ZWFyY2hUZXh0KTsKIAotICAgIHdlYktpdEZpbmRDb250cm9sbGVyU2V0U2VhcmNoRGF0YShmaW5k Q29udHJvbGxlciwgc2VhcmNoVGV4dCwgZmluZE9wdGlvbnMsIG1heE1hdGNoQ291bnQpOworICAg IHdlYktpdEZpbmRDb250cm9sbGVyU2V0U2VhcmNoRGF0YShmaW5kQ29udHJvbGxlciwgc2VhcmNo VGV4dCwgdG9GaW5kT3B0aW9ucyhzdGF0aWNfY2FzdDxXZWJLaXRGaW5kT3B0aW9ucz4oZmluZE9w dGlvbnMpKSwgbWF4TWF0Y2hDb3VudCk7CiAgICAgd2ViS2l0RmluZENvbnRyb2xsZXJQZXJmb3Jt KGZpbmRDb250cm9sbGVyLCBDb3VudE9wZXJhdGlvbik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5oCmluZGV4 IGM4OWMzODY0ZmRlOGQ5MWVlYmU0MWMwNjEwYTYxMzg4YzczNGQ5MjQuLjhmM2U0MzhmZjIzYTc2 YTZhMzBmMmJjMmIxYjE2Yjk3OGNlNDZlYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuaApAQCAtNjIsMTEgKzYy LDcgQEAgdHlwZWRlZiBlbnVtIHsKICAgV0VCS0lUX0ZJTkRfT1BUSU9OU19BVF9XT1JEX1NUQVJU UyA9ICAgICAgICAgICAgICAgICAgICAgMSA8PCAxLAogICBXRUJLSVRfRklORF9PUFRJT05TX1RS RUFUX01FRElBTF9DQVBJVEFMX0FTX1dPUkRfU1RBUlQgPSAxIDw8IDIsCiAgIFdFQktJVF9GSU5E X09QVElPTlNfQkFDS1dBUkRTID0gICAgICAgICAgICAgICAgICAgICAgICAgIDEgPDwgMywKLSAg V0VCS0lUX0ZJTkRfT1BUSU9OU19XUkFQX0FST1VORCA9ICAgICAgICAgICAgICAgICAgICAgICAg MSA8PCA0LAotICAvKjwgcHJpdmF0ZSA+Ki8KLSAgV0VCS0lUX0ZJTkRfT1BUSU9OU19TSE9XX09W RVJMQVkgPSAgICAgICAgICAgICAgICAgICAgICAgMSA8PCA1LAotICBXRUJLSVRfRklORF9PUFRJ T05TX1NIT1dfRklORF9JTkRJQ0FUT1IgPSAgICAgICAgICAgICAgICAxIDw8IDYsCi0gIFdFQktJ VF9GSU5EX09QVElPTlNfU0hPV19ISUdITElHSFQgPSAgICAgICAgICAgICAgICAgICAgIDEgPDwg NywKKyAgV0VCS0lUX0ZJTkRfT1BUSU9OU19XUkFQX0FST1VORCA9ICAgICAgICAgICAgICAgICAg ICAgICAgMSA8PCA0CiB9IFdlYktpdEZpbmRPcHRpb25zOwogCiBzdHJ1Y3QgX1dlYktpdEZpbmRD b250cm9sbGVyIHsK 225163 2014-02-25 11:10:20 -0800 2014-02-26 05:03:03 -0800 Patch bug-129263-20140225191018.patch text/plain 8893 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGRlMzhmNzA4MWE0MDM4 OTQ2OTRiMTAyZThlNTNkNWI0ZTA4OTZlZi4uMmYzMDVjYzk5MmQ4ZjlmMzI4ZTgyYjA4YTZmZjA2 MzY0NmU2OTk2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE0LTAyLTI0ICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgV2Vi S2l0RmluZE9wdGlvbnMgc2hvdWxkbid0IGV4cG9zZSBXRUJLSVRfRklORF9PUFRJT05TX1NIT1df e09WRVJMQVksRklORF9JTkRJQ0FUT1IsSElHSExJR0hUfQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWRlZCB0aGUgbmVlZCBvZiBXRUJLSVRfRklO RF9PUFRJT05TX1NIT1dfKiBmaWVsZHMgYnkgY2hhbmdpbmcgdGhlIHNlbWFudGljcworICAgICAg ICBvZiB0aGUgZmluZE9wdGlvbnMgZmllbGQgaW4gV2ViS2l0RmluZE9wdGlvbnMuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHA6IE5vdworICAg ICAgICBfV2ViS2l0RmluZENvbnRyb2xsZXJQcml2YXRlLmZpbmRPcHRpb25zIGlzIGludGVycHJl dGVkIGFzIFdlYktpdDo6RmluZE9wdGlvbnMKKyAgICAgICAgaW5zdGVhZCBvZiBXZWJLaXRGaW5k T3B0aW9ucyBsaWtlIGJlZm9yZS4gTm93IHRoZSBjb252ZXJzaW9uIGhhcyB0byBiZSBkb25lIGlu CisgICAgICAgIGJvdGggd2F5cy4KKyAgICAgICAgKHRvRmluZE9wdGlvbnMpOiBSZW5hbWVkIGNv bnZlcnNpb24gZnVuY3Rpb24uCisgICAgICAgICh0b1dlYktpdEZpbmRPcHRpb25zKTogQWRkZWQg Y29udmVyc2lvbiBmdW5jdGlvbiBmcm9tIFdlYktpdDo6RmluZE9wdGlvbnMgdG8KKyAgICAgICAg V2ViS2l0RmluZE9wdGlvbnMuCisgICAgICAgICh3ZWJraXRfZmluZF9jb250cm9sbGVyX2dldF9v cHRpb25zKToKKyAgICAgICAgKHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9ybSk6CisgICAgICAg ICh3ZWJraXRfZmluZF9jb250cm9sbGVyX3NlYXJjaCk6CisgICAgICAgICh3ZWJraXRfZmluZF9j b250cm9sbGVyX3NlYXJjaF9uZXh0KToKKyAgICAgICAgKHdlYmtpdF9maW5kX2NvbnRyb2xsZXJf c2VhcmNoX3ByZXZpb3VzKToKKyAgICAgICAgKHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfY291bnRf bWF0Y2hlcyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xs ZXIuaDogUmVtb3ZlZCB2YWx1ZXMgdGhhdCBzaG91bGRuJ3QgYmUKKyAgICAgICAgZXhwb3NlZC4K KwogMjAxNC0wMi0yNSAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAg IEJ1aWxkIGZpeCBmb3IgY2FzZS1zZW5zaXRpdmUgZmlsZXN5c3RlbXMuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5j cHAKaW5kZXggNmU3MTQxZTRlODNkODUxMGZlMzg0YWUwN2E1ZDcyMDc3OGE5YzMwYS4uZWRjOTk2 ZGIyZTA1MTEwMzk2ZTdhZjhmMzVmMjRlMjViNzUwZmM1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmNwcApA QCAtNzMsNiArNzMsNyBAQCB0eXBlZGVmIGVudW0gewogCiBzdHJ1Y3QgX1dlYktpdEZpbmRDb250 cm9sbGVyUHJpdmF0ZSB7CiAgICAgQ1N0cmluZyBzZWFyY2hUZXh0OworICAgIC8vIEludGVycHJl dGVkIGFzIFdlYktpdDo6RmluZE9wdGlvbnMuCiAgICAgdWludDMyX3QgZmluZE9wdGlvbnM7CiAg ICAgdW5zaWduZWQgbWF4TWF0Y2hDb3VudDsKICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3OwpA QCAtODIsMjMgKzgzLDI4IEBAIHN0YXRpYyBndWludCBzaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsg MCwgfTsKIAogV0VCS0lUX0RFRklORV9UWVBFKFdlYktpdEZpbmRDb250cm9sbGVyLCB3ZWJraXRf ZmluZF9jb250cm9sbGVyLCBHX1RZUEVfT0JKRUNUKQogCi1zdGF0aWMgaW5saW5lIFdlYktpdDo6 RmluZE9wdGlvbnMgdG9XZWJLaXRGaW5kT3B0aW9ucyhXZWJLaXRGaW5kT3B0aW9ucyB0eXBlKQor bmFtZXNwYWNlIEZpbmRPcHRpb25zIHsKKworc3RhdGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRp b25zIHRvRmluZE9wdGlvbnModWludDMyX3QgdHlwZSkKIHsKICAgICByZXR1cm4gc3RhdGljX2Nh c3Q8V2ViS2l0OjpGaW5kT3B0aW9ucz4oKHR5cGUgJiBXRUJLSVRfRklORF9PUFRJT05TX0NBU0Vf SU5TRU5TSVRJVkUgPyBGaW5kT3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZSA6IDApCiAgICAgICAgIHwg KHR5cGUgJiBXRUJLSVRfRklORF9PUFRJT05TX0FUX1dPUkRfU1RBUlRTID8gRmluZE9wdGlvbnNB dFdvcmRTdGFydHMgOiAwKQogICAgICAgICB8ICh0eXBlICYgV0VCS0lUX0ZJTkRfT1BUSU9OU19U UkVBVF9NRURJQUxfQ0FQSVRBTF9BU19XT1JEX1NUQVJUID8gRmluZE9wdGlvbnNUcmVhdE1lZGlh bENhcGl0YWxBc1dvcmRTdGFydCA6IDApCiAgICAgICAgIHwgKHR5cGUgJiBXRUJLSVRfRklORF9P UFRJT05TX0JBQ0tXQVJEUyA/IEZpbmRPcHRpb25zQmFja3dhcmRzIDogMCkKLSAgICAgICAgfCAo dHlwZSAmIFdFQktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgPyBGaW5kT3B0aW9uc1dyYXBB cm91bmQgOiAwKQotICAgICAgICB8ICh0eXBlICYgV0VCS0lUX0ZJTkRfT1BUSU9OU19TSE9XX09W RVJMQVkgPyBGaW5kT3B0aW9uc1Nob3dPdmVybGF5IDogMCkKLSAgICAgICAgfCAodHlwZSAmIFdF QktJVF9GSU5EX09QVElPTlNfU0hPV19GSU5EX0lORElDQVRPUiA/IEZpbmRPcHRpb25zU2hvd0Zp bmRJbmRpY2F0b3IgOiAwKQotICAgICAgICB8ICh0eXBlICYgV0VCS0lUX0ZJTkRfT1BUSU9OU19T SE9XX0hJR0hMSUdIVCA/IEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodCA6IDApKTsKKyAgICAgICAg fCAodHlwZSAmIFdFQktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgPyBGaW5kT3B0aW9uc1dy YXBBcm91bmQgOiAwKSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0aW9ucyB0 b1dlYktpdEZpbmRPcHRpb25zKHVpbnQzMl90IHR5cGUpCitzdGF0aWMgaW5saW5lIFdlYktpdEZp bmRPcHRpb25zIHRvV2ViS2l0RmluZE9wdGlvbnModWludDMyX3QgdHlwZSkKIHsKLSAgICByZXR1 cm4gdG9XZWJLaXRGaW5kT3B0aW9ucyhzdGF0aWNfY2FzdDxXZWJLaXRGaW5kT3B0aW9ucz4odHlw ZSkpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJLaXRGaW5kT3B0aW9ucz4oKHR5cGUgJiBG aW5kT3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZSA/IFdFQktJVF9GSU5EX09QVElPTlNfQ0FTRV9JTlNF TlNJVElWRSA6IDApCisgICAgICAgIHwgKHR5cGUgJiBGaW5kT3B0aW9uc0F0V29yZFN0YXJ0cyA/ IFdFQktJVF9GSU5EX09QVElPTlNfQVRfV09SRF9TVEFSVFMgOiAwKQorICAgICAgICB8ICh0eXBl ICYgRmluZE9wdGlvbnNUcmVhdE1lZGlhbENhcGl0YWxBc1dvcmRTdGFydCA/IFdFQktJVF9GSU5E X09QVElPTlNfVFJFQVRfTUVESUFMX0NBUElUQUxfQVNfV09SRF9TVEFSVCA6IDApCisgICAgICAg IHwgKHR5cGUgJiBGaW5kT3B0aW9uc0JhY2t3YXJkcyA/IFdFQktJVF9GSU5EX09QVElPTlNfQkFD S1dBUkRTIDogMCkKKyAgICAgICAgfCAodHlwZSAmIEZpbmRPcHRpb25zV3JhcEFyb3VuZCA/IFdF QktJVF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgOiAwKSk7CiB9CiAKK30gLy8gbmFtZXNwYWNl IFdlYktpdEZpbmRDb250cm9sbGVyCisKIHN0YXRpYyB2b2lkIGRpZEZpbmRTdHJpbmcoV0tQYWdl UmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHN0cmluZywgdW5zaWduZWQgbWF0Y2hDb3VudCwgY29uc3Qg dm9pZCogY2xpZW50SW5mbykKIHsKICAgICBnX3NpZ25hbF9lbWl0KFdFQktJVF9GSU5EX0NPTlRS T0xMRVIoY2xpZW50SW5mbyksIHNpZ25hbHNbRk9VTkRfVEVYVF0sIDAsIG1hdGNoQ291bnQpOwpA QCAtMzE3LDcgKzMyMyw3IEBAIGd1aW50MzIgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9nZXRfb3B0 aW9ucyhXZWJLaXRGaW5kQ29udHJvbGxlciogZmluZENvbnRyb2xsZXIpCiB7CiAgICAgZ19yZXR1 cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX0ZJTkRfQ09OVFJPTExFUihmaW5kQ29udHJvbGxlciks IFdFQktJVF9GSU5EX09QVElPTlNfTk9ORSk7CiAKLSAgICByZXR1cm4gZmluZENvbnRyb2xsZXIt PnByaXYtPmZpbmRPcHRpb25zOworICAgIHJldHVybiBGaW5kT3B0aW9uczo6dG9XZWJLaXRGaW5k T3B0aW9ucyhmaW5kQ29udHJvbGxlci0+cHJpdi0+ZmluZE9wdGlvbnMpOwogfQogCiAvKioKQEAg LTM2MCw3ICszNjYsNyBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0o V2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyLCBXZQogICAgIFdlYktpdEZpbmRD b250cm9sbGVyUHJpdmF0ZSogcHJpdiA9IGZpbmRDb250cm9sbGVyLT5wcml2OwogICAgIGlmIChv cGVyYXRpb24gPT0gQ291bnRPcGVyYXRpb24pIHsKICAgICAgICAgZ2V0UGFnZShmaW5kQ29udHJv bGxlciktPmNvdW50U3RyaW5nTWF0Y2hlcyhTdHJpbmc6OmZyb21VVEY4KHByaXYtPnNlYXJjaFRl eHQuZGF0YSgpKSwKLSAgICAgICAgICAgIHRvV2ViS2l0RmluZE9wdGlvbnMocHJpdi0+ZmluZE9w dGlvbnMpLCBwcml2LT5tYXhNYXRjaENvdW50KTsKKyAgICAgICAgICAgIHN0YXRpY19jYXN0PFdl YktpdDo6RmluZE9wdGlvbnM+KHByaXYtPmZpbmRPcHRpb25zKSwgcHJpdi0+bWF4TWF0Y2hDb3Vu dCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTM3Myw5ICszNzksOSBAQCBzdGF0aWMg dm9pZCB3ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0oV2ViS2l0RmluZENvbnRyb2xsZXIqIGZp bmRDb250cm9sbGVyLCBXZQogICAgICAgICAvLyB1bmNvbmRpdGlvbmFsbHkgc2hvdyBoaWdobGln aHRzLiBCb3RoIHNlYXJjaF9uZXh0KCkgYW5kCiAgICAgICAgIC8vIHNlYXJjaF9wcmV2KCkgc2hv dWxkIG5vdCBlbmFibGUgaGlnaGxpZ2h0aW5nIHRvIGF2b2lkIGFuCiAgICAgICAgIC8vIGV4dHJh IHVubWFya0FsbFRleHRNYXRjaGVzKCkgKyBtYXJrQWxsVGV4dE1hdGNoZXMoKQotICAgICAgICBm aW5kT3B0aW9ucyB8PSBXRUJLSVRfRklORF9PUFRJT05TX1NIT1dfSElHSExJR0hUOworICAgICAg ICBmaW5kT3B0aW9ucyB8PSBGaW5kT3B0aW9uc1Nob3dIaWdobGlnaHQ7CiAKLSAgICBnZXRQYWdl KGZpbmRDb250cm9sbGVyKS0+ZmluZFN0cmluZyhTdHJpbmc6OmZyb21VVEY4KHByaXYtPnNlYXJj aFRleHQuZGF0YSgpKSwgdG9XZWJLaXRGaW5kT3B0aW9ucyhmaW5kT3B0aW9ucyksCisgICAgZ2V0 UGFnZShmaW5kQ29udHJvbGxlciktPmZpbmRTdHJpbmcoU3RyaW5nOjpmcm9tVVRGOChwcml2LT5z ZWFyY2hUZXh0LmRhdGEoKSksIHN0YXRpY19jYXN0PFdlYktpdDo6RmluZE9wdGlvbnM+KGZpbmRP cHRpb25zKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcml2LT5t YXhNYXRjaENvdW50KTsKIH0KIApAQCAtNDE3LDggKzQyMyw3IEBAIHZvaWQgd2Via2l0X2ZpbmRf Y29udHJvbGxlcl9zZWFyY2goV2ViS2l0RmluZENvbnRyb2xsZXIqIGZpbmRDb250cm9sbGVyLCBj b25zdCBnCiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfRklORF9DT05UUk9MTEVS KGZpbmRDb250cm9sbGVyKSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChzZWFyY2hUZXh0KTsKLQot ICAgIHdlYktpdEZpbmRDb250cm9sbGVyU2V0U2VhcmNoRGF0YShmaW5kQ29udHJvbGxlciwgc2Vh cmNoVGV4dCwgZmluZE9wdGlvbnMsIG1heE1hdGNoQ291bnQpOworICAgIHdlYktpdEZpbmRDb250 cm9sbGVyU2V0U2VhcmNoRGF0YShmaW5kQ29udHJvbGxlciwgc2VhcmNoVGV4dCwgRmluZE9wdGlv bnM6OnRvRmluZE9wdGlvbnMoZmluZE9wdGlvbnMpLCBtYXhNYXRjaENvdW50KTsKICAgICB3ZWJL aXRGaW5kQ29udHJvbGxlclBlcmZvcm0oZmluZENvbnRyb2xsZXIsIEZpbmRPcGVyYXRpb24pOwog fQogCkBAIC00MzUsOCArNDQwLDggQEAgdm9pZCB3ZWJraXRfZmluZF9jb250cm9sbGVyX3NlYXJj aF9uZXh0KFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKIHsKICAgICBnX3Jl dHVybl9pZl9mYWlsKFdFQktJVF9JU19GSU5EX0NPTlRST0xMRVIoZmluZENvbnRyb2xsZXIpKTsK IAotICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyAmPSB+V0VCS0lUX0ZJTkRf T1BUSU9OU19CQUNLV0FSRFM7Ci0gICAgZmluZENvbnRyb2xsZXItPnByaXYtPmZpbmRPcHRpb25z ICY9IH5XRUJLSVRfRklORF9PUFRJT05TX1NIT1dfSElHSExJR0hUOworICAgIGZpbmRDb250cm9s bGVyLT5wcml2LT5maW5kT3B0aW9ucyAmPSB+RmluZE9wdGlvbnNCYWNrd2FyZHM7CisgICAgZmlu ZENvbnRyb2xsZXItPnByaXYtPmZpbmRPcHRpb25zICY9IH5GaW5kT3B0aW9uc1Nob3dIaWdobGln aHQ7CiAgICAgd2ViS2l0RmluZENvbnRyb2xsZXJQZXJmb3JtKGZpbmRDb250cm9sbGVyLCBGaW5k TmV4dFByZXZPcGVyYXRpb24pOwogfQogCkBAIC00NTMsOCArNDU4LDggQEAgdm9pZCB3ZWJraXRf ZmluZF9jb250cm9sbGVyX3NlYXJjaF9wcmV2aW91cyhXZWJLaXRGaW5kQ29udHJvbGxlciogZmlu ZENvbnRyb2xsZXIKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19GSU5EX0NPTlRS T0xMRVIoZmluZENvbnRyb2xsZXIpKTsKIAotICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5k T3B0aW9ucyB8PSBXRUJLSVRfRklORF9PUFRJT05TX0JBQ0tXQVJEUzsKLSAgICBmaW5kQ29udHJv bGxlci0+cHJpdi0+ZmluZE9wdGlvbnMgJj0gfldFQktJVF9GSU5EX09QVElPTlNfU0hPV19ISUdI TElHSFQ7CisgICAgZmluZENvbnRyb2xsZXItPnByaXYtPmZpbmRPcHRpb25zIHw9IEZpbmRPcHRp b25zQmFja3dhcmRzOworICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyAmPSB+ RmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0OwogICAgIHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9y bShmaW5kQ29udHJvbGxlciwgRmluZE5leHRQcmV2T3BlcmF0aW9uKTsKIH0KIApAQCAtNDc1LDcg KzQ4MCw3IEBAIHZvaWQgd2Via2l0X2ZpbmRfY29udHJvbGxlcl9jb3VudF9tYXRjaGVzKFdlYktp dEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlciwKICAgICBnX3JldHVybl9pZl9mYWlsKFdF QktJVF9JU19GSU5EX0NPTlRST0xMRVIoZmluZENvbnRyb2xsZXIpKTsKICAgICBnX3JldHVybl9p Zl9mYWlsKHNlYXJjaFRleHQpOwogCi0gICAgd2ViS2l0RmluZENvbnRyb2xsZXJTZXRTZWFyY2hE YXRhKGZpbmRDb250cm9sbGVyLCBzZWFyY2hUZXh0LCBmaW5kT3B0aW9ucywgbWF4TWF0Y2hDb3Vu dCk7CisgICAgd2ViS2l0RmluZENvbnRyb2xsZXJTZXRTZWFyY2hEYXRhKGZpbmRDb250cm9sbGVy LCBzZWFyY2hUZXh0LCBGaW5kT3B0aW9uczo6dG9GaW5kT3B0aW9ucyhmaW5kT3B0aW9ucyksIG1h eE1hdGNoQ291bnQpOwogICAgIHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9ybShmaW5kQ29udHJv bGxlciwgQ291bnRPcGVyYXRpb24pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuaAppbmRleCBjODljMzg2NGZk ZThkOTFlZWJlNDFjMDYxMGE2MTM4OGM3MzRkOTI0Li44ZjNlNDM4ZmYyM2E3NmE2YTMwZjJiYzJi MWIxNmI5NzhjZTQ2ZWE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRGaW5kQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmgKQEAgLTYyLDExICs2Miw3IEBAIHR5cGVk ZWYgZW51bSB7CiAgIFdFQktJVF9GSU5EX09QVElPTlNfQVRfV09SRF9TVEFSVFMgPSAgICAgICAg ICAgICAgICAgICAgIDEgPDwgMSwKICAgV0VCS0lUX0ZJTkRfT1BUSU9OU19UUkVBVF9NRURJQUxf Q0FQSVRBTF9BU19XT1JEX1NUQVJUID0gMSA8PCAyLAogICBXRUJLSVRfRklORF9PUFRJT05TX0JB Q0tXQVJEUyA9ICAgICAgICAgICAgICAgICAgICAgICAgICAxIDw8IDMsCi0gIFdFQktJVF9GSU5E X09QVElPTlNfV1JBUF9BUk9VTkQgPSAgICAgICAgICAgICAgICAgICAgICAgIDEgPDwgNCwKLSAg Lyo8IHByaXZhdGUgPiovCi0gIFdFQktJVF9GSU5EX09QVElPTlNfU0hPV19PVkVSTEFZID0gICAg ICAgICAgICAgICAgICAgICAgIDEgPDwgNSwKLSAgV0VCS0lUX0ZJTkRfT1BUSU9OU19TSE9XX0ZJ TkRfSU5ESUNBVE9SID0gICAgICAgICAgICAgICAgMSA8PCA2LAotICBXRUJLSVRfRklORF9PUFRJ T05TX1NIT1dfSElHSExJR0hUID0gICAgICAgICAgICAgICAgICAgICAxIDw8IDcsCisgIFdFQktJ VF9GSU5EX09QVElPTlNfV1JBUF9BUk9VTkQgPSAgICAgICAgICAgICAgICAgICAgICAgIDEgPDwg NAogfSBXZWJLaXRGaW5kT3B0aW9uczsKIAogc3RydWN0IF9XZWJLaXRGaW5kQ29udHJvbGxlciB7 Cg== 225248 2014-02-26 05:03:13 -0800 2014-02-26 05:46:03 -0800 Patch bug-129263-20140226130311.patch text/plain 9144 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGRlMzhmNzA4MWE0MDM4 OTQ2OTRiMTAyZThlNTNkNWI0ZTA4OTZlZi4uZmFkMDk3NjliY2JlN2U3NmM0N2Q5ZTUyNzk3Zjdm NGQ3NjgwNGJjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAyLTI2ICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgV2Vi S2l0RmluZE9wdGlvbnMgc2hvdWxkbid0IGV4cG9zZSBXRUJLSVRfRklORF9PUFRJT05TX1NIT1df e09WRVJMQVksRklORF9JTkRJQ0FUT1IsSElHSExJR0hUfQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg U2VyZ2lvIFZpbGxhciBTZW5pbi4KKworICAgICAgICBBdm9pZGVkIHRoZSBuZWVkIG9mIFdFQktJ VF9GSU5EX09QVElPTlNfU0hPV18qIGZpZWxkcyBieSBjaGFuZ2luZyB0aGUgc2VtYW50aWNzCisg ICAgICAgIG9mIHRoZSBmaW5kT3B0aW9ucyBmaWVsZCBpbiBXZWJLaXRGaW5kT3B0aW9ucy4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmNwcDogTm93 CisgICAgICAgIF9XZWJLaXRGaW5kQ29udHJvbGxlclByaXZhdGUuZmluZE9wdGlvbnMgaXMgaW50 ZXJwcmV0ZWQgYXMgV2ViS2l0OjpGaW5kT3B0aW9ucworICAgICAgICBpbnN0ZWFkIG9mIFdlYktp dEZpbmRPcHRpb25zIGxpa2UgYmVmb3JlLiBOb3cgdGhlIGNvbnZlcnNpb24gaGFzIHRvIGJlIGRv bmUgaW4KKyAgICAgICAgYm90aCB3YXlzLgorICAgICAgICAodG9XZWJLaXRGaW5kT3B0aW9ucyk6 IEFkZGVkIGNvbnZlcnNpb24gZnVuY3Rpb24gZnJvbSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvCisg ICAgICAgIFdlYktpdEZpbmRPcHRpb25zLgorICAgICAgICAod2Via2l0X2ZpbmRfY29udHJvbGxl cl9nZXRfb3B0aW9ucyk6CisgICAgICAgICh3ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0pOgor ICAgICAgICAod2Via2l0X2ZpbmRfY29udHJvbGxlcl9zZWFyY2gpOgorICAgICAgICAod2Via2l0 X2ZpbmRfY29udHJvbGxlcl9zZWFyY2hfbmV4dCk6CisgICAgICAgICh3ZWJraXRfZmluZF9jb250 cm9sbGVyX3NlYXJjaF9wcmV2aW91cyk6CisgICAgICAgICh3ZWJraXRfZmluZF9jb250cm9sbGVy X2NvdW50X21hdGNoZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRD b250cm9sbGVyLmg6IFJlbW92ZWQgdmFsdWVzIHRoYXQgc2hvdWxkbid0IGJlCisgICAgICAgIGV4 cG9zZWQuCisKIDIwMTQtMDItMjUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAog ICAgICAgICBCdWlsZCBmaXggZm9yIGNhc2Utc2Vuc2l0aXZlIGZpbGVzeXN0ZW1zLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xs ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRy b2xsZXIuY3BwCmluZGV4IDZlNzE0MWU0ZTgzZDg1MTBmZTM4NGFlMDdhNWQ3MjA3NzhhOWMzMGEu LjY1NDRkYTA1NDdiNTIzNmJhYTBmNTgxZWI0MmE2MmM4NjY1YmQyOWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJvbGxl ci5jcHAKQEAgLTczLDYgKzczLDcgQEAgdHlwZWRlZiBlbnVtIHsKIAogc3RydWN0IF9XZWJLaXRG aW5kQ29udHJvbGxlclByaXZhdGUgewogICAgIENTdHJpbmcgc2VhcmNoVGV4dDsKKyAgICAvLyBJ bnRlcnByZXRlZCBhcyBXZWJLaXQ6OkZpbmRPcHRpb25zLgogICAgIHVpbnQzMl90IGZpbmRPcHRp b25zOwogICAgIHVuc2lnbmVkIG1heE1hdGNoQ291bnQ7CiAgICAgV2ViS2l0V2ViVmlldyogd2Vi VmlldzsKQEAgLTgyLDIxICs4MywyMiBAQCBzdGF0aWMgZ3VpbnQgc2lnbmFsc1tMQVNUX1NJR05B TF0gPSB7IDAsIH07CiAKIFdFQktJVF9ERUZJTkVfVFlQRShXZWJLaXRGaW5kQ29udHJvbGxlciwg d2Via2l0X2ZpbmRfY29udHJvbGxlciwgR19UWVBFX09CSkVDVCkKIAotc3RhdGljIGlubGluZSBX ZWJLaXQ6OkZpbmRPcHRpb25zIHRvV2ViS2l0RmluZE9wdGlvbnMoV2ViS2l0RmluZE9wdGlvbnMg dHlwZSkKK3N0YXRpYyBpbmxpbmUgV2ViS2l0OjpGaW5kT3B0aW9ucyB0b1dlYkZpbmRPcHRpb25z KHVpbnQzMl90IGZpbmRPcHRpb25zKQogewotICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJLaXQ6 OkZpbmRPcHRpb25zPigodHlwZSAmIFdFQktJVF9GSU5EX09QVElPTlNfQ0FTRV9JTlNFTlNJVElW RSA/IEZpbmRPcHRpb25zQ2FzZUluc2Vuc2l0aXZlIDogMCkKLSAgICAgICAgfCAodHlwZSAmIFdF QktJVF9GSU5EX09QVElPTlNfQVRfV09SRF9TVEFSVFMgPyBGaW5kT3B0aW9uc0F0V29yZFN0YXJ0 cyA6IDApCi0gICAgICAgIHwgKHR5cGUgJiBXRUJLSVRfRklORF9PUFRJT05TX1RSRUFUX01FRElB TF9DQVBJVEFMX0FTX1dPUkRfU1RBUlQgPyBGaW5kT3B0aW9uc1RyZWF0TWVkaWFsQ2FwaXRhbEFz V29yZFN0YXJ0IDogMCkKLSAgICAgICAgfCAodHlwZSAmIFdFQktJVF9GSU5EX09QVElPTlNfQkFD S1dBUkRTID8gRmluZE9wdGlvbnNCYWNrd2FyZHMgOiAwKQotICAgICAgICB8ICh0eXBlICYgV0VC S0lUX0ZJTkRfT1BUSU9OU19XUkFQX0FST1VORCA/IEZpbmRPcHRpb25zV3JhcEFyb3VuZCA6IDAp Ci0gICAgICAgIHwgKHR5cGUgJiBXRUJLSVRfRklORF9PUFRJT05TX1NIT1dfT1ZFUkxBWSA/IEZp bmRPcHRpb25zU2hvd092ZXJsYXkgOiAwKQotICAgICAgICB8ICh0eXBlICYgV0VCS0lUX0ZJTkRf T1BUSU9OU19TSE9XX0ZJTkRfSU5ESUNBVE9SID8gRmluZE9wdGlvbnNTaG93RmluZEluZGljYXRv ciA6IDApCi0gICAgICAgIHwgKHR5cGUgJiBXRUJLSVRfRklORF9PUFRJT05TX1NIT1dfSElHSExJ R0hUID8gRmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0IDogMCkpOworICAgIHJldHVybiBzdGF0aWNf Y2FzdDxXZWJLaXQ6OkZpbmRPcHRpb25zPigoZmluZE9wdGlvbnMgJiBXRUJLSVRfRklORF9PUFRJ T05TX0NBU0VfSU5TRU5TSVRJVkUgPyBGaW5kT3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZSA6IDApCisg ICAgICAgIHwgKGZpbmRPcHRpb25zICYgV0VCS0lUX0ZJTkRfT1BUSU9OU19BVF9XT1JEX1NUQVJU UyA/IEZpbmRPcHRpb25zQXRXb3JkU3RhcnRzIDogMCkKKyAgICAgICAgfCAoZmluZE9wdGlvbnMg JiBXRUJLSVRfRklORF9PUFRJT05TX1RSRUFUX01FRElBTF9DQVBJVEFMX0FTX1dPUkRfU1RBUlQg PyBGaW5kT3B0aW9uc1RyZWF0TWVkaWFsQ2FwaXRhbEFzV29yZFN0YXJ0IDogMCkKKyAgICAgICAg fCAoZmluZE9wdGlvbnMgJiBXRUJLSVRfRklORF9PUFRJT05TX0JBQ0tXQVJEUyA/IEZpbmRPcHRp b25zQmFja3dhcmRzIDogMCkKKyAgICAgICAgfCAoZmluZE9wdGlvbnMgJiBXRUJLSVRfRklORF9P UFRJT05TX1dSQVBfQVJPVU5EID8gRmluZE9wdGlvbnNXcmFwQXJvdW5kIDogMCkpOwogfQogCi1z dGF0aWMgaW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9XZWJLaXRGaW5kT3B0aW9ucyh1aW50 MzJfdCB0eXBlKQorc3RhdGljIGlubGluZSBXZWJLaXRGaW5kT3B0aW9ucyB0b1dlYktpdEZpbmRP cHRpb25zKHVpbnQzMl90IGZpbmRPcHRpb25zKQogewotICAgIHJldHVybiB0b1dlYktpdEZpbmRP cHRpb25zKHN0YXRpY19jYXN0PFdlYktpdEZpbmRPcHRpb25zPih0eXBlKSk7CisgICAgcmV0dXJu IHN0YXRpY19jYXN0PFdlYktpdEZpbmRPcHRpb25zPigoZmluZE9wdGlvbnMgJiBGaW5kT3B0aW9u c0Nhc2VJbnNlbnNpdGl2ZSA/IFdFQktJVF9GSU5EX09QVElPTlNfQ0FTRV9JTlNFTlNJVElWRSA6 IDApCisgICAgICAgIHwgKGZpbmRPcHRpb25zICYgRmluZE9wdGlvbnNBdFdvcmRTdGFydHMgPyBX RUJLSVRfRklORF9PUFRJT05TX0FUX1dPUkRfU1RBUlRTIDogMCkKKyAgICAgICAgfCAoZmluZE9w dGlvbnMgJiBGaW5kT3B0aW9uc1RyZWF0TWVkaWFsQ2FwaXRhbEFzV29yZFN0YXJ0ID8gV0VCS0lU X0ZJTkRfT1BUSU9OU19UUkVBVF9NRURJQUxfQ0FQSVRBTF9BU19XT1JEX1NUQVJUIDogMCkKKyAg ICAgICAgfCAoZmluZE9wdGlvbnMgJiBGaW5kT3B0aW9uc0JhY2t3YXJkcyA/IFdFQktJVF9GSU5E X09QVElPTlNfQkFDS1dBUkRTIDogMCkKKyAgICAgICAgfCAoZmluZE9wdGlvbnMgJiBGaW5kT3B0 aW9uc1dyYXBBcm91bmQgPyBXRUJLSVRfRklORF9PUFRJT05TX1dSQVBfQVJPVU5EIDogMCkpOwog fQogCiBzdGF0aWMgdm9pZCBkaWRGaW5kU3RyaW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1Jl ZiBzdHJpbmcsIHVuc2lnbmVkIG1hdGNoQ291bnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCkBA IC0zMTcsNyArMzE5LDcgQEAgZ3VpbnQzMiB3ZWJraXRfZmluZF9jb250cm9sbGVyX2dldF9vcHRp b25zKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKIHsKICAgICBnX3JldHVy bl92YWxfaWZfZmFpbChXRUJLSVRfSVNfRklORF9DT05UUk9MTEVSKGZpbmRDb250cm9sbGVyKSwg V0VCS0lUX0ZJTkRfT1BUSU9OU19OT05FKTsKIAotICAgIHJldHVybiBmaW5kQ29udHJvbGxlci0+ cHJpdi0+ZmluZE9wdGlvbnM7CisgICAgcmV0dXJuIHRvV2ViS2l0RmluZE9wdGlvbnMoZmluZENv bnRyb2xsZXItPnByaXYtPmZpbmRPcHRpb25zKTsKIH0KIAogLyoqCkBAIC0zNjAsNyArMzYyLDcg QEAgc3RhdGljIHZvaWQgd2ViS2l0RmluZENvbnRyb2xsZXJQZXJmb3JtKFdlYktpdEZpbmRDb250 cm9sbGVyKiBmaW5kQ29udHJvbGxlciwgV2UKICAgICBXZWJLaXRGaW5kQ29udHJvbGxlclByaXZh dGUqIHByaXYgPSBmaW5kQ29udHJvbGxlci0+cHJpdjsKICAgICBpZiAob3BlcmF0aW9uID09IENv dW50T3BlcmF0aW9uKSB7CiAgICAgICAgIGdldFBhZ2UoZmluZENvbnRyb2xsZXIpLT5jb3VudFN0 cmluZ01hdGNoZXMoU3RyaW5nOjpmcm9tVVRGOChwcml2LT5zZWFyY2hUZXh0LmRhdGEoKSksCi0g ICAgICAgICAgICB0b1dlYktpdEZpbmRPcHRpb25zKHByaXYtPmZpbmRPcHRpb25zKSwgcHJpdi0+ bWF4TWF0Y2hDb3VudCk7CisgICAgICAgICAgICBzdGF0aWNfY2FzdDxXZWJLaXQ6OkZpbmRPcHRp b25zPihwcml2LT5maW5kT3B0aW9ucyksIHByaXYtPm1heE1hdGNoQ291bnQpOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCkBAIC0zNzMsOSArMzc1LDkgQEAgc3RhdGljIHZvaWQgd2ViS2l0Rmlu ZENvbnRyb2xsZXJQZXJmb3JtKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlciwg V2UKICAgICAgICAgLy8gdW5jb25kaXRpb25hbGx5IHNob3cgaGlnaGxpZ2h0cy4gQm90aCBzZWFy Y2hfbmV4dCgpIGFuZAogICAgICAgICAvLyBzZWFyY2hfcHJldigpIHNob3VsZCBub3QgZW5hYmxl IGhpZ2hsaWdodGluZyB0byBhdm9pZCBhbgogICAgICAgICAvLyBleHRyYSB1bm1hcmtBbGxUZXh0 TWF0Y2hlcygpICsgbWFya0FsbFRleHRNYXRjaGVzKCkKLSAgICAgICAgZmluZE9wdGlvbnMgfD0g V0VCS0lUX0ZJTkRfT1BUSU9OU19TSE9XX0hJR0hMSUdIVDsKKyAgICAgICAgZmluZE9wdGlvbnMg fD0gRmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0OwogCi0gICAgZ2V0UGFnZShmaW5kQ29udHJvbGxl ciktPmZpbmRTdHJpbmcoU3RyaW5nOjpmcm9tVVRGOChwcml2LT5zZWFyY2hUZXh0LmRhdGEoKSks IHRvV2ViS2l0RmluZE9wdGlvbnMoZmluZE9wdGlvbnMpLAorICAgIGdldFBhZ2UoZmluZENvbnRy b2xsZXIpLT5maW5kU3RyaW5nKFN0cmluZzo6ZnJvbVVURjgocHJpdi0+c2VhcmNoVGV4dC5kYXRh KCkpLCBzdGF0aWNfY2FzdDxXZWJLaXQ6OkZpbmRPcHRpb25zPihmaW5kT3B0aW9ucyksCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpdi0+bWF4TWF0Y2hDb3VudCk7 CiB9CiAKQEAgLTQxNyw4ICs0MTksNyBAQCB2b2lkIHdlYmtpdF9maW5kX2NvbnRyb2xsZXJfc2Vh cmNoKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlciwgY29uc3QgZwogewogICAg IGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX0ZJTkRfQ09OVFJPTExFUihmaW5kQ29udHJvbGxl cikpOwogICAgIGdfcmV0dXJuX2lmX2ZhaWwoc2VhcmNoVGV4dCk7Ci0KLSAgICB3ZWJLaXRGaW5k Q29udHJvbGxlclNldFNlYXJjaERhdGEoZmluZENvbnRyb2xsZXIsIHNlYXJjaFRleHQsIGZpbmRP cHRpb25zLCBtYXhNYXRjaENvdW50KTsKKyAgICB3ZWJLaXRGaW5kQ29udHJvbGxlclNldFNlYXJj aERhdGEoZmluZENvbnRyb2xsZXIsIHNlYXJjaFRleHQsIHRvV2ViRmluZE9wdGlvbnMoZmluZE9w dGlvbnMpLCBtYXhNYXRjaENvdW50KTsKICAgICB3ZWJLaXRGaW5kQ29udHJvbGxlclBlcmZvcm0o ZmluZENvbnRyb2xsZXIsIEZpbmRPcGVyYXRpb24pOwogfQogCkBAIC00MzUsOCArNDM2LDggQEAg dm9pZCB3ZWJraXRfZmluZF9jb250cm9sbGVyX3NlYXJjaF9uZXh0KFdlYktpdEZpbmRDb250cm9s bGVyKiBmaW5kQ29udHJvbGxlcikKIHsKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19G SU5EX0NPTlRST0xMRVIoZmluZENvbnRyb2xsZXIpKTsKIAotICAgIGZpbmRDb250cm9sbGVyLT5w cml2LT5maW5kT3B0aW9ucyAmPSB+V0VCS0lUX0ZJTkRfT1BUSU9OU19CQUNLV0FSRFM7Ci0gICAg ZmluZENvbnRyb2xsZXItPnByaXYtPmZpbmRPcHRpb25zICY9IH5XRUJLSVRfRklORF9PUFRJT05T X1NIT1dfSElHSExJR0hUOworICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyAm PSB+RmluZE9wdGlvbnNCYWNrd2FyZHM7CisgICAgZmluZENvbnRyb2xsZXItPnByaXYtPmZpbmRP cHRpb25zICY9IH5GaW5kT3B0aW9uc1Nob3dIaWdobGlnaHQ7CiAgICAgd2ViS2l0RmluZENvbnRy b2xsZXJQZXJmb3JtKGZpbmRDb250cm9sbGVyLCBGaW5kTmV4dFByZXZPcGVyYXRpb24pOwogfQog CkBAIC00NTMsOCArNDU0LDggQEAgdm9pZCB3ZWJraXRfZmluZF9jb250cm9sbGVyX3NlYXJjaF9w cmV2aW91cyhXZWJLaXRGaW5kQ29udHJvbGxlciogZmluZENvbnRyb2xsZXIKIHsKICAgICBnX3Jl dHVybl9pZl9mYWlsKFdFQktJVF9JU19GSU5EX0NPTlRST0xMRVIoZmluZENvbnRyb2xsZXIpKTsK IAotICAgIGZpbmRDb250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyB8PSBXRUJLSVRfRklORF9P UFRJT05TX0JBQ0tXQVJEUzsKLSAgICBmaW5kQ29udHJvbGxlci0+cHJpdi0+ZmluZE9wdGlvbnMg Jj0gfldFQktJVF9GSU5EX09QVElPTlNfU0hPV19ISUdITElHSFQ7CisgICAgZmluZENvbnRyb2xs ZXItPnByaXYtPmZpbmRPcHRpb25zIHw9IEZpbmRPcHRpb25zQmFja3dhcmRzOworICAgIGZpbmRD b250cm9sbGVyLT5wcml2LT5maW5kT3B0aW9ucyAmPSB+RmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0 OwogICAgIHdlYktpdEZpbmRDb250cm9sbGVyUGVyZm9ybShmaW5kQ29udHJvbGxlciwgRmluZE5l eHRQcmV2T3BlcmF0aW9uKTsKIH0KIApAQCAtNDc1LDcgKzQ3Niw3IEBAIHZvaWQgd2Via2l0X2Zp bmRfY29udHJvbGxlcl9jb3VudF9tYXRjaGVzKFdlYktpdEZpbmRDb250cm9sbGVyKiBmaW5kQ29u dHJvbGxlciwKICAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJVF9JU19GSU5EX0NPTlRST0xMRVIo ZmluZENvbnRyb2xsZXIpKTsKICAgICBnX3JldHVybl9pZl9mYWlsKHNlYXJjaFRleHQpOwogCi0g ICAgd2ViS2l0RmluZENvbnRyb2xsZXJTZXRTZWFyY2hEYXRhKGZpbmRDb250cm9sbGVyLCBzZWFy Y2hUZXh0LCBmaW5kT3B0aW9ucywgbWF4TWF0Y2hDb3VudCk7CisgICAgd2ViS2l0RmluZENvbnRy b2xsZXJTZXRTZWFyY2hEYXRhKGZpbmRDb250cm9sbGVyLCBzZWFyY2hUZXh0LCB0b1dlYkZpbmRP cHRpb25zKGZpbmRPcHRpb25zKSwgbWF4TWF0Y2hDb3VudCk7CiAgICAgd2ViS2l0RmluZENvbnRy b2xsZXJQZXJmb3JtKGZpbmRDb250cm9sbGVyLCBDb3VudE9wZXJhdGlvbik7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9s bGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGaW5kQ29udHJv bGxlci5oCmluZGV4IGM4OWMzODY0ZmRlOGQ5MWVlYmU0MWMwNjEwYTYxMzg4YzczNGQ5MjQuLjhm M2U0MzhmZjIzYTc2YTZhMzBmMmJjMmIxYjE2Yjk3OGNlNDZlYTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZpbmRDb250cm9sbGVyLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RmluZENvbnRyb2xsZXIuaApA QCAtNjIsMTEgKzYyLDcgQEAgdHlwZWRlZiBlbnVtIHsKICAgV0VCS0lUX0ZJTkRfT1BUSU9OU19B VF9XT1JEX1NUQVJUUyA9ICAgICAgICAgICAgICAgICAgICAgMSA8PCAxLAogICBXRUJLSVRfRklO RF9PUFRJT05TX1RSRUFUX01FRElBTF9DQVBJVEFMX0FTX1dPUkRfU1RBUlQgPSAxIDw8IDIsCiAg IFdFQktJVF9GSU5EX09QVElPTlNfQkFDS1dBUkRTID0gICAgICAgICAgICAgICAgICAgICAgICAg IDEgPDwgMywKLSAgV0VCS0lUX0ZJTkRfT1BUSU9OU19XUkFQX0FST1VORCA9ICAgICAgICAgICAg ICAgICAgICAgICAgMSA8PCA0LAotICAvKjwgcHJpdmF0ZSA+Ki8KLSAgV0VCS0lUX0ZJTkRfT1BU SU9OU19TSE9XX09WRVJMQVkgPSAgICAgICAgICAgICAgICAgICAgICAgMSA8PCA1LAotICBXRUJL SVRfRklORF9PUFRJT05TX1NIT1dfRklORF9JTkRJQ0FUT1IgPSAgICAgICAgICAgICAgICAxIDw8 IDYsCi0gIFdFQktJVF9GSU5EX09QVElPTlNfU0hPV19ISUdITElHSFQgPSAgICAgICAgICAgICAg ICAgICAgIDEgPDwgNywKKyAgV0VCS0lUX0ZJTkRfT1BUSU9OU19XUkFQX0FST1VORCA9ICAgICAg ICAgICAgICAgICAgICAgICAgMSA8PCA0CiB9IFdlYktpdEZpbmRPcHRpb25zOwogCiBzdHJ1Y3Qg X1dlYktpdEZpbmRDb250cm9sbGVyIHsK