97873 2012-09-28 00:19:28 -0700 [EFL][WK2] Add API to count the matching text 2012-10-05 03:59:23 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 1 jinwoo7.song jinwoo7.song cdumez gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 730308 0 jinwoo7.song 2012-09-28 00:19:28 -0700 We need a API to only count the matching text such as ewk_view_text_count(), as described in https://bugs.webkit.org/show_bug.cgi?id=97431. ewk_view_text_find() finds the matching text and but also update the UI view, for example, highlight the text. But some application may not want to affect the view, and just want to know the count. 733750 1 166905 jinwoo7.song 2012-10-03 08:50:02 -0700 Created attachment 166905 Patch 733754 2 166905 rakuco 2012-10-03 08:59:27 -0700 Comment on attachment 166905 Patch Looks OK, I guess. 734597 3 166905 ryuan.choi 2012-10-04 04:48:07 -0700 Comment on attachment 166905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166905&action=review Looks fine. Below are minor which you can choose. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:828 > +TEST_F(EWK2UnitTestBase, ewk_view_text_matches_count) Can we add test which max_match_count is smaller than result ? > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:836 > + "<html>" > + "<body>" > + "apple Apple apple apple banana bananaApple banana coconut" > + "</body>" > + "</html>"; For the simplity, you can omit html tag for html5. 734604 4 166905 gyuyoung.kim 2012-10-04 05:06:55 -0700 Comment on attachment 166905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166905&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.h:620 > +* Searches and hightlights the given string in the document. Missing a space in front of * > Source/WebKit2/UIProcess/API/efl/ewk_view.h:641 > +* Counts the given string in the document. ditto. > Source/WebKit2/UIProcess/API/efl/ewk_view.h:657 > +* @param max count to find, unlimited if 0 max -> max_match_count 734655 5 166905 cdumez 2012-10-04 06:56:48 -0700 Comment on attachment 166905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166905&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:1612 > + WKPageCountStringMatches(toAPI(priv->pageProxy.get()), findText.get(), static_cast<WKFindOptions>(options), maxMatchCount); You could use priv->pageProxy->countStringMatches() directly to avoid useless converting to WK and then back to PageProxy. 734718 6 jinwoo7.song 2012-10-04 08:37:07 -0700 (In reply to comment #3) > (From update of attachment 166905 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166905&action=review > > Looks fine. > > Below are minor which you can choose. > > > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:828 > > +TEST_F(EWK2UnitTestBase, ewk_view_text_matches_count) > > Can we add test which max_match_count is smaller than result ? > I added test case. > > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:836 > > + "<html>" > > + "<body>" > > + "apple Apple apple apple banana bananaApple banana coconut" > > + "</body>" > > + "</html>"; > > For the simplity, you can omit html tag for html5. Fixed. 734719 7 jinwoo7.song 2012-10-04 08:37:28 -0700 (In reply to comment #4) > (From update of attachment 166905 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166905&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.h:620 > > +* Searches and hightlights the given string in the document. > > Missing a space in front of * > Fixed. > > Source/WebKit2/UIProcess/API/efl/ewk_view.h:641 > > +* Counts the given string in the document. > > ditto. > Fixed. > > Source/WebKit2/UIProcess/API/efl/ewk_view.h:657 > > +* @param max count to find, unlimited if 0 > > max -> max_match_count Fixed. 734720 8 jinwoo7.song 2012-10-04 08:37:49 -0700 (In reply to comment #5) > (From update of attachment 166905 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166905&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:1612 > > + WKPageCountStringMatches(toAPI(priv->pageProxy.get()), findText.get(), static_cast<WKFindOptions>(options), maxMatchCount); > > You could use priv->pageProxy->countStringMatches() directly to avoid useless converting to WK and then back to PageProxy. Fixed, Thanks. 734722 9 167110 jinwoo7.song 2012-10-04 08:39:44 -0700 Created attachment 167110 Patch 735280 10 167110 webkit.review.bot 2012-10-04 20:51:24 -0700 Comment on attachment 167110 Patch Rejecting attachment 167110 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 Last 500 characters of output: Kit/chromium/third_party/yasm/source/patched-yasm --revision 154708 --non-interactive --force --accept theirs-conflict --ignore-externals' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' 51>At revision 154708. ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/14152794 735547 11 167300 jinwoo7.song 2012-10-05 03:35:05 -0700 Created attachment 167300 patch for landing. 735554 12 167300 webkit.review.bot 2012-10-05 03:59:19 -0700 Comment on attachment 167300 patch for landing. Clearing flags on attachment: 167300 Committed r130492: <http://trac.webkit.org/changeset/130492> 735555 13 webkit.review.bot 2012-10-05 03:59:23 -0700 All reviewed patches have been landed. Closing bug. 166905 2012-10-03 08:50:02 -0700 2012-10-04 08:39:40 -0700 Patch bug-97873-20121004004912.patch text/plain 6287 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMjc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTZlMmVmMjkyMmYxZDA5 OTA5ZDUwNzQ1NzA3ZTM5MGExOWUwMTBhMC4uZWMzODQyNjE2MDdmMjUyOWVmNGJjMDRhYzc0NTIz NWIxMDQ2ZTAzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTAzICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUEkgdG8gY291bnQgdGhlIG1hdGNoaW5nIHRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIEFQSSwgZXdrX3ZpZXdfdGV4dF9tYXRj aGVzX2NvdW50KCksIHRvIGNvdW50IHRoZSBtYXRjaGVkIHRleHQgaW4gdGhlIGRvY3VtZW50LiAK KyAgICAgICAgVGhpcyBBUEkgZG9lcyBub3QgaGlnaGxpZ2h0IHRoZSBtYXRjaGVkIHRleHQgaW4g dGhlIGRvY3VtZW50IHVubGlrZSBld2tfdmlld190ZXh0X2ZpbmQoKS4KKworICAgICAgICBld2tf dmlld190ZXh0X2ZpbmQoKSBmaW5kcyB0aGUgbWF0Y2hpbmcgdGV4dCBhbmQgYnV0IGFsc28gdXBk YXRlIHRoZSBVSSB2aWV3LCAKKyAgICAgICAgYnV0IHNvbWUgYXBwbGljYXRpb25zIG1heSBub3Qg d2FudCB0byBhZmZlY3QgdGhlIHZpZXcsIGFuZCBqdXN0IHdhbnQgdG8ga25vdyB0aGUgY291bnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChl d2tfdmlld190ZXh0X21hdGNoZXNfY291bnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMi0xMC0wMiAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIEFQSSB0 byBnZXQgdGhlIHdlYiB2aWV3IHRoYXQgaW5pdGlhdGVkIGEgY3VzdG9tIFVSSSByZXF1ZXN0IHRv IFdlYktpdDIgR1RLKwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuY3BwCmluZGV4IDU1OGNkMjIxYTQyNzZmMDZiNWViOTMxNjM5Y2Y2OGE3NzFlMDNhY2QuLmMx ZmIwZmRlNTRjMWFhN2RlM2ZlMDEwMTQ4M2UxNjNmNTIwOTc1ODEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTE2MDIsNiArMTYwMiwxOCBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfdGV4dF9maW5kX2hpZ2hsaWdodF9jbGVhcihFdmFzX09iamVj dCogZXdrVmlldykKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorRWluYV9Cb29sIGV3a192aWV3X3Rl eHRfbWF0Y2hlc19jb3VudChFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgY2hhciogdGV4dCwg RXdrX0ZpbmRfT3B0aW9ucyBvcHRpb25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50KQoreworICAg IEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7Cisg ICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwor ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTCh0ZXh0LCBmYWxzZSk7CisKKyAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gZmluZFRleHQoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcodGV4dCkpOworICAgIFdLUGFnZUNvdW50U3RyaW5nTWF0Y2hlcyh0b0FQ SShwcml2LT5wYWdlUHJveHkuZ2V0KCkpLCBmaW5kVGV4dC5nZXQoKSwgc3RhdGljX2Nhc3Q8V0tG aW5kT3B0aW9ucz4ob3B0aW9ucyksIG1heE1hdGNoQ291bnQpOworCisgICAgcmV0dXJuIHRydWU7 Cit9CisKIHZvaWQgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9jaGFuZ2VkKGNvbnN0IEV2YXNfT2Jq ZWN0KiBld2tWaWV3LCBjb25zdCBJbnRTaXplJiBzaXplKQogewogI2lmIFVTRShDT09SRElOQVRF RF9HUkFQSElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5o CmluZGV4IGU5ODk1YjJjNTM5YWQ3MWU1MjJkMjMxYTAzOTE3Njc1NGY5OGI0MGQuLmRlYWM3MGQ2 OGVmMDBiNzgxNDMxNzYxMjQ4ZjVlOGI4MGE3MjczMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtNjE3LDcgKzYxNyw3IEBAIEVBUEkgY29uc3Qg Y2hhciAgKmV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX2dldChjb25zdCBFdmFzX09i amVjdCAqbyk7CiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1 c3RvbV9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKmVuY29kaW5nKTsKIAogLyoqCi0q IFNlYXJjaGVzIHRoZSBnaXZlbiBzdHJpbmcgaW4gdGhlIGRvY3VtZW50LgorKiBTZWFyY2hlcyBh bmQgaGlnaHRsaWdodHMgdGhlIGdpdmVuIHN0cmluZyBpbiB0aGUgZG9jdW1lbnQuCiAqCiAqIEBw YXJhbSBvIHZpZXcgb2JqZWN0IHRvIGZpbmQgdGV4dAogKiBAcGFyYW0gdGV4dCB0ZXh0IHRvIGZp bmQKQEAgLTYzOCw2ICs2MzgsMjkgQEAgRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfdGV4dF9maW5k KEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFyICp0ZXh0LCBFd2tfRmluZF9PcHQKIEVBUEkgRWlu YV9Cb29sIGV3a192aWV3X3RleHRfZmluZF9oaWdobGlnaHRfY2xlYXIoRXZhc19PYmplY3QgKm8p OwogCiAvKioKKyogQ291bnRzIHRoZSBnaXZlbiBzdHJpbmcgaW4gdGhlIGRvY3VtZW50LgorKgor KiBUaGlzIGRvZXMgbm90IGhpZ2hsaWdodCB0aGUgbWF0Y2hlZCBzdHJpbmcgYW5kIGp1c3QgY291 bnQgdGhlIG1hdGNoZWQgc3RyaW5nLgorKgorKiBBcyB0aGUgc2VhcmNoIGlzIGNhcnJpZWQgb3V0 IHRocm91Z2ggdGhlIHdob2xlIGRvY3VtZW50LAorKiBvbmx5IHRoZSBmb2xsb3dpbmcgRVdLX0ZJ TkRfT1BUSU9OUyBhcmUgdmFsaWQuIAorKiAgLSBFV0tfRklORF9PUFRJT05TX05PTkUKKyogIC0g RVdLX0ZJTkRfT1BUSU9OU19DQVNFX0lOU0VOU0lUSVZFCisqICAtIEVXS19GSU5EX09QVElPTlNf QVRfV09SRF9TVEFSVAorKiAgLSBFV0tfRklORF9PUFRJT05TX1RSRUFUX01FRElBTF9DQVBJVEFM X0FTX1dPUkRfU1RBUlQKKyoKKyogVGhlICJ0ZXh0LGZvdW5kIiBjYWxsYmFjayB3aWxsIGJlIGNh bGxlZCB3aXRoIHRoZSBudW1iZXIgb2YgbWF0Y2hlZCBzdHJpbmcuCisqCisqIEBwYXJhbSBvIHZp ZXcgb2JqZWN0IHRvIGZpbmQgdGV4dAorKiBAcGFyYW0gdGV4dCB0ZXh0IHRvIGZpbmQKKyogQHBh cmFtIG9wdGlvbnMgb3B0aW9ucyB0byBmaW5kCisqIEBwYXJhbSBtYXggY291bnQgdG8gZmluZCwg dW5saW1pdGVkIGlmIDAKKyoKKyogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcywgQGMg RUlOQV9GQUxTRSBvbiBlcnJvcnMKKyovCitFQVBJIEVpbmFfQm9vbCBld2tfdmlld190ZXh0X21h dGNoZXNfY291bnQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKnRleHQsIEV3a19GaW5kX09w dGlvbnMgb3B0aW9ucywgdW5zaWduZWQgbWF4X21hdGNoX2NvdW50KTsKKworLyoqCiAgKiBTZWxl Y3RzIGluZGV4IG9mIGN1cnJlbnQgcG9wdXAgbWVudS4KICAqCiAgKiBAcGFyYW0gbyB2aWV3IG9i amVjdCBjb250YWlucyBwb3B1cCBtZW51LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IGRiYjBjMTQ0 ZDMzOTkzYWI3MTQ5MWFhOWNlOTBkYjI0ZWNiOTNkMzQuLjVmNzRiMWVjMjgwMTE0ZjE4NDdlODQ2 N2ZlZDVkM2I3NzI3ZDk2NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTgyNSw2ICs4MjUsNTMg QEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3RleHRfZmluZCkKICAgICBldmFz X29iamVjdF9zbWFydF9jYWxsYmFja19kZWwod2ViVmlldygpLCAidGV4dCxmb3VuZCIsIG9uVGV4 dEZvdW5kKTsKIH0KIAorVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3RleHRfbWF0 Y2hlc19jb3VudCkKK3sKKyAgICBjb25zdCBjaGFyIHRleHRGaW5kSFRNTFtdID0KKyAgICAgICAg IjwhRE9DVFlQRSBodG1sPiIKKyAgICAgICAgIjxodG1sPiIKKyAgICAgICAgIjxib2R5PiIKKyAg ICAgICAgImFwcGxlIEFwcGxlIGFwcGxlIGFwcGxlIGJhbmFuYSBiYW5hbmFBcHBsZSBiYW5hbmEg Y29jb251dCIKKyAgICAgICAgIjwvYm9keT4iCisgICAgICAgICI8L2h0bWw+IjsKKyAgICBld2tf dmlld19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgdGV4dEZpbmRIVE1MLCAwLCAwKTsKKyAg ICB3YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIGludCBtYXRjaENvdW50ID0gLTE7Cisg ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHdlYlZpZXcoKSwgInRleHQsZm91bmQi LCBvblRleHRGb3VuZCwgJm1hdGNoQ291bnQpOworCisgICAgZXdrX3ZpZXdfdGV4dF9tYXRjaGVz X2NvdW50KHdlYlZpZXcoKSwgImFwcGxlIiwgRVdLX0ZJTkRfT1BUSU9OU19OT05FLCAxMDApOwor ICAgIHdoaWxlIChtYXRjaENvdW50IDwgMCkKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJh dGUoKTsKKyAgICBFWFBFQ1RfRVEoMywgbWF0Y2hDb3VudCk7CisKKyAgICBtYXRjaENvdW50ID0g LTE7CisgICAgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdlYlZpZXcoKSwgImFwcGxlIiwg RVdLX0ZJTkRfT1BUSU9OU19DQVNFX0lOU0VOU0lUSVZFLCAxMDApOworICAgIHdoaWxlIChtYXRj aENvdW50IDwgMCkKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKKyAgICBFWFBF Q1RfRVEoNSwgbWF0Y2hDb3VudCk7CisKKyAgICBtYXRjaENvdW50ID0gLTE7CisgICAgZXdrX3Zp ZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdlYlZpZXcoKSwgIkFwcGxlIiwgRVdLX0ZJTkRfT1BUSU9O U19BVF9XT1JEX1NUQVJUUywgMTAwKTsKKyAgICB3aGlsZSAobWF0Y2hDb3VudCA8IDApCisgICAg ICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgRVhQRUNUX0VRKDEsIG1hdGNoQ291 bnQpOworCisgICAgbWF0Y2hDb3VudCA9IC0xOworICAgIGV3a192aWV3X3RleHRfbWF0Y2hlc19j b3VudCh3ZWJWaWV3KCksICJBcHBsZSIsIEVXS19GSU5EX09QVElPTlNfVFJFQVRfTUVESUFMX0NB UElUQUxfQVNfV09SRF9TVEFSVCwgMTAwKTsKKyAgICB3aGlsZSAobWF0Y2hDb3VudCA8IDApCisg ICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgRVhQRUNUX0VRKDIsIG1hdGNo Q291bnQpOworCisgICAgbWF0Y2hDb3VudCA9IC0xOworICAgIGV3a192aWV3X3RleHRfbWF0Y2hl c19jb3VudCh3ZWJWaWV3KCksICJtYW5nbyIsIEVXS19GSU5EX09QVElPTlNfTk9ORSwgMTAwKTsK KyAgICB3aGlsZSAobWF0Y2hDb3VudCA8IDApCisgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVy YXRlKCk7CisgICAgRVhQRUNUX0VRKDAsIG1hdGNoQ291bnQpOworCisgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgInRleHQsZm91bmQiLCBvblRleHRGb3VuZCk7 Cit9CisKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld190b3VjaF9ldmVudHNfZW5h YmxlZCkKIHsKICAgICBBU1NFUlRfRkFMU0UoZXdrX3ZpZXdfdG91Y2hfZXZlbnRzX2VuYWJsZWRf Z2V0KHdlYlZpZXcoKSkpOwo= 167110 2012-10-04 08:39:44 -0700 2012-10-05 03:35:05 -0700 Patch bug-97873-20121005003853.patch text/plain 7556 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmM5YzMwZjE5YzhkNjc4 MWU4M2RiMjRkZmMyNDI1MGZmMjkxOGVjZS4uYzcxZjE2NDhlNzQzYzk5YmQxZDlhNTJkN2FmNzYw YTU2ZjE3NzAyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTA0ICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IEFkZCBBUEkgdG8gY291bnQgdGhlIG1hdGNoaW5nIHRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIEFQSSwgZXdrX3ZpZXdfdGV4dF9tYXRj aGVzX2NvdW50KCksIHRvIGNvdW50IHRoZSBtYXRjaGVkIHRleHQgaW4gdGhlIGRvY3VtZW50LiAK KyAgICAgICAgVGhpcyBBUEkgZG9lcyBub3QgaGlnaGxpZ2h0IHRoZSBtYXRjaGVkIHRleHQgaW4g dGhlIGRvY3VtZW50IHVubGlrZSBld2tfdmlld190ZXh0X2ZpbmQoKS4KKworICAgICAgICBld2tf dmlld190ZXh0X2ZpbmQoKSBmaW5kcyB0aGUgbWF0Y2hpbmcgdGV4dCBhbmQgYnV0IGFsc28gdXBk YXRlIHRoZSBVSSB2aWV3LCAKKyAgICAgICAgYnV0IHNvbWUgYXBwbGljYXRpb25zIG1heSBub3Qg d2FudCB0byBhZmZlY3QgdGhlIHZpZXcsIGFuZCBqdXN0IHdhbnQgdG8ga25vdyB0aGUgY291bnQu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChl d2tfdmlld190ZXh0X21hdGNoZXNfY291bnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMi0xMC0wNCAgSm9jZWx5biBUdXJj b3R0ZSAgPGpvY2VseW4udHVyY290dGVAZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF0gRml4IHRo ZSB0c3RfUVF1aWNrV2ViVmlldzo6c2Nyb2xsUmVxdWVzdCBhdXRvIHRlc3QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCA1NThjZDIyMWE0Mjc2 ZjA2YjVlYjkzMTYzOWNmNjhhNzcxZTAzYWNkLi42MTFhZmUwY2YyZjU5MTcyZDE3MDYwMGNjNzY2 NTFjNGUzNDM0ODkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXcuY3BwCkBAIC0xNjAyLDYgKzE2MDIsMTcgQEAgRWluYV9Cb29sIGV3a192aWV3X3RleHRf ZmluZF9oaWdobGlnaHRfY2xlYXIoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiAgICAgcmV0dXJuIHRy dWU7CiB9CiAKK0VpbmFfQm9vbCBld2tfdmlld190ZXh0X21hdGNoZXNfY291bnQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIGNvbnN0IGNoYXIqIHRleHQsIEV3a19GaW5kX09wdGlvbnMgb3B0aW9ucywg dW5zaWduZWQgbWF4TWF0Y2hDb3VudCkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJO KGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JF VFVSTihzbWFydERhdGEsIHByaXYsIGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTl9WQUwodGV4dCwgZmFsc2UpOworCisgICAgcHJpdi0+cGFnZVByb3h5LT5jb3VudFN0cmlu Z01hdGNoZXMoU3RyaW5nOjpmcm9tVVRGOCh0ZXh0KSwgc3RhdGljX2Nhc3Q8V2ViS2l0OjpGaW5k T3B0aW9ucz4ob3B0aW9ucyksIG1heE1hdGNoQ291bnQpOworCisgICAgcmV0dXJuIHRydWU7Cit9 CisKIHZvaWQgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9jaGFuZ2VkKGNvbnN0IEV2YXNfT2JqZWN0 KiBld2tWaWV3LCBjb25zdCBJbnRTaXplJiBzaXplKQogewogI2lmIFVTRShDT09SRElOQVRFRF9H UkFQSElDUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmlu ZGV4IGU5ODk1YjJjNTM5YWQ3MWU1MjJkMjMxYTAzOTE3Njc1NGY5OGI0MGQuLjg3YTEzYzFhN2I1 NzRmOWFlZmE3ZGRkZmJkNDZkNTM5MWE0MWJjOTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtNjE3LDI3ICs2MTcsNTAgQEAgRUFQSSBjb25zdCBj aGFyICAqZXdrX3ZpZXdfc2V0dGluZ19lbmNvZGluZ19jdXN0b21fZ2V0KGNvbnN0IEV2YXNfT2Jq ZWN0ICpvKTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3Vz dG9tX3NldChFdmFzX09iamVjdCAqbywgY29uc3QgY2hhciAqZW5jb2RpbmcpOwogCiAvKioKLSog U2VhcmNoZXMgdGhlIGdpdmVuIHN0cmluZyBpbiB0aGUgZG9jdW1lbnQuCi0qCi0qIEBwYXJhbSBv IHZpZXcgb2JqZWN0IHRvIGZpbmQgdGV4dAotKiBAcGFyYW0gdGV4dCB0ZXh0IHRvIGZpbmQKLSog QHBhcmFtIG9wdGlvbnMgb3B0aW9ucyB0byBmaW5kCi0qIEBwYXJhbSBtYXggY291bnQgdG8gZmlu ZCwgdW5saW1pdGVkIGlmIDAKLSoKLSogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2Vzcywg QGMgRUlOQV9GQUxTRSBvbiBlcnJvcnMKLSovCisgKiBTZWFyY2hlcyBhbmQgaGlnaHRsaWdodHMg dGhlIGdpdmVuIHN0cmluZyBpbiB0aGUgZG9jdW1lbnQuCisgKgorICogQHBhcmFtIG8gdmlldyBv YmplY3QgdG8gZmluZCB0ZXh0CisgKiBAcGFyYW0gdGV4dCB0ZXh0IHRvIGZpbmQKKyAqIEBwYXJh bSBvcHRpb25zIG9wdGlvbnMgdG8gZmluZAorICogQHBhcmFtIG1heF9tYXRjaF9jb3VudCBtYXhp bXVtIG1hdGNoIGNvdW50IHRvIGZpbmQsIHVubGltaXRlZCBpZiAwCisgKgorICogQHJldHVybiBA YyBFSU5BX1RSVUUgb24gc3VjY2VzcywgQGMgRUlOQV9GQUxTRSBvbiBlcnJvcnMKKyAqLwogRUFQ SSBFaW5hX0Jvb2wgZXdrX3ZpZXdfdGV4dF9maW5kKEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFy ICp0ZXh0LCBFd2tfRmluZF9PcHRpb25zIG9wdGlvbnMsIHVuc2lnbmVkIG1heF9tYXRjaF9jb3Vu dCk7CiAKIC8qKgotKiBDbGVhcnMgdGhlIGhpZ2hsaWdodCBvZiBzZWFyY2hlZCB0ZXh0LgotKgot KiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBmaW5kIHRleHQKLSoKLSogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2VzcywgQGMgRUlOQV9GQUxTRSBvbiBlcnJvcnMKLSovCisgKiBDbGVhcnMg dGhlIGhpZ2hsaWdodCBvZiBzZWFyY2hlZCB0ZXh0LgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2Jq ZWN0IHRvIGZpbmQgdGV4dAorICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Ms IEBjIEVJTkFfRkFMU0Ugb24gZXJyb3JzCisgKi8KIEVBUEkgRWluYV9Cb29sIGV3a192aWV3X3Rl eHRfZmluZF9oaWdobGlnaHRfY2xlYXIoRXZhc19PYmplY3QgKm8pOwogCiAvKioKKyAqIENvdW50 cyB0aGUgZ2l2ZW4gc3RyaW5nIGluIHRoZSBkb2N1bWVudC4KKyAqCisgKiBUaGlzIGRvZXMgbm90 IGhpZ2hsaWdodCB0aGUgbWF0Y2hlZCBzdHJpbmcgYW5kIGp1c3QgY291bnQgdGhlIG1hdGNoZWQg c3RyaW5nLgorICoKKyAqIEFzIHRoZSBzZWFyY2ggaXMgY2FycmllZCBvdXQgdGhyb3VnaCB0aGUg d2hvbGUgZG9jdW1lbnQsCisgKiBvbmx5IHRoZSBmb2xsb3dpbmcgRVdLX0ZJTkRfT1BUSU9OUyBh cmUgdmFsaWQuCisgKiAgLSBFV0tfRklORF9PUFRJT05TX05PTkUKKyAqICAtIEVXS19GSU5EX09Q VElPTlNfQ0FTRV9JTlNFTlNJVElWRQorICogIC0gRVdLX0ZJTkRfT1BUSU9OU19BVF9XT1JEX1NU QVJUCisgKiAgLSBFV0tfRklORF9PUFRJT05TX1RSRUFUX01FRElBTF9DQVBJVEFMX0FTX1dPUkRf U1RBUlQKKyAqCisgKiBUaGUgInRleHQsZm91bmQiIGNhbGxiYWNrIHdpbGwgYmUgY2FsbGVkIHdp dGggdGhlIG51bWJlciBvZiBtYXRjaGVkIHN0cmluZy4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9i amVjdCB0byBmaW5kIHRleHQKKyAqIEBwYXJhbSB0ZXh0IHRleHQgdG8gZmluZAorICogQHBhcmFt IG9wdGlvbnMgb3B0aW9ucyB0byBmaW5kCisgKiBAcGFyYW0gbWF4X21hdGNoX2NvdW50IG1heGlt dW0gbWF0Y2ggY291bnQgdG8gZmluZCwgdW5saW1pdGVkIGlmIDAKKyAqCisgKiBAcmV0dXJuIEBj IEVJTkFfVFJVRSBvbiBzdWNjZXNzLCBAYyBFSU5BX0ZBTFNFIG9uIGVycm9ycworICovCitFQVBJ IEVpbmFfQm9vbCBld2tfdmlld190ZXh0X21hdGNoZXNfY291bnQoRXZhc19PYmplY3QgKm8sIGNv bnN0IGNoYXIgKnRleHQsIEV3a19GaW5kX09wdGlvbnMgb3B0aW9ucywgdW5zaWduZWQgbWF4X21h dGNoX2NvdW50KTsKKworLyoqCiAgKiBTZWxlY3RzIGluZGV4IG9mIGN1cnJlbnQgcG9wdXAgbWVu dS4KICAqCiAgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCBjb250YWlucyBwb3B1cCBtZW51LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX3ZpZXcuY3BwCmluZGV4IGJjYmE3NTVhNmU0ZmQ1OGNiMGEzMDhhOTAwMWM1MTc5ZDBlYmYw ZDQuLmViZWI0YTY2MWRiMjg2ZjI3MDI4NzljODAzOGE4MGNmNjY1N2Q4N2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf dmlldy5jcHAKQEAgLTc5OCwxMSArNzk4LDkgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3 a192aWV3X3RleHRfZmluZCkKIHsKICAgICBjb25zdCBjaGFyIHRleHRGaW5kSFRNTFtdID0KICAg ICAgICAgIjwhRE9DVFlQRSBodG1sPiIKLSAgICAgICAgIjxodG1sPiIKICAgICAgICAgIjxib2R5 PiIKICAgICAgICAgImFwcGxlIGFwcGxlIGFwcGxlIGJhbmFuYSBiYW5hbmEgY29jb251dCIKLSAg ICAgICAgIjwvYm9keT4iCi0gICAgICAgICI8L2h0bWw+IjsKKyAgICAgICAgIjwvYm9keT4iOwog ICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCB0ZXh0RmluZEhUTUwsIDAs IDApOwogICAgIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogCkBAIC04MjMsNiArODIxLDU4IEBA IFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld190ZXh0X2ZpbmQpCiAgICAgZXZhc19v YmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgInRleHQsZm91bmQiLCBvblRleHRG b3VuZCk7CiB9CiAKK1RFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld190ZXh0X21hdGNo ZXNfY291bnQpCit7CisgICAgY29uc3QgY2hhciB0ZXh0RmluZEhUTUxbXSA9CisgICAgICAgICI8 IURPQ1RZUEUgaHRtbD4iCisgICAgICAgICI8Ym9keT4iCisgICAgICAgICJhcHBsZSBBcHBsZSBh cHBsZSBhcHBsZSBiYW5hbmEgYmFuYW5hQXBwbGUgYmFuYW5hIGNvY29udXQiCisgICAgICAgICI8 L2JvZHk+IjsKKyAgICBld2tfdmlld19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgdGV4dEZp bmRIVE1MLCAwLCAwKTsKKyAgICB3YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKworICAgIGludCBt YXRjaENvdW50ID0gLTE7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHdlYlZp ZXcoKSwgInRleHQsZm91bmQiLCBvblRleHRGb3VuZCwgJm1hdGNoQ291bnQpOworCisgICAgZXdr X3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdlYlZpZXcoKSwgImFwcGxlIiwgRVdLX0ZJTkRfT1BU SU9OU19OT05FLCAxMDApOworICAgIHdoaWxlIChtYXRjaENvdW50IDwgMCkKKyAgICAgICAgZWNv cmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKKyAgICBFWFBFQ1RfRVEoMywgbWF0Y2hDb3VudCk7CisK KyAgICBtYXRjaENvdW50ID0gLTE7CisgICAgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdl YlZpZXcoKSwgImFwcGxlIiwgRVdLX0ZJTkRfT1BUSU9OU19DQVNFX0lOU0VOU0lUSVZFLCAxMDAp OworICAgIHdoaWxlIChtYXRjaENvdW50IDwgMCkKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0 ZXJhdGUoKTsKKyAgICBFWFBFQ1RfRVEoNSwgbWF0Y2hDb3VudCk7CisKKyAgICBtYXRjaENvdW50 ID0gLTE7CisgICAgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdlYlZpZXcoKSwgIkFwcGxl IiwgRVdLX0ZJTkRfT1BUSU9OU19BVF9XT1JEX1NUQVJUUywgMTAwKTsKKyAgICB3aGlsZSAobWF0 Y2hDb3VudCA8IDApCisgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgRVhQ RUNUX0VRKDEsIG1hdGNoQ291bnQpOworCisgICAgbWF0Y2hDb3VudCA9IC0xOworICAgIGV3a192 aWV3X3RleHRfbWF0Y2hlc19jb3VudCh3ZWJWaWV3KCksICJBcHBsZSIsIEVXS19GSU5EX09QVElP TlNfVFJFQVRfTUVESUFMX0NBUElUQUxfQVNfV09SRF9TVEFSVCwgMTAwKTsKKyAgICB3aGlsZSAo bWF0Y2hDb3VudCA8IDApCisgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAg RVhQRUNUX0VRKDIsIG1hdGNoQ291bnQpOworCisgICAgbWF0Y2hDb3VudCA9IC0xOworICAgIGV3 a192aWV3X3RleHRfbWF0Y2hlc19jb3VudCh3ZWJWaWV3KCksICJtYW5nbyIsIEVXS19GSU5EX09Q VElPTlNfTk9ORSwgMTAwKTsKKyAgICB3aGlsZSAobWF0Y2hDb3VudCA8IDApCisgICAgICAgIGVj b3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgRVhQRUNUX0VRKDAsIG1hdGNoQ291bnQpOwor CisgICAgLy8gSWYgd2UgaGF2ZSBtb3JlIG1hdGNoZXMgdGhhbiBhbGxvd2VkLCAtMSBpcyByZXR1 cm5lZCBhcyBhIG1hdGNoZWQgY291bnQuCisgICAgbWF0Y2hDb3VudCA9IC0yOworICAgIGV3a192 aWV3X3RleHRfbWF0Y2hlc19jb3VudCh3ZWJWaWV3KCksICJhcHBsZSIsIEVXS19GSU5EX09QVElP TlNfTk9ORSwgMik7CisgICAgd2hpbGUgKG1hdGNoQ291bnQgPCAtMSkKKyAgICAgICAgZWNvcmVf bWFpbl9sb29wX2l0ZXJhdGUoKTsKKyAgICBFWFBFQ1RfRVEoLTEsIG1hdGNoQ291bnQpOworCisg ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgInRleHQsZm91bmQi LCBvblRleHRGb3VuZCk7Cit9CisKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld190 b3VjaF9ldmVudHNfZW5hYmxlZCkKIHsKICAgICBBU1NFUlRfRkFMU0UoZXdrX3ZpZXdfdG91Y2hf ZXZlbnRzX2VuYWJsZWRfZ2V0KHdlYlZpZXcoKSkpOwo= 167300 2012-10-05 03:35:05 -0700 2012-10-05 03:59:19 -0700 patch for landing. count_api.patch text/plain 7279 jinwoo7.song ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxOGY1MTg2Li43NTAzNTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMTAtMDUgIEppbndvbyBTb25nICA8amlud29vNy5zb25nQHNhbXN1bmcuY29tPgor CisgICAgICAgIFtFRkxdW1dLMl0gQWRkIEFQSSB0byBjb3VudCB0aGUgbWF0Y2hpbmcgdGV4dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc4NzMKKwor ICAgICAgICBSZXZpZXdlZCBieSBHeXV5b3VuZyBLaW0uCisKKyAgICAgICAgQWRkIGFuIEFQSSwg ZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KCksIHRvIGNvdW50IHRoZSBtYXRjaGVkIHRleHQg aW4gdGhlIGRvY3VtZW50LgorICAgICAgICBUaGlzIEFQSSBkb2VzIG5vdCBoaWdobGlnaHQgdGhl IG1hdGNoZWQgdGV4dCBpbiB0aGUgZG9jdW1lbnQgdW5saWtlIGV3a192aWV3X3RleHRfZmluZCgp LgorCisgICAgICAgIGV3a192aWV3X3RleHRfZmluZCgpIGZpbmRzIHRoZSBtYXRjaGluZyB0ZXh0 IGFuZCBidXQgYWxzbyB1cGRhdGUgdGhlIFVJIHZpZXcsCisgICAgICAgIGJ1dCBzb21lIGFwcGxp Y2F0aW9ucyBtYXkgbm90IHdhbnQgdG8gYWZmZWN0IHRoZSB2aWV3LCBhbmQganVzdCB3YW50IHRv IGtub3cgdGhlIGNvdW50LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu Y3BwOgorICAgICAgICAoZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTItMTAt MDUgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2FuYS5uYWdpbmVuaUBpbnRlbC5jb20+CiAK ICAgICAgICAgW1dLMl1bR1RLXVtFRkxdIHN0YW5kYXJkX291dHB1dCByZXR1cm5lZCBieSBnX3Nw YXduX3N5bmMgbXVzdCBiZSBmcmVlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDZlYTEyZTIuLjIxOGIxYTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTE2MDIsNiArMTYwMiwxNyBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfdGV4dF9maW5kX2hpZ2hsaWdodF9jbGVhcihFdmFzX09iamVj dCogZXdrVmlldykKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorRWluYV9Cb29sIGV3a192aWV3X3Rl eHRfbWF0Y2hlc19jb3VudChFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgY2hhciogdGV4dCwg RXdrX0ZpbmRfT3B0aW9ucyBvcHRpb25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50KQoreworICAg IEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7Cisg ICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwor ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTCh0ZXh0LCBmYWxzZSk7CisKKyAgICBw cml2LT5wYWdlUHJveHktPmNvdW50U3RyaW5nTWF0Y2hlcyhTdHJpbmc6OmZyb21VVEY4KHRleHQp LCBzdGF0aWNfY2FzdDxXZWJLaXQ6OkZpbmRPcHRpb25zPihvcHRpb25zKSwgbWF4TWF0Y2hDb3Vu dCk7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogdm9pZCBld2tfdmlld19jb250ZW50c19zaXpl X2NoYW5nZWQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IEludFNpemUmIHNpemUp CiB7CiAjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXggMWE4NGM1Mi4uOGVkMmMzOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC02MTcsMjcgKzYxNyw1 MCBAQCBFQVBJIGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9n ZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0 dGluZ19lbmNvZGluZ19jdXN0b21fc2V0KEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFyICplbmNv ZGluZyk7CiAKIC8qKgotKiBTZWFyY2hlcyB0aGUgZ2l2ZW4gc3RyaW5nIGluIHRoZSBkb2N1bWVu dC4KLSoKLSogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZmluZCB0ZXh0Ci0qIEBwYXJhbSB0ZXh0 IHRleHQgdG8gZmluZAotKiBAcGFyYW0gb3B0aW9ucyBvcHRpb25zIHRvIGZpbmQKLSogQHBhcmFt IG1heCBjb3VudCB0byBmaW5kLCB1bmxpbWl0ZWQgaWYgMAotKgotKiBAcmV0dXJuIEBjIEVJTkFf VFJVRSBvbiBzdWNjZXNzLCBAYyBFSU5BX0ZBTFNFIG9uIGVycm9ycwotKi8KKyAqIFNlYXJjaGVz IGFuZCBoaWdodGxpZ2h0cyB0aGUgZ2l2ZW4gc3RyaW5nIGluIHRoZSBkb2N1bWVudC4KKyAqCisg KiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBmaW5kIHRleHQKKyAqIEBwYXJhbSB0ZXh0IHRleHQg dG8gZmluZAorICogQHBhcmFtIG9wdGlvbnMgb3B0aW9ucyB0byBmaW5kCisgKiBAcGFyYW0gbWF4 X21hdGNoX2NvdW50IG1heGltdW0gbWF0Y2ggY291bnQgdG8gZmluZCwgdW5saW1pdGVkIGlmIDAK KyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzLCBAYyBFSU5BX0ZBTFNFIG9u IGVycm9ycworICovCiBFQVBJIEVpbmFfQm9vbCBld2tfdmlld190ZXh0X2ZpbmQoRXZhc19PYmpl Y3QgKm8sIGNvbnN0IGNoYXIgKnRleHQsIEV3a19GaW5kX09wdGlvbnMgb3B0aW9ucywgdW5zaWdu ZWQgbWF4X21hdGNoX2NvdW50KTsKIAogLyoqCi0qIENsZWFycyB0aGUgaGlnaGxpZ2h0IG9mIHNl YXJjaGVkIHRleHQuCi0qCi0qIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGZpbmQgdGV4dAotKgot KiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzLCBAYyBFSU5BX0ZBTFNFIG9uIGVycm9y cwotKi8KKyAqIENsZWFycyB0aGUgaGlnaGxpZ2h0IG9mIHNlYXJjaGVkIHRleHQuCisgKgorICog QHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZmluZCB0ZXh0CisgKgorICogQHJldHVybiBAYyBFSU5B X1RSVUUgb24gc3VjY2VzcywgQGMgRUlOQV9GQUxTRSBvbiBlcnJvcnMKKyAqLwogRUFQSSBFaW5h X0Jvb2wgZXdrX3ZpZXdfdGV4dF9maW5kX2hpZ2hsaWdodF9jbGVhcihFdmFzX09iamVjdCAqbyk7 CiAKIC8qKgorICogQ291bnRzIHRoZSBnaXZlbiBzdHJpbmcgaW4gdGhlIGRvY3VtZW50LgorICoK KyAqIFRoaXMgZG9lcyBub3QgaGlnaGxpZ2h0IHRoZSBtYXRjaGVkIHN0cmluZyBhbmQganVzdCBj b3VudCB0aGUgbWF0Y2hlZCBzdHJpbmcuCisgKgorICogQXMgdGhlIHNlYXJjaCBpcyBjYXJyaWVk IG91dCB0aHJvdWdoIHRoZSB3aG9sZSBkb2N1bWVudCwKKyAqIG9ubHkgdGhlIGZvbGxvd2luZyBF V0tfRklORF9PUFRJT05TIGFyZSB2YWxpZC4KKyAqICAtIEVXS19GSU5EX09QVElPTlNfTk9ORQor ICogIC0gRVdLX0ZJTkRfT1BUSU9OU19DQVNFX0lOU0VOU0lUSVZFCisgKiAgLSBFV0tfRklORF9P UFRJT05TX0FUX1dPUkRfU1RBUlQKKyAqICAtIEVXS19GSU5EX09QVElPTlNfVFJFQVRfTUVESUFM X0NBUElUQUxfQVNfV09SRF9TVEFSVAorICoKKyAqIFRoZSAidGV4dCxmb3VuZCIgY2FsbGJhY2sg d2lsbCBiZSBjYWxsZWQgd2l0aCB0aGUgbnVtYmVyIG9mIG1hdGNoZWQgc3RyaW5nLgorICoKKyAq IEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGZpbmQgdGV4dAorICogQHBhcmFtIHRleHQgdGV4dCB0 byBmaW5kCisgKiBAcGFyYW0gb3B0aW9ucyBvcHRpb25zIHRvIGZpbmQKKyAqIEBwYXJhbSBtYXhf bWF0Y2hfY291bnQgbWF4aW11bSBtYXRjaCBjb3VudCB0byBmaW5kLCB1bmxpbWl0ZWQgaWYgMAor ICoKKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3MsIEBjIEVJTkFfRkFMU0Ugb24g ZXJyb3JzCisgKi8KK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3RleHRfbWF0Y2hlc19jb3VudChF dmFzX09iamVjdCAqbywgY29uc3QgY2hhciAqdGV4dCwgRXdrX0ZpbmRfT3B0aW9ucyBvcHRpb25z LCB1bnNpZ25lZCBtYXhfbWF0Y2hfY291bnQpOworCisvKioKICAqIFNlbGVjdHMgaW5kZXggb2Yg Y3VycmVudCBwb3B1cCBtZW51LgogICoKICAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IGNvbnRhaW5z IHBvcHVwIG1lbnUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKaW5kZXggYjE1Njc0MC4uM2NlNWY2ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rl c3RfZXdrMl92aWV3LmNwcApAQCAtNzk4LDExICs3OTgsOSBAQCBURVNUX0YoRVdLMlVuaXRUZXN0 QmFzZSwgZXdrX3ZpZXdfdGV4dF9maW5kKQogewogICAgIGNvbnN0IGNoYXIgdGV4dEZpbmRIVE1M W10gPQogICAgICAgICAiPCFET0NUWVBFIGh0bWw+IgotICAgICAgICAiPGh0bWw+IgogICAgICAg ICAiPGJvZHk+IgogICAgICAgICAiYXBwbGUgYXBwbGUgYXBwbGUgYmFuYW5hIGJhbmFuYSBjb2Nv bnV0IgotICAgICAgICAiPC9ib2R5PiIKLSAgICAgICAgIjwvaHRtbD4iOworICAgICAgICAiPC9i b2R5PiI7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIHRleHRGaW5k SFRNTCwgMCwgMCk7CiAgICAgd2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKQEAgLTgyMyw2ICs4 MjEsNTggQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3RleHRfZmluZCkKICAg ICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19kZWwod2ViVmlldygpLCAidGV4dCxmb3VuZCIs IG9uVGV4dEZvdW5kKTsKIH0KIAorVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3Rl eHRfbWF0Y2hlc19jb3VudCkKK3sKKyAgICBjb25zdCBjaGFyIHRleHRGaW5kSFRNTFtdID0KKyAg ICAgICAgIjwhRE9DVFlQRSBodG1sPiIKKyAgICAgICAgIjxib2R5PiIKKyAgICAgICAgImFwcGxl IEFwcGxlIGFwcGxlIGFwcGxlIGJhbmFuYSBiYW5hbmFBcHBsZSBiYW5hbmEgY29jb251dCIKKyAg ICAgICAgIjwvYm9keT4iOworICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldygp LCB0ZXh0RmluZEhUTUwsIDAsIDApOworICAgIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpOworCisg ICAgaW50IG1hdGNoQ291bnQgPSAtMTsKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19h ZGQod2ViVmlldygpLCAidGV4dCxmb3VuZCIsIG9uVGV4dEZvdW5kLCAmbWF0Y2hDb3VudCk7CisK KyAgICBld2tfdmlld190ZXh0X21hdGNoZXNfY291bnQod2ViVmlldygpLCAiYXBwbGUiLCBFV0tf RklORF9PUFRJT05TX05PTkUsIDEwMCk7CisgICAgd2hpbGUgKG1hdGNoQ291bnQgPCAwKQorICAg ICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworICAgIEVYUEVDVF9FUSgzLCBtYXRjaENv dW50KTsKKworICAgIG1hdGNoQ291bnQgPSAtMTsKKyAgICBld2tfdmlld190ZXh0X21hdGNoZXNf Y291bnQod2ViVmlldygpLCAiYXBwbGUiLCBFV0tfRklORF9PUFRJT05TX0NBU0VfSU5TRU5TSVRJ VkUsIDEwMCk7CisgICAgd2hpbGUgKG1hdGNoQ291bnQgPCAwKQorICAgICAgICBlY29yZV9tYWlu X2xvb3BfaXRlcmF0ZSgpOworICAgIEVYUEVDVF9FUSg1LCBtYXRjaENvdW50KTsKKworICAgIG1h dGNoQ291bnQgPSAtMTsKKyAgICBld2tfdmlld190ZXh0X21hdGNoZXNfY291bnQod2ViVmlldygp LCAiQXBwbGUiLCBFV0tfRklORF9PUFRJT05TX0FUX1dPUkRfU1RBUlRTLCAxMDApOworICAgIHdo aWxlIChtYXRjaENvdW50IDwgMCkKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsK KyAgICBFWFBFQ1RfRVEoMSwgbWF0Y2hDb3VudCk7CisKKyAgICBtYXRjaENvdW50ID0gLTE7Cisg ICAgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdlYlZpZXcoKSwgIkFwcGxlIiwgRVdLX0ZJ TkRfT1BUSU9OU19UUkVBVF9NRURJQUxfQ0FQSVRBTF9BU19XT1JEX1NUQVJULCAxMDApOworICAg IHdoaWxlIChtYXRjaENvdW50IDwgMCkKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUo KTsKKyAgICBFWFBFQ1RfRVEoMiwgbWF0Y2hDb3VudCk7CisKKyAgICBtYXRjaENvdW50ID0gLTE7 CisgICAgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdlYlZpZXcoKSwgIm1hbmdvIiwgRVdL X0ZJTkRfT1BUSU9OU19OT05FLCAxMDApOworICAgIHdoaWxlIChtYXRjaENvdW50IDwgMCkKKyAg ICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKKyAgICBFWFBFQ1RfRVEoMCwgbWF0Y2hD b3VudCk7CisKKyAgICAvLyBJZiB3ZSBoYXZlIG1vcmUgbWF0Y2hlcyB0aGFuIGFsbG93ZWQsIC0x IGlzIHJldHVybmVkIGFzIGEgbWF0Y2hlZCBjb3VudC4KKyAgICBtYXRjaENvdW50ID0gLTI7Cisg ICAgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KHdlYlZpZXcoKSwgImFwcGxlIiwgRVdLX0ZJ TkRfT1BUSU9OU19OT05FLCAyKTsKKyAgICB3aGlsZSAobWF0Y2hDb3VudCA8IC0xKQorICAgICAg ICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworICAgIEVYUEVDVF9FUSgtMSwgbWF0Y2hDb3Vu dCk7CisKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19kZWwod2ViVmlldygpLCAidGV4 dCxmb3VuZCIsIG9uVGV4dEZvdW5kKTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3 a192aWV3X3RvdWNoX2V2ZW50c19lbmFibGVkKQogewogICAgIEFTU0VSVF9GQUxTRShld2tfdmll d190b3VjaF9ldmVudHNfZW5hYmxlZF9nZXQod2ViVmlldygpKSk7Cg==