106752 2013-01-13 21:05:22 -0800 [EFL][WK2] Add support for getting page contents as string 2013-04-04 19:50:37 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108634 109038 106620 111543 1 ky0.choi ky0.choi benjamin buildbot cdumez commit-queue dglazkov gyuyoung.kim jinwoo7.song kling lucas.de.marchi rakuco rniwa tmpsantos webkit.review.bot oldest_to_newest 806064 0 ky0.choi 2013-01-13 21:05:22 -0800 Add support for getting page contents as string. Now, we can use EWK_PAGE_CONTENTS_TYPE_MHTML and EWK_PAGE_CONTENTS_TYPE_STRING for getting page contents data. 806065 1 182502 ky0.choi 2013-01-13 21:20:07 -0800 Created attachment 182502 Patch 808949 2 182502 gyuyoung.kim 2013-01-16 18:30:12 -0800 Comment on attachment 182502 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182502&action=review > Source/WebKit2/ChangeLog:3 > + [EFL] Add support for getting page contents as string Missing [WK2] prefix. > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:989 > + if (type == EWK_PAGE_CONTENTS_TYPE_MHTML) { Isn't switch ~ case better ? 809056 3 183116 ky0.choi 2013-01-16 21:19:09 -0800 Created attachment 183116 Patch 809057 4 182502 ky0.choi 2013-01-16 21:19:49 -0800 Comment on attachment 182502 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182502&action=review >> Source/WebKit2/ChangeLog:3 >> + [EFL] Add support for getting page contents as string > > Missing [WK2] prefix. OK >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:989 >> + if (type == EWK_PAGE_CONTENTS_TYPE_MHTML) { > > Isn't switch ~ case better ? OK 809070 5 183116 gyuyoung.kim 2013-01-16 22:06:16 -0800 Comment on attachment 183116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183116&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:1006 > + default: ASSERT_NOT_REACHED() ? 809071 6 183116 ky0.choi 2013-01-16 22:08:16 -0800 Comment on attachment 183116 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183116&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:1006 >> + default: > > ASSERT_NOT_REACHED() ? OK. I will add. 809072 7 183119 ky0.choi 2013-01-16 22:10:39 -0800 Created attachment 183119 Patch 809100 8 183119 gyuyoung.kim 2013-01-16 22:52:44 -0800 Comment on attachment 183119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183119&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:991 > + Ewk_Page_Contents_Context* context = new Ewk_Page_Contents_Context; How about delegating Ewk_Page_Contents_Context creation to application side in order to reduce duplicated code usage ? Is there any reason it should be created inside WebKit ? 809143 9 183119 ky0.choi 2013-01-17 00:30:08 -0800 Comment on attachment 183119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183119&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:991 >> + Ewk_Page_Contents_Context* context = new Ewk_Page_Contents_Context; > > How about delegating Ewk_Page_Contents_Context creation to application side in order to reduce duplicated code usage ? Is there any reason it should be created inside WebKit ? OK. I'll try. 809172 10 183140 ky0.choi 2013-01-17 01:16:54 -0800 Created attachment 183140 Patch 809189 11 183140 buildbot 2013-01-17 01:43:49 -0800 Comment on attachment 183140 Patch Attachment 183140 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/15907728 New failing tests: svg/as-image/img-relative-height.html 809213 12 ky0.choi 2013-01-17 02:25:40 -0800 Should I upload patch again due to false alarm? 809216 13 gyuyoung.kim 2013-01-17 02:26:34 -0800 (In reply to comment #12) > Should I upload patch again due to false alarm? I think no. 809218 14 gyuyoung.kim 2013-01-17 02:29:04 -0800 (In reply to comment #13) > (In reply to comment #12) > > Should I upload patch again due to false alarm? > > I think no. But, it would be good if you pass mac ews as well. 809222 15 183157 ky0.choi 2013-01-17 02:38:19 -0800 Created attachment 183157 Patch 809246 16 183157 mikhail.pozdnyakov 2013-01-17 04:01:24 -0800 Comment on attachment 183157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183157&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:968 > + contentsContext->callback(contentsContext->type, webString->string().utf8().data()); Wouldn't it look more beatiful if WKEinaSharedString is used? 809262 17 183157 ky0.choi 2013-01-17 04:34:00 -0800 Comment on attachment 183157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183157&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:968 >> + contentsContext->callback(contentsContext->type, webString->string().utf8().data()); > > Wouldn't it look more beatiful if WKEinaSharedString is used? OK. I will check. 809263 18 183157 ky0.choi 2013-01-17 04:34:02 -0800 Comment on attachment 183157 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183157&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:968 >> + contentsContext->callback(contentsContext->type, webString->string().utf8().data()); > > Wouldn't it look more beatiful if WKEinaSharedString is used? OK. I will check. 809932 19 183307 ky0.choi 2013-01-17 16:20:15 -0800 Created attachment 183307 Patch 810199 20 183366 ky0.choi 2013-01-17 21:13:43 -0800 Created attachment 183366 Patch Remove 'delete contentsContext;' in ewkViewPageContentsAsMHTMLCallback() 811559 21 183366 gyuyoung.kim 2013-01-19 22:21:31 -0800 Comment on attachment 183366 Patch LGTM. 813726 22 183366 gyuyoung.kim 2013-01-22 20:25:24 -0800 Comment on attachment 183366 Patch Clear r+ according to new webkit2 review policy. 813798 23 184137 ky0.choi 2013-01-22 21:44:21 -0800 Created attachment 184137 Patch Added user_data to the ewk_view_page_contents_get() API. User data is commonly required for the callback functions. And I think, it's better to take parameters separately instead of taking one allocated structure. 815213 24 184433 ky0.choi 2013-01-24 01:03:35 -0800 Created attachment 184433 Patch Replace internal API with C API. 815275 25 184433 webkit.review.bot 2013-01-24 02:46:25 -0800 Comment on attachment 184433 Patch Attachment 184433 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16084579 New failing tests: fast/repaint/selection-clear.html 815606 26 184433 rniwa 2013-01-24 10:47:58 -0800 Comment on attachment 184433 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184433&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:984 > + Ewk_Page_Contents_Context* contentsContext= static_cast<Ewk_Page_Contents_Context*>(context); Nit: space before = 816008 27 184615 ky0.choi 2013-01-24 17:04:04 -0800 Created attachment 184615 Patch Style fix 817125 28 184615 gyuyoung.kim 2013-01-25 22:11:25 -0800 Comment on attachment 184615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184615&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:1004 > + Nit: WebKit hasn't added a new line between cases. > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:1008 > + ditto. > Source/WebKit2/UIProcess/API/efl/ewk_view.h:828 > + * @param user_data user data Too poor param description for user_data. 817434 29 184925 ky0.choi 2013-01-27 16:49:22 -0800 Created attachment 184925 Patch Applied Gyuyoung mentioned. 824074 30 ky0.choi 2013-02-03 22:41:03 -0800 Please someone r+? 824076 31 184925 cdumez 2013-02-03 22:46:31 -0800 Comment on attachment 184925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184925&action=review > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:944 > + ASSERT_EQ(0, strcmp(data, "Simple HTML")); Please use ASSERT_STREQ() instead, this will result in more useful output in case of failure. 824078 32 184925 ky0.choi 2013-02-03 22:47:57 -0800 Comment on attachment 184925 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184925&action=review >> Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:944 >> + ASSERT_EQ(0, strcmp(data, "Simple HTML")); > > Please use ASSERT_STREQ() instead, this will result in more useful output in case of failure. OK. 824095 33 ky0.choi 2013-02-03 23:41:24 -0800 I think bug 108634 should be landed first. 824099 34 cdumez 2013-02-03 23:50:57 -0800 (In reply to comment #33) > I think bug 108634 should be landed first. Yes, I agree. I hope we can land that other patch soon as it keeps our bots red :/ 828119 35 ky0.choi 2013-02-07 19:59:23 -0800 I can not upload new patch because test_ewk2_view is failing. :( 1. ewk_view_type_check() crash 2. CoreIPC::MessageReceiverMap::dispatchMessage crash 3. ewk_view_scale_set fail 835105 36 188792 ky0.choi 2013-02-17 21:05:29 -0800 Created attachment 188792 Patch Rebase and use ASSERT_STREQ(). 835121 37 188792 gyuyoung.kim 2013-02-17 21:54:52 -0800 Comment on attachment 188792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188792&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.h:283 > + * @param user_data user_data will be passed when ewk_view_page_contents_get is called This line use "user_data", on the other hands, 816 line uses "user data". Is it better to use same word for user_data ? 835144 38 188800 ky0.choi 2013-02-17 22:44:39 -0800 Created attachment 188800 Patch 835147 39 188800 cdumez 2013-02-17 22:49:49 -0800 Comment on attachment 188800 Patch LGTM. 835151 40 188800 gyuyoung.kim 2013-02-17 23:08:43 -0800 Comment on attachment 188800 Patch Looks fine as well. 835830 41 gyuyoung.kim 2013-02-18 16:47:09 -0800 CC'ing WK2 owners. 839051 42 ky0.choi 2013-02-21 17:17:04 -0800 r+ please? 839236 43 189684 ky0.choi 2013-02-21 22:18:04 -0800 Created attachment 189684 Rebased. 866082 44 ky0.choi 2013-03-29 04:49:23 -0700 WebKit2 owners! Review please! 869523 45 189684 commit-queue 2013-04-04 19:50:31 -0700 Comment on attachment 189684 Rebased. Clearing flags on attachment: 189684 Committed r147700: <http://trac.webkit.org/changeset/147700> 869524 46 commit-queue 2013-04-04 19:50:37 -0700 All reviewed patches have been landed. Closing bug. 182502 2013-01-13 21:20:07 -0800 2013-01-16 21:19:49 -0800 Patch diff text/plain 6157 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjZDllYWEzLi40YzY2YjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTMtMDEtMTMgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF0gQWRkIHN1cHBvcnQgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cyBhcyBz dHJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw Njc1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1v ZGlmaWVkIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIHRvIGdldCBwYWdlIGNvbnRl bnRzIGFzIHN0cmluZy4KKyAgICAgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcgaXMg YWRkZWQgdG8gRXdrX1BhZ2VfQ29udGVudHNfVHlwZS4KKyAgICAgICAgTm93LCB3ZSBjYW4gdXNl IGJvdGggRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCBhbmQgRVdLX1BBR0VfQ09OVEVOVFNf VFlQRV9TVFJJTkcKKyAgICAgICAgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a1ZpZXdQYWdl Q29udGVudHNNSFRNTENhbGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNTdHJp bmdDYWxsYmFjayk6CisgICAgICAgIChld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHA6CisgICAgICAgIChQYWdlQ29udGVudHNN SFRNTENhbGxiYWNrKToKKyAgICAgICAgKFBhZ2VDb250ZW50c1N0cmluZ0NhbGxiYWNrKToKKyAg ICAgICAgKFRFU1RfRik6CisKIDIwMTMtMDEtMTEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxl LmNvbT4KIAogICAgICAgICBKSVRUaHVua3Mgc2hvdWxkIG5vdCBjb21waWxlIG9ubHkgYmVjYXVz ZSBvZiBsdWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5j cHAKaW5kZXggZWY1MjEzZS4uNWUxYzU0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtOTU1LDcgKzk1NSw3IEBAIHZvaWQgZXdrX3ZpZXdf ZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqZXdrVmlldywgRWluYV9Cb29s IGVuYWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3 a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQYWdl Q29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhXS0Rh dGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCkBAIC05NjYsMjAgKzk2Niw0NSBAQCBzdGF0 aWMgdm9pZCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2soV0tEYXRhUmVmIHdrRGF0YSwgV0tF cnJvclJlZiwgdm9pZCogY29udAogICAgIGRlbGV0ZSBjb250ZW50c0NvbnRleHQ7CiB9CiAKKy8q KgorICogQGludGVybmFsCisgKiBDYWxsYmFjayBmdW5jdGlvbiB1c2VkIGZvciBld2tfdmlld19w YWdlX2NvbnRlbnRzX2dldCgpLgorICovCitzdGF0aWMgdm9pZCBld2tWaWV3UGFnZUNvbnRlbnRz QXNTdHJpbmdDYWxsYmFjayhXS1N0cmluZ1JlZiB3a1N0cmluZywgV0tFcnJvclJlZiwgdm9pZCog Y29udGV4dCkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0KTsKKwor ICAgIFJlZlB0cjxXZWJTdHJpbmc+IHdlYlN0cmluZyA9IHRvSW1wbCh3a1N0cmluZyk7CisgICAg RXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0PSBzdGF0aWNfY2FzdDxF d2tfUGFnZV9Db250ZW50c19Db250ZXh0Kj4oY29udGV4dCk7CisgICAgY29udGVudHNDb250ZXh0 LT5jYWxsYmFjayhjb250ZW50c0NvbnRleHQtPnR5cGUsIHdlYlN0cmluZy0+c3RyaW5nKCkudXRm OCgpLmRhdGEoKSk7CisKKyAgICBkZWxldGUgY29udGVudHNDb250ZXh0OworfQorCiBFaW5hX0Jv b2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcs IEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJh Y2spCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGNhbGxiYWNrLCBmYWxz ZSk7CiAgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIGltcGwsIGZhbHNl KTsKIAotICAgIC8vIFdlIG9ubHkgc3VwcG9ydCBNSFRNTCBhdCB0aGUgbW9tZW50LgotICAgIGlm ICh0eXBlICE9IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwpCi0gICAgICAgIHJldHVybiBm YWxzZTsKKyAgICBpZiAodHlwZSA9PSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MKSB7Cisg ICAgICAgIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqIGNvbnRleHQgPSBuZXcgRXdrX1BhZ2Vf Q29udGVudHNfQ29udGV4dDsKKyAgICAgICAgY29udGV4dC0+dHlwZSA9IHR5cGU7CisgICAgICAg IGNvbnRleHQtPmNhbGxiYWNrID0gY2FsbGJhY2s7CisKKyAgICAgICAgaW1wbC0+cGFnZSgpLT5n ZXRDb250ZW50c0FzTUhUTUxEYXRhKERhdGFDYWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1Zp ZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spLCBmYWxzZSk7CiAKLSAgICBFd2tfUGFnZV9D b250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7 Ci0gICAgY29udGV4dC0+dHlwZSA9IHR5cGU7Ci0gICAgY29udGV4dC0+Y2FsbGJhY2sgPSBjYWxs YmFjazsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQogCi0gICAgaW1wbC0+cGFnZSgpLT5n ZXRDb250ZW50c0FzTUhUTUxEYXRhKERhdGFDYWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1Zp ZXdQYWdlQ29udGVudHNDYWxsYmFjayksIGZhbHNlKTsKKyAgICBpZiAodHlwZSA9PSBFV0tfUEFH RV9DT05URU5UU19UWVBFX1NUUklORykgeworICAgICAgICBFd2tfUGFnZV9Db250ZW50c19Db250 ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7CisgICAgICAgIGNv bnRleHQtPnR5cGUgPSB0eXBlOworICAgICAgICBjb250ZXh0LT5jYWxsYmFjayA9IGNhbGxiYWNr OwogCi0gICAgcmV0dXJuIHRydWU7CisgICAgICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNB c1N0cmluZyhTdHJpbmdDYWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVu dHNBc1N0cmluZ0NhbGxiYWNrKSk7CisKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCisg ICAgcmV0dXJuIGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmgKaW5kZXggYjJmZjY1YS4uNzk0YjRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC0xMDksNyArMTA5LDggQEAgdHlwZWRlZiBlbnVt IHsKIAogLy8vIEVudW0gdmFsdWVzIGNvbnRhaW5pbmcgcGFnZSBjb250ZW50cyB0eXBlIHZhbHVl cy4KIHR5cGVkZWYgZW51bSB7Ci0gICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTAorICAg IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwsCisgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQ RV9TVFJJTkcKIH0gRXdrX1BhZ2VfQ29udGVudHNfVHlwZTsKIAogdHlwZWRlZiBzdHJ1Y3QgRXdr X1ZpZXdfU21hcnRfRGF0YSBFd2tfVmlld19TbWFydF9EYXRhOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmlu ZGV4IGIzNTA4ZDQuLjRlMGE4ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTkxOSw3ICs5MTks NyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9jaGFu Z2VkKQogCiBzdGF0aWMgYm9vbCBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gZmFsc2U7CiAKLXN0 YXRpYyB2b2lkIFBhZ2VDb250ZW50c0NhbGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlw ZSwgY29uc3QgY2hhciogZGF0YSkKK3N0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0FzTUhUTUxDYWxs YmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCiB7CiAg ICAgLy8gQ2hlY2sgdGhlIHR5cGUKICAgICBBU1NFUlRfRVEoRVdLX1BBR0VfQ09OVEVOVFNfVFlQ RV9NSFRNTCwgdHlwZSk7CkBAIC05MzUsMTMgKzkzNSwyOSBAQCBzdGF0aWMgdm9pZCBQYWdlQ29u dGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRh dGEpCiAgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IHRydWU7CiB9CiAKK3N0YXRpYyB2b2lk IFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBl LCBjb25zdCBjaGFyKiBkYXRhKQoreworICAgIC8vIENoZWNrIHRoZSB0eXBlCisgICAgQVNTRVJU X0VRKEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HLCB0eXBlKTsKKworICAgIC8vIFRoZSB2 YXJpYWJsZSBkYXRhIHNob3VsZCBiZSAiU2ltcGxlIEhUTUwiCisgICAgQVNTRVJUX0VRKDAsIHN0 cmNtcChkYXRhLCAiU2ltcGxlIEhUTUwiKSk7CisKKyAgICBpc09idGFpbmVkUGFnZUNvbnRlbnRz ID0gdHJ1ZTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3BhZ2VfY29u dGVudHNfZ2V0KQogewogICAgIGNvbnN0IGNoYXIgY29udGVudFtdID0gIjxwPlNpbXBsZSBIVE1M PC9wPiI7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGNvbnRlbnQs IDAsIDApOwogICAgIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogCi0gICAgQVNTRVJUX1RSVUUo ZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05URU5UU19U WVBFX01IVE1MLCBQYWdlQ29udGVudHNDYWxsYmFjaykpOworICAgIEFTU0VSVF9UUlVFKGV3a192 aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9N SFRNTCwgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKSk7CisgICAgd2hpbGUgKCFpc09idGFp bmVkUGFnZUNvbnRlbnRzKQorICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworCisg ICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNlOworICAgIEFTU0VSVF9UUlVFKGV3a192 aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9T VFJJTkcsIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spKTsKICAgICB3aGlsZSAoIWlzT2J0 YWluZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9 Cg== 183116 2013-01-16 21:19:09 -0800 2013-01-16 22:10:32 -0800 Patch bug-106752-20130117141608.patch text/plain 6435 ky0.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjc5MTc0ZTIzNjU4NmU4 ZDE1YjhkYTQwMTJjNzQ4MTI3NTY0OTdhMS4uN2JlNTcxODFlOTZkM2RkZWY3NzY3OWRkNmVlZDc1 YmUyYTI1NGQ0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAxLTE2ICBLd2Fu Z1lvbmcgQ2hvaSAgPGt5MC5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIHN1cHBvcnQgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cyBhcyBzdHJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjc1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmaWVkIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIHRvIGdldCBwYWdlIGNvbnRlbnRzIGFzIHN0cmluZy4K KyAgICAgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcgaXMgYWRkZWQgdG8gRXdrX1Bh Z2VfQ29udGVudHNfVHlwZS4KKyAgICAgICAgTm93LCB3ZSBjYW4gdXNlIGJvdGggRVdLX1BBR0Vf Q09OVEVOVFNfVFlQRV9NSFRNTCBhbmQgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKKyAg ICAgICAgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNNSFRNTENh bGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNTdHJpbmdDYWxsYmFjayk6Cisg ICAgICAgIChld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfdmlldy5jcHA6CisgICAgICAgIChQYWdlQ29udGVudHNNSFRNTENhbGxiYWNrKToK KyAgICAgICAgKFBhZ2VDb250ZW50c1N0cmluZ0NhbGxiYWNrKToKKyAgICAgICAgKFRFU1RfRik6 CisKIDIwMTMtMDEtMTYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBV cGRhdGUgT3duZXJzIGZpbGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5jcHAKaW5kZXggZWY1MjEzZWYxYTRhZDZlMWNlZmY4N2I3NmY3NDI3Mjc1MWQ3ODMw NC4uYWM1YzJlYjBlZGMxYjVjNjZiNGQ1NmUzMTNhYTc5ZDk2ZDQ4ODFlMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtOTU1LDcgKzk1NSw3 IEBAIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAq ZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1 bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRp YyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vy cm9yUmVmLCB2b2lkKiBjb250ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0Fz TUhUTUxDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCkBAIC05NjYs MjAgKzk2Niw0NiBAQCBzdGF0aWMgdm9pZCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2soV0tE YXRhUmVmIHdrRGF0YSwgV0tFcnJvclJlZiwgdm9pZCogY29udAogICAgIGRlbGV0ZSBjb250ZW50 c0NvbnRleHQ7CiB9CiAKKy8qKgorICogQGludGVybmFsCisgKiBDYWxsYmFjayBmdW5jdGlvbiB1 c2VkIGZvciBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpLgorICovCitzdGF0aWMgdm9pZCBl d2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayhXS1N0cmluZ1JlZiB3a1N0cmluZywg V0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTihjb250ZXh0KTsKKworICAgIFJlZlB0cjxXZWJTdHJpbmc+IHdlYlN0cmluZyA9IHRvSW1w bCh3a1N0cmluZyk7CisgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250 ZXh0PSBzdGF0aWNfY2FzdDxFd2tfUGFnZV9Db250ZW50c19Db250ZXh0Kj4oY29udGV4dCk7Cisg ICAgY29udGVudHNDb250ZXh0LT5jYWxsYmFjayhjb250ZW50c0NvbnRleHQtPnR5cGUsIHdlYlN0 cmluZy0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisKKyAgICBkZWxldGUgY29udGVudHNDb250 ZXh0OworfQorCiBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcsIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2Vf Q29udGVudHNfQ2IgY2FsbGJhY2spCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5f VkFMKGNhbGxiYWNrLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKIAotICAgIC8vIFdlIG9ubHkgc3VwcG9ydCBNSFRNTCBhdCB0 aGUgbW9tZW50LgotICAgIGlmICh0eXBlICE9IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwp Ci0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNlIEVX S19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUw6IHsKKyAgICAgICAgRXdrX1BhZ2VfQ29udGVudHNf Q29udGV4dCogY29udGV4dCA9IG5ldyBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0OworICAgICAg ICBjb250ZXh0LT50eXBlID0gdHlwZTsKKyAgICAgICAgY29udGV4dC0+Y2FsbGJhY2sgPSBjYWxs YmFjazsKKyAgICAgICAgaW1wbC0+cGFnZSgpLT5nZXRDb250ZW50c0FzTUhUTUxEYXRhKERhdGFD YWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJh Y2spLCBmYWxzZSk7CisgICAgICAgIGJyZWFrOworICAgIH0KIAotICAgIEV3a19QYWdlX0NvbnRl bnRzX0NvbnRleHQqIGNvbnRleHQgPSBuZXcgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dDsKLSAg ICBjb250ZXh0LT50eXBlID0gdHlwZTsKLSAgICBjb250ZXh0LT5jYWxsYmFjayA9IGNhbGxiYWNr OworICAgIGNhc2UgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkc6IHsKKyAgICAgICAgRXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGV4dCA9IG5ldyBFd2tfUGFnZV9Db250ZW50c19D b250ZXh0OworICAgICAgICBjb250ZXh0LT50eXBlID0gdHlwZTsKKyAgICAgICAgY29udGV4dC0+ Y2FsbGJhY2sgPSBjYWxsYmFjazsKKyAgICAgICAgaW1wbC0+cGFnZSgpLT5nZXRDb250ZW50c0Fz U3RyaW5nKFN0cmluZ0NhbGxiYWNrOjpjcmVhdGUoY29udGV4dCwgZXdrVmlld1BhZ2VDb250ZW50 c0FzU3RyaW5nQ2FsbGJhY2spKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQogCi0gICAgaW1wbC0+ cGFnZSgpLT5nZXRDb250ZW50c0FzTUhUTUxEYXRhKERhdGFDYWxsYmFjazo6Y3JlYXRlKGNvbnRl eHQsIGV3a1ZpZXdQYWdlQ29udGVudHNDYWxsYmFjayksIGZhbHNlKTsKKyAgICBkZWZhdWx0Ogor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAppbmRleCBiMmZmNjVhOTVk ZDlmNTJlNDk5ZGJiZjBkZTZhZTJjN2U5ZmVlMDNlLi43OTRiNGJhOTE2ZWE5ZjY2MjE4OWFlM2U4 MWZjZWQyYWM5YTQ0OGZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3LmgKQEAgLTEwOSw3ICsxMDksOCBAQCB0eXBlZGVmIGVudW0gewogCiAvLy8gRW51bSB2 YWx1ZXMgY29udGFpbmluZyBwYWdlIGNvbnRlbnRzIHR5cGUgdmFsdWVzLgogdHlwZWRlZiBlbnVt IHsKLSAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MCisgICAgRVdLX1BBR0VfQ09OVEVO VFNfVFlQRV9NSFRNTCwKKyAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORwogfSBFd2tf UGFnZV9Db250ZW50c19UeXBlOwogCiB0eXBlZGVmIHN0cnVjdCBFd2tfVmlld19TbWFydF9EYXRh IEV3a19WaWV3X1NtYXJ0X0RhdGE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKaW5kZXggYjM1MDhkNGFkNTVh MTA3Y2IyZWNkMzI1MjAyNjFjMmQ2YjA4ZWEzYi4uNGUwYThkMTE1MWFjMjM1ZmVlNWIyMTNiMjIy NTAxYmEyMjIzZjkyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcApAQCAtOTE5LDcgKzkxOSw3IEBAIFRF U1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19jb250ZW50c19zaXplX2NoYW5nZWQpCiAK IHN0YXRpYyBib29sIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKIAotc3RhdGljIHZv aWQgUGFnZUNvbnRlbnRzQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25z dCBjaGFyKiBkYXRhKQorc3RhdGljIHZvaWQgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKEV3 a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSkKIHsKICAgICAvLyBD aGVjayB0aGUgdHlwZQogICAgIEFTU0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1M LCB0eXBlKTsKQEAgLTkzNSwxMyArOTM1LDI5IEBAIHN0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0Nh bGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSkKICAg ICBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gdHJ1ZTsKIH0KIAorc3RhdGljIHZvaWQgUGFnZUNv bnRlbnRzQXNTdHJpbmdDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0 IGNoYXIqIGRhdGEpCit7CisgICAgLy8gQ2hlY2sgdGhlIHR5cGUKKyAgICBBU1NFUlRfRVEoRVdL X1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcsIHR5cGUpOworCisgICAgLy8gVGhlIHZhcmlhYmxl IGRhdGEgc2hvdWxkIGJlICJTaW1wbGUgSFRNTCIKKyAgICBBU1NFUlRfRVEoMCwgc3RyY21wKGRh dGEsICJTaW1wbGUgSFRNTCIpKTsKKworICAgIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSB0cnVl OworfQorCiBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19n ZXQpCiB7CiAgICAgY29uc3QgY2hhciBjb250ZW50W10gPSAiPHA+U2ltcGxlIEhUTUw8L3A+IjsK ICAgICBld2tfdmlld19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgY29udGVudCwgMCwgMCk7 CiAgICAgd2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBBU1NFUlRfVFJVRShld2tfdmll d19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhU TUwsIFBhZ2VDb250ZW50c0NhbGxiYWNrKSk7CisgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFn ZV9jb250ZW50c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLCBQ YWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spKTsKKyAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdl Q29udGVudHMpCisgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisKKyAgICBpc09i dGFpbmVkUGFnZUNvbnRlbnRzID0gZmFsc2U7CisgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFn ZV9jb250ZW50c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywg UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjaykpOwogICAgIHdoaWxlICghaXNPYnRhaW5lZFBh Z2VDb250ZW50cykKICAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKIH0K 183119 2013-01-16 22:10:39 -0800 2013-01-17 01:16:46 -0800 Patch bug-106752-20130117150739.patch text/plain 6466 ky0.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjc5MTc0ZTIzNjU4NmU4 ZDE1YjhkYTQwMTJjNzQ4MTI3NTY0OTdhMS4uN2JlNTcxODFlOTZkM2RkZWY3NzY3OWRkNmVlZDc1 YmUyYTI1NGQ0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAxLTE2ICBLd2Fu Z1lvbmcgQ2hvaSAgPGt5MC5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIHN1cHBvcnQgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cyBhcyBzdHJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjc1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmaWVkIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIHRvIGdldCBwYWdlIGNvbnRlbnRzIGFzIHN0cmluZy4K KyAgICAgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcgaXMgYWRkZWQgdG8gRXdrX1Bh Z2VfQ29udGVudHNfVHlwZS4KKyAgICAgICAgTm93LCB3ZSBjYW4gdXNlIGJvdGggRVdLX1BBR0Vf Q09OVEVOVFNfVFlQRV9NSFRNTCBhbmQgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKKyAg ICAgICAgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNNSFRNTENh bGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNTdHJpbmdDYWxsYmFjayk6Cisg ICAgICAgIChld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfdmlldy5jcHA6CisgICAgICAgIChQYWdlQ29udGVudHNNSFRNTENhbGxiYWNrKToK KyAgICAgICAgKFBhZ2VDb250ZW50c1N0cmluZ0NhbGxiYWNrKToKKyAgICAgICAgKFRFU1RfRik6 CisKIDIwMTMtMDEtMTYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBV cGRhdGUgT3duZXJzIGZpbGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5jcHAKaW5kZXggZWY1MjEzZWYxYTRhZDZlMWNlZmY4N2I3NmY3NDI3Mjc1MWQ3ODMw NC4uNjRlNzAxZWNiYzNhODc0NTYxNDhmZjA1OThlYzQzNzlmYWJlNDAwNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtOTU1LDcgKzk1NSw3 IEBAIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAq ZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1 bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRp YyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vy cm9yUmVmLCB2b2lkKiBjb250ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0Fz TUhUTUxDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCkBAIC05NjYs MjAgKzk2Niw0NyBAQCBzdGF0aWMgdm9pZCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2soV0tE YXRhUmVmIHdrRGF0YSwgV0tFcnJvclJlZiwgdm9pZCogY29udAogICAgIGRlbGV0ZSBjb250ZW50 c0NvbnRleHQ7CiB9CiAKKy8qKgorICogQGludGVybmFsCisgKiBDYWxsYmFjayBmdW5jdGlvbiB1 c2VkIGZvciBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpLgorICovCitzdGF0aWMgdm9pZCBl d2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayhXS1N0cmluZ1JlZiB3a1N0cmluZywg V0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTihjb250ZXh0KTsKKworICAgIFJlZlB0cjxXZWJTdHJpbmc+IHdlYlN0cmluZyA9IHRvSW1w bCh3a1N0cmluZyk7CisgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250 ZXh0PSBzdGF0aWNfY2FzdDxFd2tfUGFnZV9Db250ZW50c19Db250ZXh0Kj4oY29udGV4dCk7Cisg ICAgY29udGVudHNDb250ZXh0LT5jYWxsYmFjayhjb250ZW50c0NvbnRleHQtPnR5cGUsIHdlYlN0 cmluZy0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisKKyAgICBkZWxldGUgY29udGVudHNDb250 ZXh0OworfQorCiBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZh c19PYmplY3QqIGV3a1ZpZXcsIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2Vf Q29udGVudHNfQ2IgY2FsbGJhY2spCiB7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5f VkFMKGNhbGxiYWNrLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIGltcGwsIGZhbHNlKTsKIAotICAgIC8vIFdlIG9ubHkgc3VwcG9ydCBNSFRNTCBhdCB0 aGUgbW9tZW50LgotICAgIGlmICh0eXBlICE9IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwp Ci0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBzd2l0Y2ggKHR5cGUpIHsKKyAgICBjYXNlIEVX S19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUw6IHsKKyAgICAgICAgRXdrX1BhZ2VfQ29udGVudHNf Q29udGV4dCogY29udGV4dCA9IG5ldyBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0OworICAgICAg ICBjb250ZXh0LT50eXBlID0gdHlwZTsKKyAgICAgICAgY29udGV4dC0+Y2FsbGJhY2sgPSBjYWxs YmFjazsKKyAgICAgICAgaW1wbC0+cGFnZSgpLT5nZXRDb250ZW50c0FzTUhUTUxEYXRhKERhdGFD YWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJh Y2spLCBmYWxzZSk7CisgICAgICAgIGJyZWFrOworICAgIH0KIAotICAgIEV3a19QYWdlX0NvbnRl bnRzX0NvbnRleHQqIGNvbnRleHQgPSBuZXcgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dDsKLSAg ICBjb250ZXh0LT50eXBlID0gdHlwZTsKLSAgICBjb250ZXh0LT5jYWxsYmFjayA9IGNhbGxiYWNr OworICAgIGNhc2UgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkc6IHsKKyAgICAgICAgRXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGV4dCA9IG5ldyBFd2tfUGFnZV9Db250ZW50c19D b250ZXh0OworICAgICAgICBjb250ZXh0LT50eXBlID0gdHlwZTsKKyAgICAgICAgY29udGV4dC0+ Y2FsbGJhY2sgPSBjYWxsYmFjazsKKyAgICAgICAgaW1wbC0+cGFnZSgpLT5nZXRDb250ZW50c0Fz U3RyaW5nKFN0cmluZ0NhbGxiYWNrOjpjcmVhdGUoY29udGV4dCwgZXdrVmlld1BhZ2VDb250ZW50 c0FzU3RyaW5nQ2FsbGJhY2spKTsKKyAgICAgICAgYnJlYWs7CisgICAgfQogCi0gICAgaW1wbC0+ cGFnZSgpLT5nZXRDb250ZW50c0FzTUhUTUxEYXRhKERhdGFDYWxsYmFjazo6Y3JlYXRlKGNvbnRl eHQsIGV3a1ZpZXdQYWdlQ29udGVudHNDYWxsYmFjayksIGZhbHNlKTsKKyAgICBkZWZhdWx0Ogor ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg IH0KIAogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmgKaW5kZXggYjJmZjY1YTk1ZGQ5ZjUyZTQ5OWRiYmYwZGU2YWUyYzdlOWZl ZTAzZS4uNzk0YjRiYTkxNmVhOWY2NjIxODlhZTNlODFmY2VkMmFjOWE0NDhmYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC0xMDksNyArMTA5LDgg QEAgdHlwZWRlZiBlbnVtIHsKIAogLy8vIEVudW0gdmFsdWVzIGNvbnRhaW5pbmcgcGFnZSBjb250 ZW50cyB0eXBlIHZhbHVlcy4KIHR5cGVkZWYgZW51bSB7Ci0gICAgRVdLX1BBR0VfQ09OVEVOVFNf VFlQRV9NSFRNTAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwsCisgICAgRVdLX1BB R0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKIH0gRXdrX1BhZ2VfQ29udGVudHNfVHlwZTsKIAogdHlw ZWRlZiBzdHJ1Y3QgRXdrX1ZpZXdfU21hcnRfRGF0YSBFd2tfVmlld19TbWFydF9EYXRhOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX3ZpZXcuY3BwCmluZGV4IGIzNTA4ZDRhZDU1YTEwN2NiMmVjZDMyNTIwMjYxYzJkNmIwOGVh M2IuLjRlMGE4ZDExNTFhYzIzNWZlZTViMjEzYjIyMjUwMWJhMjIyM2Y5MjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf dmlldy5jcHAKQEAgLTkxOSw3ICs5MTksNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdr X3ZpZXdfY29udGVudHNfc2l6ZV9jaGFuZ2VkKQogCiBzdGF0aWMgYm9vbCBpc09idGFpbmVkUGFn ZUNvbnRlbnRzID0gZmFsc2U7CiAKLXN0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0NhbGxiYWNrKEV3 a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSkKK3N0YXRpYyB2b2lk IFBhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUs IGNvbnN0IGNoYXIqIGRhdGEpCiB7CiAgICAgLy8gQ2hlY2sgdGhlIHR5cGUKICAgICBBU1NFUlRf RVEoRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgdHlwZSk7CkBAIC05MzUsMTMgKzkzNSwy OSBAQCBzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19U eXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCiAgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9 IHRydWU7CiB9CiAKK3N0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2soRXdr X1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhKQoreworICAgIC8vIENo ZWNrIHRoZSB0eXBlCisgICAgQVNTRVJUX0VRKEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5H LCB0eXBlKTsKKworICAgIC8vIFRoZSB2YXJpYWJsZSBkYXRhIHNob3VsZCBiZSAiU2ltcGxlIEhU TUwiCisgICAgQVNTRVJUX0VRKDAsIHN0cmNtcChkYXRhLCAiU2ltcGxlIEhUTUwiKSk7CisKKyAg ICBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gdHJ1ZTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVz dEJhc2UsIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KQogewogICAgIGNvbnN0IGNoYXIgY29u dGVudFtdID0gIjxwPlNpbXBsZSBIVE1MPC9wPiI7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdf bG9hZCh3ZWJWaWV3KCksIGNvbnRlbnQsIDAsIDApOwogICAgIHdhaXRVbnRpbExvYWRGaW5pc2hl ZCgpOwogCi0gICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmll dygpLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLCBQYWdlQ29udGVudHNDYWxsYmFjaykp OworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwg RVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNr KSk7CisgICAgd2hpbGUgKCFpc09idGFpbmVkUGFnZUNvbnRlbnRzKQorICAgICAgICBlY29yZV9t YWluX2xvb3BfaXRlcmF0ZSgpOworCisgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNl OworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwg RVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcsIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJh Y2spKTsKICAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3Jl X21haW5fbG9vcF9pdGVyYXRlKCk7CiB9Cg== 183140 2013-01-17 01:16:54 -0800 2013-01-17 02:38:11 -0800 Patch bug-106752-20130117181353.patch text/plain 9105 ky0.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjc5MTc0ZTIzNjU4NmU4 ZDE1YjhkYTQwMTJjNzQ4MTI3NTY0OTdhMS4uMmM4Y2ViOGYzZDBlZGQ5ZmVkNjRkMTllZTgwNTEz OTgwZDM2ZjdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAxLTE3ICBLd2Fu Z1lvbmcgQ2hvaSAgPGt5MC5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIHN1cHBvcnQgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cyBhcyBzdHJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjc1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmaWVkIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIHRvIGdldCBwYWdlIGNvbnRlbnRzIGFzIHN0cmluZy4K KyAgICAgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcgaXMgYWRkZWQgdG8gRXdrX1Bh Z2VfQ29udGVudHNfVHlwZS4KKyAgICAgICAgTm93LCB3ZSBjYW4gdXNlIGJvdGggRVdLX1BBR0Vf Q09OVEVOVFNfVFlQRV9NSFRNTCBhbmQgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKKyAg ICAgICAgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cy4KKworICAgICAgICBBbmQgZXdrX3ZpZXdf cGFnZV9jb250ZW50c19nZXQoKSBBUEkgaXMgY2hhbmdlZCB0byBnZXR0aW5nIHNpbmdsZSBjb250 ZXh0IHBhcmFtZXRlcgorICAgICAgICBmcm9tIGdldHRpbmcgdHdvIHBhcmFtZXRlcnMgc2VwYXJh dGVseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spOgorICAgICAgICAoZXdrVmll d1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spOgorICAgICAgICAoZXdrX3ZpZXdfcGFnZV9j b250ZW50c19nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAg ICAgICAoUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKToKKyAgICAgICAgKFBhZ2VDb250ZW50 c0FzU3RyaW5nQ2FsbGJhY2spOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMy0wMS0xNiAgU2Ft IFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVwZGF0ZSBPd25lcnMgZmlsZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBl ZjUyMTNlZjFhNGFkNmUxY2VmZjg3Yjc2Zjc0MjcyNzUxZDc4MzA0Li44NDgyY2U4YmQ1ZjQzMjEx Y2U5YzNlZjcxNmI5ZjM3YzdjMmUwMTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNDYsMTcgKzE0Niw2IEBAIHN0YXRpYyBjb25zdCBj aGFyIEVXS19WSUVXX1RZUEVfU1RSW10gPSAiRVdLMl9WaWV3IjsKICAgICAgICAgfSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCiAgICAgfSB3aGlsZSAoMCkKIAotLy8vIENyZWF0ZXMgYSB0eXBlIG5hbWUgZm9yIEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQuCi10eXBlZGVmIHN0cnVjdCBFd2tfUGFnZV9Db250ZW50 c19Db250ZXh0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7Ci0KLS8qCi0gKiBAYnJpZWYgU3Ry dWN0dXJlIGNvbnRhaW5pbmcgcGFnZSBjb250ZW50cyBjb250ZXh0IHVzZWQgZm9yIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJLgotICovCi1zdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNf Q29udGV4dCB7Ci0gICAgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlOwotICAgIEV3a19QYWdl X0NvbnRlbnRzX0NiIGNhbGxiYWNrOwotfTsKLQogc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0 X2NoYW5nZWQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogewogICAgIGlmIChzbWFy dERhdGEtPmNoYW5nZWQuYW55KQpAQCAtOTU1LDcgKzk0NCw3IEBAIHZvaWQgZXdrX3ZpZXdfZHJh d3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqZXdrVmlldywgRWluYV9Cb29sIGVu YWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192 aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29u dGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhXS0RhdGFS ZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFfU0FGRVRZ X09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCkBAIC05NjYsMjAgKzk1NSwzOCBAQCBzdGF0aWMg dm9pZCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2soV0tEYXRhUmVmIHdrRGF0YSwgV0tFcnJv clJlZiwgdm9pZCogY29udAogICAgIGRlbGV0ZSBjb250ZW50c0NvbnRleHQ7CiB9CiAKLUVpbmFf Qm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxs YmFjaykKKy8qKgorICogQGludGVybmFsCisgKiBDYWxsYmFjayBmdW5jdGlvbiB1c2VkIGZvciBl d2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpLgorICovCitzdGF0aWMgdm9pZCBld2tWaWV3UGFn ZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayhXS1N0cmluZ1JlZiB3a1N0cmluZywgV0tFcnJvclJl Ziwgdm9pZCogY29udGV4dCkKIHsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwo Y2FsbGJhY2ssIGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0 KTsKKworICAgIFJlZlB0cjxXZWJTdHJpbmc+IHdlYlN0cmluZyA9IHRvSW1wbCh3a1N0cmluZyk7 CisgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0PSBzdGF0aWNf Y2FzdDxFd2tfUGFnZV9Db250ZW50c19Db250ZXh0Kj4oY29udGV4dCk7CisgICAgY29udGVudHND b250ZXh0LT5jYWxsYmFjayhjb250ZW50c0NvbnRleHQtPnR5cGUsIHdlYlN0cmluZy0+c3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRz X2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4 dCogY29udGV4dCkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoY29udGV4 dCwgZmFsc2UpOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChjb250ZXh0LT5j YWxsYmFjaywgZmFsc2UpOwogICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBpbXBsLCBmYWxzZSk7CiAKLSAgICAvLyBXZSBvbmx5IHN1cHBvcnQgTUhUTUwgYXQgdGhlIG1v bWVudC4KLSAgICBpZiAodHlwZSAhPSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MKQotICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgc3dpdGNoIChjb250ZXh0LT50eXBlKSB7CisgICAgY2Fz ZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MOgorICAgICAgICBpbXBsLT5wYWdlKCktPmdl dENvbnRlbnRzQXNNSFRNTERhdGEoRGF0YUNhbGxiYWNrOjpjcmVhdGUoY29udGV4dCwgZXdrVmll d1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayksIGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CiAK LSAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0Nv bnRlbnRzX0NvbnRleHQ7Ci0gICAgY29udGV4dC0+dHlwZSA9IHR5cGU7Ci0gICAgY29udGV4dC0+ Y2FsbGJhY2sgPSBjYWxsYmFjazsKKyAgICBjYXNlIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RS SU5HOgorICAgICAgICBpbXBsLT5wYWdlKCktPmdldENvbnRlbnRzQXNTdHJpbmcoU3RyaW5nQ2Fs bGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFj aykpOworICAgICAgICBicmVhazsKIAotICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNBc01I VE1MRGF0YShEYXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRz Q2FsbGJhY2spLCBmYWxzZSk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IGIy ZmY2NWE5NWRkOWY1MmU0OTlkYmJmMGRlNmFlMmM3ZTlmZWUwM2UuLjJiNDEzMmY1MzMyNjc4MmRl NzVkNjMyZTkzY2Q2MmUxNzNmODFkNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaApAQCAtMTA3LDExICsxMDcsNiBAQCB0eXBlZGVmIGVudW0gewogICAg IEVXS19URVhUX0RJUkVDVElPTl9MRUZUX1RPX1JJR0hUCiB9IEV3a19UZXh0X0RpcmVjdGlvbjsK IAotLy8vIEVudW0gdmFsdWVzIGNvbnRhaW5pbmcgcGFnZSBjb250ZW50cyB0eXBlIHZhbHVlcy4K LXR5cGVkZWYgZW51bSB7Ci0gICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTAotfSBFd2tf UGFnZV9Db250ZW50c19UeXBlOwotCiB0eXBlZGVmIHN0cnVjdCBFd2tfVmlld19TbWFydF9EYXRh IEV3a19WaWV3X1NtYXJ0X0RhdGE7CiB0eXBlZGVmIHN0cnVjdCBFd2tfVmlld19TbWFydF9DbGFz cyBFd2tfVmlld19TbWFydF9DbGFzczsKIApAQCAtMzE5LDYgKzMxNCwxMiBAQCB0eXBlZGVmIGVu dW0gewogICAgIEVXS19QQUdJTkFUSU9OX01PREVfQk9UVE9NX1RPX1RPUCAvKio8IGdvIHRvIHRo ZSBuZXh0IHBhZ2Ugd2l0aCBzY3JvbGxpbmcgYm90dG9tIHRvIHRvcCB2ZXJ0aWNhbGx5LiAqLwog fSBFd2tfUGFnaW5hdGlvbl9Nb2RlOwogCisvLy8gRW51bSB2YWx1ZXMgY29udGFpbmluZyBwYWdl IGNvbnRlbnRzIHR5cGUgdmFsdWVzLgordHlwZWRlZiBlbnVtIHsKKyAgICBFV0tfUEFHRV9DT05U RU5UU19UWVBFX01IVE1MLAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HCit9IEV3 a19QYWdlX0NvbnRlbnRzX1R5cGU7CisKIC8qKgogICogQ3JlYXRlcyBhIHR5cGUgbmFtZSBmb3Ig dGhlIGNhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgdG8gZ2V0IHRoZSBwYWdlIGNvbnRlbnRzLgogICoK QEAgLTMyNyw2ICszMjgsMTcgQEAgdHlwZWRlZiBlbnVtIHsKICAqLwogdHlwZWRlZiB2b2lkICgq RXdrX1BhZ2VfQ29udGVudHNfQ2IpKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3Qg Y2hhciAqZGF0YSk7CiAKKy8vLyBDcmVhdGVzIGEgdHlwZSBuYW1lIGZvciBFd2tfUGFnZV9Db250 ZW50c19Db250ZXh0LgordHlwZWRlZiBzdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCBF d2tfUGFnZV9Db250ZW50c19Db250ZXh0OworCisvKgorICogQGJyaWVmIFN0cnVjdHVyZSBjb250 YWluaW5nIHBhZ2UgY29udGVudHMgY29udGV4dCB1c2VkIGZvciBld2tfdmlld19wYWdlX2NvbnRl bnRzX2dldCgpIEFQSS4KKyAqLworc3RydWN0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgewor ICAgIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZTsKKyAgICBFd2tfUGFnZV9Db250ZW50c19D YiBjYWxsYmFjazsKK307CisKIC8qKgogICogU2V0cyB0aGUgc21hcnQgY2xhc3MgQVBJcywgZW5h YmxpbmcgdmlldyB0byBiZSBpbmhlcml0ZWQuCiAgKgpAQCAtODYzLDEyICs4NzUsMTEgQEAgRUFQ SSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19PYmplY3QgKm8s IEVpbmFfQm9vbCBlbmFibGVkKTsKICAqIEdldCBjb250ZW50cyBvZiB0aGUgY3VycmVudCB3ZWIg cGFnZS4KICAqCiAgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhlIHBhZ2UgY29udGVu dHMKLSAqIEBwYXJhbSB0eXBlIHR5cGUgb2YgdGhlIHBhZ2UgY29udGVudHMKLSAqIEBwYXJhbSBj YWxsYmFjayBjYWxsYmFjayBmdW5jdGlvbiB0byBiZSBjYWxsZWQgd2hlbiB0aGUgb3BlcmF0aW9u IGlzIGZpbmlzaGVkCisgKiBAcGFyYW0gY29udGV4dCBjb250ZXh0IG9mIHRoZSBwYWdlIGNvbnRl bnRzIHdoaWNoIGhhcyBjb250ZW50cyB0eXBlIGFuZCBjYWxsYmFjayBmdW5jdGlvbgogICoKICAq IEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvdGhlcndp c2UKICAqLwotRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3Qg RXZhc19PYmplY3QgKm8sIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29u dGVudHNfQ2IgY2FsbGJhY2spOworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50 c19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgKmNv bnRleHQpOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBi MzUwOGQ0YWQ1NWExMDdjYjJlY2QzMjUyMDI2MWMyZDZiMDhlYTNiLi44MjU3MzkzZjAyZTFkZjA1 ODkyMTI5M2QwMWE3MTFmMDM5Yjc0MTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCkBAIC05MTksNyAr OTE5LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X2NvbnRlbnRzX3NpemVf Y2hhbmdlZCkKIAogc3RhdGljIGJvb2wgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNlOwog Ci1zdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBl IHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCitzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNBc01IVE1M Q2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhKQog ewogICAgIC8vIENoZWNrIHRoZSB0eXBlCiAgICAgQVNTRVJUX0VRKEVXS19QQUdFX0NPTlRFTlRT X1RZUEVfTUhUTUwsIHR5cGUpOwpAQCAtOTM1LDEzICs5MzUsMzcgQEAgc3RhdGljIHZvaWQgUGFn ZUNvbnRlbnRzQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFy KiBkYXRhKQogICAgIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSB0cnVlOwogfQogCitzdGF0aWMg dm9pZCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUg dHlwZSwgY29uc3QgY2hhciogZGF0YSkKK3sKKyAgICAvLyBDaGVjayB0aGUgdHlwZQorICAgIEFT U0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywgdHlwZSk7CisKKyAgICAvLyBU aGUgdmFyaWFibGUgZGF0YSBzaG91bGQgYmUgIlNpbXBsZSBIVE1MIgorICAgIEFTU0VSVF9FUSgw LCBzdHJjbXAoZGF0YSwgIlNpbXBsZSBIVE1MIikpOworCisgICAgaXNPYnRhaW5lZFBhZ2VDb250 ZW50cyA9IHRydWU7Cit9CisKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19wYWdl X2NvbnRlbnRzX2dldCkKIHsKICAgICBjb25zdCBjaGFyIGNvbnRlbnRbXSA9ICI8cD5TaW1wbGUg SFRNTDwvcD4iOwogICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCBjb250 ZW50LCAwLCAwKTsKICAgICB3YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAotICAgIEFTU0VSVF9U UlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVO VFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQ2FsbGJhY2spKTsKKyAgICBFd2tfUGFnZV9Db250 ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7CisK KyAgICBjb250ZXh0LT50eXBlID0gRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTDsKKyAgICBj b250ZXh0LT5jYWxsYmFjayA9IFBhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjazsKKyAgICBBU1NF UlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIGNvbnRleHQpKTsK KyAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29udGVudHMpCisgICAgICAgIGVjb3JlX21haW5f bG9vcF9pdGVyYXRlKCk7CisKKyAgICBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gZmFsc2U7Cisg ICAgY29udGV4dC0+dHlwZSA9IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HOworICAgIGNv bnRleHQtPmNhbGxiYWNrID0gUGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjazsKKyAgICBBU1NF UlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIGNvbnRleHQpKTsK ICAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5f bG9vcF9pdGVyYXRlKCk7CisKKyAgICBkZWxldGUgY29udGV4dDsKIH0K 183157 2013-01-17 02:38:19 -0800 2013-01-17 16:20:08 -0800 Patch bug-106752-20130117193518.patch text/plain 9105 ky0.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjc5MTc0ZTIzNjU4NmU4 ZDE1YjhkYTQwMTJjNzQ4MTI3NTY0OTdhMS4uMmM4Y2ViOGYzZDBlZGQ5ZmVkNjRkMTllZTgwNTEz OTgwZDM2ZjdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAxLTE3ICBLd2Fu Z1lvbmcgQ2hvaSAgPGt5MC5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIHN1cHBvcnQgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cyBhcyBzdHJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjc1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmaWVkIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIHRvIGdldCBwYWdlIGNvbnRlbnRzIGFzIHN0cmluZy4K KyAgICAgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcgaXMgYWRkZWQgdG8gRXdrX1Bh Z2VfQ29udGVudHNfVHlwZS4KKyAgICAgICAgTm93LCB3ZSBjYW4gdXNlIGJvdGggRVdLX1BBR0Vf Q09OVEVOVFNfVFlQRV9NSFRNTCBhbmQgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKKyAg ICAgICAgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cy4KKworICAgICAgICBBbmQgZXdrX3ZpZXdf cGFnZV9jb250ZW50c19nZXQoKSBBUEkgaXMgY2hhbmdlZCB0byBnZXR0aW5nIHNpbmdsZSBjb250 ZXh0IHBhcmFtZXRlcgorICAgICAgICBmcm9tIGdldHRpbmcgdHdvIHBhcmFtZXRlcnMgc2VwYXJh dGVseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spOgorICAgICAgICAoZXdrVmll d1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spOgorICAgICAgICAoZXdrX3ZpZXdfcGFnZV9j b250ZW50c19nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAg ICAgICAoUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKToKKyAgICAgICAgKFBhZ2VDb250ZW50 c0FzU3RyaW5nQ2FsbGJhY2spOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMy0wMS0xNiAgU2Ft IFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVwZGF0ZSBPd25lcnMgZmlsZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBl ZjUyMTNlZjFhNGFkNmUxY2VmZjg3Yjc2Zjc0MjcyNzUxZDc4MzA0Li44NDgyY2U4YmQ1ZjQzMjEx Y2U5YzNlZjcxNmI5ZjM3YzdjMmUwMTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNDYsMTcgKzE0Niw2IEBAIHN0YXRpYyBjb25zdCBj aGFyIEVXS19WSUVXX1RZUEVfU1RSW10gPSAiRVdLMl9WaWV3IjsKICAgICAgICAgfSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCiAgICAgfSB3aGlsZSAoMCkKIAotLy8vIENyZWF0ZXMgYSB0eXBlIG5hbWUgZm9yIEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQuCi10eXBlZGVmIHN0cnVjdCBFd2tfUGFnZV9Db250ZW50 c19Db250ZXh0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7Ci0KLS8qCi0gKiBAYnJpZWYgU3Ry dWN0dXJlIGNvbnRhaW5pbmcgcGFnZSBjb250ZW50cyBjb250ZXh0IHVzZWQgZm9yIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJLgotICovCi1zdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNf Q29udGV4dCB7Ci0gICAgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlOwotICAgIEV3a19QYWdl X0NvbnRlbnRzX0NiIGNhbGxiYWNrOwotfTsKLQogc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0 X2NoYW5nZWQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogewogICAgIGlmIChzbWFy dERhdGEtPmNoYW5nZWQuYW55KQpAQCAtOTU1LDcgKzk0NCw3IEBAIHZvaWQgZXdrX3ZpZXdfZHJh d3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqZXdrVmlldywgRWluYV9Cb29sIGVu YWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192 aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29u dGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhXS0RhdGFS ZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFfU0FGRVRZ X09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCkBAIC05NjYsMjAgKzk1NSwzOCBAQCBzdGF0aWMg dm9pZCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2soV0tEYXRhUmVmIHdrRGF0YSwgV0tFcnJv clJlZiwgdm9pZCogY29udAogICAgIGRlbGV0ZSBjb250ZW50c0NvbnRleHQ7CiB9CiAKLUVpbmFf Qm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxs YmFjaykKKy8qKgorICogQGludGVybmFsCisgKiBDYWxsYmFjayBmdW5jdGlvbiB1c2VkIGZvciBl d2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpLgorICovCitzdGF0aWMgdm9pZCBld2tWaWV3UGFn ZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayhXS1N0cmluZ1JlZiB3a1N0cmluZywgV0tFcnJvclJl Ziwgdm9pZCogY29udGV4dCkKIHsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwo Y2FsbGJhY2ssIGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0 KTsKKworICAgIFJlZlB0cjxXZWJTdHJpbmc+IHdlYlN0cmluZyA9IHRvSW1wbCh3a1N0cmluZyk7 CisgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0PSBzdGF0aWNf Y2FzdDxFd2tfUGFnZV9Db250ZW50c19Db250ZXh0Kj4oY29udGV4dCk7CisgICAgY29udGVudHND b250ZXh0LT5jYWxsYmFjayhjb250ZW50c0NvbnRleHQtPnR5cGUsIHdlYlN0cmluZy0+c3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRz X2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4 dCogY29udGV4dCkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoY29udGV4 dCwgZmFsc2UpOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChjb250ZXh0LT5j YWxsYmFjaywgZmFsc2UpOwogICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3 LCBpbXBsLCBmYWxzZSk7CiAKLSAgICAvLyBXZSBvbmx5IHN1cHBvcnQgTUhUTUwgYXQgdGhlIG1v bWVudC4KLSAgICBpZiAodHlwZSAhPSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MKQotICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgc3dpdGNoIChjb250ZXh0LT50eXBlKSB7CisgICAgY2Fz ZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MOgorICAgICAgICBpbXBsLT5wYWdlKCktPmdl dENvbnRlbnRzQXNNSFRNTERhdGEoRGF0YUNhbGxiYWNrOjpjcmVhdGUoY29udGV4dCwgZXdrVmll d1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayksIGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CiAK LSAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0Nv bnRlbnRzX0NvbnRleHQ7Ci0gICAgY29udGV4dC0+dHlwZSA9IHR5cGU7Ci0gICAgY29udGV4dC0+ Y2FsbGJhY2sgPSBjYWxsYmFjazsKKyAgICBjYXNlIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RS SU5HOgorICAgICAgICBpbXBsLT5wYWdlKCktPmdldENvbnRlbnRzQXNTdHJpbmcoU3RyaW5nQ2Fs bGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFj aykpOworICAgICAgICBicmVhazsKIAotICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNBc01I VE1MRGF0YShEYXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRz Q2FsbGJhY2spLCBmYWxzZSk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IGIy ZmY2NWE5NWRkOWY1MmU0OTlkYmJmMGRlNmFlMmM3ZTlmZWUwM2UuLjJiNDEzMmY1MzMyNjc4MmRl NzVkNjMyZTkzY2Q2MmUxNzNmODFkNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaApAQCAtMTA3LDExICsxMDcsNiBAQCB0eXBlZGVmIGVudW0gewogICAg IEVXS19URVhUX0RJUkVDVElPTl9MRUZUX1RPX1JJR0hUCiB9IEV3a19UZXh0X0RpcmVjdGlvbjsK IAotLy8vIEVudW0gdmFsdWVzIGNvbnRhaW5pbmcgcGFnZSBjb250ZW50cyB0eXBlIHZhbHVlcy4K LXR5cGVkZWYgZW51bSB7Ci0gICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTAotfSBFd2tf UGFnZV9Db250ZW50c19UeXBlOwotCiB0eXBlZGVmIHN0cnVjdCBFd2tfVmlld19TbWFydF9EYXRh IEV3a19WaWV3X1NtYXJ0X0RhdGE7CiB0eXBlZGVmIHN0cnVjdCBFd2tfVmlld19TbWFydF9DbGFz cyBFd2tfVmlld19TbWFydF9DbGFzczsKIApAQCAtMzE5LDYgKzMxNCwxMiBAQCB0eXBlZGVmIGVu dW0gewogICAgIEVXS19QQUdJTkFUSU9OX01PREVfQk9UVE9NX1RPX1RPUCAvKio8IGdvIHRvIHRo ZSBuZXh0IHBhZ2Ugd2l0aCBzY3JvbGxpbmcgYm90dG9tIHRvIHRvcCB2ZXJ0aWNhbGx5LiAqLwog fSBFd2tfUGFnaW5hdGlvbl9Nb2RlOwogCisvLy8gRW51bSB2YWx1ZXMgY29udGFpbmluZyBwYWdl IGNvbnRlbnRzIHR5cGUgdmFsdWVzLgordHlwZWRlZiBlbnVtIHsKKyAgICBFV0tfUEFHRV9DT05U RU5UU19UWVBFX01IVE1MLAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HCit9IEV3 a19QYWdlX0NvbnRlbnRzX1R5cGU7CisKIC8qKgogICogQ3JlYXRlcyBhIHR5cGUgbmFtZSBmb3Ig dGhlIGNhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgdG8gZ2V0IHRoZSBwYWdlIGNvbnRlbnRzLgogICoK QEAgLTMyNyw2ICszMjgsMTcgQEAgdHlwZWRlZiBlbnVtIHsKICAqLwogdHlwZWRlZiB2b2lkICgq RXdrX1BhZ2VfQ29udGVudHNfQ2IpKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3Qg Y2hhciAqZGF0YSk7CiAKKy8vLyBDcmVhdGVzIGEgdHlwZSBuYW1lIGZvciBFd2tfUGFnZV9Db250 ZW50c19Db250ZXh0LgordHlwZWRlZiBzdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCBF d2tfUGFnZV9Db250ZW50c19Db250ZXh0OworCisvKgorICogQGJyaWVmIFN0cnVjdHVyZSBjb250 YWluaW5nIHBhZ2UgY29udGVudHMgY29udGV4dCB1c2VkIGZvciBld2tfdmlld19wYWdlX2NvbnRl bnRzX2dldCgpIEFQSS4KKyAqLworc3RydWN0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgewor ICAgIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZTsKKyAgICBFd2tfUGFnZV9Db250ZW50c19D YiBjYWxsYmFjazsKK307CisKIC8qKgogICogU2V0cyB0aGUgc21hcnQgY2xhc3MgQVBJcywgZW5h YmxpbmcgdmlldyB0byBiZSBpbmhlcml0ZWQuCiAgKgpAQCAtODYzLDEyICs4NzUsMTEgQEAgRUFQ SSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19PYmplY3QgKm8s IEVpbmFfQm9vbCBlbmFibGVkKTsKICAqIEdldCBjb250ZW50cyBvZiB0aGUgY3VycmVudCB3ZWIg cGFnZS4KICAqCiAgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhlIHBhZ2UgY29udGVu dHMKLSAqIEBwYXJhbSB0eXBlIHR5cGUgb2YgdGhlIHBhZ2UgY29udGVudHMKLSAqIEBwYXJhbSBj YWxsYmFjayBjYWxsYmFjayBmdW5jdGlvbiB0byBiZSBjYWxsZWQgd2hlbiB0aGUgb3BlcmF0aW9u IGlzIGZpbmlzaGVkCisgKiBAcGFyYW0gY29udGV4dCBjb250ZXh0IG9mIHRoZSBwYWdlIGNvbnRl bnRzIHdoaWNoIGhhcyBjb250ZW50cyB0eXBlIGFuZCBjYWxsYmFjayBmdW5jdGlvbgogICoKICAq IEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvdGhlcndp c2UKICAqLwotRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3Qg RXZhc19PYmplY3QgKm8sIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29u dGVudHNfQ2IgY2FsbGJhY2spOworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50 c19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgKmNv bnRleHQpOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBi MzUwOGQ0YWQ1NWExMDdjYjJlY2QzMjUyMDI2MWMyZDZiMDhlYTNiLi44MjU3MzkzZjAyZTFkZjA1 ODkyMTI5M2QwMWE3MTFmMDM5Yjc0MTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCkBAIC05MTksNyAr OTE5LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X2NvbnRlbnRzX3NpemVf Y2hhbmdlZCkKIAogc3RhdGljIGJvb2wgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNlOwog Ci1zdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBl IHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCitzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNBc01IVE1M Q2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhKQog ewogICAgIC8vIENoZWNrIHRoZSB0eXBlCiAgICAgQVNTRVJUX0VRKEVXS19QQUdFX0NPTlRFTlRT X1RZUEVfTUhUTUwsIHR5cGUpOwpAQCAtOTM1LDEzICs5MzUsMzcgQEAgc3RhdGljIHZvaWQgUGFn ZUNvbnRlbnRzQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFy KiBkYXRhKQogICAgIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSB0cnVlOwogfQogCitzdGF0aWMg dm9pZCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUg dHlwZSwgY29uc3QgY2hhciogZGF0YSkKK3sKKyAgICAvLyBDaGVjayB0aGUgdHlwZQorICAgIEFT U0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywgdHlwZSk7CisKKyAgICAvLyBU aGUgdmFyaWFibGUgZGF0YSBzaG91bGQgYmUgIlNpbXBsZSBIVE1MIgorICAgIEFTU0VSVF9FUSgw LCBzdHJjbXAoZGF0YSwgIlNpbXBsZSBIVE1MIikpOworCisgICAgaXNPYnRhaW5lZFBhZ2VDb250 ZW50cyA9IHRydWU7Cit9CisKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19wYWdl X2NvbnRlbnRzX2dldCkKIHsKICAgICBjb25zdCBjaGFyIGNvbnRlbnRbXSA9ICI8cD5TaW1wbGUg SFRNTDwvcD4iOwogICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCBjb250 ZW50LCAwLCAwKTsKICAgICB3YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAotICAgIEFTU0VSVF9U UlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVO VFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQ2FsbGJhY2spKTsKKyAgICBFd2tfUGFnZV9Db250 ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7CisK KyAgICBjb250ZXh0LT50eXBlID0gRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTDsKKyAgICBj b250ZXh0LT5jYWxsYmFjayA9IFBhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjazsKKyAgICBBU1NF UlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIGNvbnRleHQpKTsK KyAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29udGVudHMpCisgICAgICAgIGVjb3JlX21haW5f bG9vcF9pdGVyYXRlKCk7CisKKyAgICBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gZmFsc2U7Cisg ICAgY29udGV4dC0+dHlwZSA9IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HOworICAgIGNv bnRleHQtPmNhbGxiYWNrID0gUGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjazsKKyAgICBBU1NF UlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIGNvbnRleHQpKTsK ICAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5f bG9vcF9pdGVyYXRlKCk7CisKKyAgICBkZWxldGUgY29udGV4dDsKIH0K 183307 2013-01-17 16:20:15 -0800 2013-01-17 21:13:43 -0800 Patch bug-106752-20130118091714.patch text/plain 9047 ky0.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjc5MTc0ZTIzNjU4NmU4 ZDE1YjhkYTQwMTJjNzQ4MTI3NTY0OTdhMS4uMmM4Y2ViOGYzZDBlZGQ5ZmVkNjRkMTllZTgwNTEz OTgwZDM2ZjdlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTAxLTE3ICBLd2Fu Z1lvbmcgQ2hvaSAgPGt5MC5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIHN1cHBvcnQgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cyBhcyBzdHJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjc1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmaWVkIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIHRvIGdldCBwYWdlIGNvbnRlbnRzIGFzIHN0cmluZy4K KyAgICAgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcgaXMgYWRkZWQgdG8gRXdrX1Bh Z2VfQ29udGVudHNfVHlwZS4KKyAgICAgICAgTm93LCB3ZSBjYW4gdXNlIGJvdGggRVdLX1BBR0Vf Q09OVEVOVFNfVFlQRV9NSFRNTCBhbmQgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKKyAg ICAgICAgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cy4KKworICAgICAgICBBbmQgZXdrX3ZpZXdf cGFnZV9jb250ZW50c19nZXQoKSBBUEkgaXMgY2hhbmdlZCB0byBnZXR0aW5nIHNpbmdsZSBjb250 ZXh0IHBhcmFtZXRlcgorICAgICAgICBmcm9tIGdldHRpbmcgdHdvIHBhcmFtZXRlcnMgc2VwYXJh dGVseS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAg ICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spOgorICAgICAgICAoZXdrVmll d1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spOgorICAgICAgICAoZXdrX3ZpZXdfcGFnZV9j b250ZW50c19nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAg ICAgICAoUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKToKKyAgICAgICAgKFBhZ2VDb250ZW50 c0FzU3RyaW5nQ2FsbGJhY2spOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxMy0wMS0xNiAgU2Ft IFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVwZGF0ZSBPd25lcnMgZmlsZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBl ZjUyMTNlZjFhNGFkNmUxY2VmZjg3Yjc2Zjc0MjcyNzUxZDc4MzA0Li5jN2MxYjc0NTU2NDgyMzNm YTVjMTliN2VhYWEwNzZmZWFjNzk4MjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNDYsMTcgKzE0Niw2IEBAIHN0YXRpYyBjb25zdCBj aGFyIEVXS19WSUVXX1RZUEVfU1RSW10gPSAiRVdLMl9WaWV3IjsKICAgICAgICAgfSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcCiAgICAgfSB3aGlsZSAoMCkKIAotLy8vIENyZWF0ZXMgYSB0eXBlIG5hbWUgZm9yIEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQuCi10eXBlZGVmIHN0cnVjdCBFd2tfUGFnZV9Db250ZW50 c19Db250ZXh0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7Ci0KLS8qCi0gKiBAYnJpZWYgU3Ry dWN0dXJlIGNvbnRhaW5pbmcgcGFnZSBjb250ZW50cyBjb250ZXh0IHVzZWQgZm9yIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJLgotICovCi1zdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNf Q29udGV4dCB7Ci0gICAgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlOwotICAgIEV3a19QYWdl X0NvbnRlbnRzX0NiIGNhbGxiYWNrOwotfTsKLQogc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0 X2NoYW5nZWQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogewogICAgIGlmIChzbWFy dERhdGEtPmNoYW5nZWQuYW55KQpAQCAtOTU1LDcgKzk0NCw3IEBAIHZvaWQgZXdrX3ZpZXdfZHJh d3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqZXdrVmlldywgRWluYV9Cb29sIGVu YWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192 aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29u dGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhXS0RhdGFS ZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFfU0FGRVRZ X09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCkBAIC05NjYsMjAgKzk1NSwzNyBAQCBzdGF0aWMg dm9pZCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2soV0tEYXRhUmVmIHdrRGF0YSwgV0tFcnJv clJlZiwgdm9pZCogY29udAogICAgIGRlbGV0ZSBjb250ZW50c0NvbnRleHQ7CiB9CiAKLUVpbmFf Qm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxs YmFjaykKKy8qKgorICogQGludGVybmFsCisgKiBDYWxsYmFjayBmdW5jdGlvbiB1c2VkIGZvciBl d2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpLgorICovCitzdGF0aWMgdm9pZCBld2tWaWV3UGFn ZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayhXS1N0cmluZ1JlZiB3a1N0cmluZywgV0tFcnJvclJl Ziwgdm9pZCogY29udGV4dCkKIHsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwo Y2FsbGJhY2ssIGZhbHNlKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0 KTsKKworICAgIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqIGNvbnRlbnRzQ29udGV4dD0gc3Rh dGljX2Nhc3Q8RXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCo+KGNvbnRleHQpOworICAgIGNvbnRl bnRzQ29udGV4dC0+Y2FsbGJhY2soY29udGVudHNDb250ZXh0LT50eXBlLCBXS0VpbmFTaGFyZWRT dHJpbmcod2tTdHJpbmcpKTsKK30KKworRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVudHNf Z2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0 KiBjb250ZXh0KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChjb250ZXh0 LCBmYWxzZSk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGNvbnRleHQtPmNh bGxiYWNrLCBmYWxzZSk7CiAgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcs IGltcGwsIGZhbHNlKTsKIAotICAgIC8vIFdlIG9ubHkgc3VwcG9ydCBNSFRNTCBhdCB0aGUgbW9t ZW50LgotICAgIGlmICh0eXBlICE9IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwpCi0gICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICBzd2l0Y2ggKGNvbnRleHQtPnR5cGUpIHsKKyAgICBjYXNl IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUw6CisgICAgICAgIGltcGwtPnBhZ2UoKS0+Z2V0 Q29udGVudHNBc01IVE1MRGF0YShEYXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3 UGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKSwgZmFsc2UpOworICAgICAgICBicmVhazsKIAot ICAgIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqIGNvbnRleHQgPSBuZXcgRXdrX1BhZ2VfQ29u dGVudHNfQ29udGV4dDsKLSAgICBjb250ZXh0LT50eXBlID0gdHlwZTsKLSAgICBjb250ZXh0LT5j YWxsYmFjayA9IGNhbGxiYWNrOworICAgIGNhc2UgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJ Tkc6CisgICAgICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNBc1N0cmluZyhTdHJpbmdDYWxs YmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNr KSk7CisgICAgICAgIGJyZWFrOwogCi0gICAgaW1wbC0+cGFnZSgpLT5nZXRDb250ZW50c0FzTUhU TUxEYXRhKERhdGFDYWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVudHND YWxsYmFjayksIGZhbHNlKTsKKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KIAogICAgIHJldHVybiB0cnVlOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXggYjJm ZjY1YTk1ZGQ5ZjUyZTQ5OWRiYmYwZGU2YWUyYzdlOWZlZTAzZS4uMmI0MTMyZjUzMzI2NzgyZGU3 NWQ2MzJlOTNjZDYyZTE3M2Y4MWQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlldy5oCkBAIC0xMDcsMTEgKzEwNyw2IEBAIHR5cGVkZWYgZW51bSB7CiAgICAg RVdLX1RFWFRfRElSRUNUSU9OX0xFRlRfVE9fUklHSFQKIH0gRXdrX1RleHRfRGlyZWN0aW9uOwog Ci0vLy8gRW51bSB2YWx1ZXMgY29udGFpbmluZyBwYWdlIGNvbnRlbnRzIHR5cGUgdmFsdWVzLgot dHlwZWRlZiBlbnVtIHsKLSAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MCi19IEV3a19Q YWdlX0NvbnRlbnRzX1R5cGU7Ci0KIHR5cGVkZWYgc3RydWN0IEV3a19WaWV3X1NtYXJ0X0RhdGEg RXdrX1ZpZXdfU21hcnRfRGF0YTsKIHR5cGVkZWYgc3RydWN0IEV3a19WaWV3X1NtYXJ0X0NsYXNz IEV3a19WaWV3X1NtYXJ0X0NsYXNzOwogCkBAIC0zMTksNiArMzE0LDEyIEBAIHR5cGVkZWYgZW51 bSB7CiAgICAgRVdLX1BBR0lOQVRJT05fTU9ERV9CT1RUT01fVE9fVE9QIC8qKjwgZ28gdG8gdGhl IG5leHQgcGFnZSB3aXRoIHNjcm9sbGluZyBib3R0b20gdG8gdG9wIHZlcnRpY2FsbHkuICovCiB9 IEV3a19QYWdpbmF0aW9uX01vZGU7CiAKKy8vLyBFbnVtIHZhbHVlcyBjb250YWluaW5nIHBhZ2Ug Y29udGVudHMgdHlwZSB2YWx1ZXMuCit0eXBlZGVmIGVudW0geworICAgIEVXS19QQUdFX0NPTlRF TlRTX1RZUEVfTUhUTUwsCisgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKK30gRXdr X1BhZ2VfQ29udGVudHNfVHlwZTsKKwogLyoqCiAgKiBDcmVhdGVzIGEgdHlwZSBuYW1lIGZvciB0 aGUgY2FsbGJhY2sgZnVuY3Rpb24gdXNlZCB0byBnZXQgdGhlIHBhZ2UgY29udGVudHMuCiAgKgpA QCAtMzI3LDYgKzMyOCwxNyBAQCB0eXBlZGVmIGVudW0gewogICovCiB0eXBlZGVmIHZvaWQgKCpF d2tfUGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBj aGFyICpkYXRhKTsKIAorLy8vIENyZWF0ZXMgYSB0eXBlIG5hbWUgZm9yIEV3a19QYWdlX0NvbnRl bnRzX0NvbnRleHQuCit0eXBlZGVmIHN0cnVjdCBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0IEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7CisKKy8qCisgKiBAYnJpZWYgU3RydWN0dXJlIGNvbnRh aW5pbmcgcGFnZSBjb250ZW50cyBjb250ZXh0IHVzZWQgZm9yIGV3a192aWV3X3BhZ2VfY29udGVu dHNfZ2V0KCkgQVBJLgorICovCitzdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCB7Cisg ICAgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlOworICAgIEV3a19QYWdlX0NvbnRlbnRzX0Ni IGNhbGxiYWNrOworfTsKKwogLyoqCiAgKiBTZXRzIHRoZSBzbWFydCBjbGFzcyBBUElzLCBlbmFi bGluZyB2aWV3IHRvIGJlIGluaGVyaXRlZC4KICAqCkBAIC04NjMsMTIgKzg3NSwxMSBAQCBFQVBJ IHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqbywg RWluYV9Cb29sIGVuYWJsZWQpOwogICogR2V0IGNvbnRlbnRzIG9mIHRoZSBjdXJyZW50IHdlYiBw YWdlLgogICoKICAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdldCB0aGUgcGFnZSBjb250ZW50 cwotICogQHBhcmFtIHR5cGUgdHlwZSBvZiB0aGUgcGFnZSBjb250ZW50cwotICogQHBhcmFtIGNh bGxiYWNrIGNhbGxiYWNrIGZ1bmN0aW9uIHRvIGJlIGNhbGxlZCB3aGVuIHRoZSBvcGVyYXRpb24g aXMgZmluaXNoZWQKKyAqIEBwYXJhbSBjb250ZXh0IGNvbnRleHQgb2YgdGhlIHBhZ2UgY29udGVu dHMgd2hpY2ggaGFzIGNvbnRlbnRzIHR5cGUgYW5kIGNhbGxiYWNrIGZ1bmN0aW9uCiAgKgogICog QHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBAYyBFSU5BX0ZBTFNFIG90aGVyd2lz ZQogICovCi1FQVBJIEVpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBF dmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250 ZW50c19DYiBjYWxsYmFjayk7CitFQVBJIEVpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRz X2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCAqY29u dGV4dCk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IGIz NTA4ZDRhZDU1YTEwN2NiMmVjZDMyNTIwMjYxYzJkNmIwOGVhM2IuLjgyNTczOTNmMDJlMWRmMDU4 OTIxMjkzZDAxYTcxMWYwMzliNzQxMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTkxOSw3ICs5 MTksNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9j aGFuZ2VkKQogCiBzdGF0aWMgYm9vbCBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gZmFsc2U7CiAK LXN0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0NhbGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUg dHlwZSwgY29uc3QgY2hhciogZGF0YSkKK3N0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0FzTUhUTUxD YWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCiB7 CiAgICAgLy8gQ2hlY2sgdGhlIHR5cGUKICAgICBBU1NFUlRfRVEoRVdLX1BBR0VfQ09OVEVOVFNf VFlQRV9NSFRNTCwgdHlwZSk7CkBAIC05MzUsMTMgKzkzNSwzNyBAQCBzdGF0aWMgdm9pZCBQYWdl Q29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIq IGRhdGEpCiAgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IHRydWU7CiB9CiAKK3N0YXRpYyB2 b2lkIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0 eXBlLCBjb25zdCBjaGFyKiBkYXRhKQoreworICAgIC8vIENoZWNrIHRoZSB0eXBlCisgICAgQVNT RVJUX0VRKEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HLCB0eXBlKTsKKworICAgIC8vIFRo ZSB2YXJpYWJsZSBkYXRhIHNob3VsZCBiZSAiU2ltcGxlIEhUTUwiCisgICAgQVNTRVJUX0VRKDAs IHN0cmNtcChkYXRhLCAiU2ltcGxlIEhUTUwiKSk7CisKKyAgICBpc09idGFpbmVkUGFnZUNvbnRl bnRzID0gdHJ1ZTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3BhZ2Vf Y29udGVudHNfZ2V0KQogewogICAgIGNvbnN0IGNoYXIgY29udGVudFtdID0gIjxwPlNpbXBsZSBI VE1MPC9wPiI7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGNvbnRl bnQsIDAsIDApOwogICAgIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogCi0gICAgQVNTRVJUX1RS VUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05URU5U U19UWVBFX01IVE1MLCBQYWdlQ29udGVudHNDYWxsYmFjaykpOworICAgIEV3a19QYWdlX0NvbnRl bnRzX0NvbnRleHQqIGNvbnRleHQgPSBuZXcgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dDsKKwor ICAgIGNvbnRleHQtPnR5cGUgPSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MOworICAgIGNv bnRleHQtPmNhbGxiYWNrID0gUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrOworICAgIEFTU0VS VF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgY29udGV4dCkpOwor ICAgIHdoaWxlICghaXNPYnRhaW5lZFBhZ2VDb250ZW50cykKKyAgICAgICAgZWNvcmVfbWFpbl9s b29wX2l0ZXJhdGUoKTsKKworICAgIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKKyAg ICBjb250ZXh0LT50eXBlID0gRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkc7CisgICAgY29u dGV4dC0+Y2FsbGJhY2sgPSBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrOworICAgIEFTU0VS VF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgY29udGV4dCkpOwog ICAgIHdoaWxlICghaXNPYnRhaW5lZFBhZ2VDb250ZW50cykKICAgICAgICAgZWNvcmVfbWFpbl9s b29wX2l0ZXJhdGUoKTsKKworICAgIGRlbGV0ZSBjb250ZXh0OwogfQo= 183366 2013-01-17 21:13:43 -0800 2013-01-22 21:44:21 -0800 Patch diff text/plain 8904 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNzkxNzRlLi4yYzhjZWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDEtMTcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRz IGFzIHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2NzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW9kaWZpZWQgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkgdG8gZ2V0IHBhZ2Ug Y29udGVudHMgYXMgc3RyaW5nLgorICAgICAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklO RyBpcyBhZGRlZCB0byBFd2tfUGFnZV9Db250ZW50c19UeXBlLgorICAgICAgICBOb3csIHdlIGNh biB1c2UgYm90aCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MIGFuZCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX1NUUklORworICAgICAgICBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRzLgorCisg ICAgICAgIEFuZCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpIEFQSSBpcyBjaGFuZ2VkIHRv IGdldHRpbmcgc2luZ2xlIGNvbnRleHQgcGFyYW1ldGVyCisgICAgICAgIGZyb20gZ2V0dGluZyB0 d28gcGFyYW1ldGVycyBzZXBhcmF0ZWx5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFj ayk6CisgICAgICAgIChld2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayk6CisgICAg ICAgIChld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfdmlldy5jcHA6CisgICAgICAgIChQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spOgor ICAgICAgICAoUGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayk6CisgICAgICAgIChURVNUX0Yp OgorCiAyMDEzLTAxLTE2ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAg VXBkYXRlIE93bmVycyBmaWxlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCmluZGV4IGVmNTIxM2UuLjc4NDk0MWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTE0NiwxNyArMTQ2LDYgQEAgc3Rh dGljIGNvbnN0IGNoYXIgRVdLX1ZJRVdfVFlQRV9TVFJbXSA9ICJFV0syX1ZpZXciOwogICAgICAg ICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKICAgICB9IHdoaWxlICgwKQogCi0vLy8gQ3JlYXRlcyBhIHR5cGUg bmFtZSBmb3IgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dC4KLXR5cGVkZWYgc3RydWN0IEV3a19Q YWdlX0NvbnRlbnRzX0NvbnRleHQgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dDsKLQotLyoKLSAq IEBicmllZiBTdHJ1Y3R1cmUgY29udGFpbmluZyBwYWdlIGNvbnRlbnRzIGNvbnRleHQgdXNlZCBm b3IgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkuCi0gKi8KLXN0cnVjdCBFd2tfUGFn ZV9Db250ZW50c19Db250ZXh0IHsKLSAgICBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGU7Ci0g ICAgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJhY2s7Ci19OwotCiBzdGF0aWMgdm9pZCBfZXdr X3ZpZXdfc21hcnRfY2hhbmdlZChFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEpCiB7CiAg ICAgaWYgKHNtYXJ0RGF0YS0+Y2hhbmdlZC5hbnkpCkBAIC05NTUsMzEgKzk0NCw0NiBAQCB2b2lk IGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19PYmplY3QgKmV3a1ZpZXcs IEVpbmFfQm9vbCBlbmFibGVkKQogICogQGludGVybmFsCiAgKiBDYWxsYmFjayBmdW5jdGlvbiB1 c2VkIGZvciBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpLgogICovCi1zdGF0aWMgdm9pZCBl d2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2soV0tEYXRhUmVmIHdrRGF0YSwgV0tFcnJvclJlZiwg dm9pZCogY29udGV4dCkKK3N0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNBc01IVE1MQ2Fs bGJhY2soV0tEYXRhUmVmIHdrRGF0YSwgV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKIHsKICAg ICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0KTsKIAogICAgIFJlZlB0cjxXZWJE YXRhPiB3ZWJEYXRhID0gdG9JbXBsKHdrRGF0YSk7CiAgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29u dGV4dCogY29udGVudHNDb250ZXh0PSBzdGF0aWNfY2FzdDxFd2tfUGFnZV9Db250ZW50c19Db250 ZXh0Kj4oY29udGV4dCk7CiAgICAgY29udGVudHNDb250ZXh0LT5jYWxsYmFjayhjb250ZW50c0Nv bnRleHQtPnR5cGUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KHdlYkRhdGEtPmJ5dGVz KCkpKTsKK30KKworLyoqCisgKiBAaW50ZXJuYWwKKyAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQg Zm9yIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCisgKi8KK3N0YXRpYyB2b2lkIGV3a1Zp ZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKFdLU3RyaW5nUmVmIHdrU3RyaW5nLCBXS0Vy cm9yUmVmLCB2b2lkKiBjb250ZXh0KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJO KGNvbnRleHQpOwogCi0gICAgZGVsZXRlIGNvbnRlbnRzQ29udGV4dDsKKyAgICBFd2tfUGFnZV9D b250ZW50c19Db250ZXh0KiBjb250ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0Nv bnRlbnRzX0NvbnRleHQqPihjb250ZXh0KTsKKyAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNr KGNvbnRlbnRzQ29udGV4dC0+dHlwZSwgV0tFaW5hU2hhcmVkU3RyaW5nKHdrU3RyaW5nKSk7CiB9 CiAKLUVpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVj dCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50 c19DYiBjYWxsYmFjaykKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25z dCBFdmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGV4 dCkKIHsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoY2FsbGJhY2ssIGZhbHNl KTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoY29udGV4dCwgZmFsc2UpOwor ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChjb250ZXh0LT5jYWxsYmFjaywgZmFs c2UpOwogICAgIEVXS19WSUVXX0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxz ZSk7CiAKLSAgICAvLyBXZSBvbmx5IHN1cHBvcnQgTUhUTUwgYXQgdGhlIG1vbWVudC4KLSAgICBp ZiAodHlwZSAhPSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MKQotICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgc3dpdGNoIChjb250ZXh0LT50eXBlKSB7CisgICAgY2FzZSBFV0tfUEFHRV9D T05URU5UU19UWVBFX01IVE1MOgorICAgICAgICBpbXBsLT5wYWdlKCktPmdldENvbnRlbnRzQXNN SFRNTERhdGEoRGF0YUNhbGxiYWNrOjpjcmVhdGUoY29udGV4dCwgZXdrVmlld1BhZ2VDb250ZW50 c0FzTUhUTUxDYWxsYmFjayksIGZhbHNlKTsKKyAgICAgICAgYnJlYWs7CiAKLSAgICBFd2tfUGFn ZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRl eHQ7Ci0gICAgY29udGV4dC0+dHlwZSA9IHR5cGU7Ci0gICAgY29udGV4dC0+Y2FsbGJhY2sgPSBj YWxsYmFjazsKKyAgICBjYXNlIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HOgorICAgICAg ICBpbXBsLT5wYWdlKCktPmdldENvbnRlbnRzQXNTdHJpbmcoU3RyaW5nQ2FsbGJhY2s6OmNyZWF0 ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjaykpOworICAgICAg ICBicmVhazsKIAotICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNBc01IVE1MRGF0YShEYXRh Q2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2spLCBm YWxzZSk7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IGIyZmY2NWEuLjJiNDEz MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAt MTA3LDExICsxMDcsNiBAQCB0eXBlZGVmIGVudW0gewogICAgIEVXS19URVhUX0RJUkVDVElPTl9M RUZUX1RPX1JJR0hUCiB9IEV3a19UZXh0X0RpcmVjdGlvbjsKIAotLy8vIEVudW0gdmFsdWVzIGNv bnRhaW5pbmcgcGFnZSBjb250ZW50cyB0eXBlIHZhbHVlcy4KLXR5cGVkZWYgZW51bSB7Ci0gICAg RVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTAotfSBFd2tfUGFnZV9Db250ZW50c19UeXBlOwot CiB0eXBlZGVmIHN0cnVjdCBFd2tfVmlld19TbWFydF9EYXRhIEV3a19WaWV3X1NtYXJ0X0RhdGE7 CiB0eXBlZGVmIHN0cnVjdCBFd2tfVmlld19TbWFydF9DbGFzcyBFd2tfVmlld19TbWFydF9DbGFz czsKIApAQCAtMzE5LDYgKzMxNCwxMiBAQCB0eXBlZGVmIGVudW0gewogICAgIEVXS19QQUdJTkFU SU9OX01PREVfQk9UVE9NX1RPX1RPUCAvKio8IGdvIHRvIHRoZSBuZXh0IHBhZ2Ugd2l0aCBzY3Jv bGxpbmcgYm90dG9tIHRvIHRvcCB2ZXJ0aWNhbGx5LiAqLwogfSBFd2tfUGFnaW5hdGlvbl9Nb2Rl OwogCisvLy8gRW51bSB2YWx1ZXMgY29udGFpbmluZyBwYWdlIGNvbnRlbnRzIHR5cGUgdmFsdWVz LgordHlwZWRlZiBlbnVtIHsKKyAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLAorICAg IEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HCit9IEV3a19QYWdlX0NvbnRlbnRzX1R5cGU7 CisKIC8qKgogICogQ3JlYXRlcyBhIHR5cGUgbmFtZSBmb3IgdGhlIGNhbGxiYWNrIGZ1bmN0aW9u IHVzZWQgdG8gZ2V0IHRoZSBwYWdlIGNvbnRlbnRzLgogICoKQEAgLTMyNyw2ICszMjgsMTcgQEAg dHlwZWRlZiBlbnVtIHsKICAqLwogdHlwZWRlZiB2b2lkICgqRXdrX1BhZ2VfQ29udGVudHNfQ2Ip KEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSk7CiAKKy8vLyBD cmVhdGVzIGEgdHlwZSBuYW1lIGZvciBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0LgordHlwZWRl ZiBzdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCBFd2tfUGFnZV9Db250ZW50c19Db250 ZXh0OworCisvKgorICogQGJyaWVmIFN0cnVjdHVyZSBjb250YWluaW5nIHBhZ2UgY29udGVudHMg Y29udGV4dCB1c2VkIGZvciBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpIEFQSS4KKyAqLwor c3RydWN0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgeworICAgIEV3a19QYWdlX0NvbnRlbnRz X1R5cGUgdHlwZTsKKyAgICBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjazsKK307CisKIC8q KgogICogU2V0cyB0aGUgc21hcnQgY2xhc3MgQVBJcywgZW5hYmxpbmcgdmlldyB0byBiZSBpbmhl cml0ZWQuCiAgKgpAQCAtODYzLDEyICs4NzUsMTEgQEAgRUFQSSB2b2lkIGV3a192aWV3X2RyYXdz X3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsK ICAqIEdldCBjb250ZW50cyBvZiB0aGUgY3VycmVudCB3ZWIgcGFnZS4KICAqCiAgKiBAcGFyYW0g byB2aWV3IG9iamVjdCB0byBnZXQgdGhlIHBhZ2UgY29udGVudHMKLSAqIEBwYXJhbSB0eXBlIHR5 cGUgb2YgdGhlIHBhZ2UgY29udGVudHMKLSAqIEBwYXJhbSBjYWxsYmFjayBjYWxsYmFjayBmdW5j dGlvbiB0byBiZSBjYWxsZWQgd2hlbiB0aGUgb3BlcmF0aW9uIGlzIGZpbmlzaGVkCisgKiBAcGFy YW0gY29udGV4dCBjb250ZXh0IG9mIHRoZSBwYWdlIGNvbnRlbnRzIHdoaWNoIGhhcyBjb250ZW50 cyB0eXBlIGFuZCBjYWxsYmFjayBmdW5jdGlvbgogICoKICAqIEByZXR1cm4gQGMgRUlOQV9UUlVF IG9uIHN1Y2Nlc3Mgb3IgQGMgRUlOQV9GQUxTRSBvdGhlcndpc2UKICAqLwotRUFQSSBFaW5hX0Jv b2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIEV3a19Q YWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJhY2spOwor RUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmpl Y3QgKm8sIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgKmNvbnRleHQpOwogCiAjaWZkZWYgX19j cGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBiMzUwOGQ0Li44MjU3MzkzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVz dF9ld2syX3ZpZXcuY3BwCkBAIC05MTksNyArOTE5LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJh c2UsIGV3a192aWV3X2NvbnRlbnRzX3NpemVfY2hhbmdlZCkKIAogc3RhdGljIGJvb2wgaXNPYnRh aW5lZFBhZ2VDb250ZW50cyA9IGZhbHNlOwogCi1zdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxs YmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCitzdGF0 aWMgdm9pZCBQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlw ZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhKQogewogICAgIC8vIENoZWNrIHRoZSB0eXBlCiAgICAg QVNTRVJUX0VRKEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwsIHR5cGUpOwpAQCAtOTM1LDEz ICs5MzUsMzcgQEAgc3RhdGljIHZvaWQgUGFnZUNvbnRlbnRzQ2FsbGJhY2soRXdrX1BhZ2VfQ29u dGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhKQogICAgIGlzT2J0YWluZWRQYWdlQ29u dGVudHMgPSB0cnVlOwogfQogCitzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxi YWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSkKK3sKKyAg ICAvLyBDaGVjayB0aGUgdHlwZQorICAgIEFTU0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBF X1NUUklORywgdHlwZSk7CisKKyAgICAvLyBUaGUgdmFyaWFibGUgZGF0YSBzaG91bGQgYmUgIlNp bXBsZSBIVE1MIgorICAgIEFTU0VSVF9FUSgwLCBzdHJjbXAoZGF0YSwgIlNpbXBsZSBIVE1MIikp OworCisgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IHRydWU7Cit9CisKIFRFU1RfRihFV0sy VW5pdFRlc3RCYXNlLCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCkKIHsKICAgICBjb25zdCBj aGFyIGNvbnRlbnRbXSA9ICI8cD5TaW1wbGUgSFRNTDwvcD4iOwogICAgIGV3a192aWV3X2h0bWxf c3RyaW5nX2xvYWQod2ViVmlldygpLCBjb250ZW50LCAwLCAwKTsKICAgICB3YWl0VW50aWxMb2Fk RmluaXNoZWQoKTsKIAotICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0 KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQ2Fs bGJhY2spKTsKKyAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7CisKKyAgICBjb250ZXh0LT50eXBlID0gRVdLX1BBR0Vf Q09OVEVOVFNfVFlQRV9NSFRNTDsKKyAgICBjb250ZXh0LT5jYWxsYmFjayA9IFBhZ2VDb250ZW50 c0FzTUhUTUxDYWxsYmFjazsKKyAgICBBU1NFUlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRz X2dldCh3ZWJWaWV3KCksIGNvbnRleHQpKTsKKyAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29u dGVudHMpCisgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisKKyAgICBpc09idGFp bmVkUGFnZUNvbnRlbnRzID0gZmFsc2U7CisgICAgY29udGV4dC0+dHlwZSA9IEVXS19QQUdFX0NP TlRFTlRTX1RZUEVfU1RSSU5HOworICAgIGNvbnRleHQtPmNhbGxiYWNrID0gUGFnZUNvbnRlbnRz QXNTdHJpbmdDYWxsYmFjazsKKyAgICBBU1NFUlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRz X2dldCh3ZWJWaWV3KCksIGNvbnRleHQpKTsKICAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29u dGVudHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisKKyAgICBkZWxldGUg Y29udGV4dDsKIH0K 184137 2013-01-22 21:44:21 -0800 2013-01-24 01:03:35 -0800 Patch diff text/plain 7994 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1ZDYyZDlmLi5kNTViZmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDEtMjIgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRz IGFzIHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2NzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW9kaWZpZWQgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkgdG8gZ2V0IHBhZ2Ug Y29udGVudHMgYXMgc3RyaW5nLgorICAgICAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklO RyBpcyBhZGRlZCB0byBFd2tfUGFnZV9Db250ZW50c19UeXBlLgorICAgICAgICBOb3csIHdlIGNh biB1c2UgYm90aCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MIGFuZCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX1NUUklORworICAgICAgICBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRzLgorCisg ICAgICAgIEFuZCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpIEFQSSBpcyBjaGFuZ2VkIHRv IHBhc3MgdGhlIHVzZXIgZGF0YSB0byB0aGUKKyAgICAgICAgY2FsbGJhY2sgZnVuY3Rpb24uCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tW aWV3UGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29u dGVudHNBc1N0cmluZ0NhbGxiYWNrKToKKyAgICAgICAgKGV3a192aWV3X3BhZ2VfY29udGVudHNf Z2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFBh Z2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayk6CisgICAgICAgIChQYWdlQ29udGVudHNBc1N0cmlu Z0NhbGxiYWNrKToKKyAgICAgICAgKFRFU1RfRik6CisKIDIwMTMtMDEtMjIgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgYSBwbGF0Zm9yb20gc3Ry YXRlZ3kgZm9yIGxvY2FsIHN0b3JhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmNwcAppbmRleCA5NzgyNTA2Li5mYWJhYzhiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNTQsNiArMTU0LDcgQEAg dHlwZWRlZiBzdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCBFd2tfUGFnZV9Db250ZW50 c19Db250ZXh0Owogc3RydWN0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgewogICAgIEV3a19Q YWdlX0NvbnRlbnRzX1R5cGUgdHlwZTsKICAgICBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFj azsKKyAgICB2b2lkKiB1c2VyRGF0YTsKIH07CiAKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFy dF9jaGFuZ2VkKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKQEAgLTk1NCwzMSArOTU1 LDU1IEBAIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVj dCAqZXdrVmlldywgRWluYV9Cb29sIGVuYWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNr IGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0 YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBX S0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50 c0FzTUhUTUxDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCiAgICAg UmVmUHRyPFdlYkRhdGE+IHdlYkRhdGEgPSB0b0ltcGwod2tEYXRhKTsKICAgICBFd2tfUGFnZV9D b250ZW50c19Db250ZXh0KiBjb250ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0Nv bnRlbnRzX0NvbnRleHQqPihjb250ZXh0KTsKLSAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNr KGNvbnRlbnRzQ29udGV4dC0+dHlwZSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4od2Vi RGF0YS0+Ynl0ZXMoKSkpOworICAgIGNvbnRlbnRzQ29udGV4dC0+Y2FsbGJhY2soY29udGVudHND b250ZXh0LT50eXBlLCByZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPih3ZWJEYXRhLT5ieXRl cygpKSwgY29udGVudHNDb250ZXh0LT51c2VyRGF0YSk7CiAKICAgICBkZWxldGUgY29udGVudHND b250ZXh0OwogfQogCi1FaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3Qg RXZhc19PYmplY3QqIGV3a1ZpZXcsIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1Bh Z2VfQ29udGVudHNfQ2IgY2FsbGJhY2spCisvKioKKyAqIEBpbnRlcm5hbAorICogQ2FsbGJhY2sg ZnVuY3Rpb24gdXNlZCBmb3IgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKS4KKyAqLworc3Rh dGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2soV0tTdHJpbmdSZWYg d2tTdHJpbmcsIFdLRXJyb3JSZWYsIHZvaWQqIGNvbnRleHQpCit7CisgICAgRUlOQV9TQUZFVFlf T05fTlVMTF9SRVRVUk4oY29udGV4dCk7CisKKyAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0 KiBjb250ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQq Pihjb250ZXh0KTsKKyAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4 dC0+dHlwZSwgV0tFaW5hU2hhcmVkU3RyaW5nKHdrU3RyaW5nKSwgY29udGVudHNDb250ZXh0LT51 c2VyRGF0YSk7CisKKyAgICBkZWxldGUgY29udGVudHNDb250ZXh0OworfQorCitFaW5hX0Jvb2wg ZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcsIEV3 a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJhY2ss IHZvaWQqIHVzZXJfZGF0YSkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwo Y2FsbGJhY2ssIGZhbHNlKTsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmll dywgaW1wbCwgZmFsc2UpOwogCi0gICAgLy8gV2Ugb25seSBzdXBwb3J0IE1IVE1MIGF0IHRoZSBt b21lbnQuCi0gICAgaWYgKHR5cGUgIT0gRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29u dGV4dCA9IG5ldyBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0OwogICAgIGNvbnRleHQtPnR5cGUg PSB0eXBlOwogICAgIGNvbnRleHQtPmNhbGxiYWNrID0gY2FsbGJhY2s7CisgICAgY29udGV4dC0+ dXNlckRhdGEgPSB1c2VyX2RhdGE7CiAKLSAgICBpbXBsLT5wYWdlKCktPmdldENvbnRlbnRzQXNN SFRNTERhdGEoRGF0YUNhbGxiYWNrOjpjcmVhdGUoY29udGV4dCwgZXdrVmlld1BhZ2VDb250ZW50 c0NhbGxiYWNrKSwgZmFsc2UpOworICAgIHN3aXRjaCAoY29udGV4dC0+dHlwZSkgeworICAgIGNh c2UgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTDoKKyAgICAgICAgaW1wbC0+cGFnZSgpLT5n ZXRDb250ZW50c0FzTUhUTUxEYXRhKERhdGFDYWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGV3a1Zp ZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spLCBmYWxzZSk7CisgICAgICAgIGJyZWFrOwor CisgICAgY2FzZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORzoKKyAgICAgICAgaW1wbC0+ cGFnZSgpLT5nZXRDb250ZW50c0FzU3RyaW5nKFN0cmluZ0NhbGxiYWNrOjpjcmVhdGUoY29udGV4 dCwgZXdrVmlld1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spKTsKKyAgICAgICAgYnJlYWs7 CisKKyAgICBkZWZhdWx0OgorICAgICAgICBkZWxldGUgY29udGV4dDsKKyAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICByZXR1 cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5o CmluZGV4IDEyNDYyMDQuLjllYmFkMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaApAQCAtMTAzLDcgKzEwMyw4IEBAIHR5cGVkZWYgZW51bSB7CiAKIC8v LyBFbnVtIHZhbHVlcyBjb250YWluaW5nIHBhZ2UgY29udGVudHMgdHlwZSB2YWx1ZXMuCiB0eXBl ZGVmIGVudW0gewotICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwKKyAgICBFV0tfUEFH RV9DT05URU5UU19UWVBFX01IVE1MLAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5H CiB9IEV3a19QYWdlX0NvbnRlbnRzX1R5cGU7CiAKIHR5cGVkZWYgc3RydWN0IEV3a19WaWV3X1Nt YXJ0X0RhdGEgRXdrX1ZpZXdfU21hcnRfRGF0YTsKQEAgLTI4Miw4ICsyODMsOSBAQCB0eXBlZGVm IGVudW0gewogICoKICAqIEBwYXJhbSB0eXBlIHR5cGUgb2YgdGhlIGNvbnRlbnRzCiAgKiBAcGFy YW0gZGF0YSBzdHJpbmcgYnVmZmVyIG9mIHRoZSBjb250ZW50cworICogQHBhcmFtIHVzZXJfZGF0 YSB1c2VyX2RhdGEgd2lsbCBiZSBwYXNzZWQgd2hlbiBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dl dCBpcyBjYWxsZWQKICAqLwotdHlwZWRlZiB2b2lkICgqRXdrX1BhZ2VfQ29udGVudHNfQ2IpKEV3 a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSk7Cit0eXBlZGVmIHZv aWQgKCpFd2tfUGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBj b25zdCBjaGFyICpkYXRhLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNldHMgdGhlIHNt YXJ0IGNsYXNzIEFQSXMsIGVuYWJsaW5nIHZpZXcgdG8gYmUgaW5oZXJpdGVkLgpAQCAtODIzLDEw ICs4MjUsMTEgQEAgRUFQSSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQo RXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKICAqIEBwYXJhbSBvIHZpZXcgb2Jq ZWN0IHRvIGdldCB0aGUgcGFnZSBjb250ZW50cwogICogQHBhcmFtIHR5cGUgdHlwZSBvZiB0aGUg cGFnZSBjb250ZW50cwogICogQHBhcmFtIGNhbGxiYWNrIGNhbGxiYWNrIGZ1bmN0aW9uIHRvIGJl IGNhbGxlZCB3aGVuIHRoZSBvcGVyYXRpb24gaXMgZmluaXNoZWQKKyAqIEBwYXJhbSB1c2VyX2Rh dGEgdXNlciBkYXRhCiAgKgogICogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBvciBA YyBFSU5BX0ZBTFNFIG90aGVyd2lzZQogICovCi1FQVBJIEVpbmFfQm9vbCBld2tfdmlld19wYWdl X2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVudHNfVHlw ZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjayk7CitFQVBJIEVpbmFfQm9vbCBl d2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2Vf Q29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjaywgdm9pZCAq dXNlcl9kYXRhKTsKIAogLyoqCiAgKiBTZXRzIHRoZSBzb3VyY2UgbW9kZSBhcyBFSU5BX1RSVUUg dG8gZGlzcGxheSB0aGUgd2ViIHNvdXJjZSBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKaW5kZXggYWM4 OTgyMS4uNzc1OWZmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcApAQCAtOTE5LDcgKzkxOSw3IEBAIFRF U1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19jb250ZW50c19zaXplX2NoYW5nZWQpCiAK IHN0YXRpYyBib29sIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKIAotc3RhdGljIHZv aWQgUGFnZUNvbnRlbnRzQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25z dCBjaGFyKiBkYXRhKQorc3RhdGljIHZvaWQgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKEV3 a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSwgdm9pZCopCiB7CiAg ICAgLy8gQ2hlY2sgdGhlIHR5cGUKICAgICBBU1NFUlRfRVEoRVdLX1BBR0VfQ09OVEVOVFNfVFlQ RV9NSFRNTCwgdHlwZSk7CkBAIC05MzUsMTMgKzkzNSwyOSBAQCBzdGF0aWMgdm9pZCBQYWdlQ29u dGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRh dGEpCiAgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IHRydWU7CiB9CiAKK3N0YXRpYyB2b2lk IFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBl LCBjb25zdCBjaGFyKiBkYXRhLCB2b2lkKikKK3sKKyAgICAvLyBDaGVjayB0aGUgdHlwZQorICAg IEFTU0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywgdHlwZSk7CisKKyAgICAv LyBUaGUgdmFyaWFibGUgZGF0YSBzaG91bGQgYmUgIlNpbXBsZSBIVE1MIgorICAgIEFTU0VSVF9F USgwLCBzdHJjbXAoZGF0YSwgIlNpbXBsZSBIVE1MIikpOworCisgICAgaXNPYnRhaW5lZFBhZ2VD b250ZW50cyA9IHRydWU7Cit9CisKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19w YWdlX2NvbnRlbnRzX2dldCkKIHsKICAgICBjb25zdCBjaGFyIGNvbnRlbnRbXSA9ICI8cD5TaW1w bGUgSFRNTDwvcD4iOwogICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCBj b250ZW50LCAwLCAwKTsKICAgICB3YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAotICAgIEFTU0VS VF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09O VEVOVFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQ2FsbGJhY2spKTsKKyAgICBBU1NFUlRfVFJV RShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdFX0NPTlRFTlRT X1RZUEVfTUhUTUwsIFBhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjaywgMCkpOworICAgIHdoaWxl ICghaXNPYnRhaW5lZFBhZ2VDb250ZW50cykKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJh dGUoKTsKKworICAgIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKKyAgICBBU1NFUlRf VFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdFX0NPTlRF TlRTX1RZUEVfU1RSSU5HLCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrLCAwKSk7CiAgICAg d2hpbGUgKCFpc09idGFpbmVkUGFnZUNvbnRlbnRzKQogICAgICAgICBlY29yZV9tYWluX2xvb3Bf aXRlcmF0ZSgpOwogfQo= 184433 2013-01-24 01:03:35 -0800 2013-01-24 17:04:04 -0800 Patch diff text/plain 8000 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyMzBjNDY4Li4yMzNjMTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDEtMjMgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRz IGFzIHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2NzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW9kaWZpZWQgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkgdG8gZ2V0IHBhZ2Ug Y29udGVudHMgYXMgc3RyaW5nLgorICAgICAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklO RyBpcyBhZGRlZCB0byBFd2tfUGFnZV9Db250ZW50c19UeXBlLgorICAgICAgICBOb3csIHdlIGNh biB1c2UgYm90aCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MIGFuZCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX1NUUklORworICAgICAgICBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRzLgorCisg ICAgICAgIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIGlzIGNoYW5nZWQgdG8gcGFz cyB0aGUgdXNlciBkYXRhIHRvIHRoZQorICAgICAgICBjYWxsYmFjayBmdW5jdGlvbi4gQW5kIHJl cGxhY2UgaW50ZXJuYWwgQVBJIHVzYWdlIHdpdGggQyBBUEkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tWaWV3UGFnZUNvbnRlbnRzQXNN SFRNTENhbGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxi YWNrKToKKyAgICAgICAgKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFBhZ2VDb250ZW50c0FzTUhUTUxD YWxsYmFjayk6CisgICAgICAgIChQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKToKKyAgICAg ICAgKFRFU1RfRik6CisKIDIwMTMtMDEtMjMgIFNlb2tqdSBLd29uICA8c2Vva2p1Lmt3b25AZ21h aWwuY29tPgogCiAgICAgICAgIFtFRkxdIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIxNDA2 MDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRl eCA0YmJlNGU3Li43ODZhNDgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNTYsNiArMTU2LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgRXdrX1Bh Z2VfQ29udGVudHNfQ29udGV4dCBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0Owogc3RydWN0IEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgewogICAgIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlw ZTsKICAgICBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjazsKKyAgICB2b2lkKiB1c2VyRGF0 YTsKIH07CiAKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9jaGFuZ2VkKEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSkKQEAgLTk2MSwzMSArOTYyLDU1IEBAIHZvaWQgZXdrX3ZpZXdf ZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqZXdrVmlldywgRWluYV9Cb29s IGVuYWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3 a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQYWdl Q29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhXS0Rh dGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCiAgICAgUmVmUHRyPFdlYkRhdGE+IHdlYkRh dGEgPSB0b0ltcGwod2tEYXRhKTsKICAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBjb250 ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250 ZXh0KTsKLSAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlw ZSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSkpOworICAg IGNvbnRlbnRzQ29udGV4dC0+Y2FsbGJhY2soY29udGVudHNDb250ZXh0LT50eXBlLCByZWludGVy cHJldF9jYXN0PGNvbnN0IGNoYXIqPih3ZWJEYXRhLT5ieXRlcygpKSwgY29udGVudHNDb250ZXh0 LT51c2VyRGF0YSk7CiAKICAgICBkZWxldGUgY29udGVudHNDb250ZXh0OwogfQogCi1FaW5hX0Jv b2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcs IEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJh Y2spCisvKioKKyAqIEBpbnRlcm5hbAorICogQ2FsbGJhY2sgZnVuY3Rpb24gdXNlZCBmb3IgZXdr X3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKS4KKyAqLworc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VD b250ZW50c0FzU3RyaW5nQ2FsbGJhY2soV0tTdHJpbmdSZWYgd2tTdHJpbmcsIFdLRXJyb3JSZWYs IHZvaWQqIGNvbnRleHQpCit7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oY29udGV4 dCk7CisKKyAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBjb250ZW50c0NvbnRleHQ9IHN0 YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250ZXh0KTsKKyAgICBjb250 ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlwZSwgV0tFaW5hU2hhcmVk U3RyaW5nKHdrU3RyaW5nKSwgY29udGVudHNDb250ZXh0LT51c2VyRGF0YSk7CisKKyAgICBkZWxl dGUgY29udGVudHNDb250ZXh0OworfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50 c19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcsIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUg dHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJhY2ssIHZvaWQqIHVzZXJfZGF0YSkKIHsK ICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoY2FsbGJhY2ssIGZhbHNlKTsKICAg ICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgaW1wbCwgZmFsc2UpOwogCi0g ICAgLy8gV2Ugb25seSBzdXBwb3J0IE1IVE1MIGF0IHRoZSBtb21lbnQuCi0gICAgaWYgKHR5cGUg IT0gRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot CiAgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGV4dCA9IG5ldyBFd2tfUGFnZV9D b250ZW50c19Db250ZXh0OwogICAgIGNvbnRleHQtPnR5cGUgPSB0eXBlOwogICAgIGNvbnRleHQt PmNhbGxiYWNrID0gY2FsbGJhY2s7CisgICAgY29udGV4dC0+dXNlckRhdGEgPSB1c2VyX2RhdGE7 CiAKLSAgICBpbXBsLT5wYWdlKCktPmdldENvbnRlbnRzQXNNSFRNTERhdGEoRGF0YUNhbGxiYWNr OjpjcmVhdGUoY29udGV4dCwgZXdrVmlld1BhZ2VDb250ZW50c0NhbGxiYWNrKSwgZmFsc2UpOwor ICAgIHN3aXRjaCAoY29udGV4dC0+dHlwZSkgeworICAgIGNhc2UgRVdLX1BBR0VfQ09OVEVOVFNf VFlQRV9NSFRNTDoKKyAgICAgICAgV0tQYWdlR2V0Q29udGVudHNBc01IVE1MRGF0YShpbXBsLT53 a1BhZ2UoKSwgZmFsc2UsIGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJh Y2spOworICAgICAgICBicmVhazsKKworICAgIGNhc2UgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9T VFJJTkc6CisgICAgICAgIFdLUGFnZUdldENvbnRlbnRzQXNTdHJpbmcoaW1wbC0+d2tQYWdlKCks IGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKTsKKyAgICAgICAg YnJlYWs7CisKKyAgICBkZWZhdWx0OgorICAgICAgICBkZWxldGUgY29udGV4dDsKKyAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAg ICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf dmlldy5oCmluZGV4IDEyNDYyMDQuLjllYmFkMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaApAQCAtMTAzLDcgKzEwMyw4IEBAIHR5cGVkZWYgZW51bSB7 CiAKIC8vLyBFbnVtIHZhbHVlcyBjb250YWluaW5nIHBhZ2UgY29udGVudHMgdHlwZSB2YWx1ZXMu CiB0eXBlZGVmIGVudW0gewotICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwKKyAgICBF V0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVf U1RSSU5HCiB9IEV3a19QYWdlX0NvbnRlbnRzX1R5cGU7CiAKIHR5cGVkZWYgc3RydWN0IEV3a19W aWV3X1NtYXJ0X0RhdGEgRXdrX1ZpZXdfU21hcnRfRGF0YTsKQEAgLTI4Miw4ICsyODMsOSBAQCB0 eXBlZGVmIGVudW0gewogICoKICAqIEBwYXJhbSB0eXBlIHR5cGUgb2YgdGhlIGNvbnRlbnRzCiAg KiBAcGFyYW0gZGF0YSBzdHJpbmcgYnVmZmVyIG9mIHRoZSBjb250ZW50cworICogQHBhcmFtIHVz ZXJfZGF0YSB1c2VyX2RhdGEgd2lsbCBiZSBwYXNzZWQgd2hlbiBld2tfdmlld19wYWdlX2NvbnRl bnRzX2dldCBpcyBjYWxsZWQKICAqLwotdHlwZWRlZiB2b2lkICgqRXdrX1BhZ2VfQ29udGVudHNf Q2IpKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSk7Cit0eXBl ZGVmIHZvaWQgKCpFd2tfUGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0 eXBlLCBjb25zdCBjaGFyICpkYXRhLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNldHMg dGhlIHNtYXJ0IGNsYXNzIEFQSXMsIGVuYWJsaW5nIHZpZXcgdG8gYmUgaW5oZXJpdGVkLgpAQCAt ODIzLDEwICs4MjUsMTEgQEAgRUFQSSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3Vu ZF9zZXQoRXZhc19PYmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKICAqIEBwYXJhbSBvIHZp ZXcgb2JqZWN0IHRvIGdldCB0aGUgcGFnZSBjb250ZW50cwogICogQHBhcmFtIHR5cGUgdHlwZSBv ZiB0aGUgcGFnZSBjb250ZW50cwogICogQHBhcmFtIGNhbGxiYWNrIGNhbGxiYWNrIGZ1bmN0aW9u IHRvIGJlIGNhbGxlZCB3aGVuIHRoZSBvcGVyYXRpb24gaXMgZmluaXNoZWQKKyAqIEBwYXJhbSB1 c2VyX2RhdGEgdXNlciBkYXRhCiAgKgogICogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2Vz cyBvciBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQogICovCi1FQVBJIEVpbmFfQm9vbCBld2tfdmll d19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdrX1BhZ2VfQ29udGVu dHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjayk7CitFQVBJIEVpbmFf Qm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBFdmFzX09iamVjdCAqbywgRXdr X1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjaywg dm9pZCAqdXNlcl9kYXRhKTsKIAogLyoqCiAgKiBTZXRzIHRoZSBzb3VyY2UgbW9kZSBhcyBFSU5B X1RSVUUgdG8gZGlzcGxheSB0aGUgd2ViIHNvdXJjZSBjb2RlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKaW5k ZXggYWM4OTgyMS4uNzc1OWZmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcApAQCAtOTE5LDcgKzkxOSw3 IEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19jb250ZW50c19zaXplX2NoYW5n ZWQpCiAKIHN0YXRpYyBib29sIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKIAotc3Rh dGljIHZvaWQgUGFnZUNvbnRlbnRzQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBl LCBjb25zdCBjaGFyKiBkYXRhKQorc3RhdGljIHZvaWQgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxi YWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSwgdm9pZCop CiB7CiAgICAgLy8gQ2hlY2sgdGhlIHR5cGUKICAgICBBU1NFUlRfRVEoRVdLX1BBR0VfQ09OVEVO VFNfVFlQRV9NSFRNTCwgdHlwZSk7CkBAIC05MzUsMTMgKzkzNSwyOSBAQCBzdGF0aWMgdm9pZCBQ YWdlQ29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNo YXIqIGRhdGEpCiAgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IHRydWU7CiB9CiAKK3N0YXRp YyB2b2lkIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlw ZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhLCB2b2lkKikKK3sKKyAgICAvLyBDaGVjayB0aGUgdHlw ZQorICAgIEFTU0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywgdHlwZSk7CisK KyAgICAvLyBUaGUgdmFyaWFibGUgZGF0YSBzaG91bGQgYmUgIlNpbXBsZSBIVE1MIgorICAgIEFT U0VSVF9FUSgwLCBzdHJjbXAoZGF0YSwgIlNpbXBsZSBIVE1MIikpOworCisgICAgaXNPYnRhaW5l ZFBhZ2VDb250ZW50cyA9IHRydWU7Cit9CisKIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tf dmlld19wYWdlX2NvbnRlbnRzX2dldCkKIHsKICAgICBjb25zdCBjaGFyIGNvbnRlbnRbXSA9ICI8 cD5TaW1wbGUgSFRNTDwvcD4iOwogICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmll dygpLCBjb250ZW50LCAwLCAwKTsKICAgICB3YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKIAotICAg IEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BB R0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQ2FsbGJhY2spKTsKKyAgICBBU1NF UlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdFX0NP TlRFTlRTX1RZUEVfTUhUTUwsIFBhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjaywgMCkpOworICAg IHdoaWxlICghaXNPYnRhaW5lZFBhZ2VDb250ZW50cykKKyAgICAgICAgZWNvcmVfbWFpbl9sb29w X2l0ZXJhdGUoKTsKKworICAgIGlzT2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKKyAgICBB U1NFUlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdF X0NPTlRFTlRTX1RZUEVfU1RSSU5HLCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrLCAwKSk7 CiAgICAgd2hpbGUgKCFpc09idGFpbmVkUGFnZUNvbnRlbnRzKQogICAgICAgICBlY29yZV9tYWlu X2xvb3BfaXRlcmF0ZSgpOwogfQo= 184615 2013-01-24 17:04:04 -0800 2013-01-27 16:49:22 -0800 Patch diff text/plain 8101 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyMzBjNDY4Li4yMzNjMTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDEtMjMgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRz IGFzIHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2NzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW9kaWZpZWQgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkgdG8gZ2V0IHBhZ2Ug Y29udGVudHMgYXMgc3RyaW5nLgorICAgICAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklO RyBpcyBhZGRlZCB0byBFd2tfUGFnZV9Db250ZW50c19UeXBlLgorICAgICAgICBOb3csIHdlIGNh biB1c2UgYm90aCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MIGFuZCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX1NUUklORworICAgICAgICBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRzLgorCisg ICAgICAgIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIGlzIGNoYW5nZWQgdG8gcGFz cyB0aGUgdXNlciBkYXRhIHRvIHRoZQorICAgICAgICBjYWxsYmFjayBmdW5jdGlvbi4gQW5kIHJl cGxhY2UgaW50ZXJuYWwgQVBJIHVzYWdlIHdpdGggQyBBUEkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tWaWV3UGFnZUNvbnRlbnRzQXNN SFRNTENhbGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxi YWNrKToKKyAgICAgICAgKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFBhZ2VDb250ZW50c0FzTUhUTUxD YWxsYmFjayk6CisgICAgICAgIChQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKToKKyAgICAg ICAgKFRFU1RfRik6CisKIDIwMTMtMDEtMjMgIFNlb2tqdSBLd29uICA8c2Vva2p1Lmt3b25AZ21h aWwuY29tPgogCiAgICAgICAgIFtFRkxdIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIxNDA2 MDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRl eCA0YmJlNGU3Li5iYjEzN2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNTYsNiArMTU2LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgRXdrX1Bh Z2VfQ29udGVudHNfQ29udGV4dCBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0Owogc3RydWN0IEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgewogICAgIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlw ZTsKICAgICBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjazsKKyAgICB2b2lkKiB1c2VyRGF0 YTsKIH07CiAKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9jaGFuZ2VkKEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSkKQEAgLTk2MSwzMSArOTYyLDU1IEBAIHZvaWQgZXdrX3ZpZXdf ZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqZXdrVmlldywgRWluYV9Cb29s IGVuYWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3 a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQYWdl Q29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhXS0Rh dGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCiAgICAgUmVmUHRyPFdlYkRhdGE+IHdlYkRh dGEgPSB0b0ltcGwod2tEYXRhKTsKLSAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBjb250 ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250 ZXh0KTsKLSAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlw ZSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSkpOworICAg IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqIGNvbnRlbnRzQ29udGV4dCA9IHN0YXRpY19jYXN0 PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250ZXh0KTsKKyAgICBjb250ZW50c0NvbnRl eHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlwZSwgcmVpbnRlcnByZXRfY2FzdDxjb25z dCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSksIGNvbnRlbnRzQ29udGV4dC0+dXNlckRhdGEpOwog CiAgICAgZGVsZXRlIGNvbnRlbnRzQ29udGV4dDsKIH0KIAotRWluYV9Cb29sIGV3a192aWV3X3Bh Z2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250 ZW50c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrKQorLyoqCisgKiBA aW50ZXJuYWwKKyAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2VfY29u dGVudHNfZ2V0KCkuCisgKi8KK3N0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmlu Z0NhbGxiYWNrKFdLU3RyaW5nUmVmIHdrU3RyaW5nLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOworCisgICAgRXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0ID0gc3RhdGljX2Nhc3Q8RXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCo+KGNvbnRleHQpOworICAgIGNvbnRlbnRzQ29udGV4dC0+ Y2FsbGJhY2soY29udGVudHNDb250ZXh0LT50eXBlLCBXS0VpbmFTaGFyZWRTdHJpbmcod2tTdHJp bmcpLCBjb250ZW50c0NvbnRleHQtPnVzZXJEYXRhKTsKKworICAgIGRlbGV0ZSBjb250ZW50c0Nv bnRleHQ7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBF dmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFn ZV9Db250ZW50c19DYiBjYWxsYmFjaywgdm9pZCogdXNlcl9kYXRhKQogewogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOX1ZBTChjYWxsYmFjaywgZmFsc2UpOwogICAgIEVXS19WSUVXX0lN UExfR0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CiAKLSAgICAvLyBXZSBvbmx5 IHN1cHBvcnQgTUhUTUwgYXQgdGhlIG1vbWVudC4KLSAgICBpZiAodHlwZSAhPSBFV0tfUEFHRV9D T05URU5UU19UWVBFX01IVE1MKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBFd2tfUGFn ZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRl eHQ7CiAgICAgY29udGV4dC0+dHlwZSA9IHR5cGU7CiAgICAgY29udGV4dC0+Y2FsbGJhY2sgPSBj YWxsYmFjazsKKyAgICBjb250ZXh0LT51c2VyRGF0YSA9IHVzZXJfZGF0YTsKIAotICAgIGltcGwt PnBhZ2UoKS0+Z2V0Q29udGVudHNBc01IVE1MRGF0YShEYXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250 ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2spLCBmYWxzZSk7CisgICAgc3dpdGNoIChj b250ZXh0LT50eXBlKSB7CisgICAgY2FzZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MOgor ICAgICAgICBXS1BhZ2VHZXRDb250ZW50c0FzTUhUTUxEYXRhKGltcGwtPndrUGFnZSgpLCBmYWxz ZSwgY29udGV4dCwgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayk7CisgICAgICAg IGJyZWFrOworCisgICAgY2FzZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORzoKKyAgICAg ICAgV0tQYWdlR2V0Q29udGVudHNBc1N0cmluZyhpbXBsLT53a1BhZ2UoKSwgY29udGV4dCwgZXdr Vmlld1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spOworICAgICAgICBicmVhazsKKworICAg IGRlZmF1bHQ6CisgICAgICAgIGRlbGV0ZSBjb250ZXh0OworICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KIAogICAgIHJldHVybiB0cnVl OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKaW5kZXgg MTI0NjIwNC4uOWViYWQyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5oCkBAIC0xMDMsNyArMTAzLDggQEAgdHlwZWRlZiBlbnVtIHsKIAogLy8vIEVudW0g dmFsdWVzIGNvbnRhaW5pbmcgcGFnZSBjb250ZW50cyB0eXBlIHZhbHVlcy4KIHR5cGVkZWYgZW51 bSB7Ci0gICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTAorICAgIEVXS19QQUdFX0NPTlRF TlRTX1RZUEVfTUhUTUwsCisgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKIH0gRXdr X1BhZ2VfQ29udGVudHNfVHlwZTsKIAogdHlwZWRlZiBzdHJ1Y3QgRXdrX1ZpZXdfU21hcnRfRGF0 YSBFd2tfVmlld19TbWFydF9EYXRhOwpAQCAtMjgyLDggKzI4Myw5IEBAIHR5cGVkZWYgZW51bSB7 CiAgKgogICogQHBhcmFtIHR5cGUgdHlwZSBvZiB0aGUgY29udGVudHMKICAqIEBwYXJhbSBkYXRh IHN0cmluZyBidWZmZXIgb2YgdGhlIGNvbnRlbnRzCisgKiBAcGFyYW0gdXNlcl9kYXRhIHVzZXJf ZGF0YSB3aWxsIGJlIHBhc3NlZCB3aGVuIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0IGlzIGNh bGxlZAogICovCi10eXBlZGVmIHZvaWQgKCpFd2tfUGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2Vf Q29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyICpkYXRhKTsKK3R5cGVkZWYgdm9pZCAoKkV3 a19QYWdlX0NvbnRlbnRzX0NiKShFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNo YXIgKmRhdGEsIHZvaWQgKnVzZXJfZGF0YSk7CiAKIC8qKgogICogU2V0cyB0aGUgc21hcnQgY2xh c3MgQVBJcywgZW5hYmxpbmcgdmlldyB0byBiZSBpbmhlcml0ZWQuCkBAIC04MjMsMTAgKzgyNSwx MSBAQCBFQVBJIHZvaWQgZXdrX3ZpZXdfZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09i amVjdCAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8g Z2V0IHRoZSBwYWdlIGNvbnRlbnRzCiAgKiBAcGFyYW0gdHlwZSB0eXBlIG9mIHRoZSBwYWdlIGNv bnRlbnRzCiAgKiBAcGFyYW0gY2FsbGJhY2sgY2FsbGJhY2sgZnVuY3Rpb24gdG8gYmUgY2FsbGVk IHdoZW4gdGhlIG9wZXJhdGlvbiBpcyBmaW5pc2hlZAorICogQHBhcmFtIHVzZXJfZGF0YSB1c2Vy IGRhdGEKICAqCiAgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFf RkFMU0Ugb3RoZXJ3aXNlCiAgKi8KLUVBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVu dHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUs IEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrKTsKK0VBUEkgRWluYV9Cb29sIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50 c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrLCB2b2lkICp1c2VyX2Rh dGEpOwogCiAvKioKICAqIFNldHMgdGhlIHNvdXJjZSBtb2RlIGFzIEVJTkFfVFJVRSB0byBkaXNw bGF5IHRoZSB3ZWIgc291cmNlIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBhYzg5ODIxLi43 NzU5ZmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy90ZXN0X2V3azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCkBAIC05MTksNyArOTE5LDcgQEAgVEVTVF9GKEVX SzJVbml0VGVzdEJhc2UsIGV3a192aWV3X2NvbnRlbnRzX3NpemVfY2hhbmdlZCkKIAogc3RhdGlj IGJvb2wgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNlOwogCi1zdGF0aWMgdm9pZCBQYWdl Q29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIq IGRhdGEpCitzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2soRXdrX1BhZ2Vf Q29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhLCB2b2lkKikKIHsKICAgICAvLyBD aGVjayB0aGUgdHlwZQogICAgIEFTU0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1M LCB0eXBlKTsKQEAgLTkzNSwxMyArOTM1LDI5IEBAIHN0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0Nh bGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSkKICAg ICBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gdHJ1ZTsKIH0KIAorc3RhdGljIHZvaWQgUGFnZUNv bnRlbnRzQXNTdHJpbmdDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0 IGNoYXIqIGRhdGEsIHZvaWQqKQoreworICAgIC8vIENoZWNrIHRoZSB0eXBlCisgICAgQVNTRVJU X0VRKEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HLCB0eXBlKTsKKworICAgIC8vIFRoZSB2 YXJpYWJsZSBkYXRhIHNob3VsZCBiZSAiU2ltcGxlIEhUTUwiCisgICAgQVNTRVJUX0VRKDAsIHN0 cmNtcChkYXRhLCAiU2ltcGxlIEhUTUwiKSk7CisKKyAgICBpc09idGFpbmVkUGFnZUNvbnRlbnRz ID0gdHJ1ZTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3BhZ2VfY29u dGVudHNfZ2V0KQogewogICAgIGNvbnN0IGNoYXIgY29udGVudFtdID0gIjxwPlNpbXBsZSBIVE1M PC9wPiI7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGNvbnRlbnQs IDAsIDApOwogICAgIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpOwogCi0gICAgQVNTRVJUX1RSVUUo ZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05URU5UU19U WVBFX01IVE1MLCBQYWdlQ29udGVudHNDYWxsYmFjaykpOworICAgIEFTU0VSVF9UUlVFKGV3a192 aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9N SFRNTCwgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrLCAwKSk7CisgICAgd2hpbGUgKCFpc09i dGFpbmVkUGFnZUNvbnRlbnRzKQorICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOwor CisgICAgaXNPYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNlOworICAgIEFTU0VSVF9UUlVFKGV3 a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQ RV9TVFJJTkcsIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2ssIDApKTsKICAgICB3aGlsZSAo IWlzT2J0YWluZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRl KCk7CiB9Cg== 184925 2013-01-27 16:49:22 -0800 2013-02-17 21:05:29 -0800 Patch diff text/plain 8137 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyMzBjNDY4Li4yMzNjMTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDEtMjMgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRz IGFzIHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2NzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW9kaWZpZWQgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkgdG8gZ2V0IHBhZ2Ug Y29udGVudHMgYXMgc3RyaW5nLgorICAgICAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklO RyBpcyBhZGRlZCB0byBFd2tfUGFnZV9Db250ZW50c19UeXBlLgorICAgICAgICBOb3csIHdlIGNh biB1c2UgYm90aCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MIGFuZCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX1NUUklORworICAgICAgICBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRzLgorCisg ICAgICAgIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIGlzIGNoYW5nZWQgdG8gcGFz cyB0aGUgdXNlciBkYXRhIHRvIHRoZQorICAgICAgICBjYWxsYmFjayBmdW5jdGlvbi4gQW5kIHJl cGxhY2UgaW50ZXJuYWwgQVBJIHVzYWdlIHdpdGggQyBBUEkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tWaWV3UGFnZUNvbnRlbnRzQXNN SFRNTENhbGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxi YWNrKToKKyAgICAgICAgKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFBhZ2VDb250ZW50c0FzTUhUTUxD YWxsYmFjayk6CisgICAgICAgIChQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKToKKyAgICAg ICAgKFRFU1RfRik6CisKIDIwMTMtMDEtMjMgIFNlb2tqdSBLd29uICA8c2Vva2p1Lmt3b25AZ21h aWwuY29tPgogCiAgICAgICAgIFtFRkxdIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIxNDA2 MDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRl eCA0YmJlNGU3Li5iNzE5ODQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwCkBAIC0xNTYsNiArMTU2LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgRXdrX1Bh Z2VfQ29udGVudHNfQ29udGV4dCBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0Owogc3RydWN0IEV3 a19QYWdlX0NvbnRlbnRzX0NvbnRleHQgewogICAgIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlw ZTsKICAgICBFd2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjazsKKyAgICB2b2lkKiB1c2VyRGF0 YTsKIH07CiAKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9jaGFuZ2VkKEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSkKQEAgLTk2MSwzMSArOTYyLDUzIEBAIHZvaWQgZXdrX3ZpZXdf ZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqZXdrVmlldywgRWluYV9Cb29s IGVuYWJsZWQpCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3 a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQYWdl Q29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhXS0Rh dGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCiAgICAgUmVmUHRyPFdlYkRhdGE+IHdlYkRh dGEgPSB0b0ltcGwod2tEYXRhKTsKLSAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBjb250 ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250 ZXh0KTsKLSAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlw ZSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSkpOworICAg IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqIGNvbnRlbnRzQ29udGV4dCA9IHN0YXRpY19jYXN0 PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250ZXh0KTsKKyAgICBjb250ZW50c0NvbnRl eHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlwZSwgcmVpbnRlcnByZXRfY2FzdDxjb25z dCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSksIGNvbnRlbnRzQ29udGV4dC0+dXNlckRhdGEpOwog CiAgICAgZGVsZXRlIGNvbnRlbnRzQ29udGV4dDsKIH0KIAotRWluYV9Cb29sIGV3a192aWV3X3Bh Z2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9Db250 ZW50c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrKQorLyoqCisgKiBA aW50ZXJuYWwKKyAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2VfY29u dGVudHNfZ2V0KCkuCisgKi8KK3N0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmlu Z0NhbGxiYWNrKFdLU3RyaW5nUmVmIHdrU3RyaW5nLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOworCisgICAgRXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0ID0gc3RhdGljX2Nhc3Q8RXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCo+KGNvbnRleHQpOworICAgIGNvbnRlbnRzQ29udGV4dC0+ Y2FsbGJhY2soY29udGVudHNDb250ZXh0LT50eXBlLCBXS0VpbmFTaGFyZWRTdHJpbmcod2tTdHJp bmcpLCBjb250ZW50c0NvbnRleHQtPnVzZXJEYXRhKTsKKworICAgIGRlbGV0ZSBjb250ZW50c0Nv bnRleHQ7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25zdCBF dmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tfUGFn ZV9Db250ZW50c19DYiBjYWxsYmFjaywgdm9pZCogdXNlcl9kYXRhKQogewogICAgIEVJTkFfU0FG RVRZX09OX05VTExfUkVUVVJOX1ZBTChjYWxsYmFjaywgZmFsc2UpOwogICAgIEVXS19WSUVXX0lN UExfR0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CiAKLSAgICAvLyBXZSBvbmx5 IHN1cHBvcnQgTUhUTUwgYXQgdGhlIG1vbWVudC4KLSAgICBpZiAodHlwZSAhPSBFV0tfUEFHRV9D T05URU5UU19UWVBFX01IVE1MKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBFd2tfUGFn ZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRl eHQ7CiAgICAgY29udGV4dC0+dHlwZSA9IHR5cGU7CiAgICAgY29udGV4dC0+Y2FsbGJhY2sgPSBj YWxsYmFjazsKLQotICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNBc01IVE1MRGF0YShEYXRh Q2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2spLCBm YWxzZSk7CisgICAgY29udGV4dC0+dXNlckRhdGEgPSB1c2VyX2RhdGE7CisKKyAgICBzd2l0Y2gg KGNvbnRleHQtPnR5cGUpIHsKKyAgICBjYXNlIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUw6 CisgICAgICAgIFdLUGFnZUdldENvbnRlbnRzQXNNSFRNTERhdGEoaW1wbC0+d2tQYWdlKCksIGZh bHNlLCBjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKTsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORzoKKyAgICAg ICAgV0tQYWdlR2V0Q29udGVudHNBc1N0cmluZyhpbXBsLT53a1BhZ2UoKSwgY29udGV4dCwgZXdr Vmlld1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spOworICAgICAgICBicmVhazsKKyAgICBk ZWZhdWx0OgorICAgICAgICBkZWxldGUgY29udGV4dDsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4IDEy NDYyMDQuLmM5YjI4OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXcuaApAQCAtMTAzLDcgKzEwMyw4IEBAIHR5cGVkZWYgZW51bSB7CiAKIC8vLyBFbnVtIHZh bHVlcyBjb250YWluaW5nIHBhZ2UgY29udGVudHMgdHlwZSB2YWx1ZXMuCiB0eXBlZGVmIGVudW0g ewotICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwKKyAgICBFV0tfUEFHRV9DT05URU5U U19UWVBFX01IVE1MLAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HCiB9IEV3a19Q YWdlX0NvbnRlbnRzX1R5cGU7CiAKIHR5cGVkZWYgc3RydWN0IEV3a19WaWV3X1NtYXJ0X0RhdGEg RXdrX1ZpZXdfU21hcnRfRGF0YTsKQEAgLTI4Miw4ICsyODMsOSBAQCB0eXBlZGVmIGVudW0gewog ICoKICAqIEBwYXJhbSB0eXBlIHR5cGUgb2YgdGhlIGNvbnRlbnRzCiAgKiBAcGFyYW0gZGF0YSBz dHJpbmcgYnVmZmVyIG9mIHRoZSBjb250ZW50cworICogQHBhcmFtIHVzZXJfZGF0YSB1c2VyX2Rh dGEgd2lsbCBiZSBwYXNzZWQgd2hlbiBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCBpcyBjYWxs ZWQKICAqLwotdHlwZWRlZiB2b2lkICgqRXdrX1BhZ2VfQ29udGVudHNfQ2IpKEV3a19QYWdlX0Nv bnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSk7Cit0eXBlZGVmIHZvaWQgKCpFd2tf UGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFy ICpkYXRhLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNldHMgdGhlIHNtYXJ0IGNsYXNz IEFQSXMsIGVuYWJsaW5nIHZpZXcgdG8gYmUgaW5oZXJpdGVkLgpAQCAtODIzLDEwICs4MjUsMTEg QEAgRUFQSSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19PYmpl Y3QgKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKICAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdl dCB0aGUgcGFnZSBjb250ZW50cwogICogQHBhcmFtIHR5cGUgdHlwZSBvZiB0aGUgcGFnZSBjb250 ZW50cwogICogQHBhcmFtIGNhbGxiYWNrIGNhbGxiYWNrIGZ1bmN0aW9uIHRvIGJlIGNhbGxlZCB3 aGVuIHRoZSBvcGVyYXRpb24gaXMgZmluaXNoZWQKKyAqIEBwYXJhbSB1c2VyX2RhdGEgdXNlciBk YXRhIHRvIGJlIHBhc3NlZCB0byB0aGUgY2FsbGJhY2sgZnVuY3Rpb24KICAqCiAgKiBAcmV0dXJu IEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCiAgKi8K LUVBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNfT2Jq ZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRzX0Ni IGNhbGxiYWNrKTsKK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KGNv bnN0IEV2YXNfT2JqZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIEV3a19QYWdl X0NvbnRlbnRzX0NiIGNhbGxiYWNrLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNldHMg dGhlIHNvdXJjZSBtb2RlIGFzIEVJTkFfVFJVRSB0byBkaXNwbGF5IHRoZSB3ZWIgc291cmNlIGNv ZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rl c3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBhYzg5ODIxLi43NzU5ZmY0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3Zp ZXcuY3BwCkBAIC05MTksNyArOTE5LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192 aWV3X2NvbnRlbnRzX3NpemVfY2hhbmdlZCkKIAogc3RhdGljIGJvb2wgaXNPYnRhaW5lZFBhZ2VD b250ZW50cyA9IGZhbHNlOwogCi1zdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxsYmFjayhFd2tf UGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCitzdGF0aWMgdm9pZCBQ YWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBj b25zdCBjaGFyKiBkYXRhLCB2b2lkKikKIHsKICAgICAvLyBDaGVjayB0aGUgdHlwZQogICAgIEFT U0VSVF9FUShFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLCB0eXBlKTsKQEAgLTkzNSwxMyAr OTM1LDI5IEBAIHN0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0NhbGxiYWNrKEV3a19QYWdlX0NvbnRl bnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSkKICAgICBpc09idGFpbmVkUGFnZUNvbnRl bnRzID0gdHJ1ZTsKIH0KIAorc3RhdGljIHZvaWQgUGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFj ayhFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEsIHZvaWQqKQor eworICAgIC8vIENoZWNrIHRoZSB0eXBlCisgICAgQVNTRVJUX0VRKEVXS19QQUdFX0NPTlRFTlRT X1RZUEVfU1RSSU5HLCB0eXBlKTsKKworICAgIC8vIFRoZSB2YXJpYWJsZSBkYXRhIHNob3VsZCBi ZSAiU2ltcGxlIEhUTUwiCisgICAgQVNTRVJUX0VRKDAsIHN0cmNtcChkYXRhLCAiU2ltcGxlIEhU TUwiKSk7CisKKyAgICBpc09idGFpbmVkUGFnZUNvbnRlbnRzID0gdHJ1ZTsKK30KKwogVEVTVF9G KEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KQogewogICAgIGNv bnN0IGNoYXIgY29udGVudFtdID0gIjxwPlNpbXBsZSBIVE1MPC9wPiI7CiAgICAgZXdrX3ZpZXdf aHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGNvbnRlbnQsIDAsIDApOwogICAgIHdhaXRVbnRp bExvYWRGaW5pc2hlZCgpOwogCi0gICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50 c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLCBQYWdlQ29udGVu dHNDYWxsYmFjaykpOworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0 KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQXNN SFRNTENhbGxiYWNrLCAwKSk7CisgICAgd2hpbGUgKCFpc09idGFpbmVkUGFnZUNvbnRlbnRzKQor ICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworCisgICAgaXNPYnRhaW5lZFBhZ2VD b250ZW50cyA9IGZhbHNlOworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNf Z2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcsIFBhZ2VDb250ZW50 c0FzU3RyaW5nQ2FsbGJhY2ssIDApKTsKICAgICB3aGlsZSAoIWlzT2J0YWluZWRQYWdlQ29udGVu dHMpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9Cg== 188792 2013-02-17 21:05:29 -0800 2013-02-17 22:44:39 -0800 Patch diff text/plain 8008 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNGRhOTAyLi5kOGRiYzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDItMTcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRz IGFzIHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2NzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW9kaWZpZWQgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkgdG8gZ2V0IHBhZ2Ug Y29udGVudHMgYXMgc3RyaW5nLgorICAgICAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklO RyBpcyBhZGRlZCB0byBFd2tfUGFnZV9Db250ZW50c19UeXBlLgorICAgICAgICBOb3csIHdlIGNh biB1c2UgYm90aCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MIGFuZCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX1NUUklORworICAgICAgICBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRzLgorCisg ICAgICAgIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIGlzIGNoYW5nZWQgdG8gcGFz cyB0aGUgdXNlciBkYXRhIHRvIHRoZQorICAgICAgICBjYWxsYmFjayBmdW5jdGlvbi4gQW5kIHJl cGxhY2UgaW50ZXJuYWwgQVBJIHVzYWdlIHdpdGggQyBBUEkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tWaWV3UGFnZUNvbnRlbnRzQXNN SFRNTENhbGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxi YWNrKToKKyAgICAgICAgKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFBhZ2VDb250ZW50c0FzTUhUTUxD YWxsYmFjayk6CisgICAgICAgIChQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKToKKyAgICAg ICAgKFRFU1RfRik6CisKIDIwMTMtMDItMTcgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2Fu YS5uYWdpbmVuaUBpbnRlbC5jb20+CiAKICAgICAgICAgW1dLMl1bRUZMXSBSZW1vdmUgZnVsbHNj cmVlbiBtYW5hZ2VyIHByb3h5IGFzIGEgbWVzc2FnZSByZWNlaXZlciBvbiBpbnZhbGlkYXRlKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBj M2E1OWM0Li5jNjM2ZGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCkBAIC01MDAsMzcgKzUwMCw2MCBAQCB0eXBlZGVmIHN0cnVjdCBFd2tfUGFn ZV9Db250ZW50c19Db250ZXh0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7CiBzdHJ1Y3QgRXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCB7CiAgICAgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBl OwogICAgIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrOworICAgIHZvaWQqIHVzZXJEYXRh OwogfTsKIAogLyoqCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9y IGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQ YWdlQ29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBj b250ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhX S0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCiAgICAgUmVmUHRyPFdlYkRhdGE+IHdl YkRhdGEgPSB0b0ltcGwod2tEYXRhKTsKLSAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBj b250ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihj b250ZXh0KTsKLSAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+ dHlwZSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSkpOwor ICAgIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqIGNvbnRlbnRzQ29udGV4dCA9IHN0YXRpY19j YXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250ZXh0KTsKKyAgICBjb250ZW50c0Nv bnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlwZSwgcmVpbnRlcnByZXRfY2FzdDxj b25zdCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSksIGNvbnRlbnRzQ29udGV4dC0+dXNlckRhdGEp OwogCiAgICAgZGVsZXRlIGNvbnRlbnRzQ29udGV4dDsKIH0KIAotRWluYV9Cb29sIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9D b250ZW50c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrKQorLyoqCisg KiBAaW50ZXJuYWwKKyAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2Vf Y29udGVudHNfZ2V0KCkuCisgKi8KK3N0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0 cmluZ0NhbGxiYWNrKFdLU3RyaW5nUmVmIHdrU3RyaW5nLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOworCisgICAg RXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0ID0gc3RhdGljX2Nhc3Q8 RXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCo+KGNvbnRleHQpOworICAgIGNvbnRlbnRzQ29udGV4 dC0+Y2FsbGJhY2soY29udGVudHNDb250ZXh0LT50eXBlLCBXS0VpbmFTaGFyZWRTdHJpbmcod2tT dHJpbmcpLCBjb250ZW50c0NvbnRleHQtPnVzZXJEYXRhKTsKKworICAgIGRlbGV0ZSBjb250ZW50 c0NvbnRleHQ7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25z dCBFdmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tf UGFnZV9Db250ZW50c19DYiBjYWxsYmFjaywgdm9pZCogdXNlcl9kYXRhKQogewogICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChjYWxsYmFjaywgZmFsc2UpOwogICAgIEVXS19WSUVX X0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CiAKLSAgICAvLyBXZSBv bmx5IHN1cHBvcnQgTUhUTUwgYXQgdGhlIG1vbWVudC4KLSAgICBpZiAodHlwZSAhPSBFV0tfUEFH RV9DT05URU5UU19UWVBFX01IVE1MKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBFd2tf UGFnZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0Nv bnRleHQ7CiAgICAgY29udGV4dC0+dHlwZSA9IHR5cGU7CiAgICAgY29udGV4dC0+Y2FsbGJhY2sg PSBjYWxsYmFjazsKLQotICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNBc01IVE1MRGF0YShE YXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2sp LCBmYWxzZSk7CisgICAgY29udGV4dC0+dXNlckRhdGEgPSB1c2VyX2RhdGE7CisKKyAgICBzd2l0 Y2ggKGNvbnRleHQtPnR5cGUpIHsKKyAgICBjYXNlIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhU TUw6CisgICAgICAgIFdLUGFnZUdldENvbnRlbnRzQXNNSFRNTERhdGEoaW1wbC0+d2tQYWdlKCks IGZhbHNlLCBjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKTsKKyAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORzoKKyAg ICAgICAgV0tQYWdlR2V0Q29udGVudHNBc1N0cmluZyhpbXBsLT53a1BhZ2UoKSwgY29udGV4dCwg ZXdrVmlld1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spOworICAgICAgICBicmVhazsKKyAg ICBkZWZhdWx0OgorICAgICAgICBkZWxldGUgY29udGV4dDsKKyAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1 ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4 IDExYmViOTQuLjQ4MWRmYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuaApAQCAtMTAwLDcgKzEwMCw4IEBAIHR5cGVkZWYgZW51bSB7CiAKIC8vLyBFbnVt IHZhbHVlcyBjb250YWluaW5nIHBhZ2UgY29udGVudHMgdHlwZSB2YWx1ZXMuCiB0eXBlZGVmIGVu dW0gewotICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwKKyAgICBFV0tfUEFHRV9DT05U RU5UU19UWVBFX01IVE1MLAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HCiB9IEV3 a19QYWdlX0NvbnRlbnRzX1R5cGU7CiAKIHR5cGVkZWYgc3RydWN0IEV3a19WaWV3X1NtYXJ0X0Rh dGEgRXdrX1ZpZXdfU21hcnRfRGF0YTsKQEAgLTI3OSw4ICsyODAsOSBAQCB0eXBlZGVmIGVudW0g ewogICoKICAqIEBwYXJhbSB0eXBlIHR5cGUgb2YgdGhlIGNvbnRlbnRzCiAgKiBAcGFyYW0gZGF0 YSBzdHJpbmcgYnVmZmVyIG9mIHRoZSBjb250ZW50cworICogQHBhcmFtIHVzZXJfZGF0YSB1c2Vy X2RhdGEgd2lsbCBiZSBwYXNzZWQgd2hlbiBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCBpcyBj YWxsZWQKICAqLwotdHlwZWRlZiB2b2lkICgqRXdrX1BhZ2VfQ29udGVudHNfQ2IpKEV3a19QYWdl X0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSk7Cit0eXBlZGVmIHZvaWQgKCpF d2tfUGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBj aGFyICpkYXRhLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNldHMgdGhlIHNtYXJ0IGNs YXNzIEFQSXMsIGVuYWJsaW5nIHZpZXcgdG8gYmUgaW5oZXJpdGVkLgpAQCAtODExLDEwICs4MTMs MTEgQEAgRUFQSSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19P YmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKICAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRv IGdldCB0aGUgcGFnZSBjb250ZW50cwogICogQHBhcmFtIHR5cGUgdHlwZSBvZiB0aGUgcGFnZSBj b250ZW50cwogICogQHBhcmFtIGNhbGxiYWNrIGNhbGxiYWNrIGZ1bmN0aW9uIHRvIGJlIGNhbGxl ZCB3aGVuIHRoZSBvcGVyYXRpb24gaXMgZmluaXNoZWQKKyAqIEBwYXJhbSB1c2VyX2RhdGEgdXNl ciBkYXRhIHRvIGJlIHBhc3NlZCB0byB0aGUgY2FsbGJhY2sgZnVuY3Rpb24KICAqCiAgKiBAcmV0 dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCiAg Ki8KLUVBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNf T2JqZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRz X0NiIGNhbGxiYWNrKTsKK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0 KGNvbnN0IEV2YXNfT2JqZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIEV3a19Q YWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNl dHMgdGhlIHNvdXJjZSBtb2RlIGFzIEVJTkFfVFJVRSB0byBkaXNwbGF5IHRoZSB3ZWIgc291cmNl IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCA4ZTA4ZjllLi5hNzNjZjRjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwCkBAIC05MTksNyArOTE5LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3 a192aWV3X2NvbnRlbnRzX3NpemVfY2hhbmdlZCkKIAogc3RhdGljIGJvb2wgb2J0YWluZWRQYWdl Q29udGVudHMgPSBmYWxzZTsKIAotc3RhdGljIHZvaWQgUGFnZUNvbnRlbnRzQ2FsbGJhY2soRXdr X1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhKQorc3RhdGljIHZvaWQg UGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwg Y29uc3QgY2hhciogZGF0YSwgdm9pZCopCiB7CiAgICAgLy8gQ2hlY2sgdGhlIHR5cGUKICAgICBB U1NFUlRfRVEoRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgdHlwZSk7CkBAIC05MzYsMTMg KzkzNiwyOSBAQCBzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250 ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCiAgICAgb2J0YWluZWRQYWdlQ29udGVu dHMgPSB0cnVlOwogfQogCitzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNr KEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSwgdm9pZCopCit7 CisgICAgLy8gQ2hlY2sgdGhlIHR5cGUuCisgICAgQVNTRVJUX0VRKEVXS19QQUdFX0NPTlRFTlRT X1RZUEVfU1RSSU5HLCB0eXBlKTsKKworICAgIC8vIFRoZSB2YXJpYWJsZSBkYXRhIHNob3VsZCBi ZSAiU2ltcGxlIEhUTUwiLgorICAgIEFTU0VSVF9TVFJFUSgiU2ltcGxlIEhUTUwiLCBkYXRhKTsK KworICAgIG9idGFpbmVkUGFnZUNvbnRlbnRzID0gdHJ1ZTsKK30KKwogVEVTVF9GKEVXSzJVbml0 VGVzdEJhc2UsIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KQogewogICAgIGNvbnN0IGNoYXIg Y29udGVudFtdID0gIjxwPlNpbXBsZSBIVE1MPC9wPiI7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJp bmdfbG9hZCh3ZWJWaWV3KCksIGNvbnRlbnQsIDAsIDApOwogICAgIHdhaXRVbnRpbExvYWRGaW5p c2hlZCgpOwogCi0gICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2Vi VmlldygpLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLCBQYWdlQ29udGVudHNDYWxsYmFj aykpOworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXco KSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxi YWNrLCAwKSk7CisgICAgd2hpbGUgKCFvYnRhaW5lZFBhZ2VDb250ZW50cykKKyAgICAgICAgZWNv cmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKKworICAgIG9idGFpbmVkUGFnZUNvbnRlbnRzID0gZmFs c2U7CisgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygp LCBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywgUGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxs YmFjaywgMCkpOwogICAgIHdoaWxlICghb2J0YWluZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVj b3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9Cg== 188800 2013-02-17 22:44:39 -0800 2013-02-21 22:17:57 -0800 Patch diff text/plain 8008 ky0.choi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyNGRhOTAyLi5kOGRiYzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDItMTcgIEt3YW5nWW9uZyBDaG9pICA8a3kwLmNob2lAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW0VGTF1bV0syXSBBZGQgc3VwcG9ydCBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRz IGFzIHN0cmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA2NzUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTW9kaWZpZWQgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoKSBBUEkgdG8gZ2V0IHBhZ2Ug Y29udGVudHMgYXMgc3RyaW5nLgorICAgICAgICBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklO RyBpcyBhZGRlZCB0byBFd2tfUGFnZV9Db250ZW50c19UeXBlLgorICAgICAgICBOb3csIHdlIGNh biB1c2UgYm90aCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MIGFuZCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX1NUUklORworICAgICAgICBmb3IgZ2V0dGluZyBwYWdlIGNvbnRlbnRzLgorCisg ICAgICAgIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIGlzIGNoYW5nZWQgdG8gcGFz cyB0aGUgdXNlciBkYXRhIHRvIHRoZQorICAgICAgICBjYWxsYmFjayBmdW5jdGlvbi4gQW5kIHJl cGxhY2UgaW50ZXJuYWwgQVBJIHVzYWdlIHdpdGggQyBBUEkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tWaWV3UGFnZUNvbnRlbnRzQXNN SFRNTENhbGxiYWNrKToKKyAgICAgICAgKGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxi YWNrKToKKyAgICAgICAgKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKFBhZ2VDb250ZW50c0FzTUhUTUxD YWxsYmFjayk6CisgICAgICAgIChQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrKToKKyAgICAg ICAgKFRFU1RfRik6CisKIDIwMTMtMDItMTcgIFN1ZGFyc2FuYSBOYWdpbmVuaSAgPHN1ZGFyc2Fu YS5uYWdpbmVuaUBpbnRlbC5jb20+CiAKICAgICAgICAgW1dLMl1bRUZMXSBSZW1vdmUgZnVsbHNj cmVlbiBtYW5hZ2VyIHByb3h5IGFzIGEgbWVzc2FnZSByZWNlaXZlciBvbiBpbnZhbGlkYXRlKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCBj M2E1OWM0Li5jNjM2ZGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuY3BwCkBAIC01MDAsMzcgKzUwMCw2MCBAQCB0eXBlZGVmIHN0cnVjdCBFd2tfUGFn ZV9Db250ZW50c19Db250ZXh0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQ7CiBzdHJ1Y3QgRXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCB7CiAgICAgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBl OwogICAgIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrOworICAgIHZvaWQqIHVzZXJEYXRh OwogfTsKIAogLyoqCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9y IGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRpYyB2b2lkIGV3a1ZpZXdQ YWdlQ29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBj b250ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayhX S0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCiAgICAgUmVmUHRyPFdlYkRhdGE+IHdl YkRhdGEgPSB0b0ltcGwod2tEYXRhKTsKLSAgICBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0KiBj b250ZW50c0NvbnRleHQ9IHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihj b250ZXh0KTsKLSAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+ dHlwZSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSkpOwor ICAgIEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqIGNvbnRlbnRzQ29udGV4dCA9IHN0YXRpY19j YXN0PEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQqPihjb250ZXh0KTsKKyAgICBjb250ZW50c0Nv bnRleHQtPmNhbGxiYWNrKGNvbnRlbnRzQ29udGV4dC0+dHlwZSwgcmVpbnRlcnByZXRfY2FzdDxj b25zdCBjaGFyKj4od2ViRGF0YS0+Ynl0ZXMoKSksIGNvbnRlbnRzQ29udGV4dC0+dXNlckRhdGEp OwogCiAgICAgZGVsZXRlIGNvbnRlbnRzQ29udGV4dDsKIH0KIAotRWluYV9Cb29sIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfUGFnZV9D b250ZW50c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrKQorLyoqCisg KiBAaW50ZXJuYWwKKyAqIENhbGxiYWNrIGZ1bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2Vf Y29udGVudHNfZ2V0KCkuCisgKi8KK3N0YXRpYyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNBc1N0 cmluZ0NhbGxiYWNrKFdLU3RyaW5nUmVmIHdrU3RyaW5nLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250 ZXh0KQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOworCisgICAg RXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0ID0gc3RhdGljX2Nhc3Q8 RXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCo+KGNvbnRleHQpOworICAgIGNvbnRlbnRzQ29udGV4 dC0+Y2FsbGJhY2soY29udGVudHNDb250ZXh0LT50eXBlLCBXS0VpbmFTaGFyZWRTdHJpbmcod2tT dHJpbmcpLCBjb250ZW50c0NvbnRleHQtPnVzZXJEYXRhKTsKKworICAgIGRlbGV0ZSBjb250ZW50 c0NvbnRleHQ7Cit9CisKK0VpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChjb25z dCBFdmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBFd2tf UGFnZV9Db250ZW50c19DYiBjYWxsYmFjaywgdm9pZCogdXNlcl9kYXRhKQogewogICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChjYWxsYmFjaywgZmFsc2UpOwogICAgIEVXS19WSUVX X0lNUExfR0VUX09SX1JFVFVSTihld2tWaWV3LCBpbXBsLCBmYWxzZSk7CiAKLSAgICAvLyBXZSBv bmx5IHN1cHBvcnQgTUhUTUwgYXQgdGhlIG1vbWVudC4KLSAgICBpZiAodHlwZSAhPSBFV0tfUEFH RV9DT05URU5UU19UWVBFX01IVE1MKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICBFd2tf UGFnZV9Db250ZW50c19Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19QYWdlX0NvbnRlbnRzX0Nv bnRleHQ7CiAgICAgY29udGV4dC0+dHlwZSA9IHR5cGU7CiAgICAgY29udGV4dC0+Y2FsbGJhY2sg PSBjYWxsYmFjazsKLQotICAgIGltcGwtPnBhZ2UoKS0+Z2V0Q29udGVudHNBc01IVE1MRGF0YShE YXRhQ2FsbGJhY2s6OmNyZWF0ZShjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQ2FsbGJhY2sp LCBmYWxzZSk7CisgICAgY29udGV4dC0+dXNlckRhdGEgPSB1c2VyX2RhdGE7CisKKyAgICBzd2l0 Y2ggKGNvbnRleHQtPnR5cGUpIHsKKyAgICBjYXNlIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhU TUw6CisgICAgICAgIFdLUGFnZUdldENvbnRlbnRzQXNNSFRNTERhdGEoaW1wbC0+d2tQYWdlKCks IGZhbHNlLCBjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKTsKKyAg ICAgICAgYnJlYWs7CisgICAgY2FzZSBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORzoKKyAg ICAgICAgV0tQYWdlR2V0Q29udGVudHNBc1N0cmluZyhpbXBsLT53a1BhZ2UoKSwgY29udGV4dCwg ZXdrVmlld1BhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2spOworICAgICAgICBicmVhazsKKyAg ICBkZWZhdWx0OgorICAgICAgICBkZWxldGUgY29udGV4dDsKKyAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1 ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCmluZGV4 IDExYmViOTQuLjQ4MWRmYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3ZpZXcuaApAQCAtMTAwLDcgKzEwMCw4IEBAIHR5cGVkZWYgZW51bSB7CiAKIC8vLyBFbnVt IHZhbHVlcyBjb250YWluaW5nIHBhZ2UgY29udGVudHMgdHlwZSB2YWx1ZXMuCiB0eXBlZGVmIGVu dW0gewotICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwKKyAgICBFV0tfUEFHRV9DT05U RU5UU19UWVBFX01IVE1MLAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfU1RSSU5HCiB9IEV3 a19QYWdlX0NvbnRlbnRzX1R5cGU7CiAKIHR5cGVkZWYgc3RydWN0IEV3a19WaWV3X1NtYXJ0X0Rh dGEgRXdrX1ZpZXdfU21hcnRfRGF0YTsKQEAgLTI3OSw4ICsyODAsOSBAQCB0eXBlZGVmIGVudW0g ewogICoKICAqIEBwYXJhbSB0eXBlIHR5cGUgb2YgdGhlIGNvbnRlbnRzCiAgKiBAcGFyYW0gZGF0 YSBzdHJpbmcgYnVmZmVyIG9mIHRoZSBjb250ZW50cworICogQHBhcmFtIHVzZXJfZGF0YSB1c2Vy IGRhdGEgd2lsbCBiZSBwYXNzZWQgd2hlbiBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCBpcyBj YWxsZWQKICAqLwotdHlwZWRlZiB2b2lkICgqRXdrX1BhZ2VfQ29udGVudHNfQ2IpKEV3a19QYWdl X0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciAqZGF0YSk7Cit0eXBlZGVmIHZvaWQgKCpF d2tfUGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBj aGFyICpkYXRhLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNldHMgdGhlIHNtYXJ0IGNs YXNzIEFQSXMsIGVuYWJsaW5nIHZpZXcgdG8gYmUgaW5oZXJpdGVkLgpAQCAtODExLDEwICs4MTMs MTEgQEAgRUFQSSB2b2lkIGV3a192aWV3X2RyYXdzX3BhZ2VfYmFja2dyb3VuZF9zZXQoRXZhc19P YmplY3QgKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKICAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRv IGdldCB0aGUgcGFnZSBjb250ZW50cwogICogQHBhcmFtIHR5cGUgdHlwZSBvZiB0aGUgcGFnZSBj b250ZW50cwogICogQHBhcmFtIGNhbGxiYWNrIGNhbGxiYWNrIGZ1bmN0aW9uIHRvIGJlIGNhbGxl ZCB3aGVuIHRoZSBvcGVyYXRpb24gaXMgZmluaXNoZWQKKyAqIEBwYXJhbSB1c2VyX2RhdGEgdXNl ciBkYXRhIHRvIGJlIHBhc3NlZCB0byB0aGUgY2FsbGJhY2sgZnVuY3Rpb24KICAqCiAgKiBAcmV0 dXJuIEBjIEVJTkFfVFJVRSBvbiBzdWNjZXNzIG9yIEBjIEVJTkFfRkFMU0Ugb3RoZXJ3aXNlCiAg Ki8KLUVBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KGNvbnN0IEV2YXNf T2JqZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIEV3a19QYWdlX0NvbnRlbnRz X0NiIGNhbGxiYWNrKTsKK0VBUEkgRWluYV9Cb29sIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0 KGNvbnN0IEV2YXNfT2JqZWN0ICpvLCBFd2tfUGFnZV9Db250ZW50c19UeXBlIHR5cGUsIEV3a19Q YWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrLCB2b2lkICp1c2VyX2RhdGEpOwogCiAvKioKICAqIFNl dHMgdGhlIHNvdXJjZSBtb2RlIGFzIEVJTkFfVFJVRSB0byBkaXNwbGF5IHRoZSB3ZWIgc291cmNl IGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCA4ZTA4ZjllLi5hNzNjZjRjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X3ZpZXcuY3BwCkBAIC05MTksNyArOTE5LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3 a192aWV3X2NvbnRlbnRzX3NpemVfY2hhbmdlZCkKIAogc3RhdGljIGJvb2wgb2J0YWluZWRQYWdl Q29udGVudHMgPSBmYWxzZTsKIAotc3RhdGljIHZvaWQgUGFnZUNvbnRlbnRzQ2FsbGJhY2soRXdr X1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhKQorc3RhdGljIHZvaWQg UGFnZUNvbnRlbnRzQXNNSFRNTENhbGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwg Y29uc3QgY2hhciogZGF0YSwgdm9pZCopCiB7CiAgICAgLy8gQ2hlY2sgdGhlIHR5cGUKICAgICBB U1NFUlRfRVEoRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgdHlwZSk7CkBAIC05MzYsMTMg KzkzNiwyOSBAQCBzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250 ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCiAgICAgb2J0YWluZWRQYWdlQ29udGVu dHMgPSB0cnVlOwogfQogCitzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNr KEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgY29uc3QgY2hhciogZGF0YSwgdm9pZCopCit7 CisgICAgLy8gQ2hlY2sgdGhlIHR5cGUuCisgICAgQVNTRVJUX0VRKEVXS19QQUdFX0NPTlRFTlRT X1RZUEVfU1RSSU5HLCB0eXBlKTsKKworICAgIC8vIFRoZSB2YXJpYWJsZSBkYXRhIHNob3VsZCBi ZSAiU2ltcGxlIEhUTUwiLgorICAgIEFTU0VSVF9TVFJFUSgiU2ltcGxlIEhUTUwiLCBkYXRhKTsK KworICAgIG9idGFpbmVkUGFnZUNvbnRlbnRzID0gdHJ1ZTsKK30KKwogVEVTVF9GKEVXSzJVbml0 VGVzdEJhc2UsIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KQogewogICAgIGNvbnN0IGNoYXIg Y29udGVudFtdID0gIjxwPlNpbXBsZSBIVE1MPC9wPiI7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJp bmdfbG9hZCh3ZWJWaWV3KCksIGNvbnRlbnQsIDAsIDApOwogICAgIHdhaXRVbnRpbExvYWRGaW5p c2hlZCgpOwogCi0gICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2Vi VmlldygpLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX01IVE1MLCBQYWdlQ29udGVudHNDYWxsYmFj aykpOworICAgIEFTU0VSVF9UUlVFKGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXco KSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTCwgUGFnZUNvbnRlbnRzQXNNSFRNTENhbGxi YWNrLCAwKSk7CisgICAgd2hpbGUgKCFvYnRhaW5lZFBhZ2VDb250ZW50cykKKyAgICAgICAgZWNv cmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKKworICAgIG9idGFpbmVkUGFnZUNvbnRlbnRzID0gZmFs c2U7CisgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygp LCBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywgUGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxs YmFjaywgMCkpOwogICAgIHdoaWxlICghb2J0YWluZWRQYWdlQ29udGVudHMpCiAgICAgICAgIGVj b3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiB9Cg== 189684 2013-02-21 22:18:04 -0800 2013-04-04 19:50:30 -0700 Rebased. bug-106752-20130222151424.patch text/plain 8106 ky0.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzNjg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWEzOGE5YjFlOTI1MGI2 MzhjZmJhYjEyNmExMGNkZTQ2MjRkZGY3Yy4uZmU5ZTQ5MTE3OTRjNDMwMjZjZmRlNzQ0NzRjZWNm YjZhOWNhYzY5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTAyLTIxICBLd2Fu Z1lvbmcgQ2hvaSAgPGt5MC5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0g QWRkIHN1cHBvcnQgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cyBhcyBzdHJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjc1MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vZGlmaWVkIGV3a192aWV3 X3BhZ2VfY29udGVudHNfZ2V0KCkgQVBJIHRvIGdldCBwYWdlIGNvbnRlbnRzIGFzIHN0cmluZy4K KyAgICAgICAgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcgaXMgYWRkZWQgdG8gRXdrX1Bh Z2VfQ29udGVudHNfVHlwZS4KKyAgICAgICAgTm93LCB3ZSBjYW4gdXNlIGJvdGggRVdLX1BBR0Vf Q09OVEVOVFNfVFlQRV9NSFRNTCBhbmQgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKKyAg ICAgICAgZm9yIGdldHRpbmcgcGFnZSBjb250ZW50cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmNwcDoKKyAgICAgICAgKEV3a19QYWdlX0NvbnRlbnRzX0NvbnRleHQp OgorICAgICAgICAoZXdrVmlld1BhZ2VDb250ZW50c0FzTUhUTUxDYWxsYmFjayk6CisgICAgICAg IChld2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayk6CisgICAgICAgIChld2tfdmll d19wYWdlX2NvbnRlbnRzX2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Zp ZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5j cHA6CisgICAgICAgIChQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2spOgorICAgICAgICAoUGFn ZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayk6CisgICAgICAgIChURVNUX0YpOgorCiAyMDEzLTAy LTIxICBEaW1hIEdvcmJpayAgPGRnb3JiaWtAYXBwbGUuY29tPgogCiAgICAgICAgIFF1aWNrVGlt ZSBwbHVnaW4gZG9lc24ndCBsb2FkIHdoZW4gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgaXMgZGlz YWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192 aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApp bmRleCA0ZjFhMTMxZDI1ZDc0MzU0ZGUwYmU5M2YxYmJiM2Q2OGY5NzE3ZTNiLi4yNTcyZDAzOGU5 NGRhM2NkNTE2M2Y2NmM1MWQ0M2JmODk4MGMzODI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC00OTYsMzYgKzQ5Niw1OSBAQCB0eXBlZGVm IHN0cnVjdCBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0IEV3a19QYWdlX0NvbnRlbnRzX0NvbnRl eHQ7CiBzdHJ1Y3QgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4dCB7CiAgICAgRXdrX1BhZ2VfQ29u dGVudHNfVHlwZSB0eXBlOwogICAgIEV3a19QYWdlX0NvbnRlbnRzX0NiIGNhbGxiYWNrOworICAg IHZvaWQqIHVzZXJEYXRhOwogfTsKIAogLyoqCiAgKiBAaW50ZXJuYWwKICAqIENhbGxiYWNrIGZ1 bmN0aW9uIHVzZWQgZm9yIGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KCkuCiAgKi8KLXN0YXRp YyB2b2lkIGV3a1ZpZXdQYWdlQ29udGVudHNDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vy cm9yUmVmLCB2b2lkKiBjb250ZXh0KQorc3RhdGljIHZvaWQgZXdrVmlld1BhZ2VDb250ZW50c0Fz TUhUTUxDYWxsYmFjayhXS0RhdGFSZWYgd2tEYXRhLCBXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0 KQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwogCi0gICAgRXdr X1BhZ2VfQ29udGVudHNfQ29udGV4dCogY29udGVudHNDb250ZXh0PSBzdGF0aWNfY2FzdDxFd2tf UGFnZV9Db250ZW50c19Db250ZXh0Kj4oY29udGV4dCk7Ci0gICAgY29udGVudHNDb250ZXh0LT5j YWxsYmFjayhjb250ZW50c0NvbnRleHQtPnR5cGUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hh cio+KFdLRGF0YUdldEJ5dGVzKHdrRGF0YSkpKTsKKyAgICBFd2tfUGFnZV9Db250ZW50c19Db250 ZXh0KiBjb250ZW50c0NvbnRleHQgPSBzdGF0aWNfY2FzdDxFd2tfUGFnZV9Db250ZW50c19Db250 ZXh0Kj4oY29udGV4dCk7CisgICAgY29udGVudHNDb250ZXh0LT5jYWxsYmFjayhjb250ZW50c0Nv bnRleHQtPnR5cGUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KFdLRGF0YUdldEJ5dGVz KHdrRGF0YSkpLCBjb250ZW50c0NvbnRleHQtPnVzZXJEYXRhKTsKIAogICAgIGRlbGV0ZSBjb250 ZW50c0NvbnRleHQ7CiB9CiAKLUVpbmFfQm9vbCBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldChj b25zdCBFdmFzX09iamVjdCogZXdrVmlldywgRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBF d2tfUGFnZV9Db250ZW50c19DYiBjYWxsYmFjaykKKy8qKgorICogQGludGVybmFsCisgKiBDYWxs YmFjayBmdW5jdGlvbiB1c2VkIGZvciBld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCgpLgorICov CitzdGF0aWMgdm9pZCBld2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFjayhXS1N0cmlu Z1JlZiB3a1N0cmluZywgV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKK3sKKyAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0KTsKKworICAgIEV3a19QYWdlX0NvbnRlbnRzX0Nv bnRleHQqIGNvbnRlbnRzQ29udGV4dCA9IHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX0Nv bnRleHQqPihjb250ZXh0KTsKKyAgICBjb250ZW50c0NvbnRleHQtPmNhbGxiYWNrKGNvbnRlbnRz Q29udGV4dC0+dHlwZSwgV0tFaW5hU2hhcmVkU3RyaW5nKHdrU3RyaW5nKSwgY29udGVudHNDb250 ZXh0LT51c2VyRGF0YSk7CisKKyAgICBkZWxldGUgY29udGVudHNDb250ZXh0OworfQorCitFaW5h X0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1Zp ZXcsIEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2Fs bGJhY2ssIHZvaWQqIHVzZXJfZGF0YSkKIHsKICAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVS Tl9WQUwoY2FsbGJhY2ssIGZhbHNlKTsKICAgICBFV0tfVklFV19JTVBMX0dFVF9PUl9SRVRVUk4o ZXdrVmlldywgaW1wbCwgZmFsc2UpOwogCi0gICAgLy8gV2Ugb25seSBzdXBwb3J0IE1IVE1MIGF0 IHRoZSBtb21lbnQuCi0gICAgaWYgKHR5cGUgIT0gRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRN TCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgRXdrX1BhZ2VfQ29udGVudHNfQ29udGV4 dCogY29udGV4dCA9IG5ldyBFd2tfUGFnZV9Db250ZW50c19Db250ZXh0OwogICAgIGNvbnRleHQt PnR5cGUgPSB0eXBlOwogICAgIGNvbnRleHQtPmNhbGxiYWNrID0gY2FsbGJhY2s7Ci0KLSAgICBX S1BhZ2VHZXRDb250ZW50c0FzTUhUTUxEYXRhKGltcGwtPndrUGFnZSgpLCBmYWxzZSwgY29udGV4 dCwgZXdrVmlld1BhZ2VDb250ZW50c0NhbGxiYWNrKTsKKyAgICBjb250ZXh0LT51c2VyRGF0YSA9 IHVzZXJfZGF0YTsKKworICAgIHN3aXRjaCAoY29udGV4dC0+dHlwZSkgeworICAgIGNhc2UgRVdL X1BBR0VfQ09OVEVOVFNfVFlQRV9NSFRNTDoKKyAgICAgICAgV0tQYWdlR2V0Q29udGVudHNBc01I VE1MRGF0YShpbXBsLT53a1BhZ2UoKSwgZmFsc2UsIGNvbnRleHQsIGV3a1ZpZXdQYWdlQ29udGVu dHNBc01IVE1MQ2FsbGJhY2spOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEVXS19QQUdFX0NP TlRFTlRTX1RZUEVfU1RSSU5HOgorICAgICAgICBXS1BhZ2VHZXRDb250ZW50c0FzU3RyaW5nKGlt cGwtPndrUGFnZSgpLCBjb250ZXh0LCBld2tWaWV3UGFnZUNvbnRlbnRzQXNTdHJpbmdDYWxsYmFj ayk7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIGRlbGV0ZSBjb250ZXh0 OworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH0KIAogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a192aWV3LmgKaW5kZXggNWI5MjNjNDJjNjZiZWFjMWZhZTI0NDc1ZjYyMjNmYjYy ZDJjY2QxMy4uYTgxMGEzN2JlODMwNDk5YTY1MTA4YjQ0OGYxNWY4ODhlY2JmNmRhZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCkBAIC0xMDEsNyArMTAx LDggQEAgdHlwZWRlZiBlbnVtIHsKIAogLy8vIEVudW0gdmFsdWVzIGNvbnRhaW5pbmcgcGFnZSBj b250ZW50cyB0eXBlIHZhbHVlcy4KIHR5cGVkZWYgZW51bSB7Ci0gICAgRVdLX1BBR0VfQ09OVEVO VFNfVFlQRV9NSFRNTAorICAgIEVXS19QQUdFX0NPTlRFTlRTX1RZUEVfTUhUTUwsCisgICAgRVdL X1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcKIH0gRXdrX1BhZ2VfQ29udGVudHNfVHlwZTsKIAog dHlwZWRlZiBzdHJ1Y3QgRXdrX1ZpZXdfU21hcnRfRGF0YSBFd2tfVmlld19TbWFydF9EYXRhOwpA QCAtMjgwLDggKzI4MSw5IEBAIHR5cGVkZWYgZW51bSB7CiAgKgogICogQHBhcmFtIHR5cGUgdHlw ZSBvZiB0aGUgY29udGVudHMKICAqIEBwYXJhbSBkYXRhIHN0cmluZyBidWZmZXIgb2YgdGhlIGNv bnRlbnRzCisgKiBAcGFyYW0gdXNlcl9kYXRhIHVzZXIgZGF0YSB3aWxsIGJlIHBhc3NlZCB3aGVu IGV3a192aWV3X3BhZ2VfY29udGVudHNfZ2V0IGlzIGNhbGxlZAogICovCi10eXBlZGVmIHZvaWQg KCpFd2tfUGFnZV9Db250ZW50c19DYikoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25z dCBjaGFyICpkYXRhKTsKK3R5cGVkZWYgdm9pZCAoKkV3a19QYWdlX0NvbnRlbnRzX0NiKShFd2tf UGFnZV9Db250ZW50c19UeXBlIHR5cGUsIGNvbnN0IGNoYXIgKmRhdGEsIHZvaWQgKnVzZXJfZGF0 YSk7CiAKIC8qKgogICogU2V0cyB0aGUgc21hcnQgY2xhc3MgQVBJcywgZW5hYmxpbmcgdmlldyB0 byBiZSBpbmhlcml0ZWQuCkBAIC04MTAsMTAgKzgxMiwxMSBAQCBFQVBJIHZvaWQgZXdrX3ZpZXdf ZHJhd3NfcGFnZV9iYWNrZ3JvdW5kX3NldChFdmFzX09iamVjdCAqbywgRWluYV9Cb29sIGVuYWJs ZWQpOwogICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRoZSBwYWdlIGNvbnRlbnRzCiAg KiBAcGFyYW0gdHlwZSB0eXBlIG9mIHRoZSBwYWdlIGNvbnRlbnRzCiAgKiBAcGFyYW0gY2FsbGJh Y2sgY2FsbGJhY2sgZnVuY3Rpb24gdG8gYmUgY2FsbGVkIHdoZW4gdGhlIG9wZXJhdGlvbiBpcyBm aW5pc2hlZAorICogQHBhcmFtIHVzZXJfZGF0YSB1c2VyIGRhdGEgdG8gYmUgcGFzc2VkIHRvIHRo ZSBjYWxsYmFjayBmdW5jdGlvbgogICoKICAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nl c3Mgb3IgQGMgRUlOQV9GQUxTRSBvdGhlcndpc2UKICAqLwotRUFQSSBFaW5hX0Jvb2wgZXdrX3Zp ZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIEV3a19QYWdlX0NvbnRl bnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJhY2spOworRUFQSSBFaW5h X0Jvb2wgZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQoY29uc3QgRXZhc19PYmplY3QgKm8sIEV3 a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwgRXdrX1BhZ2VfQ29udGVudHNfQ2IgY2FsbGJhY2ss IHZvaWQgKnVzZXJfZGF0YSk7CiAKIC8qKgogICogU2V0cyB0aGUgc291cmNlIG1vZGUgYXMgRUlO QV9UUlVFIHRvIGRpc3BsYXkgdGhlIHdlYiBzb3VyY2UgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmlu ZGV4IDllMjNlNWZlMzI4NGU2MTA1ZjdhNDE4OWZhYTIzOGNjNjdkNjNkZDIuLjhkNjRhNDE0NzRk ODU4MDk1MTBkYTZjYTZiZTcwOGI2NTg5ZjBhZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTkx OSw3ICs5MTksNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfY29udGVudHNf c2l6ZV9jaGFuZ2VkKQogCiBzdGF0aWMgYm9vbCBvYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNl OwogCi1zdGF0aWMgdm9pZCBQYWdlQ29udGVudHNDYWxsYmFjayhFd2tfUGFnZV9Db250ZW50c19U eXBlIHR5cGUsIGNvbnN0IGNoYXIqIGRhdGEpCitzdGF0aWMgdm9pZCBQYWdlQ29udGVudHNBc01I VE1MQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVudHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRh LCB2b2lkKikKIHsKICAgICAvLyBDaGVjayB0aGUgdHlwZQogICAgIEFTU0VSVF9FUShFV0tfUEFH RV9DT05URU5UU19UWVBFX01IVE1MLCB0eXBlKTsKQEAgLTkzNiwxMyArOTM2LDI5IEBAIHN0YXRp YyB2b2lkIFBhZ2VDb250ZW50c0NhbGxiYWNrKEV3a19QYWdlX0NvbnRlbnRzX1R5cGUgdHlwZSwg Y29uc3QgY2hhciogZGF0YSkKICAgICBvYnRhaW5lZFBhZ2VDb250ZW50cyA9IHRydWU7CiB9CiAK K3N0YXRpYyB2b2lkIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2soRXdrX1BhZ2VfQ29udGVu dHNfVHlwZSB0eXBlLCBjb25zdCBjaGFyKiBkYXRhLCB2b2lkKikKK3sKKyAgICAvLyBDaGVjayB0 aGUgdHlwZS4KKyAgICBBU1NFUlRfRVEoRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcsIHR5 cGUpOworCisgICAgLy8gVGhlIHZhcmlhYmxlIGRhdGEgc2hvdWxkIGJlICJTaW1wbGUgSFRNTCIu CisgICAgQVNTRVJUX1NUUkVRKCJTaW1wbGUgSFRNTCIsIGRhdGEpOworCisgICAgb2J0YWluZWRQ YWdlQ29udGVudHMgPSB0cnVlOworfQorCiBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3Zp ZXdfcGFnZV9jb250ZW50c19nZXQpCiB7CiAgICAgY29uc3QgY2hhciBjb250ZW50W10gPSAiPHA+ U2ltcGxlIEhUTUw8L3A+IjsKICAgICBld2tfdmlld19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXco KSwgY29udGVudCwgMCwgMCk7CiAgICAgd2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiAKLSAgICBB U1NFUlRfVFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdF X0NPTlRFTlRTX1RZUEVfTUhUTUwsIFBhZ2VDb250ZW50c0NhbGxiYWNrKSk7CisgICAgQVNTRVJU X1RSVUUoZXdrX3ZpZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05U RU5UU19UWVBFX01IVE1MLCBQYWdlQ29udGVudHNBc01IVE1MQ2FsbGJhY2ssIDApKTsKKyAgICB3 aGlsZSAoIW9idGFpbmVkUGFnZUNvbnRlbnRzKQorICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRl cmF0ZSgpOworCisgICAgb2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKKyAgICBBU1NFUlRf VFJVRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdFX0NPTlRF TlRTX1RZUEVfU1RSSU5HLCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrLCAwKSk7CiAgICAg d2hpbGUgKCFvYnRhaW5lZFBhZ2VDb250ZW50cykKICAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0 ZXJhdGUoKTsKIH0K