73015 2011-11-23 03:56:56 -0800 [EFL] Add alpha channel API to single and tiled backing store. 2011-11-30 18:40:47 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 jungjik.lee webkit-unassigned gyuyoung.kim hyuki.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 508049 0 116340 jungjik.lee 2011-11-23 03:56:56 -0800 Created attachment 116340 proposal_patch Rename bg_color_set API to alpha_set because it only uses alpha channel in parameters And new alpha_set API is added into tiled backing store. Alpha_set API is for turning the alpha channel on/off on the tiled or single backing store objects. 508052 1 webkit.review.bot 2011-11-23 04:00:06 -0800 Attachment 116340 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/efl/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/efl/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 508054 2 116341 jungjik.lee 2011-11-23 04:02:10 -0800 Created attachment 116341 minor_edit.patch 508093 3 116347 jungjik.lee 2011-11-23 06:03:50 -0800 Created attachment 116347 rebased patch attach new rebased patch. 508501 4 116347 gyuyoung.kim 2011-11-23 16:48:47 -0800 Comment on attachment 116347 rebased patch View in context: https://bugs.webkit.org/attachment.cgi?id=116347&action=review > Source/WebKit/efl/ewk/ewk_tiled_backing_store.h:103 > +void ewk_tiled_backing_store_alpha_set(Evas_Object* o, Eina_Bool has_alpha); In EFL style, it looks they don't use prefix for Eina_Bool type as below, ewk_view_setting_auto_load_images_set(Evas_Object *o, Eina_Bool automatic); ewk_view_zoom_weak_smooth_scale_set(Evas_Object *o, Eina_Bool smooth_scale); ewk_view_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight); So, it seems it is better to use "Eina_Bool alpha" instead of "Eina_Bool has_alpha" 508526 5 hyuki.kim 2011-11-23 17:36:36 -0800 (In reply to comment #4) > (From update of attachment 116347 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=116347&action=review > > > Source/WebKit/efl/ewk/ewk_tiled_backing_store.h:103 > > +void ewk_tiled_backing_store_alpha_set(Evas_Object* o, Eina_Bool has_alpha); > > In EFL style, it looks they don't use prefix for Eina_Bool type as below, > > ewk_view_setting_auto_load_images_set(Evas_Object *o, Eina_Bool automatic); > ewk_view_zoom_weak_smooth_scale_set(Evas_Object *o, Eina_Bool smooth_scale); > ewk_view_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight); > > So, it seems it is better to use "Eina_Bool alpha" instead of "Eina_Bool has_alpha" IMO, Jungjik might refer the evas_object api. evas_object_image_alpha_set (Evas_Object *obj, Eina_Bool has_alpha); As a result, I agree with api name Jungjik proposed. :) 508528 6 hyuki.kim 2011-11-23 17:46:56 -0800 LGTM because it will works. But, may be next time, I suggest you to consider the ewk_tiled_backing_store_alpha_set API's current implementation. I can't make sure whether current implementation is good enough for the case when this API is called because it just set the flag and no instant action for the tiles inside of viewport area. 508993 7 116347 gyuyoung.kim 2011-11-24 23:58:53 -0800 Comment on attachment 116347 rebased patch View in context: https://bugs.webkit.org/attachment.cgi?id=116347&action=review >>> Source/WebKit/efl/ewk/ewk_tiled_backing_store.h:103 >>> +void ewk_tiled_backing_store_alpha_set(Evas_Object* o, Eina_Bool has_alpha); >> >> In EFL style, it looks they don't use prefix for Eina_Bool type as below, >> >> ewk_view_setting_auto_load_images_set(Evas_Object *o, Eina_Bool automatic); >> ewk_view_zoom_weak_smooth_scale_set(Evas_Object *o, Eina_Bool smooth_scale); >> ewk_view_text_matches_highlight_set(Evas_Object *o, Eina_Bool highlight); >> >> So, it seems it is better to use "Eina_Bool alpha" instead of "Eina_Bool has_alpha" > > IMO, Jungjik might refer the evas_object api. > evas_object_image_alpha_set (Evas_Object *obj, Eina_Bool has_alpha); > > As a result, I agree with api name Jungjik proposed. :) Ok, Looks good. 509101 8 116347 rakuco 2011-11-25 05:00:36 -0800 Comment on attachment 116347 rebased patch View in context: https://bugs.webkit.org/attachment.cgi?id=116347&action=review At first glance, this looks like a change for change's sake. I agree that currently the other parameters of bg_color_set are not being used, however we don't know what child implementations might want to do, so I think it is better to err on the safe side and provide more parameters, not less, here. If you provide a function to set alpha, it doesn't really hurt to pass r, g and b with it. > Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp:211 > + evas_object_image_alpha_set(item->tile->image, priv->view.tile.hasAlpha); Was there any problem you noticed with this not being set before? 509552 9 jungjik.lee 2011-11-27 20:58:53 -0800 Widget does not have exact rectangle shape, some of them has round shape. so it needs alpha set API not to show background image. If you do not want to rename the API, I will change them. However IMO, I like to have the exact working code and naming. when it need to be changed, it would be better to change them at that moment and refactor more frequently if it is possible. 509757 10 rakuco 2011-11-28 05:11:41 -0800 Please use some context in your replies so it's easier to see what part of previous comments you're referring to. (In reply to comment #9) > Widget does not have exact rectangle shape, some of them has round shape. so it needs alpha set API not to show background image. OK. > If you do not want to rename the API, I will change them. However IMO, I like to have the exact working code and naming. when it need to be changed, it would be better to change them at that moment and refactor more frequently if it is possible. That makes sense if we consider our own needs, I'm trying to think from a third party developer's perspective, who may need to subclass one of the backing store smart objects and will then be unable to reimplement some part of the API in case he needs to. 509833 11 jungjik.lee 2011-11-28 07:56:05 -0800 (In reply to comment #10) > Please use some context in your replies so it's easier to see what part of previous comments you're referring to. Next time I will reply the answer more carefully. > > (In reply to comment #9) > > Widget does not have exact rectangle shape, some of them has round shape. so it needs alpha set API not to show background image. > > OK. > > > If you do not want to rename the API, I will change them. However IMO, I like to have the exact working code and naming. when it need to be changed, it would be better to change them at that moment and refactor more frequently if it is possible. > > That makes sense if we consider our own needs, I'm trying to think from a third party developer's perspective, who may need to subclass one of the backing store smart objects and will then be unable to reimplement some part of the API in case he needs to. I understand your thought and if you think the API is subclassing API, I think the function prototype should be preserved. I misunderstood it. I will recover the API name. 509851 12 116765 jungjik.lee 2011-11-28 08:47:23 -0800 Created attachment 116765 restore the API name Add bg_color_set API into tiled backing store and restore the API name from the previous patch. 510404 13 rakuco 2011-11-28 19:09:56 -0800 LGTM. 511786 14 116765 cshu 2011-11-30 08:55:22 -0800 Comment on attachment 116765 restore the API name LGTM 512319 15 116765 webkit.review.bot 2011-11-30 18:40:42 -0800 Comment on attachment 116765 restore the API name Clearing flags on attachment: 116765 Committed r101585: <http://trac.webkit.org/changeset/101585> 512320 16 webkit.review.bot 2011-11-30 18:40:47 -0800 All reviewed patches have been landed. Closing bug. 116340 2011-11-23 03:56:56 -0800 2011-11-23 04:02:10 -0800 proposal_patch proposal.patch text/plain 8258 jungjik.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA0ZWYyMDcyLi5jZWJiMDVkIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTEtMTEtMjMgIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQXBwbHkgYWxwaGEgY2hhbm5lbCBpbnRvIGV3a190 aWxlZF9iYWNraW5nX3N0b3JlJ3MgdGlsZSBvYmplY3RzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9WFhYWFgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgYmdfY29sb3Jfc2V0IHRvIGFscGhhX3Nl dCBiZWNhdXNlIHRoZSBBUEkgYWN0dWFsbHkgb25seSB1c2VzIGFscGhhIHZhbHVlLgorICAgICAg ICBBbmQgYWRkIGFscGhhX3NldCBBUEkgdG8gdGlsZWQgYmFja2luZyBzdG9yZSB0byBhcHBseSBh bHBoYSBjaGFubmVsIG9uIHRpbGUgb2JqZWN0cy4KKworICAgICAgICAqIGV3ay9ld2tfdGlsZWRf YmFja2luZ19zdG9yZS5jcHA6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGls ZV9hc3NvY2lhdGUpOgorICAgICAgICAoZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfYWxwaGFfc2V0 KToKKyAgICAgICAgKiBld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaDoKKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfYmdfY29sb3Jfc2V0KToKKyAgICAg ICAgKiBld2svZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBld2svZXdrX3ZpZXdfc2luZ2xlLmNwcDoK KyAgICAgICAgKF9ld2tfdmlld19zaW5nbGVfc21hcnRfYWxwaGFfc2V0KToKKyAgICAgICAgKGV3 a192aWV3X3NpbmdsZV9zbWFydF9zZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlld190aWxlZC5j cHA6CisgICAgICAgIChfZXdrX3ZpZXdfdGlsZWRfc21hcnRfYWxwaGFfc2V0KToKKyAgICAgICAg KGV3a192aWV3X3RpbGVkX3NtYXJ0X3NldCk6CisKIDIwMTEtMTEtMjIgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBJ bnNwZWN0b3I6OmJyaW5nVG9Gcm9udCBmcm9tIHRoZSBwcm90b2NvbC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3BwCmluZGV4IGE5Yjc4MTIu LjNmNDM3NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFj a2luZ19zdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNr aW5nX3N0b3JlLmNwcApAQCAtNjUsNiArNjUsNyBAQCBzdHJ1Y3QgX0V3a19UaWxlZF9CYWNraW5n X1N0b3JlX0RhdGEgewogICAgICAgICAgICAgRXZhc19Db29yZCB3aWR0aCwgaGVpZ2h0OwogICAg ICAgICAgICAgZmxvYXQgem9vbTsKICAgICAgICAgICAgIGJvb2wgem9vbVdlYWtTbW9vdGhTY2Fs ZSA6IDE7CisgICAgICAgICAgICBib29sIGhhc0FscGhhIDogMTsKICAgICAgICAgfSB0aWxlOwog ICAgICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgc3RydWN0IHsKQEAgLTIwNyw2ICsyMDgsNyBA QCBzdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGlsZV9hc3NvY2lhdGUoRXdr X1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YQogICAgIGV2YXNfb2JqZWN0X2ltYWdlX2ZpbGxfc2V0 CiAgICAgICAgIChpdGVtLT50aWxlLT5pbWFnZSwgMCwgMCwgaXRlbS0+Z2VvbWV0cnkud2lkdGgs IGl0ZW0tPmdlb21ldHJ5LmhlaWdodCk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2Vfc21vb3RoX3Nj YWxlX3NldChpdGVtLT50aWxlLT5pbWFnZSwgaXRlbS0+c21vb3RoX3NjYWxlKTsKKyAgICBldmFz X29iamVjdF9pbWFnZV9hbHBoYV9zZXQoaXRlbS0+dGlsZS0+aW1hZ2UsIHByaXYtPnZpZXcudGls ZS5oYXNBbHBoYSk7CiAKICAgICBpZiAoIWV3a190aWxlX3Zpc2libGVfZ2V0KHRpbGUpKQogICAg ICAgICBldmFzX29iamVjdF9zbWFydF9tZW1iZXJfYWRkKHRpbGUtPmltYWdlLCBwcml2LT5zZWxm KTsKQEAgLTE3MTcsNiArMTcxOSwxMiBAQCB2b2lkIGV3a190aWxlZF9iYWNraW5nX3N0b3JlX3pv b21fd2Vha19zbW9vdGhfc2NhbGVfc2V0KEV2YXNfT2JqZWN0KiBld2tCYWNraW5nUwogICAgIH0K IH0KIAordm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9hbHBoYV9zZXQoRXZhc19PYmplY3Qq IGV3a0JhY2tpbmdTdG9yZSwgRWluYV9Cb29sIGhhc0FscGhhKQoreworICAgIFBSSVZfREFUQV9H RVRfT1JfUkVUVVJOKGV3a0JhY2tpbmdTdG9yZSwgcHJpdik7CisgICAgcHJpdi0+dmlldy50aWxl Lmhhc0FscGhhID0gaGFzQWxwaGE7Cit9CisKIEVpbmFfQm9vbCBld2tfdGlsZWRfYmFja2luZ19z dG9yZV91cGRhdGUoRXZhc19PYmplY3QqIGV3a0JhY2tpbmdTdG9yZSwgY29uc3QgRWluYV9SZWN0 YW5nbGUqIHVwZGF0ZSkKIHsKICAgICBQUklWX0RBVEFfR0VUX09SX1JFVFVSTihld2tCYWNraW5n U3RvcmUsIHByaXYsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdGlsZWRfYmFja2luZ19zdG9yZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxl ZF9iYWNraW5nX3N0b3JlLmgKaW5kZXggNzk0NTFhZS4uMGU1MGI4NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKKysrIGIvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKQEAgLTEwMCw2ICsxMDAs NyBAQCBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfem9vbV9zZXQoRXZhc19PYmpl Y3QqIG8sIGZsb2F0KiB6b29tLCBFdmFzX0NvbwogRWluYV9Cb29sIGV3a190aWxlZF9iYWNraW5n X3N0b3JlX3pvb21fd2Vha19zZXQoRXZhc19PYmplY3QqIG8sIGZsb2F0IHpvb20sIEV2YXNfQ29v cmQgY3gsIEV2YXNfQ29vcmQgY3kpOwogdm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9maXhf b2Zmc2V0cyhFdmFzX09iamVjdCogbywgRXZhc19Db29yZCB3LCBFdmFzX0Nvb3JkIGgpOwogdm9p ZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV96b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldChFdmFz X09iamVjdCogbywgRWluYV9Cb29sIHNtb290aF9zY2FsZSk7Cit2b2lkIGV3a190aWxlZF9iYWNr aW5nX3N0b3JlX2FscGhhX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGhhc19hbHBoYSk7 CiBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlKEV2YXNfT2JqZWN0KiBv LCBjb25zdCBFaW5hX1JlY3RhbmdsZSogdXBkYXRlKTsKIHZvaWQgZXdrX3RpbGVkX2JhY2tpbmdf c3RvcmVfdXBkYXRlc19wcm9jZXNzX3ByZV9zZXQoRXZhc19PYmplY3QqIG8sIHZvaWQqKCpjYiko dm9pZCogZGF0YSwgRXZhc19PYmplY3QgKm8pLCBjb25zdCB2b2lkKiBkYXRhKTsKIHZvaWQgZXdr X3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlc19wcm9jZXNzX3Bvc3Rfc2V0KEV2YXNfT2JqZWN0 KiBvLCB2b2lkKigqY2IpKHZvaWQqIGRhdGEsIHZvaWQqIHByZV9kYXRhLCBFdmFzX09iamVjdCAq byksIGNvbnN0IHZvaWQqIGRhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXgg ODI4MDJjMi4uYzg4MjY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0xMjcx LDcgKzEyNzEsNyBAQCB2b2lkIGV3a192aWV3X2JnX2NvbG9yX3NldChFdmFzX09iamVjdCogZXdr VmlldywgaW50IHJlZCwgaW50IGdyZWVuLCBpbnQgYmx1ZSwgaQogewogICAgIEVXS19WSUVXX1NE X0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhKTsKICAgICBFSU5BX1NBRkVUWV9PTl9O VUxMX1JFVFVSTihzbWFydERhdGEtPmFwaSk7Ci0gICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRV Uk4oc21hcnREYXRhLT5hcGktPmJnX2NvbG9yX3NldCk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVM TF9SRVRVUk4oc21hcnREYXRhLT5hcGktPmFscGhhX3NldCk7CiAKICAgICBpZiAoYWxwaGEgPCAw KSB7CiAgICAgICAgIFdSTigiQWxwaGEgbGVzcyB0aGFuIHplcm8gKCVkKS4iLCBhbHBoYSk7CkBA IC0xMzAwLDcgKzEzMDAsNyBAQCB2b2lkIGV3a192aWV3X2JnX2NvbG9yX3NldChFdmFzX09iamVj dCogZXdrVmlldywgaW50IHJlZCwgaW50IGdyZWVuLCBpbnQgYmx1ZSwgaQogICAgIHNtYXJ0RGF0 YS0+YmdfY29sb3IuYiA9IGJsdWU7CiAgICAgc21hcnREYXRhLT5iZ19jb2xvci5hID0gYWxwaGE7 CiAKLSAgICBzbWFydERhdGEtPmFwaS0+YmdfY29sb3Jfc2V0KHNtYXJ0RGF0YSwgcmVkLCBncmVl biwgYmx1ZSwgYWxwaGEpOworICAgIHNtYXJ0RGF0YS0+YXBpLT5hbHBoYV9zZXQoc21hcnREYXRh LCBhbHBoYSk7CiAKICAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBzbWFydERhdGEtPl9w cml2LT5tYWluRnJhbWUtPnZpZXcoKTsKICAgICBpZiAodmlldykgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaAppbmRleCA3ZjkxZDIxLi40MWRiOTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu aApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICAg IEVpbmFfQm9vbCAoKnpvb21fc2V0KShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgZmxvYXQgem9v bSwgRXZhc19Db29yZCBjeCwgRXZhc19Db29yZCBjeSk7CiAgICAgRWluYV9Cb29sICgqem9vbV93 ZWFrX3NldCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIGZsb2F0IHpvb20sIEV2YXNfQ29vcmQg Y3gsIEV2YXNfQ29vcmQgY3kpOwogICAgIHZvaWQgKCp6b29tX3dlYWtfc21vb3RoX3NjYWxlX3Nl dCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEVpbmFfQm9vbCBzbW9vdGhfc2NhbGUpOwotICAg IHZvaWQgKCpiZ19jb2xvcl9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBj aGFyIHIsIHVuc2lnbmVkIGNoYXIgZywgdW5zaWduZWQgY2hhciBiLCB1bnNpZ25lZCBjaGFyIGEp OworICAgIHZvaWQgKCphbHBoYV9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25l ZCBjaGFyIGFscGhhKTsKICAgICB2b2lkICgqZmx1c2gpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNk KTsKICAgICBFaW5hX0Jvb2wgKCpwcmVfcmVuZGVyX3JlZ2lvbikoRXdrX1ZpZXdfU21hcnRfRGF0 YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFdmFzX0Nvb3JkIHcsIEV2YXNfQ29v cmQgaCwgZmxvYXQgem9vbSk7CiAgICAgRWluYV9Cb29sICgqcHJlX3JlbmRlcl9yZWxhdGl2ZV9y YWRpdXMpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBpbnQgbiwgZmxvYXQgem9v bSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfc2luZ2xlLmNw cCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld19zaW5nbGUuY3BwCmluZGV4IGZiNzQ0 ODYyLi45ZTE1NWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdf c2luZ2xlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfc2luZ2xlLmNw cApAQCAtNTIyLDcgKzUyMiw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRf em9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQoRXdrX1ZpZXdfU21hcnRfRGF0CiAgICAgZXZhc19v YmplY3RfaW1hZ2Vfc21vb3RoX3NjYWxlX3NldChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIHNt b290aF9zY2FsZSk7CiB9CiAKLXN0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRfYmdf Y29sb3Jfc2V0KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgdW5zaWduZWQgY2hhciBy ZWQsIHVuc2lnbmVkIGNoYXIgZ3JlZW4sIHVuc2lnbmVkIGNoYXIgYmx1ZSwgdW5zaWduZWQgY2hh ciBhbHBoYSkKK3N0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRfYWxwaGFfc2V0KEV3 a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgdW5zaWduZWQgY2hhciBhbHBoYSkKIHsKICAg ICBldmFzX29iamVjdF9pbWFnZV9hbHBoYV9zZXQoc21hcnREYXRhLT5iYWNraW5nX3N0b3JlLCBh bHBoYSA8IDI1NSk7CiB9CkBAIC01NDMsNyArNTQzLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3Np bmdsZV9zbWFydF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAgICBhcGktPnJlcGFp bnRzX3Byb2Nlc3MgPSBfZXdrX3ZpZXdfc2luZ2xlX3NtYXJ0X3JlcGFpbnRzX3Byb2Nlc3M7CiAg ICAgYXBpLT56b29tX3dlYWtfc2V0ID0gX2V3a192aWV3X3NpbmdsZV9zbWFydF96b29tX3dlYWtf c2V0OwogICAgIGFwaS0+em9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQgPSBfZXdrX3ZpZXdfc2lu Z2xlX3NtYXJ0X3pvb21fd2Vha19zbW9vdGhfc2NhbGVfc2V0OwotICAgIGFwaS0+YmdfY29sb3Jf c2V0ID0gX2V3a192aWV3X3NpbmdsZV9zbWFydF9iZ19jb2xvcl9zZXQ7CisgICAgYXBpLT5hbHBo YV9zZXQgPSBfZXdrX3ZpZXdfc2luZ2xlX3NtYXJ0X2FscGhhX3NldDsKIAogICAgIHJldHVybiB0 cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVk LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAKaW5kZXggN2Rl ZDg4NS4uOWYzMTYwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 X3RpbGVkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3Bw CkBAIC0xOTYsNiArMTk2LDExIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld190aWxlZF9zbWFydF96 b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldChFd2tfVmlld19TbWFydF9EYXRhCiAgICAgZXdrX3Rp bGVkX2JhY2tpbmdfc3RvcmVfem9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQoc21hcnREYXRhLT5i YWNraW5nX3N0b3JlLCBzbW9vdGhTY2FsZSk7CiB9CiAKK3N0YXRpYyB2b2lkIF9ld2tfdmlld190 aWxlZF9zbWFydF9hbHBoYV9zZXQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCB1bnNp Z25lZCBjaGFyIGFscGhhKQoreworICAgIGV3a190aWxlZF9iYWNraW5nX3N0b3JlX2FscGhhX3Nl dChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIGFscGhhIDwgMjU1KTsKK30KKwogc3RhdGljIHZv aWQgX2V3a192aWV3X3RpbGVkX3NtYXJ0X2ZsdXNoKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0 RGF0YSkKIHsKICAgICBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9mbHVzaChzbWFydERhdGEtPmJh Y2tpbmdfc3RvcmUpOwpAQCAtMjQ2LDYgKzI1MSw3IEBAIEVpbmFfQm9vbCBld2tfdmlld190aWxl ZF9zbWFydF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAgICBhcGktPnpvb21fc2V0 ID0gX2V3a192aWV3X3RpbGVkX3NtYXJ0X3pvb21fc2V0OwogICAgIGFwaS0+em9vbV93ZWFrX3Nl dCA9IF9ld2tfdmlld190aWxlZF9zbWFydF96b29tX3dlYWtfc2V0OwogICAgIGFwaS0+em9vbV93 ZWFrX3Ntb290aF9zY2FsZV9zZXQgPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfem9vbV93ZWFrX3Nt b290aF9zY2FsZV9zZXQ7CisgICAgYXBpLT5hbHBoYV9zZXQgPSBfZXdrX3ZpZXdfdGlsZWRfc21h cnRfYWxwaGFfc2V0OwogICAgIGFwaS0+Zmx1c2ggPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfZmx1 c2g7CiAgICAgYXBpLT5wcmVfcmVuZGVyX3JlZ2lvbiA9IF9ld2tfdmlld190aWxlZF9zbWFydF9w cmVfcmVuZGVyX3JlZ2lvbjsKICAgICBhcGktPnByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzID0g X2V3a192aWV3X3RpbGVkX3NtYXJ0X3ByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzOwo= 116341 2011-11-23 04:02:10 -0800 2011-11-23 06:03:50 -0800 minor_edit.patch edited.patch text/plain 8258 jungjik.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA0ZWYyMDcyLi5jZWJiMDVkIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTEtMTEtMjMgIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQXBwbHkgYWxwaGEgY2hhbm5lbCBpbnRvIGV3a190 aWxlZF9iYWNraW5nX3N0b3JlJ3MgdGlsZSBvYmplY3RzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMwMTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgYmdfY29sb3Jfc2V0IHRvIGFscGhhX3Nl dCBiZWNhdXNlIHRoZSBBUEkgYWN0dWFsbHkgb25seSB1c2VzIGFscGhhIHZhbHVlLgorICAgICAg ICBBbmQgYWRkIGFscGhhX3NldCBBUEkgdG8gdGlsZWQgYmFja2luZyBzdG9yZSB0byBhcHBseSBh bHBoYSBjaGFubmVsIG9uIHRpbGUgb2JqZWN0cy4KKworICAgICAgICAqIGV3ay9ld2tfdGlsZWRf YmFja2luZ19zdG9yZS5jcHA6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGls ZV9hc3NvY2lhdGUpOgorICAgICAgICAoZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfYWxwaGFfc2V0 KToKKyAgICAgICAgKiBld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaDoKKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfYmdfY29sb3Jfc2V0KToKKyAgICAg ICAgKiBld2svZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBld2svZXdrX3ZpZXdfc2luZ2xlLmNwcDoK KyAgICAgICAgKF9ld2tfdmlld19zaW5nbGVfc21hcnRfYWxwaGFfc2V0KToKKyAgICAgICAgKGV3 a192aWV3X3NpbmdsZV9zbWFydF9zZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlld190aWxlZC5j cHA6CisgICAgICAgIChfZXdrX3ZpZXdfdGlsZWRfc21hcnRfYWxwaGFfc2V0KToKKyAgICAgICAg KGV3a192aWV3X3RpbGVkX3NtYXJ0X3NldCk6CisKIDIwMTEtMTEtMjIgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBJ bnNwZWN0b3I6OmJyaW5nVG9Gcm9udCBmcm9tIHRoZSBwcm90b2NvbC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3BwCmluZGV4IGE5Yjc4MTIu LjNmNDM3NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFj a2luZ19zdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNr aW5nX3N0b3JlLmNwcApAQCAtNjUsNiArNjUsNyBAQCBzdHJ1Y3QgX0V3a19UaWxlZF9CYWNraW5n X1N0b3JlX0RhdGEgewogICAgICAgICAgICAgRXZhc19Db29yZCB3aWR0aCwgaGVpZ2h0OwogICAg ICAgICAgICAgZmxvYXQgem9vbTsKICAgICAgICAgICAgIGJvb2wgem9vbVdlYWtTbW9vdGhTY2Fs ZSA6IDE7CisgICAgICAgICAgICBib29sIGhhc0FscGhhIDogMTsKICAgICAgICAgfSB0aWxlOwog ICAgICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgc3RydWN0IHsKQEAgLTIwNyw2ICsyMDgsNyBA QCBzdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGlsZV9hc3NvY2lhdGUoRXdr X1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YQogICAgIGV2YXNfb2JqZWN0X2ltYWdlX2ZpbGxfc2V0 CiAgICAgICAgIChpdGVtLT50aWxlLT5pbWFnZSwgMCwgMCwgaXRlbS0+Z2VvbWV0cnkud2lkdGgs IGl0ZW0tPmdlb21ldHJ5LmhlaWdodCk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2Vfc21vb3RoX3Nj YWxlX3NldChpdGVtLT50aWxlLT5pbWFnZSwgaXRlbS0+c21vb3RoX3NjYWxlKTsKKyAgICBldmFz X29iamVjdF9pbWFnZV9hbHBoYV9zZXQoaXRlbS0+dGlsZS0+aW1hZ2UsIHByaXYtPnZpZXcudGls ZS5oYXNBbHBoYSk7CiAKICAgICBpZiAoIWV3a190aWxlX3Zpc2libGVfZ2V0KHRpbGUpKQogICAg ICAgICBldmFzX29iamVjdF9zbWFydF9tZW1iZXJfYWRkKHRpbGUtPmltYWdlLCBwcml2LT5zZWxm KTsKQEAgLTE3MTcsNiArMTcxOSwxMiBAQCB2b2lkIGV3a190aWxlZF9iYWNraW5nX3N0b3JlX3pv b21fd2Vha19zbW9vdGhfc2NhbGVfc2V0KEV2YXNfT2JqZWN0KiBld2tCYWNraW5nUwogICAgIH0K IH0KIAordm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9hbHBoYV9zZXQoRXZhc19PYmplY3Qq IGV3a0JhY2tpbmdTdG9yZSwgRWluYV9Cb29sIGhhc0FscGhhKQoreworICAgIFBSSVZfREFUQV9H RVRfT1JfUkVUVVJOKGV3a0JhY2tpbmdTdG9yZSwgcHJpdik7CisgICAgcHJpdi0+dmlldy50aWxl Lmhhc0FscGhhID0gaGFzQWxwaGE7Cit9CisKIEVpbmFfQm9vbCBld2tfdGlsZWRfYmFja2luZ19z dG9yZV91cGRhdGUoRXZhc19PYmplY3QqIGV3a0JhY2tpbmdTdG9yZSwgY29uc3QgRWluYV9SZWN0 YW5nbGUqIHVwZGF0ZSkKIHsKICAgICBQUklWX0RBVEFfR0VUX09SX1JFVFVSTihld2tCYWNraW5n U3RvcmUsIHByaXYsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdGlsZWRfYmFja2luZ19zdG9yZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxl ZF9iYWNraW5nX3N0b3JlLmgKaW5kZXggNzk0NTFhZS4uMGU1MGI4NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKKysrIGIvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKQEAgLTEwMCw2ICsxMDAs NyBAQCBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfem9vbV9zZXQoRXZhc19PYmpl Y3QqIG8sIGZsb2F0KiB6b29tLCBFdmFzX0NvbwogRWluYV9Cb29sIGV3a190aWxlZF9iYWNraW5n X3N0b3JlX3pvb21fd2Vha19zZXQoRXZhc19PYmplY3QqIG8sIGZsb2F0IHpvb20sIEV2YXNfQ29v cmQgY3gsIEV2YXNfQ29vcmQgY3kpOwogdm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9maXhf b2Zmc2V0cyhFdmFzX09iamVjdCogbywgRXZhc19Db29yZCB3LCBFdmFzX0Nvb3JkIGgpOwogdm9p ZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV96b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldChFdmFz X09iamVjdCogbywgRWluYV9Cb29sIHNtb290aF9zY2FsZSk7Cit2b2lkIGV3a190aWxlZF9iYWNr aW5nX3N0b3JlX2FscGhhX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGhhc19hbHBoYSk7 CiBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlKEV2YXNfT2JqZWN0KiBv LCBjb25zdCBFaW5hX1JlY3RhbmdsZSogdXBkYXRlKTsKIHZvaWQgZXdrX3RpbGVkX2JhY2tpbmdf c3RvcmVfdXBkYXRlc19wcm9jZXNzX3ByZV9zZXQoRXZhc19PYmplY3QqIG8sIHZvaWQqKCpjYiko dm9pZCogZGF0YSwgRXZhc19PYmplY3QgKm8pLCBjb25zdCB2b2lkKiBkYXRhKTsKIHZvaWQgZXdr X3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlc19wcm9jZXNzX3Bvc3Rfc2V0KEV2YXNfT2JqZWN0 KiBvLCB2b2lkKigqY2IpKHZvaWQqIGRhdGEsIHZvaWQqIHByZV9kYXRhLCBFdmFzX09iamVjdCAq byksIGNvbnN0IHZvaWQqIGRhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXgg ODI4MDJjMi4uYzg4MjY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0xMjcx LDcgKzEyNzEsNyBAQCB2b2lkIGV3a192aWV3X2JnX2NvbG9yX3NldChFdmFzX09iamVjdCogZXdr VmlldywgaW50IHJlZCwgaW50IGdyZWVuLCBpbnQgYmx1ZSwgaQogewogICAgIEVXS19WSUVXX1NE X0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhKTsKICAgICBFSU5BX1NBRkVUWV9PTl9O VUxMX1JFVFVSTihzbWFydERhdGEtPmFwaSk7Ci0gICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRV Uk4oc21hcnREYXRhLT5hcGktPmJnX2NvbG9yX3NldCk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVM TF9SRVRVUk4oc21hcnREYXRhLT5hcGktPmFscGhhX3NldCk7CiAKICAgICBpZiAoYWxwaGEgPCAw KSB7CiAgICAgICAgIFdSTigiQWxwaGEgbGVzcyB0aGFuIHplcm8gKCVkKS4iLCBhbHBoYSk7CkBA IC0xMzAwLDcgKzEzMDAsNyBAQCB2b2lkIGV3a192aWV3X2JnX2NvbG9yX3NldChFdmFzX09iamVj dCogZXdrVmlldywgaW50IHJlZCwgaW50IGdyZWVuLCBpbnQgYmx1ZSwgaQogICAgIHNtYXJ0RGF0 YS0+YmdfY29sb3IuYiA9IGJsdWU7CiAgICAgc21hcnREYXRhLT5iZ19jb2xvci5hID0gYWxwaGE7 CiAKLSAgICBzbWFydERhdGEtPmFwaS0+YmdfY29sb3Jfc2V0KHNtYXJ0RGF0YSwgcmVkLCBncmVl biwgYmx1ZSwgYWxwaGEpOworICAgIHNtYXJ0RGF0YS0+YXBpLT5hbHBoYV9zZXQoc21hcnREYXRh LCBhbHBoYSk7CiAKICAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBzbWFydERhdGEtPl9w cml2LT5tYWluRnJhbWUtPnZpZXcoKTsKICAgICBpZiAodmlldykgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaAppbmRleCA3ZjkxZDIxLi40MWRiOTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu aApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICAg IEVpbmFfQm9vbCAoKnpvb21fc2V0KShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgZmxvYXQgem9v bSwgRXZhc19Db29yZCBjeCwgRXZhc19Db29yZCBjeSk7CiAgICAgRWluYV9Cb29sICgqem9vbV93 ZWFrX3NldCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIGZsb2F0IHpvb20sIEV2YXNfQ29vcmQg Y3gsIEV2YXNfQ29vcmQgY3kpOwogICAgIHZvaWQgKCp6b29tX3dlYWtfc21vb3RoX3NjYWxlX3Nl dCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEVpbmFfQm9vbCBzbW9vdGhfc2NhbGUpOwotICAg IHZvaWQgKCpiZ19jb2xvcl9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBj aGFyIHIsIHVuc2lnbmVkIGNoYXIgZywgdW5zaWduZWQgY2hhciBiLCB1bnNpZ25lZCBjaGFyIGEp OworICAgIHZvaWQgKCphbHBoYV9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25l ZCBjaGFyIGFscGhhKTsKICAgICB2b2lkICgqZmx1c2gpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNk KTsKICAgICBFaW5hX0Jvb2wgKCpwcmVfcmVuZGVyX3JlZ2lvbikoRXdrX1ZpZXdfU21hcnRfRGF0 YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFdmFzX0Nvb3JkIHcsIEV2YXNfQ29v cmQgaCwgZmxvYXQgem9vbSk7CiAgICAgRWluYV9Cb29sICgqcHJlX3JlbmRlcl9yZWxhdGl2ZV9y YWRpdXMpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBpbnQgbiwgZmxvYXQgem9v bSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfc2luZ2xlLmNw cCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld19zaW5nbGUuY3BwCmluZGV4IGZiNzQ0 ODYyLi45ZTE1NWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdf c2luZ2xlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfc2luZ2xlLmNw cApAQCAtNTIyLDcgKzUyMiw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRf em9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQoRXdrX1ZpZXdfU21hcnRfRGF0CiAgICAgZXZhc19v YmplY3RfaW1hZ2Vfc21vb3RoX3NjYWxlX3NldChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIHNt b290aF9zY2FsZSk7CiB9CiAKLXN0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRfYmdf Y29sb3Jfc2V0KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgdW5zaWduZWQgY2hhciBy ZWQsIHVuc2lnbmVkIGNoYXIgZ3JlZW4sIHVuc2lnbmVkIGNoYXIgYmx1ZSwgdW5zaWduZWQgY2hh ciBhbHBoYSkKK3N0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRfYWxwaGFfc2V0KEV3 a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgdW5zaWduZWQgY2hhciBhbHBoYSkKIHsKICAg ICBldmFzX29iamVjdF9pbWFnZV9hbHBoYV9zZXQoc21hcnREYXRhLT5iYWNraW5nX3N0b3JlLCBh bHBoYSA8IDI1NSk7CiB9CkBAIC01NDMsNyArNTQzLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3Np bmdsZV9zbWFydF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAgICBhcGktPnJlcGFp bnRzX3Byb2Nlc3MgPSBfZXdrX3ZpZXdfc2luZ2xlX3NtYXJ0X3JlcGFpbnRzX3Byb2Nlc3M7CiAg ICAgYXBpLT56b29tX3dlYWtfc2V0ID0gX2V3a192aWV3X3NpbmdsZV9zbWFydF96b29tX3dlYWtf c2V0OwogICAgIGFwaS0+em9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQgPSBfZXdrX3ZpZXdfc2lu Z2xlX3NtYXJ0X3pvb21fd2Vha19zbW9vdGhfc2NhbGVfc2V0OwotICAgIGFwaS0+YmdfY29sb3Jf c2V0ID0gX2V3a192aWV3X3NpbmdsZV9zbWFydF9iZ19jb2xvcl9zZXQ7CisgICAgYXBpLT5hbHBo YV9zZXQgPSBfZXdrX3ZpZXdfc2luZ2xlX3NtYXJ0X2FscGhhX3NldDsKIAogICAgIHJldHVybiB0 cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVk LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAKaW5kZXggN2Rl ZDg4NS4uOWYzMTYwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 X3RpbGVkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3Bw CkBAIC0xOTYsNiArMTk2LDExIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld190aWxlZF9zbWFydF96 b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldChFd2tfVmlld19TbWFydF9EYXRhCiAgICAgZXdrX3Rp bGVkX2JhY2tpbmdfc3RvcmVfem9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQoc21hcnREYXRhLT5i YWNraW5nX3N0b3JlLCBzbW9vdGhTY2FsZSk7CiB9CiAKK3N0YXRpYyB2b2lkIF9ld2tfdmlld190 aWxlZF9zbWFydF9hbHBoYV9zZXQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCB1bnNp Z25lZCBjaGFyIGFscGhhKQoreworICAgIGV3a190aWxlZF9iYWNraW5nX3N0b3JlX2FscGhhX3Nl dChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIGFscGhhIDwgMjU1KTsKK30KKwogc3RhdGljIHZv aWQgX2V3a192aWV3X3RpbGVkX3NtYXJ0X2ZsdXNoKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0 RGF0YSkKIHsKICAgICBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9mbHVzaChzbWFydERhdGEtPmJh Y2tpbmdfc3RvcmUpOwpAQCAtMjQ2LDYgKzI1MSw3IEBAIEVpbmFfQm9vbCBld2tfdmlld190aWxl ZF9zbWFydF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAgICBhcGktPnpvb21fc2V0 ID0gX2V3a192aWV3X3RpbGVkX3NtYXJ0X3pvb21fc2V0OwogICAgIGFwaS0+em9vbV93ZWFrX3Nl dCA9IF9ld2tfdmlld190aWxlZF9zbWFydF96b29tX3dlYWtfc2V0OwogICAgIGFwaS0+em9vbV93 ZWFrX3Ntb290aF9zY2FsZV9zZXQgPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfem9vbV93ZWFrX3Nt b290aF9zY2FsZV9zZXQ7CisgICAgYXBpLT5hbHBoYV9zZXQgPSBfZXdrX3ZpZXdfdGlsZWRfc21h cnRfYWxwaGFfc2V0OwogICAgIGFwaS0+Zmx1c2ggPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfZmx1 c2g7CiAgICAgYXBpLT5wcmVfcmVuZGVyX3JlZ2lvbiA9IF9ld2tfdmlld190aWxlZF9zbWFydF9w cmVfcmVuZGVyX3JlZ2lvbjsKICAgICBhcGktPnByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzID0g X2V3a192aWV3X3RpbGVkX3NtYXJ0X3ByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzOwo= 116347 2011-11-23 06:03:50 -0800 2011-11-28 08:47:23 -0800 rebased patch rebase.patch text/plain 8258 jungjik.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA0ZWYyMDcyLi5lMTZiYmZmIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjcgQEAKKzIwMTEtMTEtMjMgIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQXBwbHkgYWxwaGEgY2hhbm5lbCBpbnRvIGV3a190 aWxlZF9iYWNraW5nX3N0b3JlJ3MgdGlsZSBvYmplY3RzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMwMTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgYmdfY29sb3Jfc2V0IHRvIGFscGhhX3Nl dCBiZWNhdXNlIHRoZSBBUEkgYWN0dWFsbHkgb25seSB1c2VzIGFscGhhIHZhbHVlLgorICAgICAg ICBBbmQgYWRkIGFscGhhX3NldCBBUEkgdG8gdGlsZWQgYmFja2luZyBzdG9yZSB0byBhcHBseSBh bHBoYSBjaGFubmVsIG9uIHRpbGUgb2JqZWN0cy4KKworICAgICAgICAqIGV3ay9ld2tfdGlsZWRf YmFja2luZ19zdG9yZS5jcHA6CisgICAgICAgIChfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGls ZV9hc3NvY2lhdGUpOgorICAgICAgICAoZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfYWxwaGFfc2V0 KToKKyAgICAgICAgKiBld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaDoKKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfYmdfY29sb3Jfc2V0KToKKyAgICAg ICAgKiBld2svZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBld2svZXdrX3ZpZXdfc2luZ2xlLmNwcDoK KyAgICAgICAgKF9ld2tfdmlld19zaW5nbGVfc21hcnRfYWxwaGFfc2V0KToKKyAgICAgICAgKGV3 a192aWV3X3NpbmdsZV9zbWFydF9zZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlld190aWxlZC5j cHA6CisgICAgICAgIChfZXdrX3ZpZXdfdGlsZWRfc21hcnRfYWxwaGFfc2V0KToKKyAgICAgICAg KGV3a192aWV3X3RpbGVkX3NtYXJ0X3NldCk6CisKIDIwMTEtMTEtMjIgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlbW92ZSBJ bnNwZWN0b3I6OmJyaW5nVG9Gcm9udCBmcm9tIHRoZSBwcm90b2NvbC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3BwCmluZGV4IGE5Yjc4MTIu LjNmNDM3NjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFj a2luZ19zdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNr aW5nX3N0b3JlLmNwcApAQCAtNjUsNiArNjUsNyBAQCBzdHJ1Y3QgX0V3a19UaWxlZF9CYWNraW5n X1N0b3JlX0RhdGEgewogICAgICAgICAgICAgRXZhc19Db29yZCB3aWR0aCwgaGVpZ2h0OwogICAg ICAgICAgICAgZmxvYXQgem9vbTsKICAgICAgICAgICAgIGJvb2wgem9vbVdlYWtTbW9vdGhTY2Fs ZSA6IDE7CisgICAgICAgICAgICBib29sIGhhc0FscGhhIDogMTsKICAgICAgICAgfSB0aWxlOwog ICAgICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgc3RydWN0IHsKQEAgLTIwNyw2ICsyMDgsNyBA QCBzdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGlsZV9hc3NvY2lhdGUoRXdr X1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YQogICAgIGV2YXNfb2JqZWN0X2ltYWdlX2ZpbGxfc2V0 CiAgICAgICAgIChpdGVtLT50aWxlLT5pbWFnZSwgMCwgMCwgaXRlbS0+Z2VvbWV0cnkud2lkdGgs IGl0ZW0tPmdlb21ldHJ5LmhlaWdodCk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2Vfc21vb3RoX3Nj YWxlX3NldChpdGVtLT50aWxlLT5pbWFnZSwgaXRlbS0+c21vb3RoX3NjYWxlKTsKKyAgICBldmFz X29iamVjdF9pbWFnZV9hbHBoYV9zZXQoaXRlbS0+dGlsZS0+aW1hZ2UsIHByaXYtPnZpZXcudGls ZS5oYXNBbHBoYSk7CiAKICAgICBpZiAoIWV3a190aWxlX3Zpc2libGVfZ2V0KHRpbGUpKQogICAg ICAgICBldmFzX29iamVjdF9zbWFydF9tZW1iZXJfYWRkKHRpbGUtPmltYWdlLCBwcml2LT5zZWxm KTsKQEAgLTE3MTcsNiArMTcxOSwxMiBAQCB2b2lkIGV3a190aWxlZF9iYWNraW5nX3N0b3JlX3pv b21fd2Vha19zbW9vdGhfc2NhbGVfc2V0KEV2YXNfT2JqZWN0KiBld2tCYWNraW5nUwogICAgIH0K IH0KIAordm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9hbHBoYV9zZXQoRXZhc19PYmplY3Qq IGV3a0JhY2tpbmdTdG9yZSwgRWluYV9Cb29sIGhhc0FscGhhKQoreworICAgIFBSSVZfREFUQV9H RVRfT1JfUkVUVVJOKGV3a0JhY2tpbmdTdG9yZSwgcHJpdik7CisgICAgcHJpdi0+dmlldy50aWxl Lmhhc0FscGhhID0gaGFzQWxwaGE7Cit9CisKIEVpbmFfQm9vbCBld2tfdGlsZWRfYmFja2luZ19z dG9yZV91cGRhdGUoRXZhc19PYmplY3QqIGV3a0JhY2tpbmdTdG9yZSwgY29uc3QgRWluYV9SZWN0 YW5nbGUqIHVwZGF0ZSkKIHsKICAgICBQUklWX0RBVEFfR0VUX09SX1JFVFVSTihld2tCYWNraW5n U3RvcmUsIHByaXYsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdGlsZWRfYmFja2luZ19zdG9yZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxl ZF9iYWNraW5nX3N0b3JlLmgKaW5kZXggNzk0NTFhZS4uMGU1MGI4NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKKysrIGIvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKQEAgLTEwMCw2ICsxMDAs NyBAQCBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfem9vbV9zZXQoRXZhc19PYmpl Y3QqIG8sIGZsb2F0KiB6b29tLCBFdmFzX0NvbwogRWluYV9Cb29sIGV3a190aWxlZF9iYWNraW5n X3N0b3JlX3pvb21fd2Vha19zZXQoRXZhc19PYmplY3QqIG8sIGZsb2F0IHpvb20sIEV2YXNfQ29v cmQgY3gsIEV2YXNfQ29vcmQgY3kpOwogdm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9maXhf b2Zmc2V0cyhFdmFzX09iamVjdCogbywgRXZhc19Db29yZCB3LCBFdmFzX0Nvb3JkIGgpOwogdm9p ZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV96b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldChFdmFz X09iamVjdCogbywgRWluYV9Cb29sIHNtb290aF9zY2FsZSk7Cit2b2lkIGV3a190aWxlZF9iYWNr aW5nX3N0b3JlX2FscGhhX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGhhc19hbHBoYSk7 CiBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlKEV2YXNfT2JqZWN0KiBv LCBjb25zdCBFaW5hX1JlY3RhbmdsZSogdXBkYXRlKTsKIHZvaWQgZXdrX3RpbGVkX2JhY2tpbmdf c3RvcmVfdXBkYXRlc19wcm9jZXNzX3ByZV9zZXQoRXZhc19PYmplY3QqIG8sIHZvaWQqKCpjYiko dm9pZCogZGF0YSwgRXZhc19PYmplY3QgKm8pLCBjb25zdCB2b2lkKiBkYXRhKTsKIHZvaWQgZXdr X3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlc19wcm9jZXNzX3Bvc3Rfc2V0KEV2YXNfT2JqZWN0 KiBvLCB2b2lkKigqY2IpKHZvaWQqIGRhdGEsIHZvaWQqIHByZV9kYXRhLCBFdmFzX09iamVjdCAq byksIGNvbnN0IHZvaWQqIGRhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXgg ODI4MDJjMi4uYzg4MjY5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0xMjcx LDcgKzEyNzEsNyBAQCB2b2lkIGV3a192aWV3X2JnX2NvbG9yX3NldChFdmFzX09iamVjdCogZXdr VmlldywgaW50IHJlZCwgaW50IGdyZWVuLCBpbnQgYmx1ZSwgaQogewogICAgIEVXS19WSUVXX1NE X0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhKTsKICAgICBFSU5BX1NBRkVUWV9PTl9O VUxMX1JFVFVSTihzbWFydERhdGEtPmFwaSk7Ci0gICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRV Uk4oc21hcnREYXRhLT5hcGktPmJnX2NvbG9yX3NldCk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVM TF9SRVRVUk4oc21hcnREYXRhLT5hcGktPmFscGhhX3NldCk7CiAKICAgICBpZiAoYWxwaGEgPCAw KSB7CiAgICAgICAgIFdSTigiQWxwaGEgbGVzcyB0aGFuIHplcm8gKCVkKS4iLCBhbHBoYSk7CkBA IC0xMzAwLDcgKzEzMDAsNyBAQCB2b2lkIGV3a192aWV3X2JnX2NvbG9yX3NldChFdmFzX09iamVj dCogZXdrVmlldywgaW50IHJlZCwgaW50IGdyZWVuLCBpbnQgYmx1ZSwgaQogICAgIHNtYXJ0RGF0 YS0+YmdfY29sb3IuYiA9IGJsdWU7CiAgICAgc21hcnREYXRhLT5iZ19jb2xvci5hID0gYWxwaGE7 CiAKLSAgICBzbWFydERhdGEtPmFwaS0+YmdfY29sb3Jfc2V0KHNtYXJ0RGF0YSwgcmVkLCBncmVl biwgYmx1ZSwgYWxwaGEpOworICAgIHNtYXJ0RGF0YS0+YXBpLT5hbHBoYV9zZXQoc21hcnREYXRh LCBhbHBoYSk7CiAKICAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBzbWFydERhdGEtPl9w cml2LT5tYWluRnJhbWUtPnZpZXcoKTsKICAgICBpZiAodmlldykgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaAppbmRleCA3ZjkxZDIxLi40MWRiOTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu aApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICAg IEVpbmFfQm9vbCAoKnpvb21fc2V0KShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgZmxvYXQgem9v bSwgRXZhc19Db29yZCBjeCwgRXZhc19Db29yZCBjeSk7CiAgICAgRWluYV9Cb29sICgqem9vbV93 ZWFrX3NldCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIGZsb2F0IHpvb20sIEV2YXNfQ29vcmQg Y3gsIEV2YXNfQ29vcmQgY3kpOwogICAgIHZvaWQgKCp6b29tX3dlYWtfc21vb3RoX3NjYWxlX3Nl dCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEVpbmFfQm9vbCBzbW9vdGhfc2NhbGUpOwotICAg IHZvaWQgKCpiZ19jb2xvcl9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBj aGFyIHIsIHVuc2lnbmVkIGNoYXIgZywgdW5zaWduZWQgY2hhciBiLCB1bnNpZ25lZCBjaGFyIGEp OworICAgIHZvaWQgKCphbHBoYV9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25l ZCBjaGFyIGFscGhhKTsKICAgICB2b2lkICgqZmx1c2gpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNk KTsKICAgICBFaW5hX0Jvb2wgKCpwcmVfcmVuZGVyX3JlZ2lvbikoRXdrX1ZpZXdfU21hcnRfRGF0 YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFdmFzX0Nvb3JkIHcsIEV2YXNfQ29v cmQgaCwgZmxvYXQgem9vbSk7CiAgICAgRWluYV9Cb29sICgqcHJlX3JlbmRlcl9yZWxhdGl2ZV9y YWRpdXMpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBpbnQgbiwgZmxvYXQgem9v bSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfc2luZ2xlLmNw cCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld19zaW5nbGUuY3BwCmluZGV4IGZiNzQ0 ODYyLi45ZTE1NWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdf c2luZ2xlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfc2luZ2xlLmNw cApAQCAtNTIyLDcgKzUyMiw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRf em9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQoRXdrX1ZpZXdfU21hcnRfRGF0CiAgICAgZXZhc19v YmplY3RfaW1hZ2Vfc21vb3RoX3NjYWxlX3NldChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIHNt b290aF9zY2FsZSk7CiB9CiAKLXN0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRfYmdf Y29sb3Jfc2V0KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgdW5zaWduZWQgY2hhciBy ZWQsIHVuc2lnbmVkIGNoYXIgZ3JlZW4sIHVuc2lnbmVkIGNoYXIgYmx1ZSwgdW5zaWduZWQgY2hh ciBhbHBoYSkKK3N0YXRpYyB2b2lkIF9ld2tfdmlld19zaW5nbGVfc21hcnRfYWxwaGFfc2V0KEV3 a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgdW5zaWduZWQgY2hhciBhbHBoYSkKIHsKICAg ICBldmFzX29iamVjdF9pbWFnZV9hbHBoYV9zZXQoc21hcnREYXRhLT5iYWNraW5nX3N0b3JlLCBh bHBoYSA8IDI1NSk7CiB9CkBAIC01NDMsNyArNTQzLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3Np bmdsZV9zbWFydF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAgICBhcGktPnJlcGFp bnRzX3Byb2Nlc3MgPSBfZXdrX3ZpZXdfc2luZ2xlX3NtYXJ0X3JlcGFpbnRzX3Byb2Nlc3M7CiAg ICAgYXBpLT56b29tX3dlYWtfc2V0ID0gX2V3a192aWV3X3NpbmdsZV9zbWFydF96b29tX3dlYWtf c2V0OwogICAgIGFwaS0+em9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQgPSBfZXdrX3ZpZXdfc2lu Z2xlX3NtYXJ0X3pvb21fd2Vha19zbW9vdGhfc2NhbGVfc2V0OwotICAgIGFwaS0+YmdfY29sb3Jf c2V0ID0gX2V3a192aWV3X3NpbmdsZV9zbWFydF9iZ19jb2xvcl9zZXQ7CisgICAgYXBpLT5hbHBo YV9zZXQgPSBfZXdrX3ZpZXdfc2luZ2xlX3NtYXJ0X2FscGhhX3NldDsKIAogICAgIHJldHVybiB0 cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVk LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAKaW5kZXggN2Rl ZDg4NS4uOWYzMTYwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 X3RpbGVkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3Bw CkBAIC0xOTYsNiArMTk2LDExIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld190aWxlZF9zbWFydF96 b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldChFd2tfVmlld19TbWFydF9EYXRhCiAgICAgZXdrX3Rp bGVkX2JhY2tpbmdfc3RvcmVfem9vbV93ZWFrX3Ntb290aF9zY2FsZV9zZXQoc21hcnREYXRhLT5i YWNraW5nX3N0b3JlLCBzbW9vdGhTY2FsZSk7CiB9CiAKK3N0YXRpYyB2b2lkIF9ld2tfdmlld190 aWxlZF9zbWFydF9hbHBoYV9zZXQoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCB1bnNp Z25lZCBjaGFyIGFscGhhKQoreworICAgIGV3a190aWxlZF9iYWNraW5nX3N0b3JlX2FscGhhX3Nl dChzbWFydERhdGEtPmJhY2tpbmdfc3RvcmUsIGFscGhhIDwgMjU1KTsKK30KKwogc3RhdGljIHZv aWQgX2V3a192aWV3X3RpbGVkX3NtYXJ0X2ZsdXNoKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0 RGF0YSkKIHsKICAgICBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9mbHVzaChzbWFydERhdGEtPmJh Y2tpbmdfc3RvcmUpOwpAQCAtMjQ2LDYgKzI1MSw3IEBAIEVpbmFfQm9vbCBld2tfdmlld190aWxl ZF9zbWFydF9zZXQoRXdrX1ZpZXdfU21hcnRfQ2xhc3MqIGFwaSkKICAgICBhcGktPnpvb21fc2V0 ID0gX2V3a192aWV3X3RpbGVkX3NtYXJ0X3pvb21fc2V0OwogICAgIGFwaS0+em9vbV93ZWFrX3Nl dCA9IF9ld2tfdmlld190aWxlZF9zbWFydF96b29tX3dlYWtfc2V0OwogICAgIGFwaS0+em9vbV93 ZWFrX3Ntb290aF9zY2FsZV9zZXQgPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfem9vbV93ZWFrX3Nt b290aF9zY2FsZV9zZXQ7CisgICAgYXBpLT5hbHBoYV9zZXQgPSBfZXdrX3ZpZXdfdGlsZWRfc21h cnRfYWxwaGFfc2V0OwogICAgIGFwaS0+Zmx1c2ggPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfZmx1 c2g7CiAgICAgYXBpLT5wcmVfcmVuZGVyX3JlZ2lvbiA9IF9ld2tfdmlld190aWxlZF9zbWFydF9w cmVfcmVuZGVyX3JlZ2lvbjsKICAgICBhcGktPnByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzID0g X2V3a192aWV3X3RpbGVkX3NtYXJ0X3ByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzOwo= 116765 2011-11-28 08:47:23 -0800 2011-11-30 18:40:42 -0800 restore the API name restore_api_name.patch text/plain 5980 jungjik.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCAyNjU2OThlLi5iZDE4M2Q3IDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjMgQEAKIDIwMTEtMTEtMjggIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ft c3VuZy5jb20+CiAKKyAgICAgICAgW0VGTF0gQXBwbHkgYWxwaGEgY2hhbm5lbCBpbnRvIGV3a190 aWxlZF9iYWNraW5nX3N0b3JlJ3MgdGlsZSBvYmplY3RzLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzMwMTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYWxwaGFfc2V0IEFQSSB0byB0aWxlZCBiYWNr aW5nIHN0b3JlIHRvIGFwcGx5IGFscGhhIGNoYW5uZWwgb24gdGlsZSBvYmplY3RzLgorCisgICAg ICAgICogZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmNwcDoKKyAgICAgICAgKF9ld2tfdGls ZWRfYmFja2luZ19zdG9yZV90aWxlX2Fzc29jaWF0ZSk6CisgICAgICAgIChld2tfdGlsZWRfYmFj a2luZ19zdG9yZV9hbHBoYV9zZXQpOgorICAgICAgICAqIGV3ay9ld2tfdGlsZWRfYmFja2luZ19z dG9yZS5oOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOgorICAgICAgICAqIGV3ay9ld2tfdmll d190aWxlZC5jcHA6CisgICAgICAgIChfZXdrX3ZpZXdfdGlsZWRfc21hcnRfYmdfY29sb3Jfc2V0 KToKKyAgICAgICAgKGV3a192aWV3X3RpbGVkX3NtYXJ0X3NldCk6CisKKzIwMTEtMTEtMjggIEp1 bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ftc3VuZy5jb20+CisKICAgICAgICAgW0VGTF0gUmVu YW1lIGFiYnJldmlhdGVkIHZhbHVlIG5hbWVzIHRvIGNwcCBzdHlsZSBuYW1lcy4KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczMTkzCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5jcHAgYi9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuY3BwCmluZGV4IGQz NDRkN2YuLjI1MjY4YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGls ZWRfYmFja2luZ19zdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxl ZF9iYWNraW5nX3N0b3JlLmNwcApAQCAtNjUsNiArNjUsNyBAQCBzdHJ1Y3QgX0V3a19UaWxlZF9C YWNraW5nX1N0b3JlX0RhdGEgewogICAgICAgICAgICAgRXZhc19Db29yZCB3aWR0aCwgaGVpZ2h0 OwogICAgICAgICAgICAgZmxvYXQgem9vbTsKICAgICAgICAgICAgIGJvb2wgem9vbVdlYWtTbW9v dGhTY2FsZSA6IDE7CisgICAgICAgICAgICBib29sIGhhc0FscGhhIDogMTsKICAgICAgICAgfSB0 aWxlOwogICAgICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgc3RydWN0IHsKQEAgLTIwNyw2ICsy MDgsNyBAQCBzdGF0aWMgdm9pZCBfZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdGlsZV9hc3NvY2lh dGUoRXdrX1RpbGVkX0JhY2tpbmdfU3RvcmVfRGF0YQogICAgIGV2YXNfb2JqZWN0X2ltYWdlX2Zp bGxfc2V0CiAgICAgICAgIChpdGVtLT50aWxlLT5pbWFnZSwgMCwgMCwgaXRlbS0+Z2VvbWV0cnku d2lkdGgsIGl0ZW0tPmdlb21ldHJ5LmhlaWdodCk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2Vfc21v b3RoX3NjYWxlX3NldChpdGVtLT50aWxlLT5pbWFnZSwgaXRlbS0+c21vb3RoX3NjYWxlKTsKKyAg ICBldmFzX29iamVjdF9pbWFnZV9hbHBoYV9zZXQoaXRlbS0+dGlsZS0+aW1hZ2UsIHByaXYtPnZp ZXcudGlsZS5oYXNBbHBoYSk7CiAKICAgICBpZiAoIWV3a190aWxlX3Zpc2libGVfZ2V0KHRpbGUp KQogICAgICAgICBldmFzX29iamVjdF9zbWFydF9tZW1iZXJfYWRkKHRpbGUtPmltYWdlLCBwcml2 LT5zZWxmKTsKQEAgLTE3MzQsNiArMTczNiwxMiBAQCB2b2lkIGV3a190aWxlZF9iYWNraW5nX3N0 b3JlX3pvb21fd2Vha19zbW9vdGhfc2NhbGVfc2V0KEV2YXNfT2JqZWN0KiBld2tCYWNraW5nUwog ICAgIH0KIH0KIAordm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9hbHBoYV9zZXQoRXZhc19P YmplY3QqIGV3a0JhY2tpbmdTdG9yZSwgRWluYV9Cb29sIGhhc0FscGhhKQoreworICAgIFBSSVZf REFUQV9HRVRfT1JfUkVUVVJOKGV3a0JhY2tpbmdTdG9yZSwgcHJpdik7CisgICAgcHJpdi0+dmll dy50aWxlLmhhc0FscGhhID0gaGFzQWxwaGE7Cit9CisKIEVpbmFfQm9vbCBld2tfdGlsZWRfYmFj a2luZ19zdG9yZV91cGRhdGUoRXZhc19PYmplY3QqIGV3a0JhY2tpbmdTdG9yZSwgY29uc3QgRWlu YV9SZWN0YW5nbGUqIHVwZGF0ZSkKIHsKICAgICBQUklWX0RBVEFfR0VUX09SX1JFVFVSTihld2tC YWNraW5nU3RvcmUsIHByaXYsIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a190aWxlZF9iYWNraW5nX3N0b3JlLmgKaW5kZXggNzk0NTFhZS4uMGU1MGI4NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKKysrIGIv U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9iYWNraW5nX3N0b3JlLmgKQEAgLTEwMCw2 ICsxMDAsNyBAQCBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfem9vbV9zZXQoRXZh c19PYmplY3QqIG8sIGZsb2F0KiB6b29tLCBFdmFzX0NvbwogRWluYV9Cb29sIGV3a190aWxlZF9i YWNraW5nX3N0b3JlX3pvb21fd2Vha19zZXQoRXZhc19PYmplY3QqIG8sIGZsb2F0IHpvb20sIEV2 YXNfQ29vcmQgY3gsIEV2YXNfQ29vcmQgY3kpOwogdm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9y ZV9maXhfb2Zmc2V0cyhFdmFzX09iamVjdCogbywgRXZhc19Db29yZCB3LCBFdmFzX0Nvb3JkIGgp Owogdm9pZCBld2tfdGlsZWRfYmFja2luZ19zdG9yZV96b29tX3dlYWtfc21vb3RoX3NjYWxlX3Nl dChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIHNtb290aF9zY2FsZSk7Cit2b2lkIGV3a190aWxl ZF9iYWNraW5nX3N0b3JlX2FscGhhX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGhhc19h bHBoYSk7CiBFaW5hX0Jvb2wgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlKEV2YXNfT2Jq ZWN0KiBvLCBjb25zdCBFaW5hX1JlY3RhbmdsZSogdXBkYXRlKTsKIHZvaWQgZXdrX3RpbGVkX2Jh Y2tpbmdfc3RvcmVfdXBkYXRlc19wcm9jZXNzX3ByZV9zZXQoRXZhc19PYmplY3QqIG8sIHZvaWQq KCpjYikodm9pZCogZGF0YSwgRXZhc19PYmplY3QgKm8pLCBjb25zdCB2b2lkKiBkYXRhKTsKIHZv aWQgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfdXBkYXRlc19wcm9jZXNzX3Bvc3Rfc2V0KEV2YXNf T2JqZWN0KiBvLCB2b2lkKigqY2IpKHZvaWQqIGRhdGEsIHZvaWQqIHByZV9kYXRhLCBFdmFzX09i amVjdCAqbyksIGNvbnN0IHZvaWQqIGRhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRl eCA3ZjkxZDIxLi5lZDMyOGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtMTI5LDcg KzEyOSw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICAgIEVpbmFfQm9vbCAo Knpvb21fc2V0KShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgZmxvYXQgem9vbSwgRXZhc19Db29y ZCBjeCwgRXZhc19Db29yZCBjeSk7CiAgICAgRWluYV9Cb29sICgqem9vbV93ZWFrX3NldCkoRXdr X1ZpZXdfU21hcnRfRGF0YSAqc2QsIGZsb2F0IHpvb20sIEV2YXNfQ29vcmQgY3gsIEV2YXNfQ29v cmQgY3kpOwogICAgIHZvaWQgKCp6b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldCkoRXdrX1ZpZXdf U21hcnRfRGF0YSAqc2QsIEVpbmFfQm9vbCBzbW9vdGhfc2NhbGUpOwotICAgIHZvaWQgKCpiZ19j b2xvcl9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBjaGFyIHIsIHVuc2ln bmVkIGNoYXIgZywgdW5zaWduZWQgY2hhciBiLCB1bnNpZ25lZCBjaGFyIGEpOworICAgIHZvaWQg KCpiZ19jb2xvcl9zZXQpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBjaGFyIHJl ZCwgdW5zaWduZWQgY2hhciBncmVlbiwgdW5zaWduZWQgY2hhciBibHVlLCB1bnNpZ25lZCBjaGFy IGFscGhhKTsKICAgICB2b2lkICgqZmx1c2gpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkKTsKICAg ICBFaW5hX0Jvb2wgKCpwcmVfcmVuZGVyX3JlZ2lvbikoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2Qs IEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFdmFzX0Nvb3JkIHcsIEV2YXNfQ29vcmQgaCwg ZmxvYXQgem9vbSk7CiAgICAgRWluYV9Cb29sICgqcHJlX3JlbmRlcl9yZWxhdGl2ZV9yYWRpdXMp KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCB1bnNpZ25lZCBpbnQgbiwgZmxvYXQgem9vbSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVkLmNwcAppbmRleCA1YjRmMzMzLi5kYWY5 NzlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAKQEAgLTE5Niw2 ICsxOTYsMTEgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3RpbGVkX3NtYXJ0X3pvb21fd2Vha19z bW9vdGhfc2NhbGVfc2V0KEV3a19WaWV3X1NtYXJ0X0RhdGEKICAgICBld2tfdGlsZWRfYmFja2lu Z19zdG9yZV96b29tX3dlYWtfc21vb3RoX3NjYWxlX3NldChzbWFydERhdGEtPmJhY2tpbmdfc3Rv cmUsIHNtb290aFNjYWxlKTsKIH0KIAorc3RhdGljIHZvaWQgX2V3a192aWV3X3RpbGVkX3NtYXJ0 X2JnX2NvbG9yX3NldChFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIHVuc2lnbmVkIGNo YXIgcmVkLCB1bnNpZ25lZCBjaGFyIGdyZWVuLCB1bnNpZ25lZCBjaGFyIGJsdWUsIHVuc2lnbmVk IGNoYXIgYWxwaGEpCit7CisgICAgZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmVfYWxwaGFfc2V0KHNt YXJ0RGF0YS0+YmFja2luZ19zdG9yZSwgYWxwaGEgPCAyNTUpOworfQorCiBzdGF0aWMgdm9pZCBf ZXdrX3ZpZXdfdGlsZWRfc21hcnRfZmx1c2goRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRh KQogewogICAgIGV3a190aWxlZF9iYWNraW5nX3N0b3JlX2ZsdXNoKHNtYXJ0RGF0YS0+YmFja2lu Z19zdG9yZSk7CkBAIC0yNDYsNiArMjUxLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3RpbGVkX3Nt YXJ0X3NldChFd2tfVmlld19TbWFydF9DbGFzcyogYXBpKQogICAgIGFwaS0+em9vbV9zZXQgPSBf ZXdrX3ZpZXdfdGlsZWRfc21hcnRfem9vbV9zZXQ7CiAgICAgYXBpLT56b29tX3dlYWtfc2V0ID0g X2V3a192aWV3X3RpbGVkX3NtYXJ0X3pvb21fd2Vha19zZXQ7CiAgICAgYXBpLT56b29tX3dlYWtf c21vb3RoX3NjYWxlX3NldCA9IF9ld2tfdmlld190aWxlZF9zbWFydF96b29tX3dlYWtfc21vb3Ro X3NjYWxlX3NldDsKKyAgICBhcGktPmJnX2NvbG9yX3NldCA9IF9ld2tfdmlld190aWxlZF9zbWFy dF9iZ19jb2xvcl9zZXQ7CiAgICAgYXBpLT5mbHVzaCA9IF9ld2tfdmlld190aWxlZF9zbWFydF9m bHVzaDsKICAgICBhcGktPnByZV9yZW5kZXJfcmVnaW9uID0gX2V3a192aWV3X3RpbGVkX3NtYXJ0 X3ByZV9yZW5kZXJfcmVnaW9uOwogICAgIGFwaS0+cHJlX3JlbmRlcl9yZWxhdGl2ZV9yYWRpdXMg PSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfcHJlX3JlbmRlcl9yZWxhdGl2ZV9yYWRpdXM7Cg==