64259 2011-07-11 03:51:46 -0700 [EFL] Implement EditorClientEfl::respondToChangedContents 2011-07-29 19:00:56 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P4 Enhancement --- 0 mpakulavelrutka webkit-unassigned gyuyoung.kim gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 434739 0 mpakulavelrutka 2011-07-11 03:51:46 -0700 Implements EditorClientEfl::respondToChangedContents by calling callback both from ewk_frame and ewk_view with frame and view objects respectively. 434740 1 100260 mpakulavelrutka 2011-07-11 03:54:04 -0700 Created attachment 100260 proposed patch 434741 2 webkit.review.bot 2011-07-11 03:56:38 -0700 Attachment 100260 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 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 434743 3 100261 mpakulavelrutka 2011-07-11 04:01:49 -0700 Created attachment 100261 fixed changelog 434811 4 rakuco 2011-07-11 06:05:46 -0700 Informal r- to address these small issues: LGTM in general, however I think these new signals should be documented in ewk_frame.h and ewk_view.h even though the functions which emit them are marked as internal, as the signals are emitted publicly anyway. > Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp:125 > + Evas_Object* frame = ewk_view_frame_focused_get(m_view); Doing it like this should make the code a bit shorter: Evas_Object* frame = ewk_view_frame_focused_get(m_view) ? ewk_view_frame_focused_get(m_view) : ewk_view_frame_main_get(m_view); > Source/WebKit/efl/ewk/ewk_private.h:115 > +void ewk_view_editor_client_contents_changed(Evas_Object* o); Nitpick: this declaration could come before the one above it so that they are sorted alphabetically. > Source/WebKit/efl/ewk/ewk_private.h:184 > +void ewk_frame_editor_client_contents_changed(Evas_Object* o); Nitpick: this declaration could come before the one above it so that they are sorted alphabetically. 434819 5 mpakulavelrutka 2011-07-11 06:21:15 -0700 (In reply to comment #4) > Informal r- to address these small issues: > > LGTM in general, however I think these new signals should be documented in ewk_frame.h and ewk_view.h even though the functions which emit them are marked as internal, as the signals are emitted publicly anyway. OK I see, should I add documentation for 'editorclient,selection,changed' in this or another patch, as I haven't added it before? > > > Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp:125 > > + Evas_Object* frame = ewk_view_frame_focused_get(m_view); > > Doing it like this should make the code a bit shorter: > > Evas_Object* frame = ewk_view_frame_focused_get(m_view) ? ewk_view_frame_focused_get(m_view) : ewk_view_frame_main_get(m_view); > OK > > Source/WebKit/efl/ewk/ewk_private.h:115 > > +void ewk_view_editor_client_contents_changed(Evas_Object* o); > > Nitpick: this declaration could come before the one above it so that they are sorted alphabetically. > > > Source/WebKit/efl/ewk/ewk_private.h:184 > > +void ewk_frame_editor_client_contents_changed(Evas_Object* o); > > Nitpick: this declaration could come before the one above it so that they are sorted alphabetically. OK 434832 6 rakuco 2011-07-11 06:35:29 -0700 (In reply to comment #5) > OK I see, should I add documentation for 'editorclient,selection,changed' in this or another patch, as I haven't added it before? Sorry, I meant the signals you added in this patch ("editorclient,contents,changed"). As for the "editorclient,selection,changed" signal, I suspect there are more undocumented signals being emitted, and they should go in a separate patch. BTW, I forgot to mention one thing: > Source/WebKit/efl/ewk/ewk_view.cpp:4593 > + * Reports the view that editor client contents were changed. the view -> to the view editor client contents -> the editor client's contents 434884 7 100303 mpakulavelrutka 2011-07-11 08:11:01 -0700 Created attachment 100303 changes according to Raphael's suggestions 434901 8 rakuco 2011-07-11 08:42:21 -0700 LGTM. 440950 9 100303 tonikitoo 2011-07-22 07:59:23 -0700 Comment on attachment 100303 changes according to Raphael's suggestions View in context: https://bugs.webkit.org/attachment.cgi?id=100303&action=review > Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp:125 > + Evas_Object* frame = ewk_view_frame_focused_get(m_view) ? ewk_view_frame_focused_get(m_view) : ewk_view_frame_main_get(m_view); I would not call the getter twice here. 441630 10 100303 mpakulavelrutka 2011-07-25 06:42:38 -0700 Comment on attachment 100303 changes according to Raphael's suggestions View in context: https://bugs.webkit.org/attachment.cgi?id=100303&action=review >> Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp:125 >> + Evas_Object* frame = ewk_view_frame_focused_get(m_view) ? ewk_view_frame_focused_get(m_view) : ewk_view_frame_main_get(m_view); > > I would not call the getter twice here. OK, should I do it this way: Evas_Object* frame = ewk_view_frame_focused_get(m_view); frame = frame ? frame : ewk_view_frame_main_get(m_view); or get back to if? 441688 11 rakuco 2011-07-25 09:19:57 -0700 Given he's already given an r+, I think you could also leave it as-is. 442106 12 gyuyoung.kim 2011-07-25 22:10:16 -0700 (In reply to comment #11) > Given he's already given an r+, I think you could also leave it as-is. I think this is not big work. Why don't we fix antonio's comment before landing this patch ? Michal, Could you update this patch based on comment #10 ? Please fill review field in ChangeLog as below, Reviewed by NOBODY (OOPS!). => Reviewed by Antonio Gomes. Then, please request only cq. 442917 13 mpakulavelrutka 2011-07-27 07:11:51 -0700 (In reply to comment #12) > (In reply to comment #11) > > Given he's already given an r+, I think you could also leave it as-is. > > I think this is not big work. Why don't we fix antonio's comment before landing this patch ? > > Michal, > > Could you update this patch based on comment #10 ? Please fill review field in ChangeLog as below, > > Reviewed by NOBODY (OOPS!). => Reviewed by Antonio Gomes. > > Then, please request only cq. I am bit confused... I know that is not a big work, but I want to get Antonio's confirmation first. Anyway until then I am leaving it as it is. 443346 14 gyuyoung.kim 2011-07-27 22:42:40 -0700 (In reply to comment #13) > (In reply to comment #12) > > (In reply to comment #11) > > > Given he's already given an r+, I think you could also leave it as-is. > > > > I think this is not big work. Why don't we fix antonio's comment before landing this patch ? > > > > Michal, > > > > Could you update this patch based on comment #10 ? Please fill review field in ChangeLog as below, > > > > Reviewed by NOBODY (OOPS!). => Reviewed by Antonio Gomes. > > > > Then, please request only cq. > > I am bit confused... I know that is not a big work, but I want to get Antonio's confirmation first. Anyway until then I am leaving it as it is. Antonio already gave r+. But, he pointed minor problem in this patch. So, if you fix it, AFAIK, you don't need to get r+ again. But, frankly, I am not sure if this fix is minor problem. If you think it is better to get r+ from Antonio again, please request r?/cq? again when you submit updated patch. 443904 15 102353 mpakulavelrutka 2011-07-29 05:55:21 -0700 Created attachment 102353 changed frame check in editorclientefl 444225 16 102353 webkit.review.bot 2011-07-29 19:00:50 -0700 Comment on attachment 102353 changed frame check in editorclientefl Clearing flags on attachment: 102353 Committed r92039: <http://trac.webkit.org/changeset/92039> 444228 17 webkit.review.bot 2011-07-29 19:00:56 -0700 All reviewed patches have been landed. Closing bug. 100260 2011-07-11 03:54:04 -0700 2011-07-11 04:01:49 -0700 proposed patch patch_editor_client.diff text/plain 3986 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5OTNkZjczLi5mNmNiZGFjIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMDQgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gSW1wbGVtZW50IEVkaXRvckNsaWVu dEVmbDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPVhYWFhYCisKKyAgICAgICAgSW1wbGVtZW50cyByZXNwb25k VG9DaGFuZ2VkQ29udGVudHMgYnkgY2FsbGluZyBjYWxsYmFjayBib3RoIGZyb20KKyAgICAgICAg ZXdrX2ZyYW1lIGFuZCBld2tfdmlldyB3aXRoIGZyYW1lIGFuZCB2aWV3IG9iamVjdHMgcmVzcGVj dGl2ZWx5LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkVkaXRvckNsaWVudEVmbDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKToKKyAgICAgICAgKiBl d2svZXdrX2ZyYW1lLmNwcDoKKyAgICAgICAgKGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X2NvbnRl bnRzX2NoYW5nZWQpOgorICAgICAgICAqIGV3ay9ld2tfcHJpdmF0ZS5oOgorICAgICAgICAqIGV3 ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRz X2NoYW5nZWQpOgorCiAyMDExLTA2LTI5ICBLYW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5n LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRF ZmwuY3BwCmluZGV4IDVjMTJmZTAuLjk3ZjNhMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv ZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcApAQCAtMTIyLDcgKzEyMiwx NSBAQCB2b2lkIEVkaXRvckNsaWVudEVmbDo6ZGlkQmVnaW5FZGl0aW5nKCkKIAogdm9pZCBFZGl0 b3JDbGllbnRFZmw6OnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpCiB7Ci0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICBFdmFzX09iamVjdCogZnJhbWUgPSBld2tfdmlld19mcmFtZV9mb2N1c2Vk X2dldChtX3ZpZXcpOworCisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgZnJhbWUgPSBld2tfdmll d19mcmFtZV9tYWluX2dldChtX3ZpZXcpOworCisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChmcmFt ZSk7CiB9CiAKIHZvaWQgRWRpdG9yQ2xpZW50RWZsOjpyZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9u KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXggODU4MzRjZC4uMzE4MGFiYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTIwMTUsMyArMjAxNSwxOCBAQCB2 b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X3NlbGVjdGlvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0 KiBvKQogICAgIEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJOKG8sIHNkKTsKICAgICBld2tfdmll d19lZGl0b3JfY2xpZW50X3NlbGVjdGlvbl9jaGFuZ2VkKHNkLT52aWV3KTsKIH0KKworLyoqCisg KiBAaW50ZXJuYWwKKyAqIFJlcG9ydHMgdGhhdCBlZGl0b3IgY2xpZW50IGNvbnRlbnRzIHdlcmUg Y2hhbmdlZC4KKyAqCisgKiBAcGFyYW0gbyBGcmFtZQorICoKKyAqIEVtaXRzIHNpZ25hbDogImVk aXRvcmNsaWVudCxjb250ZW50cyxjaGFuZ2VkIiB3aXRoIG5vIHBhcmFtZXRlcnMuCisgKi8KK3Zv aWQgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChFdmFzX09iamVjdCog bykKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKG8sICJlZGl0b3JjbGll bnQsY29udGVudHMsY2hhbmdlZCIsIDApOworICAgIEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJO KG8sIHNkKTsKKyAgICBld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5nZWQoc2Qt PnZpZXcpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRl LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAppbmRleCAxMDc2YzY2Li44 ZTkyMGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaApAQCAtMTEyLDYgKzExMiw3 IEBAIHZvaWQgZXdrX3ZpZXdfdmlld3BvcnRfYXR0cmlidXRlc19zZXQoRXZhc19PYmplY3QgKm8s IGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJnCiB2b2lkIGV3a192aWV3X2Rvd25sb2FkX3JlcXVl c3QoRXZhc19PYmplY3QgKm8sIEV3a19Eb3dubG9hZCAqZG93bmxvYWQpOwogCiB2b2lkIGV3a192 aWV3X2VkaXRvcl9jbGllbnRfc2VsZWN0aW9uX2NoYW5nZWQoRXZhc19PYmplY3QqIG8pOwordm9p ZCBld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5nZWQoRXZhc19PYmplY3QqIG8p OwogCiBpbnQgZXdrX3V0aWxfZHBpX2dldCh2b2lkKTsKIApAQCAtMTgwLDYgKzE4MSw3IEBAIFdl YkNvcmU6OkZsb2F0UmVjdCBld2tfdmlld19wYWdlX3JlY3RfZ2V0KEV2YXNfT2JqZWN0ICpvKTsK IGNvbnN0IGNoYXIqIGV3a19zZXR0aW5nc19kZWZhdWx0X3VzZXJfYWdlbnRfZ2V0KHZvaWQpOwog CiB2b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X3NlbGVjdGlvbl9jaGFuZ2VkKEV2YXNfT2Jq ZWN0KiBvKTsKK3ZvaWQgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChF dmFzX09iamVjdCogbyk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a192aWV3LmNwcAppbmRleCAzOGU2YzYxLi44MmY4YjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tf dmlldy5jcHAKQEAgLTQ1ODcsMyArNDU4NywxNiBAQCB2b2lkIGV3a192aWV3X2VkaXRvcl9jbGll bnRfc2VsZWN0aW9uX2NoYW5nZWQoRXZhc19PYmplY3QqIG8pCiB7CiAgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfY2FsbChvLCAiZWRpdG9yY2xpZW50LHNlbGVjdGlvbixjaGFuZ2VkIiwg MCk7CiB9CisKKy8qKgorICogQGludGVybmFsCisgKiBSZXBvcnRzIHRoZSB2aWV3IHRoYXQgZWRp dG9yIGNsaWVudCBjb250ZW50cyB3ZXJlIGNoYW5nZWQuCisgKgorICogQHBhcmFtIG8gVmlldy4K KyAqCisgKiBFbWl0cyBzaWduYWw6ICJlZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdlZCIgd2l0 aCBubyBwYXJhbWV0ZXJzLgorICovCit2b2lkIGV3a192aWV3X2VkaXRvcl9jbGllbnRfY29udGVu dHNfY2hhbmdlZChFdmFzX09iamVjdCogbykKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxs YmFja19jYWxsKG8sICJlZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdlZCIsIDApOworfQo= 100261 2011-07-11 04:01:49 -0700 2011-07-11 08:11:01 -0700 fixed changelog patch_editor_client.diff text/plain 3986 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5OTNkZjczLi5mNmNiZGFjIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMDQgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gSW1wbGVtZW50IEVkaXRvckNsaWVu dEVmbDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MjU5CisKKyAgICAgICAgSW1wbGVtZW50cyByZXNwb25k VG9DaGFuZ2VkQ29udGVudHMgYnkgY2FsbGluZyBjYWxsYmFjayBib3RoIGZyb20KKyAgICAgICAg ZXdrX2ZyYW1lIGFuZCBld2tfdmlldyB3aXRoIGZyYW1lIGFuZCB2aWV3IG9iamVjdHMgcmVzcGVj dGl2ZWx5LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkVkaXRvckNsaWVudEVmbDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKToKKyAgICAgICAgKiBl d2svZXdrX2ZyYW1lLmNwcDoKKyAgICAgICAgKGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X2NvbnRl bnRzX2NoYW5nZWQpOgorICAgICAgICAqIGV3ay9ld2tfcHJpdmF0ZS5oOgorICAgICAgICAqIGV3 ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRz X2NoYW5nZWQpOgorCiAyMDExLTA2LTI5ICBLYW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5n LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRF ZmwuY3BwCmluZGV4IDVjMTJmZTAuLjk3ZjNhMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv ZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcApAQCAtMTIyLDcgKzEyMiwx NSBAQCB2b2lkIEVkaXRvckNsaWVudEVmbDo6ZGlkQmVnaW5FZGl0aW5nKCkKIAogdm9pZCBFZGl0 b3JDbGllbnRFZmw6OnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpCiB7Ci0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICBFdmFzX09iamVjdCogZnJhbWUgPSBld2tfdmlld19mcmFtZV9mb2N1c2Vk X2dldChtX3ZpZXcpOworCisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgZnJhbWUgPSBld2tfdmll d19mcmFtZV9tYWluX2dldChtX3ZpZXcpOworCisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChmcmFt ZSk7CiB9CiAKIHZvaWQgRWRpdG9yQ2xpZW50RWZsOjpyZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9u KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKaW5kZXggODU4MzRjZC4uMzE4MGFiYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAKQEAgLTIwMTUsMyArMjAxNSwxOCBAQCB2 b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X3NlbGVjdGlvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0 KiBvKQogICAgIEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJOKG8sIHNkKTsKICAgICBld2tfdmll d19lZGl0b3JfY2xpZW50X3NlbGVjdGlvbl9jaGFuZ2VkKHNkLT52aWV3KTsKIH0KKworLyoqCisg KiBAaW50ZXJuYWwKKyAqIFJlcG9ydHMgdGhhdCBlZGl0b3IgY2xpZW50IGNvbnRlbnRzIHdlcmUg Y2hhbmdlZC4KKyAqCisgKiBAcGFyYW0gbyBGcmFtZQorICoKKyAqIEVtaXRzIHNpZ25hbDogImVk aXRvcmNsaWVudCxjb250ZW50cyxjaGFuZ2VkIiB3aXRoIG5vIHBhcmFtZXRlcnMuCisgKi8KK3Zv aWQgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChFdmFzX09iamVjdCog bykKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKG8sICJlZGl0b3JjbGll bnQsY29udGVudHMsY2hhbmdlZCIsIDApOworICAgIEVXS19GUkFNRV9TRF9HRVRfT1JfUkVUVVJO KG8sIHNkKTsKKyAgICBld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5nZWQoc2Qt PnZpZXcpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRl LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAppbmRleCAxMDc2YzY2Li44 ZTkyMGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaApAQCAtMTEyLDYgKzExMiw3 IEBAIHZvaWQgZXdrX3ZpZXdfdmlld3BvcnRfYXR0cmlidXRlc19zZXQoRXZhc19PYmplY3QgKm8s IGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJnCiB2b2lkIGV3a192aWV3X2Rvd25sb2FkX3JlcXVl c3QoRXZhc19PYmplY3QgKm8sIEV3a19Eb3dubG9hZCAqZG93bmxvYWQpOwogCiB2b2lkIGV3a192 aWV3X2VkaXRvcl9jbGllbnRfc2VsZWN0aW9uX2NoYW5nZWQoRXZhc19PYmplY3QqIG8pOwordm9p ZCBld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5nZWQoRXZhc19PYmplY3QqIG8p OwogCiBpbnQgZXdrX3V0aWxfZHBpX2dldCh2b2lkKTsKIApAQCAtMTgwLDYgKzE4MSw3IEBAIFdl YkNvcmU6OkZsb2F0UmVjdCBld2tfdmlld19wYWdlX3JlY3RfZ2V0KEV2YXNfT2JqZWN0ICpvKTsK IGNvbnN0IGNoYXIqIGV3a19zZXR0aW5nc19kZWZhdWx0X3VzZXJfYWdlbnRfZ2V0KHZvaWQpOwog CiB2b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X3NlbGVjdGlvbl9jaGFuZ2VkKEV2YXNfT2Jq ZWN0KiBvKTsKK3ZvaWQgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChF dmFzX09iamVjdCogbyk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a192aWV3LmNwcAppbmRleCAzOGU2YzYxLi44MmY4YjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tf dmlldy5jcHAKQEAgLTQ1ODcsMyArNDU4NywxNiBAQCB2b2lkIGV3a192aWV3X2VkaXRvcl9jbGll bnRfc2VsZWN0aW9uX2NoYW5nZWQoRXZhc19PYmplY3QqIG8pCiB7CiAgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfY2FsbChvLCAiZWRpdG9yY2xpZW50LHNlbGVjdGlvbixjaGFuZ2VkIiwg MCk7CiB9CisKKy8qKgorICogQGludGVybmFsCisgKiBSZXBvcnRzIHRoZSB2aWV3IHRoYXQgZWRp dG9yIGNsaWVudCBjb250ZW50cyB3ZXJlIGNoYW5nZWQuCisgKgorICogQHBhcmFtIG8gVmlldy4K KyAqCisgKiBFbWl0cyBzaWduYWw6ICJlZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdlZCIgd2l0 aCBubyBwYXJhbWV0ZXJzLgorICovCit2b2lkIGV3a192aWV3X2VkaXRvcl9jbGllbnRfY29udGVu dHNfY2hhbmdlZChFdmFzX09iamVjdCogbykKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxs YmFja19jYWxsKG8sICJlZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdlZCIsIDApOworfQo= 100303 2011-07-11 08:11:01 -0700 2011-07-29 05:55:21 -0700 changes according to Raphael's suggestions editor_client2.diff text/plain 5173 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5OTNkZjczLi4yM2VmNzhjIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMDQgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gSW1wbGVtZW50IEVkaXRvckNsaWVu dEVmbDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MjU5CisKKyAgICAgICAgSW1wbGVtZW50cyByZXNwb25k VG9DaGFuZ2VkQ29udGVudHMgYnkgY2FsbGluZyBjYWxsYmFjayBib3RoIGZyb20KKyAgICAgICAg ZXdrX2ZyYW1lIGFuZCBld2tfdmlldyB3aXRoIGZyYW1lIGFuZCB2aWV3IG9iamVjdHMgcmVzcGVj dGl2ZWx5LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkVkaXRvckNsaWVudEVmbDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKToKKyAgICAgICAgKiBl d2svZXdrX2ZyYW1lLmNwcDoKKyAgICAgICAgKGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X2NvbnRl bnRzX2NoYW5nZWQpOgorICAgICAgICAqIGV3ay9ld2tfcHJpdmF0ZS5oOgorICAgICAgICAqIGV3 ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRz X2NoYW5nZWQpOgorCiAyMDExLTA2LTI5ICBLYW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5n LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVu dEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRF ZmwuY3BwCmluZGV4IDVjMTJmZTAuLjYwNWY5YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv ZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50RWZsLmNwcApAQCAtMTIyLDcgKzEyMiwx MiBAQCB2b2lkIEVkaXRvckNsaWVudEVmbDo6ZGlkQmVnaW5FZGl0aW5nKCkKIAogdm9pZCBFZGl0 b3JDbGllbnRFZmw6OnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpCiB7Ci0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICBFdmFzX09iamVjdCogZnJhbWUgPSBld2tfdmlld19mcmFtZV9mb2N1c2Vk X2dldChtX3ZpZXcpID8gZXdrX3ZpZXdfZnJhbWVfZm9jdXNlZF9nZXQobV92aWV3KSA6IGV3a192 aWV3X2ZyYW1lX21haW5fZ2V0KG1fdmlldyk7CisKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICBy ZXR1cm47CisKKyAgICBld2tfZnJhbWVfZWRpdG9yX2NsaWVudF9jb250ZW50c19jaGFuZ2VkKGZy YW1lKTsKIH0KIAogdm9pZCBFZGl0b3JDbGllbnRFZmw6OnJlc3BvbmRUb0NoYW5nZWRTZWxlY3Rp b24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5jcHAgYi9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAppbmRleCA4NTgzNGNkLi4xZDQxYjZk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNwcApAQCAtMjAxNSwzICsyMDE1LDE4IEBA IHZvaWQgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfc2VsZWN0aW9uX2NoYW5nZWQoRXZhc19PYmpl Y3QqIG8pCiAgICAgRVdLX0ZSQU1FX1NEX0dFVF9PUl9SRVRVUk4obywgc2QpOwogICAgIGV3a192 aWV3X2VkaXRvcl9jbGllbnRfc2VsZWN0aW9uX2NoYW5nZWQoc2QtPnZpZXcpOwogfQorCisvKioK KyAqIEBpbnRlcm5hbAorICogUmVwb3J0cyB0aGF0IGVkaXRvciBjbGllbnQncyBjb250ZW50cyB3 ZXJlIGNoYW5nZWQuCisgKgorICogQHBhcmFtIG8gRnJhbWUKKyAqCisgKiBFbWl0cyBzaWduYWw6 ICJlZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdlZCIgd2l0aCBubyBwYXJhbWV0ZXJzLgorICov Cit2b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5nZWQoRXZhc19PYmpl Y3QqIG8pCit7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfY2FsbChvLCAiZWRpdG9y Y2xpZW50LGNvbnRlbnRzLGNoYW5nZWQiLCAwKTsKKyAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JF VFVSTihvLCBzZCk7CisgICAgZXdrX3ZpZXdfZWRpdG9yX2NsaWVudF9jb250ZW50c19jaGFuZ2Vk KHNkLT52aWV3KTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJh bWUuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuaAppbmRleCBkNjc0NDNjLi43 MmVlNWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKKysr IGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCkBAIC01OCw2ICs1OCw4IEBACiAg KiAgLSAicmVzb3VyY2UscmVxdWVzdCx3aWxsc2VuZCIsIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1 ZXN0KjogYSByZXNvdXJjZSB3aWxsCiAgKiAgICBiZSByZXF1ZXN0ZWQuCiAgKiAgLSAic3RhdGUs c2F2ZSIsIHZvaWQ6IGZyYW1lJ3Mgc3RhdGUgd2lsbCBiZSBzYXZlZCBhcyBhIGhpc3RvcnkgaXRl bS4KKyAqICAtICJlZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdlZCIsIHZvaWQ6IHJlcG9ydHMg dGhhdCBlZGl0b3IgY2xpZW50J3MKKyAqICAgIGNvbnRlbnRzIHdlcmUgY2hhbmdlZAogICovCiAK ICNpZm5kZWYgZXdrX2ZyYW1lX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKaW5kZXgg MTA3NmM2Ni4uZDc3YjNmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19w cml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKQEAgLTEx MSw2ICsxMTEsNyBAQCB2b2lkIGV3a192aWV3X3ZpZXdwb3J0X2F0dHJpYnV0ZXNfc2V0KEV2YXNf T2JqZWN0ICpvLCBjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEFyZwogCiB2b2lkIGV3a192aWV3X2Rv d25sb2FkX3JlcXVlc3QoRXZhc19PYmplY3QgKm8sIEV3a19Eb3dubG9hZCAqZG93bmxvYWQpOwog Cit2b2lkIGV3a192aWV3X2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChFdmFzX09iamVj dCogbyk7CiB2b2lkIGV3a192aWV3X2VkaXRvcl9jbGllbnRfc2VsZWN0aW9uX2NoYW5nZWQoRXZh c19PYmplY3QqIG8pOwogCiBpbnQgZXdrX3V0aWxfZHBpX2dldCh2b2lkKTsKQEAgLTE3OSw2ICsx ODAsNyBAQCBXZWJDb3JlOjpGbG9hdFJlY3QgZXdrX3ZpZXdfcGFnZV9yZWN0X2dldChFdmFzX09i amVjdCAqbyk7CiAKIGNvbnN0IGNoYXIqIGV3a19zZXR0aW5nc19kZWZhdWx0X3VzZXJfYWdlbnRf Z2V0KHZvaWQpOwogCit2b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5n ZWQoRXZhc19PYmplY3QqIG8pOwogdm9pZCBld2tfZnJhbWVfZWRpdG9yX2NsaWVudF9zZWxlY3Rp b25fY2hhbmdlZChFdmFzX09iamVjdCogbyk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggMzhlNmM2MS4uMjUzNTg1MyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCkBAIC00NTg3LDMgKzQ1ODcsMTYgQEAgdm9pZCBld2tfdmlld19l ZGl0b3JfY2xpZW50X3NlbGVjdGlvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0KiBvKQogewogICAgIGV2 YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwobywgImVkaXRvcmNsaWVudCxzZWxlY3Rpb24s Y2hhbmdlZCIsIDApOwogfQorCisvKioKKyAqIEBpbnRlcm5hbAorICogUmVwb3J0cyB0byB0aGUg dmlldyB0aGF0IGVkaXRvciBjbGllbnQncyBjb250ZW50cyB3ZXJlIGNoYW5nZWQuCisgKgorICog QHBhcmFtIG8gVmlldy4KKyAqCisgKiBFbWl0cyBzaWduYWw6ICJlZGl0b3JjbGllbnQsY29udGVu dHMsY2hhbmdlZCIgd2l0aCBubyBwYXJhbWV0ZXJzLgorICovCit2b2lkIGV3a192aWV3X2VkaXRv cl9jbGllbnRfY29udGVudHNfY2hhbmdlZChFdmFzX09iamVjdCogbykKK3sKKyAgICBldmFzX29i amVjdF9zbWFydF9jYWxsYmFja19jYWxsKG8sICJlZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdl ZCIsIDApOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3Lmgg Yi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCBmMzNhN2NjLi5jMTZiZmFl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtODksNiArODksOCBAQCBleHRlcm4gIkMi IHsKICAqICAtICJyZXN0b3JlIiwgRXZhc19PYmplY3QgKjogcmVwb3J0cyB0aGF0IHZpZXcgc2hv dWxkIGJlIHJlc3RvcmVkIHRvIGRlZmF1bHQgY29uZGl0aW9ucwogICogICAgYW5kIGl0IGdpdmVz IGEgZnJhbWUgdGhhdCBvcmlnaW5hdGVkIHJlc3RvcmUgYXMgYW4gYXJndW1lbnQuCiAgKiAgLSAi dG9vbHRpcCx0ZXh0LHNldCIsIGNvbnN0IGNoYXIqOiBzZXRzIHRvb2x0aXAgdGV4dCBhbmQgZGlz cGxheXMgaWYgaXQgaXMgY3VycmVudGx5IGhpZGRlbi4KKyAqICAtICJlZGl0b3JjbGllbnQsY29u dGVudHMsY2hhbmdlZCIsIHZvaWQ6IHJlcG9ydHMgdG8gdGhlIHZpZXcgdGhhdCBlZGl0b3IKKyAq ICAgIGNsaWVudCdzIGNvbnRlbnRzIHdlcmUgY2hhbmdlZAogICovCiAKIHR5cGVkZWYgc3RydWN0 IF9Fd2tfVmlld19TbWFydF9EYXRhIEV3a19WaWV3X1NtYXJ0X0RhdGE7Cg== 102353 2011-07-29 05:55:21 -0700 2011-07-29 19:00:50 -0700 changed frame check in editorclientefl editor_client3.diff text/plain 5235 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCBiOWNmODI0Li5jYWU2MzBkIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTEtMDctMjkgIE1pY2hhbCBQYWt1bGEgdmVsIFJ1dGthICA8bS5w YWt1bGFAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gSW1wbGVtZW50IEVkaXRvckNsaWVu dEVmbDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MjU5CisKKyAgICAgICAgSW1wbGVtZW50cyByZXNwb25k VG9DaGFuZ2VkQ29udGVudHMgYnkgY2FsbGluZyBjYWxsYmFjayBib3RoIGZyb20KKyAgICAgICAg ZXdrX2ZyYW1lIGFuZCBld2tfdmlldyB3aXRoIGZyYW1lIGFuZCB2aWV3IG9iamVjdHMgcmVzcGVj dGl2ZWx5LgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCisKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RWRpdG9yQ2xpZW50RWZsOjpyZXNwb25kVG9DaGFuZ2VkQ29udGVudHMpOgorICAgICAgICAqIGV3 ay9ld2tfZnJhbWUuY3BwOgorICAgICAgICAoZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVu dHNfY2hhbmdlZCk6CisgICAgICAgICogZXdrL2V3a19mcmFtZS5oOgorICAgICAgICAqIGV3ay9l d2tfcHJpdmF0ZS5oOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tf dmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5nZWQpOgorICAgICAgICAqIGV3ay9ld2tf dmlldy5oOgorCiAyMDExLTA3LTI4ICBLYW5naWwgSGFuICA8a2FuZ2lsLmhhbkBzYW1zdW5nLmNv bT4KIAogICAgICAgICBbRUZMXSBSZW1vdmVzIEVBUEkgYXR0cmlidXRlIGluIGludGVybmFsIGhl YWRlcnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0 b3JDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvRWRpdG9y Q2xpZW50RWZsLmNwcAppbmRleCAxNjI3M2JjLi42YTRhYzVlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEVmbC5jcHAKQEAgLTEyMiw3 ICsxMjIsMTUgQEAgdm9pZCBFZGl0b3JDbGllbnRFZmw6OmRpZEJlZ2luRWRpdGluZygpCiAKIHZv aWQgRWRpdG9yQ2xpZW50RWZsOjpyZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoKQogewotICAgIG5v dEltcGxlbWVudGVkKCk7CisgICAgRXZhc19PYmplY3QqIGZyYW1lID0gZXdrX3ZpZXdfZnJhbWVf Zm9jdXNlZF9nZXQobV92aWV3KTsKKworICAgIGlmICghZnJhbWUpCisgICAgICAgIGZyYW1lID0g ZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQobV92aWV3KTsKKworICAgIGlmICghZnJhbWUpCisgICAg ICAgIHJldHVybjsKKworICAgIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2NoYW5n ZWQoZnJhbWUpOwogfQogCiB2b2lkIEVkaXRvckNsaWVudEVmbDo6cmVzcG9uZFRvQ2hhbmdlZFNl bGVjdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmNw cCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCmluZGV4IGNiNTYxNDYuLjEy MmQ2NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUuY3BwCkBAIC0yMDMyLDMgKzIwMzIs MTggQEAgdm9pZCBld2tfZnJhbWVfZWRpdG9yX2NsaWVudF9zZWxlY3Rpb25fY2hhbmdlZChFdmFz X09iamVjdCAqbykKICAgICBFV0tfRlJBTUVfU0RfR0VUX09SX1JFVFVSTihvLCBzZCk7CiAgICAg ZXdrX3ZpZXdfZWRpdG9yX2NsaWVudF9zZWxlY3Rpb25fY2hhbmdlZChzZC0+dmlldyk7CiB9CisK Ky8qKgorICogQGludGVybmFsCisgKiBSZXBvcnRzIHRoYXQgZWRpdG9yIGNsaWVudCdzIGNvbnRl bnRzIHdlcmUgY2hhbmdlZC4KKyAqCisgKiBAcGFyYW0gbyBGcmFtZQorICoKKyAqIEVtaXRzIHNp Z25hbDogImVkaXRvcmNsaWVudCxjb250ZW50cyxjaGFuZ2VkIiB3aXRoIG5vIHBhcmFtZXRlcnMu CisgKi8KK3ZvaWQgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNfY2hhbmdlZChFdmFz X09iamVjdCAqbykKK3sKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKG8sICJl ZGl0b3JjbGllbnQsY29udGVudHMsY2hhbmdlZCIsIDApOworICAgIEVXS19GUkFNRV9TRF9HRVRf T1JfUkVUVVJOKG8sIHNkKTsKKyAgICBld2tfdmlld19lZGl0b3JfY2xpZW50X2NvbnRlbnRzX2No YW5nZWQoc2QtPnZpZXcpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a19mcmFtZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19mcmFtZS5oCmluZGV4IGM3YzI4 YTkuLjUwNWU4NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfZnJhbWUu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX2ZyYW1lLmgKQEAgLTU4LDYgKzU4LDgg QEAKICAqICAtICJyZXNvdXJjZSxyZXF1ZXN0LHdpbGxzZW5kIiwgRXdrX0ZyYW1lX1Jlc291cmNl X1JlcXVlc3QqOiBhIHJlc291cmNlIHdpbGwKICAqICAgIGJlIHJlcXVlc3RlZC4KICAqICAtICJz dGF0ZSxzYXZlIiwgdm9pZDogZnJhbWUncyBzdGF0ZSB3aWxsIGJlIHNhdmVkIGFzIGEgaGlzdG9y eSBpdGVtLgorICogIC0gImVkaXRvcmNsaWVudCxjb250ZW50cyxjaGFuZ2VkIiwgdm9pZDogcmVw b3J0cyB0aGF0IGVkaXRvciBjbGllbnQncworICogICAgY29udGVudHMgd2VyZSBjaGFuZ2VkCiAg Ki8KIAogI2lmbmRlZiBld2tfZnJhbWVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a19wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaApp bmRleCAzMzMxOGQ2Li4zMzlhMGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaApA QCAtMTExLDYgKzExMSw3IEBAIHZvaWQgZXdrX3ZpZXdfdmlld3BvcnRfYXR0cmlidXRlc19zZXQo RXZhc19PYmplY3QgKm8sIGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXJnCiAKIHZvaWQgZXdrX3Zp ZXdfZG93bmxvYWRfcmVxdWVzdChFdmFzX09iamVjdCAqbywgRXdrX0Rvd25sb2FkICpkb3dubG9h ZCk7CiAKK3ZvaWQgZXdrX3ZpZXdfZWRpdG9yX2NsaWVudF9jb250ZW50c19jaGFuZ2VkKEV2YXNf T2JqZWN0ICpvKTsKIHZvaWQgZXdrX3ZpZXdfZWRpdG9yX2NsaWVudF9zZWxlY3Rpb25fY2hhbmdl ZChFdmFzX09iamVjdCAqbyk7CiAKIGludCBld2tfdXRpbF9kcGlfZ2V0KHZvaWQpOwpAQCAtMTc5 LDYgKzE4MCw3IEBAIFdlYkNvcmU6OkZsb2F0UmVjdCBld2tfdmlld19wYWdlX3JlY3RfZ2V0KEV2 YXNfT2JqZWN0ICpvKTsKIAogY29uc3QgY2hhciogZXdrX3NldHRpbmdzX2RlZmF1bHRfdXNlcl9h Z2VudF9nZXQodm9pZCk7CiAKK3ZvaWQgZXdrX2ZyYW1lX2VkaXRvcl9jbGllbnRfY29udGVudHNf Y2hhbmdlZChFdmFzX09iamVjdCAqbyk7CiB2b2lkIGV3a19mcmFtZV9lZGl0b3JfY2xpZW50X3Nl bGVjdGlvbl9jaGFuZ2VkKEV2YXNfT2JqZWN0ICpvKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA2MWE3MDgzLi5mMzJhYjYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTQ1ODYsMyArNDU4NiwxNiBAQCB2b2lkIGV3a192 aWV3X2VkaXRvcl9jbGllbnRfc2VsZWN0aW9uX2NoYW5nZWQoRXZhc19PYmplY3QgKm8pCiB7CiAg ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfY2FsbChvLCAiZWRpdG9yY2xpZW50LHNlbGVj dGlvbixjaGFuZ2VkIiwgMCk7CiB9CisKKy8qKgorICogQGludGVybmFsCisgKiBSZXBvcnRzIHRv IHRoZSB2aWV3IHRoYXQgZWRpdG9yIGNsaWVudCdzIGNvbnRlbnRzIHdlcmUgY2hhbmdlZC4KKyAq CisgKiBAcGFyYW0gbyBWaWV3LgorICoKKyAqIEVtaXRzIHNpZ25hbDogImVkaXRvcmNsaWVudCxj b250ZW50cyxjaGFuZ2VkIiB3aXRoIG5vIHBhcmFtZXRlcnMuCisgKi8KK3ZvaWQgZXdrX3ZpZXdf ZWRpdG9yX2NsaWVudF9jb250ZW50c19jaGFuZ2VkKEV2YXNfT2JqZWN0ICpvKQoreworICAgIGV2 YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2NhbGwobywgImVkaXRvcmNsaWVudCxjb250ZW50cyxj aGFuZ2VkIiwgMCk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmluZGV4IGViNzM2NjcuLjU3 ODg2MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCisrKyBi L1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCkBAIC04OSw2ICs4OSw4IEBAIGV4dGVy biAiQyIgewogICogIC0gInJlc3RvcmUiLCBFdmFzX09iamVjdCAqOiByZXBvcnRzIHRoYXQgdmll dyBzaG91bGQgYmUgcmVzdG9yZWQgdG8gZGVmYXVsdCBjb25kaXRpb25zCiAgKiAgICBhbmQgaXQg Z2l2ZXMgYSBmcmFtZSB0aGF0IG9yaWdpbmF0ZWQgcmVzdG9yZSBhcyBhbiBhcmd1bWVudC4KICAq ICAtICJ0b29sdGlwLHRleHQsc2V0IiwgY29uc3QgY2hhcio6IHNldHMgdG9vbHRpcCB0ZXh0IGFu ZCBkaXNwbGF5cyBpZiBpdCBpcyBjdXJyZW50bHkgaGlkZGVuLgorICogIC0gImVkaXRvcmNsaWVu dCxjb250ZW50cyxjaGFuZ2VkIiwgdm9pZDogcmVwb3J0cyB0byB0aGUgdmlldyB0aGF0IGVkaXRv cgorICogICAgY2xpZW50J3MgY29udGVudHMgd2VyZSBjaGFuZ2VkCiAgKi8KIAogdHlwZWRlZiBz dHJ1Y3QgX0V3a19WaWV3X1NtYXJ0X0RhdGEgRXdrX1ZpZXdfU21hcnRfRGF0YTsK