78615 2012-02-14 09:56:13 -0800 Initial upstreaming for find-in-page for BlackBerry port 2012-02-14 14:18:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 andchen webkit-unassigned mifenton rwlbuis webkit.review.bot oldest_to_newest 556367 0 andchen 2012-02-14 09:56:13 -0800 Upstreaming InPageSearchManager.cpp and InPageSearchManager.h for BlackBerry port 556462 1 127009 andchen 2012-02-14 11:53:48 -0800 Created attachment 127009 Initial upstreaming for find-in-page for BlackBerry 556499 2 127009 rwlbuis 2012-02-14 12:36:19 -0800 Comment on attachment 127009 Initial upstreaming for find-in-page for BlackBerry View in context: https://bugs.webkit.org/attachment.cgi?id=127009&action=review Some stuff still needs to be fixed. > Source/WebKit/ChangeLog:5 > + Maybe add an explanation why this change is made. > Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.h:41 > + bool findNextString(const WTF::String& text, bool forward); I dont think you need the WTF:: prefix. 556514 3 127022 andchen 2012-02-14 12:55:01 -0800 Created attachment 127022 Initial upstreaming for find-in-page for BlackBerry 556521 4 127022 rwlbuis 2012-02-14 12:59:23 -0800 Comment on attachment 127022 Initial upstreaming for find-in-page for BlackBerry Looks good. 556591 5 127022 webkit.review.bot 2012-02-14 14:18:34 -0800 Comment on attachment 127022 Initial upstreaming for find-in-page for BlackBerry Clearing flags on attachment: 127022 Committed r107736: <http://trac.webkit.org/changeset/107736> 556592 6 webkit.review.bot 2012-02-14 14:18:38 -0800 All reviewed patches have been landed. Closing bug. 127009 2012-02-14 11:53:48 -0800 2012-02-14 12:54:09 -0800 Initial upstreaming for find-in-page for BlackBerry 0001-2012-02-13-Andy-Chen-andchen-rim.com.patch text/plain 10386 andchen RnJvbSBiZTZkYzIzMjU5MmQzNmZlMTY2OTc0ZTUzMTE3YjZkNjkyMTdlNWUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmR5IENoZW4gPGFuZGNoZW5AcmltLmNvbT4KRGF0ZTogTW9u LCAxMyBGZWIgMjAxMiAxNDozODozNSAtMDUwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTItMDItMTMg IEFuZHkgQ2hlbiAgPGFuZGNoZW5AcmltLmNvbT4KCltCbGFja0JlcnJ5XSBJbml0aWFsIHVwc3Ry ZWFtaW5nIGZvciBmaW5kLWluLXBhZ2UgZm9yIEJsYWNrQmVycnkgcG9ydApodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg2MTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgoKKiBibGFja2JlcnJ5L0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dDoKKiBibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHA6IEFkZGVkLgooQmxhY2tCZXJy eTo6V2ViS2l0OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpJblBhZ2VTZWFyY2hNYW5hZ2VyKToKKEJs YWNrQmVycnk6OldlYktpdDo6SW5QYWdlU2VhcmNoTWFuYWdlcjo6fkluUGFnZVNlYXJjaE1hbmFn ZXIpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpmaW5kTmV4dFN0 cmluZyk6CihCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUGFnZVNlYXJjaE1hbmFnZXI6OmNsZWFyVGV4 dE1hdGNoZXMpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpzZXRN YXJrZXJBY3RpdmUpOgoqIGJsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JblBhZ2VTZWFyY2hNYW5h Z2VyLmg6IEFkZGVkLgoqIGJsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVy LmNwcDoKKiBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5oOgotLS0K IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAx OCArKysrCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0 ICB8ICAgIDEgKwogLi4uL1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHAgICAg ICAgICAgfCAgIDkzICsrKysrKysrKysrKysrKysrKysrCiAuLi4vYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuaCB8ICAgNTYgKysrKysrKysrKysrCiAuLi4vYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwICB8ICAgMjQgLS0tLS0K IC4uLi9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5oICAgIHwgICAg MSAtCiA2IGZpbGVzIGNoYW5nZWQsIDE2OCBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkK IGNyZWF0ZSBtb2RlIDEwMDY0NCBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9JblBhZ2VTZWFyY2hNYW5hZ2VyLmNwcAogY3JlYXRlIG1vZGUgMTAwNjQ0IFNvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuaAoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggYzU2NzMzYy4uMTc1OGI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0w Mi0xNCAgQW5keSBDaGVuICA8YW5kY2hlbkByaW0uY29tPgorCisgICAgICAgIEluaXRpYWwgdXBz dHJlYW1pbmcgZm9yIGZpbmQtaW4tcGFnZSBmb3IgQmxhY2tCZXJyeSBwb3J0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODYxNQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmxhY2tiZXJyeS9DTWFrZUxp c3RzQmxhY2tCZXJyeS50eHQ6CisgICAgICAgICogYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu UGFnZVNlYXJjaE1hbmFnZXIuY3BwOiBBZGRlZC4KKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5QYWdlU2VhcmNoTWFuYWdlcjo6SW5QYWdlU2VhcmNoTWFuYWdlcik6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OkluUGFnZVNlYXJjaE1hbmFnZXI6On5JblBhZ2VTZWFyY2hNYW5h Z2VyKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5QYWdlU2VhcmNoTWFuYWdlcjo6 ZmluZE5leHRTdHJpbmcpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblBhZ2VTZWFy Y2hNYW5hZ2VyOjpjbGVhclRleHRNYXRjaGVzKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5QYWdlU2VhcmNoTWFuYWdlcjo6c2V0TWFya2VyQWN0aXZlKToKKyAgICAgICAgKiBibGFj a2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5oOiBBZGRlZC4KKyAgICAg ICAgKiBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHA6CisgICAg ICAgICogYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuaDoKKwogMjAx Mi0wMi0xMyAgTmltYSBHaGFuYXZhdGlhbiAgPG5naGFuYXZhdGlhbkByaW0uY29tPgogCiAgICAg ICAgIEluaXRpYWwgdXBzdHJlYW1pbmcgb2Ygc2VsZWN0aW9uIGhhbmRsaW5nIGNvZGUgZm9yIEJs YWNrQmVycnkgcG9ydApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NNYWtl TGlzdHNCbGFja0JlcnJ5LnR4dCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DTWFrZUxpc3Rz QmxhY2tCZXJyeS50eHQKaW5kZXggZDBlMjdjZi4uYzUxMzJhYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0CkBAIC02Nyw2ICs2Nyw3 IEBAIExJU1QoQVBQRU5EIFdlYktpdF9TT1VSQ0VTCiAgICAgYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0JhY2tpbmdTdG9yZUNsaWVudC5jcHAKICAgICBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv RE9NU3VwcG9ydC5jcHAKICAgICBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvRnJhbWVMYXllcnMu Y3BwCisgICAgYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuY3Bw CiAgICAgYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKICAgICBibGFj a2JlcnJ5L1dlYktpdFN1cHBvcnQvT3V0T2ZNZW1vcnlIYW5kbGVyLmNwcAogICAgIGJsYWNrYmVy cnkvV2ViS2l0U3VwcG9ydC9SZW5kZXJRdWV1ZS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5j cHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmY3MjcwZgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luUGFnZVNl YXJjaE1hbmFnZXIuY3BwCkBAIC0wLDAgKzEsOTMgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIw MTIgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgor ICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0 IGFuZC9vcgorICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBH ZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdh cmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChh dCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5IGlz IGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQg V0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBv ZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NF LiAgU2VlIHRoZSBHTlUKKyAqIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3Jl IGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUg R05VIExlc3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhbG9uZyB3aXRoIHRoaXMgbGli cmFyeTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQorICogRm91bmRhdGlvbiwg SW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQSAgMDIxMTAt MTMwMSAgVVNBCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIkluUGFnZVNl YXJjaE1hbmFnZXIuaCIKKworI2luY2x1ZGUgIkRvY3VtZW50LmgiCisjaW5jbHVkZSAiRG9jdW1l bnRNYXJrZXJDb250cm9sbGVyLmgiCisjaW5jbHVkZSAiRWRpdG9yLmgiCisjaW5jbHVkZSAiRnJh bWUuaCIKKyNpbmNsdWRlICJQYWdlLmgiCisjaW5jbHVkZSAiV2ViUGFnZV9wLmgiCisKK3N0YXRp YyBjb25zdCBpbnQgVGV4dE1hdGNoTWFya2VyTGltaXQgPSAxMDA7CisKK3VzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOworCituYW1lc3BhY2UgQmxhY2tCZXJyeSB7CituYW1lc3BhY2UgV2ViS2l0IHsK KworSW5QYWdlU2VhcmNoTWFuYWdlcjo6SW5QYWdlU2VhcmNoTWFuYWdlcihXZWJQYWdlUHJpdmF0 ZSogcGFnZSkKKyAgICA6IG1fd2ViUGFnZShwYWdlKQorICAgICwgbV9hY3RpdmVNYXRjaCgwKQor eworfQorCitJblBhZ2VTZWFyY2hNYW5hZ2VyOjp+SW5QYWdlU2VhcmNoTWFuYWdlcigpCit7Cit9 CisKK2Jvb2wgSW5QYWdlU2VhcmNoTWFuYWdlcjo6ZmluZE5leHRTdHJpbmcoY29uc3QgV1RGOjpT dHJpbmcmIHRleHQsIGJvb2wgZm9yd2FyZCkKK3sKKyAgICBpZiAoIXRleHQubGVuZ3RoKCkpIHsK KyAgICAgICAgY2xlYXJUZXh0TWF0Y2hlcygpOworICAgICAgICBtX2FjdGl2ZVNlYXJjaFN0cmlu ZyA9IFdURjo6U3RyaW5nKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBp ZiAobV9hY3RpdmVTZWFyY2hTdHJpbmcgIT0gdGV4dCkgeworICAgICAgICBjbGVhclRleHRNYXRj aGVzKCk7CisgICAgICAgIG1fYWN0aXZlU2VhcmNoU3RyaW5nID0gdGV4dDsKKyAgICAgICAgbV9h Y3RpdmVNYXRjaENvdW50ID0gbV93ZWJQYWdlLT5tX3BhZ2UtPm1hcmtBbGxNYXRjaGVzRm9yVGV4 dCh0ZXh0LCBXZWJDb3JlOjpDYXNlSW5zZW5zaXRpdmUsIHRydWUsIFRleHRNYXRjaE1hcmtlckxp bWl0KTsKKyAgICB9IGVsc2UKKyAgICAgICAgc2V0TWFya2VyQWN0aXZlKG1fYWN0aXZlTWF0Y2gu Z2V0KCksIGZhbHNlKTsKKworICAgIGlmICghbV9hY3RpdmVNYXRjaENvdW50KQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBjb25zdCBGaW5kT3B0aW9ucyBmaW5kT3B0aW9ucyA9IChmb3J3 YXJkID8gMCA6IFdlYkNvcmU6OkJhY2t3YXJkcykKKyAgICAgICAgfCBXZWJDb3JlOjpDYXNlSW5z ZW5zaXRpdmUKKyAgICAgICAgfCBXZWJDb3JlOjpXcmFwQXJvdW5kOyAvLyBUT0RPIHNob3VsZCB3 cmFwIGFyb3VuZCBpbiBwYWdlLCBub3QgaW4gZnJhbWUKKworICAgIC8vIFRPRE8gU3RhcnRJblNl bGVjdGlvbgorCisgICAgbV9hY3RpdmVNYXRjaCA9IG1fd2ViUGFnZS0+bWFpbkZyYW1lKCktPmVk aXRvcigpLT5maW5kU3RyaW5nQW5kU2Nyb2xsVG9WaXNpYmxlKHRleHQsIG1fYWN0aXZlTWF0Y2gu Z2V0KCksIGZpbmRPcHRpb25zKTsKKyAgICBzZXRNYXJrZXJBY3RpdmUobV9hY3RpdmVNYXRjaC5n ZXQoKSwgdHJ1ZSk7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwordm9pZCBJblBhZ2VTZWFyY2hN YW5hZ2VyOjpjbGVhclRleHRNYXRjaGVzKCkKK3sKKyAgICBtX3dlYlBhZ2UtPm1fcGFnZS0+dW5t YXJrQWxsVGV4dE1hdGNoZXMoKTsKKyAgICBtX2FjdGl2ZU1hdGNoID0gMDsKK30KKwordm9pZCBJ blBhZ2VTZWFyY2hNYW5hZ2VyOjpzZXRNYXJrZXJBY3RpdmUoV2ViQ29yZTo6UmFuZ2UqIHJhbmdl LCBib29sIGFjdGl2ZSkKK3sKKyAgICBpZiAoIXJhbmdlKQorICAgICAgICByZXR1cm47CisgICAg V2ViQ29yZTo6RG9jdW1lbnQqIGRvYyA9IG1fd2ViUGFnZS0+bWFpbkZyYW1lKCktPmRvY3VtZW50 KCk7CisgICAgaWYgKCFkb2MpCisgICAgICAgIHJldHVybjsKKyAgICBkb2MtPm1hcmtlcnMoKS0+ c2V0TWFya2Vyc0FjdGl2ZShyYW5nZSwgYWN0aXZlKTsKK30KKworfQorfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdl ci5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNo TWFuYWdlci5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE3YmMxM2IKLS0t IC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9J blBhZ2VTZWFyY2hNYW5hZ2VyLmgKQEAgLTAsMCArMSw1NiBAQAorLyoKKyAqIENvcHlyaWdodCAo QykgMjAxMiBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVz c2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9y IG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9m IHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFsb25nIHdpdGggdGhp cyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisgKiBGb3VuZGF0 aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAw MjExMC0xMzAxICBVU0EKKyAqLworCisjaWZuZGVmIEluUGFnZVNlYXJjaE1hbmFnZXJfaAorI2Rl ZmluZSBJblBhZ2VTZWFyY2hNYW5hZ2VyX2gKKworI2luY2x1ZGUgIldURlN0cmluZy5oIgorCisj aW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBSYW5n ZTsKK30KKworbmFtZXNwYWNlIEJsYWNrQmVycnkgeworCituYW1lc3BhY2UgV2ViS2l0IHsKKwor Y2xhc3MgV2ViUGFnZVByaXZhdGU7CisKK2NsYXNzIEluUGFnZVNlYXJjaE1hbmFnZXIgeworcHVi bGljOgorICAgIEluUGFnZVNlYXJjaE1hbmFnZXIoV2ViUGFnZVByaXZhdGUqKTsKKyAgICB+SW5Q YWdlU2VhcmNoTWFuYWdlcigpOworCisgICAgYm9vbCBmaW5kTmV4dFN0cmluZyhjb25zdCBXVEY6 OlN0cmluZyYgdGV4dCwgYm9vbCBmb3J3YXJkKTsKKworcHJpdmF0ZToKKyAgICB2b2lkIGNsZWFy VGV4dE1hdGNoZXMoKTsKKyAgICB2b2lkIHNldE1hcmtlckFjdGl2ZShXZWJDb3JlOjpSYW5nZSos IGJvb2wgYWN0aXZlKTsKKworICAgIFdlYlBhZ2VQcml2YXRlKiBtX3dlYlBhZ2U7CisgICAgUmVm UHRyPFdlYkNvcmU6OlJhbmdlPiBtX2FjdGl2ZU1hdGNoOworICAgIFdURjo6U3RyaW5nIG1fYWN0 aXZlU2VhcmNoU3RyaW5nOworICAgIGludCBtX2FjdGl2ZU1hdGNoQ291bnQ7Cit9OworCit9Cit9 CisKKyNlbmRpZiAvLyBJblBhZ2VTZWFyY2hNYW5hZ2VyX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAK aW5kZXggM2M3NjJjYS4uZjc1NWZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKQEAgLTg4LDMw ICs4OCw2IEBAIFdlYlN0cmluZyBTZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3RlZFRleHQoKSBjb25z dAogICAgIHJldHVybiBtX3dlYlBhZ2UtPmZvY3VzZWRPck1haW5GcmFtZSgpLT5lZGl0b3IoKS0+ c2VsZWN0ZWRUZXh0KCk7CiB9CiAKLWJvb2wgU2VsZWN0aW9uSGFuZGxlcjo6ZmluZE5leHRTdHJp bmcoY29uc3QgV1RGOjpTdHJpbmcmIHNlYXJjaFN0cmluZywgYm9vbCBmb3J3YXJkKQotewotICAg IGlmIChzZWFyY2hTdHJpbmcuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGNhbmNlbFNlbGVjdGlvbigp OwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQotCi0gICAgQVNTRVJUKG1fd2ViUGFnZS0+ bV9wYWdlKTsKLQotICAgIG1fd2ViUGFnZS0+bV9wYWdlLT51bm1hcmtBbGxUZXh0TWF0Y2hlcygp OwotCi0gICAgYm9vbCByZXN1bHQgPSBtX3dlYlBhZ2UtPm1fcGFnZS0+ZmluZFN0cmluZyhzZWFy Y2hTdHJpbmcsIFdURjo6VGV4dENhc2VJbnNlbnNpdGl2ZSwgZm9yd2FyZCA/IEZpbmREaXJlY3Rp b25Gb3J3YXJkIDogRmluZERpcmVjdGlvbkJhY2t3YXJkLCB0cnVlIC8qIHNob3VsZCB3cmFwICov KTsKLSAgICBpZiAocmVzdWx0ICYmIG1fd2ViUGFnZS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCktPnNl bGVjdGlvbigpLT5zZWxlY3Rpb25UeXBlKCkgPT0gVmlzaWJsZVNlbGVjdGlvbjo6Tm9TZWxlY3Rp b24pIHsKLSAgICAgICAgLy8gV29yZCB3YXMgZm91bmQgYnV0IGNvdWxkIG5vdCBiZSBzZWxlY3Rl ZCBvbiB0aGlzIHBhZ2UuCi0gICAgICAgIHJlc3VsdCA9IG1fd2ViUGFnZS0+bV9wYWdlLT5tYXJr QWxsTWF0Y2hlc0ZvclRleHQoc2VhcmNoU3RyaW5nLCBXVEY6OlRleHRDYXNlSW5zZW5zaXRpdmUs IHRydWUgLyogc2hvdWxkIGhpZ2hsaWdodCAqLywgMCAvKiBsaW1pdCB0byBtYXRjaCAwID0gdW5s aW1pdGVkICovKTsKLSAgICB9Ci0KLSAgICAvLyBEZWZvY3VzIHRoZSBpbnB1dCBmaWVsZCBpZiBv bmUgaXMgYWN0aXZlLgotICAgIGlmIChtX3dlYlBhZ2UtPm1faW5wdXRIYW5kbGVyLT5pc0lucHV0 TW9kZSgpKQotICAgICAgICBtX3dlYlBhZ2UtPm1faW5wdXRIYW5kbGVyLT5ub2RlRm9jdXNlZCgw KTsKLQotICAgIHJldHVybiByZXN1bHQ7Ci19Ci0KIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6Z2V0 Q29uc29saWRhdGVkUmVnaW9uT2ZUZXh0UXVhZHNGb3JTZWxlY3Rpb24oY29uc3QgVmlzaWJsZVNl bGVjdGlvbiYgc2VsZWN0aW9uLCBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdFJlZ2lvbiYg cmVnaW9uKSBjb25zdAogewogICAgIEFTU0VSVChyZWdpb24uaXNFbXB0eSgpKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRs ZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhh bmRsZXIuaAppbmRleCBhZDRlMzk4Li5hMWViOTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmgKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5oCkBAIC01 Myw3ICs1Myw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhbmNlbFNlbGVjdGlvbigpOwogICAgIFdl YlN0cmluZyBzZWxlY3RlZFRleHQoKSBjb25zdDsKIAotICAgIGJvb2wgZmluZE5leHRTdHJpbmco Y29uc3QgV1RGOjpTdHJpbmcmLCBib29sKTsKICAgICBib29sIHNlbGVjdGlvbkNvbnRhaW5zKGNv bnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAKICAgICB2b2lkIHNldFNlbGVjdGlvbihjb25zdCBX ZWJDb3JlOjpJbnRQb2ludCYgc3RhcnQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBlbmQpOwot LSAKMS43LjUuNAoK 127022 2012-02-14 12:55:01 -0800 2012-02-14 14:18:33 -0800 Initial upstreaming for find-in-page for BlackBerry 0001-Initial-upstreaming-for-find-in-page-for-BlackBerry-.patch text/plain 10536 andchen RnJvbSA1ZWJjYTQ3MDdjMzAwMjkxZDkwNzQyYzBiMmJlMjhhY2ZhZTg1MDIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmR5IENoZW4gPGFuZGNoZW5AcmltLmNvbT4KRGF0ZTogVHVl LCAxNCBGZWIgMjAxMiAxNTo1MToyNiAtMDUwMApTdWJqZWN0OiBbUEFUQ0hdIEluaXRpYWwgdXBz dHJlYW1pbmcgZm9yIGZpbmQtaW4tcGFnZSBmb3IgQmxhY2tCZXJyeSBwb3J0CiBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg2MTUKCkNyZWF0ZSBhIG5ldyBjbGFzcyBJ blBhZ2VTZWFyY2hNYW5hZ2VyIGZvciBmaW5kLWluLXBhZ2UgYW5kCnJlbW92ZSB0aGUgZnVuY3Rp b25zIGluIFNlbGVjdGlvbkhhbmRsZXIKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKKiBi bGFja2JlcnJ5L0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dDoKKiBibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHA6IEFkZGVkLgooQmxhY2tCZXJyeTo6V2ViS2l0 OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpJblBhZ2VTZWFyY2hNYW5hZ2VyKToKKEJsYWNrQmVycnk6 OldlYktpdDo6SW5QYWdlU2VhcmNoTWFuYWdlcjo6fkluUGFnZVNlYXJjaE1hbmFnZXIpOgooQmxh Y2tCZXJyeTo6V2ViS2l0OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpmaW5kTmV4dFN0cmluZyk6CihC bGFja0JlcnJ5OjpXZWJLaXQ6OkluUGFnZVNlYXJjaE1hbmFnZXI6OmNsZWFyVGV4dE1hdGNoZXMp OgooQmxhY2tCZXJyeTo6V2ViS2l0OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpzZXRNYXJrZXJBY3Rp dmUpOgoqIGJsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JblBhZ2VTZWFyY2hNYW5hZ2VyLmg6IEFk ZGVkLgoqIGJsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcDoKKiBi bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5oOgotLS0KIFNvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMSArKysrKwog U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NNYWtlTGlzdHNCbGFja0JlcnJ5LnR4dCAgfCAgICAx ICsKIC4uLi9XZWJLaXRTdXBwb3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuY3BwICAgICAgICAgIHwg ICA5MyArKysrKysrKysrKysrKysrKysrKwogLi4uL2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9J blBhZ2VTZWFyY2hNYW5hZ2VyLmggfCAgIDU2ICsrKysrKysrKysrKwogLi4uL2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcCAgfCAgIDI0IC0tLS0tCiAuLi4vYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuaCAgICB8ICAgIDEgLQogNiBm aWxlcyBjaGFuZ2VkLCAxNzEgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCiBjcmVhdGUg bW9kZSAxMDA2NDQgU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdl U2VhcmNoTWFuYWdlci5jcHAKIGNyZWF0ZSBtb2RlIDEwMDY0NCBTb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9JblBhZ2VTZWFyY2hNYW5hZ2VyLmgKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM1 NjczM2MuLjVmOWRlMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDItMTQgIEFu ZHkgQ2hlbiAgPGFuZGNoZW5AcmltLmNvbT4KKworICAgICAgICBJbml0aWFsIHVwc3RyZWFtaW5n IGZvciBmaW5kLWluLXBhZ2UgZm9yIEJsYWNrQmVycnkgcG9ydAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg2MTUKKworICAgICAgICBDcmVhdGUgYSBu ZXcgY2xhc3MgSW5QYWdlU2VhcmNoTWFuYWdlciBmb3IgZmluZC1pbi1wYWdlIGFuZAorICAgICAg ICByZW1vdmUgdGhlIGZ1bmN0aW9ucyBpbiBTZWxlY3Rpb25IYW5kbGVyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBibGFja2JlcnJ5L0NNYWtlTGlz dHNCbGFja0JlcnJ5LnR4dDoKKyAgICAgICAgKiBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5Q YWdlU2VhcmNoTWFuYWdlci5jcHA6IEFkZGVkLgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpJblBhZ2VTZWFyY2hNYW5hZ2VyKToKKyAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6SW5QYWdlU2VhcmNoTWFuYWdlcjo6fkluUGFnZVNlYXJjaE1hbmFn ZXIpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpm aW5kTmV4dFN0cmluZyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUGFnZVNlYXJj aE1hbmFnZXI6OmNsZWFyVGV4dE1hdGNoZXMpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpJblBhZ2VTZWFyY2hNYW5hZ2VyOjpzZXRNYXJrZXJBY3RpdmUpOgorICAgICAgICAqIGJsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9JblBhZ2VTZWFyY2hNYW5hZ2VyLmg6IEFkZGVkLgorICAgICAg ICAqIGJsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcDoKKyAgICAg ICAgKiBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5oOgorCiAyMDEy LTAyLTEzICBOaW1hIEdoYW5hdmF0aWFuICA8bmdoYW5hdmF0aWFuQHJpbS5jb20+CiAKICAgICAg ICAgSW5pdGlhbCB1cHN0cmVhbWluZyBvZiBzZWxlY3Rpb24gaGFuZGxpbmcgY29kZSBmb3IgQmxh Y2tCZXJyeSBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ01ha2VM aXN0c0JsYWNrQmVycnkudHh0IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NNYWtlTGlzdHNC bGFja0JlcnJ5LnR4dAppbmRleCBkMGUyN2NmLi5jNTEzMmFhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ01ha2VMaXN0c0JsYWNrQmVycnkudHh0CisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DTWFrZUxpc3RzQmxhY2tCZXJyeS50eHQKQEAgLTY3LDYgKzY3LDcg QEAgTElTVChBUFBFTkQgV2ViS2l0X1NPVVJDRVMKICAgICBibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvQmFja2luZ1N0b3JlQ2xpZW50LmNwcAogICAgIGJsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9E T01TdXBwb3J0LmNwcAogICAgIGJsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GcmFtZUxheWVycy5j cHAKKyAgICBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHAK ICAgICBibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAogICAgIGJsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9PdXRPZk1lbW9yeUhhbmRsZXIuY3BwCiAgICAgYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L1JlbmRlclF1ZXVlLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JblBhZ2VTZWFyY2hNYW5hZ2VyLmNw cApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hZTA0MDIxCi0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2Vh cmNoTWFuYWdlci5jcHAKQEAgLTAsMCArMSw5MyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAx MiBSZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisg KiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg YW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGVzc2VyIEdl bmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2Fy ZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0 IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMg ZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAqIGJ1dCBX SVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9m CisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0Uu ICBTZWUgdGhlIEdOVQorICogTGVzc2VyIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUg ZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBH TlUgTGVzc2VyIEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFsb25nIHdpdGggdGhpcyBsaWJy YXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisgKiBGb3VuZGF0aW9uLCBJ bmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBCb3N0b24sIE1BICAwMjExMC0x MzAxICBVU0EKKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiSW5QYWdlU2Vh cmNoTWFuYWdlci5oIgorCisjaW5jbHVkZSAiRG9jdW1lbnQuaCIKKyNpbmNsdWRlICJEb2N1bWVu dE1hcmtlckNvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJFZGl0b3IuaCIKKyNpbmNsdWRlICJGcmFt ZS5oIgorI2luY2x1ZGUgIlBhZ2UuaCIKKyNpbmNsdWRlICJXZWJQYWdlX3AuaCIKKworc3RhdGlj IGNvbnN0IGludCBUZXh0TWF0Y2hNYXJrZXJMaW1pdCA9IDEwMDsKKwordXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CisKK25hbWVzcGFjZSBCbGFja0JlcnJ5IHsKK25hbWVzcGFjZSBXZWJLaXQgewor CitJblBhZ2VTZWFyY2hNYW5hZ2VyOjpJblBhZ2VTZWFyY2hNYW5hZ2VyKFdlYlBhZ2VQcml2YXRl KiBwYWdlKQorICAgIDogbV93ZWJQYWdlKHBhZ2UpCisgICAgLCBtX2FjdGl2ZU1hdGNoKDApCit7 Cit9CisKK0luUGFnZVNlYXJjaE1hbmFnZXI6On5JblBhZ2VTZWFyY2hNYW5hZ2VyKCkKK3sKK30K KworYm9vbCBJblBhZ2VTZWFyY2hNYW5hZ2VyOjpmaW5kTmV4dFN0cmluZyhjb25zdCBTdHJpbmcm IHRleHQsIGJvb2wgZm9yd2FyZCkKK3sKKyAgICBpZiAoIXRleHQubGVuZ3RoKCkpIHsKKyAgICAg ICAgY2xlYXJUZXh0TWF0Y2hlcygpOworICAgICAgICBtX2FjdGl2ZVNlYXJjaFN0cmluZyA9IFN0 cmluZygpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgaWYgKG1fYWN0aXZl U2VhcmNoU3RyaW5nICE9IHRleHQpIHsKKyAgICAgICAgY2xlYXJUZXh0TWF0Y2hlcygpOworICAg ICAgICBtX2FjdGl2ZVNlYXJjaFN0cmluZyA9IHRleHQ7CisgICAgICAgIG1fYWN0aXZlTWF0Y2hD b3VudCA9IG1fd2ViUGFnZS0+bV9wYWdlLT5tYXJrQWxsTWF0Y2hlc0ZvclRleHQodGV4dCwgV2Vi Q29yZTo6Q2FzZUluc2Vuc2l0aXZlLCB0cnVlLCBUZXh0TWF0Y2hNYXJrZXJMaW1pdCk7CisgICAg fSBlbHNlCisgICAgICAgIHNldE1hcmtlckFjdGl2ZShtX2FjdGl2ZU1hdGNoLmdldCgpLCBmYWxz ZSk7CisKKyAgICBpZiAoIW1fYWN0aXZlTWF0Y2hDb3VudCkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgY29uc3QgRmluZE9wdGlvbnMgZmluZE9wdGlvbnMgPSAoZm9yd2FyZCA/IDAgOiBX ZWJDb3JlOjpCYWNrd2FyZHMpCisgICAgICAgIHwgV2ViQ29yZTo6Q2FzZUluc2Vuc2l0aXZlCisg ICAgICAgIHwgV2ViQ29yZTo6V3JhcEFyb3VuZDsgLy8gVE9ETyBzaG91bGQgd3JhcCBhcm91bmQg aW4gcGFnZSwgbm90IGluIGZyYW1lCisKKyAgICAvLyBUT0RPIFN0YXJ0SW5TZWxlY3Rpb24KKwor ICAgIG1fYWN0aXZlTWF0Y2ggPSBtX3dlYlBhZ2UtPm1haW5GcmFtZSgpLT5lZGl0b3IoKS0+Zmlu ZFN0cmluZ0FuZFNjcm9sbFRvVmlzaWJsZSh0ZXh0LCBtX2FjdGl2ZU1hdGNoLmdldCgpLCBmaW5k T3B0aW9ucyk7CisgICAgc2V0TWFya2VyQWN0aXZlKG1fYWN0aXZlTWF0Y2guZ2V0KCksIHRydWUp OworCisgICAgcmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgSW5QYWdlU2VhcmNoTWFuYWdlcjo6Y2xl YXJUZXh0TWF0Y2hlcygpCit7CisgICAgbV93ZWJQYWdlLT5tX3BhZ2UtPnVubWFya0FsbFRleHRN YXRjaGVzKCk7CisgICAgbV9hY3RpdmVNYXRjaCA9IDA7Cit9CisKK3ZvaWQgSW5QYWdlU2VhcmNo TWFuYWdlcjo6c2V0TWFya2VyQWN0aXZlKFdlYkNvcmU6OlJhbmdlKiByYW5nZSwgYm9vbCBhY3Rp dmUpCit7CisgICAgaWYgKCFyYW5nZSkKKyAgICAgICAgcmV0dXJuOworICAgIFdlYkNvcmU6OkRv Y3VtZW50KiBkb2MgPSBtX3dlYlBhZ2UtPm1haW5GcmFtZSgpLT5kb2N1bWVudCgpOworICAgIGlm ICghZG9jKQorICAgICAgICByZXR1cm47CisgICAgZG9jLT5tYXJrZXJzKCktPnNldE1hcmtlcnNB Y3RpdmUocmFuZ2UsIGFjdGl2ZSk7Cit9CisKK30KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuaCBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuaApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xZjZiYmI1Ci0tLSAvZGV2L251bGwK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNo TWFuYWdlci5oCkBAIC0wLDAgKzEsNTYgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIgUmVz ZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogVGhp cyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v cgorICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFs IFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91 bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3Vy IG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGRpc3Ry aWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9V VCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICog TUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2Vl IHRoZSBHTlUKKyAqIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFp bHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExl c3NlciBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsg aWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2FyZQorICogRm91bmRhdGlvbiwgSW5jLiwg NTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9zdG9uLCBNQSAgMDIxMTAtMTMwMSAg VVNBCisgKi8KKworI2lmbmRlZiBJblBhZ2VTZWFyY2hNYW5hZ2VyX2gKKyNkZWZpbmUgSW5QYWdl U2VhcmNoTWFuYWdlcl9oCisKKyNpbmNsdWRlICJXVEZTdHJpbmcuaCIKKworI2luY2x1ZGUgPHd0 Zi9SZWZQdHIuaD4KKworbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgUmFuZ2U7Cit9CisKK25h bWVzcGFjZSBCbGFja0JlcnJ5IHsKKworbmFtZXNwYWNlIFdlYktpdCB7CisKK2NsYXNzIFdlYlBh Z2VQcml2YXRlOworCitjbGFzcyBJblBhZ2VTZWFyY2hNYW5hZ2VyIHsKK3B1YmxpYzoKKyAgICBJ blBhZ2VTZWFyY2hNYW5hZ2VyKFdlYlBhZ2VQcml2YXRlKik7CisgICAgfkluUGFnZVNlYXJjaE1h bmFnZXIoKTsKKworICAgIGJvb2wgZmluZE5leHRTdHJpbmcoY29uc3QgU3RyaW5nJiB0ZXh0LCBi b29sIGZvcndhcmQpOworCitwcml2YXRlOgorICAgIHZvaWQgY2xlYXJUZXh0TWF0Y2hlcygpOwor ICAgIHZvaWQgc2V0TWFya2VyQWN0aXZlKFdlYkNvcmU6OlJhbmdlKiwgYm9vbCBhY3RpdmUpOwor CisgICAgV2ViUGFnZVByaXZhdGUqIG1fd2ViUGFnZTsKKyAgICBSZWZQdHI8V2ViQ29yZTo6UmFu Z2U+IG1fYWN0aXZlTWF0Y2g7CisgICAgU3RyaW5nIG1fYWN0aXZlU2VhcmNoU3RyaW5nOworICAg IGludCBtX2FjdGl2ZU1hdGNoQ291bnQ7Cit9OworCit9Cit9CisKKyNlbmRpZiAvLyBJblBhZ2VT ZWFyY2hNYW5hZ2VyX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKaW5kZXggM2M3NjJjYS4uZjc1NWZm ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2Vs ZWN0aW9uSGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKQEAgLTg4LDMwICs4OCw2IEBAIFdlYlN0cmluZyBT ZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3RlZFRleHQoKSBjb25zdAogICAgIHJldHVybiBtX3dlYlBh Z2UtPmZvY3VzZWRPck1haW5GcmFtZSgpLT5lZGl0b3IoKS0+c2VsZWN0ZWRUZXh0KCk7CiB9CiAK LWJvb2wgU2VsZWN0aW9uSGFuZGxlcjo6ZmluZE5leHRTdHJpbmcoY29uc3QgV1RGOjpTdHJpbmcm IHNlYXJjaFN0cmluZywgYm9vbCBmb3J3YXJkKQotewotICAgIGlmIChzZWFyY2hTdHJpbmcuaXNF bXB0eSgpKSB7Ci0gICAgICAgIGNhbmNlbFNlbGVjdGlvbigpOwotICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgfQotCi0gICAgQVNTRVJUKG1fd2ViUGFnZS0+bV9wYWdlKTsKLQotICAgIG1fd2Vi UGFnZS0+bV9wYWdlLT51bm1hcmtBbGxUZXh0TWF0Y2hlcygpOwotCi0gICAgYm9vbCByZXN1bHQg PSBtX3dlYlBhZ2UtPm1fcGFnZS0+ZmluZFN0cmluZyhzZWFyY2hTdHJpbmcsIFdURjo6VGV4dENh c2VJbnNlbnNpdGl2ZSwgZm9yd2FyZCA/IEZpbmREaXJlY3Rpb25Gb3J3YXJkIDogRmluZERpcmVj dGlvbkJhY2t3YXJkLCB0cnVlIC8qIHNob3VsZCB3cmFwICovKTsKLSAgICBpZiAocmVzdWx0ICYm IG1fd2ViUGFnZS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCktPnNlbGVjdGlvbigpLT5zZWxlY3Rpb25U eXBlKCkgPT0gVmlzaWJsZVNlbGVjdGlvbjo6Tm9TZWxlY3Rpb24pIHsKLSAgICAgICAgLy8gV29y ZCB3YXMgZm91bmQgYnV0IGNvdWxkIG5vdCBiZSBzZWxlY3RlZCBvbiB0aGlzIHBhZ2UuCi0gICAg ICAgIHJlc3VsdCA9IG1fd2ViUGFnZS0+bV9wYWdlLT5tYXJrQWxsTWF0Y2hlc0ZvclRleHQoc2Vh cmNoU3RyaW5nLCBXVEY6OlRleHRDYXNlSW5zZW5zaXRpdmUsIHRydWUgLyogc2hvdWxkIGhpZ2hs aWdodCAqLywgMCAvKiBsaW1pdCB0byBtYXRjaCAwID0gdW5saW1pdGVkICovKTsKLSAgICB9Ci0K LSAgICAvLyBEZWZvY3VzIHRoZSBpbnB1dCBmaWVsZCBpZiBvbmUgaXMgYWN0aXZlLgotICAgIGlm IChtX3dlYlBhZ2UtPm1faW5wdXRIYW5kbGVyLT5pc0lucHV0TW9kZSgpKQotICAgICAgICBtX3dl YlBhZ2UtPm1faW5wdXRIYW5kbGVyLT5ub2RlRm9jdXNlZCgwKTsKLQotICAgIHJldHVybiByZXN1 bHQ7Ci19Ci0KIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6Z2V0Q29uc29saWRhdGVkUmVnaW9uT2ZU ZXh0UXVhZHNGb3JTZWxlY3Rpb24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYgc2VsZWN0aW9uLCBC bGFja0JlcnJ5OjpQbGF0Zm9ybTo6SW50UmVjdFJlZ2lvbiYgcmVnaW9uKSBjb25zdAogewogICAg IEFTU0VSVChyZWdpb24uaXNFbXB0eSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuaCBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuaAppbmRleCBhZDRlMzk4 Li5hMWViOTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9TZWxlY3Rpb25IYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5oCkBAIC01Myw3ICs1Myw2IEBAIHB1YmxpYzoK ICAgICB2b2lkIGNhbmNlbFNlbGVjdGlvbigpOwogICAgIFdlYlN0cmluZyBzZWxlY3RlZFRleHQo KSBjb25zdDsKIAotICAgIGJvb2wgZmluZE5leHRTdHJpbmcoY29uc3QgV1RGOjpTdHJpbmcmLCBi b29sKTsKICAgICBib29sIHNlbGVjdGlvbkNvbnRhaW5zKGNvbnN0IFdlYkNvcmU6OkludFBvaW50 Jik7CiAKICAgICB2b2lkIHNldFNlbGVjdGlvbihjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc3Rh cnQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBlbmQpOwotLSAKMS43LjUuNAoK