76023 2012-01-10 21:04:24 -0800 Update and show ewk_view with updated webpage. 2012-01-12 03:10:48 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61838 0 enmi.lee webkit-unassigned ryuan.choi webkit.review.bot oldest_to_newest 533612 0 enmi.lee 2012-01-10 21:04:24 -0800 Update ewk_view with BackingStore image which is updated with shareableBitmap from WebProcess, and show updated image's area when PageClientImpl::setViewNeedsDisplay() is called. 533625 1 121972 enmi.lee 2012-01-10 21:46:13 -0800 Created attachment 121972 patch to update and show ewk_view. 534486 2 121972 ryuan.choi 2012-01-11 18:33:36 -0800 Comment on attachment 121972 patch to update and show ewk_view. View in context: https://bugs.webkit.org/attachment.cgi?id=121972&action=review > Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp:60 > - evas_object_image_data_update_add(m_viewObject, rect.x(), rect.y(), rect.width(), rect.height()); > + ewk_view_display(m_viewObject, rect); Patch itself is good, but you should rebase this because m_viewObject is renamed. > Source/WebKit2/UIProcess/API/efl/ewk_private.h:32 > +Eina_Bool ewk_view_display(Evas_Object* ewkView, const WebCore::IntRect& rect); > +Eina_Bool ewk_view_image_data_set(Evas_Object* ewkView, void* imageData, const WebCore::IntSize& size); Should we return Eina_Bool? 534501 3 122153 enmi.lee 2012-01-11 19:00:15 -0800 Created attachment 122153 patch to update and show ewk_view. Rebase and change Eina_Bool to bool. 534502 4 enmi.lee 2012-01-11 19:01:56 -0800 Thanks for your comments :) (In reply to comment #2) > (From update of attachment 121972 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=121972&action=review > > > Source/WebKit2/UIProcess/API/efl/PageClientImpl.cpp:60 > > - evas_object_image_data_update_add(m_viewObject, rect.x(), rect.y(), rect.width(), rect.height()); > > + ewk_view_display(m_viewObject, rect); > > Patch itself is good, but you should rebase this because m_viewObject is renamed. => Rebased. > > > Source/WebKit2/UIProcess/API/efl/ewk_private.h:32 > > +Eina_Bool ewk_view_display(Evas_Object* ewkView, const WebCore::IntRect& rect); > > +Eina_Bool ewk_view_image_data_set(Evas_Object* ewkView, void* imageData, const WebCore::IntSize& size); > > Should we return Eina_Bool? => No, because those APIs are internal private API. so, I've changed Eina_Bool to bool type. 534600 5 ryuan.choi 2012-01-11 23:47:05 -0800 > > > Source/WebKit2/UIProcess/API/efl/ewk_private.h:32 > > > +Eina_Bool ewk_view_display(Evas_Object* ewkView, const WebCore::IntRect& rect); > > > +Eina_Bool ewk_view_image_data_set(Evas_Object* ewkView, void* imageData, const WebCore::IntSize& size); > > > > Should we return Eina_Bool? > => No, because those APIs are internal private API. so, I've changed Eina_Bool to bool type. IMO, void looks enough. 534605 6 enmi.lee 2012-01-11 23:53:58 -0800 (In reply to comment #5) > > > > Source/WebKit2/UIProcess/API/efl/ewk_private.h:32 > > > > +Eina_Bool ewk_view_display(Evas_Object* ewkView, const WebCore::IntRect& rect); > > > > +Eina_Bool ewk_view_image_data_set(Evas_Object* ewkView, void* imageData, const WebCore::IntSize& size); > > > > > > Should we return Eina_Bool? > > => No, because those APIs are internal private API. so, I've changed Eina_Bool to bool type. > > IMO, void looks enough. => I thought you mean to remove "Eina" type. I understand now and I agree with you that boolean return type is not necessary. So, I will change return type from bool to void :) 534625 7 122182 enmi.lee 2012-01-12 00:43:41 -0800 Created attachment 122182 patch to update and show ewk_view. Change return type from bool to void. 534634 8 ryuan.choi 2012-01-12 00:49:10 -0800 (In reply to comment #7) > Created an attachment (id=122182) [details] > patch to update and show ewk_view. > > Change return type from bool to void. Looks good to me. 534697 9 122182 webkit.review.bot 2012-01-12 03:10:44 -0800 Comment on attachment 122182 patch to update and show ewk_view. Clearing flags on attachment: 122182 Committed r104804: <http://trac.webkit.org/changeset/104804> 534698 10 webkit.review.bot 2012-01-12 03:10:48 -0800 All reviewed patches have been landed. Closing bug. 121972 2012-01-10 21:46:13 -0800 2012-01-11 19:00:15 -0800 patch to update and show ewk_view. update_and_show_ewk_view.patch text/plain 6033 enmi.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwNjRkN2ZmLi4wMTQ0YWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDEtMTAgIEV1bm1pIExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gVXBkYXRlIGFuZCBzaG93IGV3a192aWV3IHdpdGggdXBkYXRlZCB3 ZWJwYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzYwMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV cGRhdGUgZXdrX3ZpZXcgd2l0aCBCYWNraW5nU3RvcmUgaW1hZ2Ugd2hpY2ggaXMgcmVuZGVyZWQg d2VicGFnZQorICAgICAgICBpbWFnZSBieSBXZWJQcm9jZXNzLCBhbmQgc2hvdyB1cGRhdGVkIGlt YWdlJ3MgYXJlYSB3aGVuCisgICAgICAgIFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNw bGF5KCkgaXMgY2FsbGVkLgorICAgICAgICBUaGUgZXdrX3ZpZXdfZGlzcGxheSgpIGZ1bmN0aW9u IGlzIHVzZWQgdG8gZGlzcGxheSB1cGRhdGVkIGFyZWEgb2YKKyAgICAgICAgZXZhc19vYmplY3Rf aW1hZ2UgYW5kIHRoZSBld2tfdmlld19pbWFnZV9kYXRhX3NldCgpIGZ1bmN0aW9uIGlzIHVzZWQK KyAgICAgICAgdG8gc2V0IGV2YXNfb2JqZWN0X2ltYWdlJ3MgZGF0YSB3aXRoIHJlbmRlcmVkIHdl YnBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfcHJpdmF0ZS5oOiBBZGRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19h ZGQpOgorICAgICAgICAoZXdrX3ZpZXdfZGlzcGxheSk6CisgICAgICAgIChld2tfdmlld19pbWFn ZV9kYXRhX3NldCk6CisgICAgICAgICogVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJv LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QmFja2luZ1N0b3JlOjppbmNvcnBvcmF0ZVVwZGF0ZSk6 CisKIDIwMTItMDEtMTAgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OIChyMTA0Mzc3KTogQWxsIHBhZ2VzIHByaW50IGJsYW5rIG9uIFNub3cgTGVvcGFy ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVu dEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudElt cGwuY3BwCmluZGV4IGFhZWU5NTYuLmI3Y2ZhZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5jcHAKQEAgLTMyLDYgKzMyLDcgQEAK ICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVQcm94eS5o IgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgorI2luY2x1ZGUgImV3a19wcml2YXRlLmgiCiAK IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCkBAIC01Niw3ICs1Nyw3IEBAIFBhc3NPd25QdHI8 RHJhd2luZ0FyZWFQcm94eT4gUGFnZUNsaWVudEltcGw6OmNyZWF0ZURyYXdpbmdBcmVhUHJveHko KQogCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0IFdlYkNv cmU6OkludFJlY3QmIHJlY3QpCiB7Ci0gICAgZXZhc19vYmplY3RfaW1hZ2VfZGF0YV91cGRhdGVf YWRkKG1fdmlld09iamVjdCwgcmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3Qu aGVpZ2h0KCkpOworICAgIGV3a192aWV3X2Rpc3BsYXkobV92aWV3T2JqZWN0LCByZWN0KTsKIH0K IAogdm9pZCBQYWdlQ2xpZW50SW1wbDo6ZGlzcGxheVZpZXcoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19wcml2YXRlLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uYmNjNzMxNQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19wcml2YXRlLmgKQEAgLTAsMCArMSwzNCBAQAorLyoKKyAqIENv cHlyaWdodCAoQykgMjAxMiBTYW1zdW5nIEVsZWN0cm9uaWNzCisgKgorICogVGhpcyBsaWJyYXJ5 IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICogbW9k aWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMK KyAqIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247 IGVpdGhlcgorICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24p IGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBp biB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICogYnV0IFdJVEhPVVQgQU5ZIFdB UlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyAqIE1FUkNIQU5U QUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05V CisgKiBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKyAq CisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBH ZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgKiBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRo ZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworICogdGhlIEZyZWUgU29mdHdh cmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwKKyAq IEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorICoKKyAqLworCisjaWZuZGVmIGV3a19wcml2 YXRlX2gKKyNkZWZpbmUgZXdrX3ByaXZhdGVfaAorCisjaW5jbHVkZSA8RXZhcy5oPgorCituYW1l c3BhY2UgV2ViQ29yZSB7CitjbGFzcyBJbnRSZWN0OworY2xhc3MgSW50U2l6ZTsKK30KKworRWlu YV9Cb29sIGV3a192aWV3X2Rpc3BsYXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IFdlYkNv cmU6OkludFJlY3QmIHJlY3QpOworRWluYV9Cb29sIGV3a192aWV3X2ltYWdlX2RhdGFfc2V0KEV2 YXNfT2JqZWN0KiBld2tWaWV3LCB2b2lkKiBpbWFnZURhdGEsIGNvbnN0IFdlYkNvcmU6OkludFNp emUmIHNpemUpOworCisjZW5kaWYgLy8gZXdrX3ByaXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCmluZGV4IDU5MmY1ODAuLjIxNzQzNWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKQEAgLTQ3 OSw3ICs0NzksNyBAQCBFdmFzX09iamVjdCogZXdrX3ZpZXdfYWRkKEV2YXMqIGNhbnZhcywgV0tD b250ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGFnZUdyb3VwUmVmCiAgICAgICAgIHJldHVybiAwOwog ICAgIH0KIAotICAgIHByaXYtPnBhZ2VDbGllbnQgPSBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlKHRv SW1wbChjb250ZXh0UmVmKSwgdG9JbXBsKHBhZ2VHcm91cFJlZiksIHNtYXJ0RGF0YS0+aW1hZ2Up OworICAgIHByaXYtPnBhZ2VDbGllbnQgPSBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlKHRvSW1wbChj b250ZXh0UmVmKSwgdG9JbXBsKHBhZ2VHcm91cFJlZiksIGV3a1ZpZXcpOwogCiAgICAgcmV0dXJu IGV3a1ZpZXc7CiB9CkBAIC00OTEsMyArNDkxLDI3IEBAIFdLUGFnZVJlZiBld2tfdmlld19wYWdl X2dldChFdmFzX09iamVjdCogZXdrVmlldykKIAogICAgIHJldHVybiB0b0FQSShwcml2LT5wYWdl Q2xpZW50LT5wYWdlKCkpOwogfQorCitFaW5hX0Jvb2wgZXdrX3ZpZXdfZGlzcGxheShFdmFzX09i amVjdCogZXdrVmlldywgY29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIGlmICghc21hcnRE YXRhLT5pbWFnZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgZXZhc19vYmplY3RfaW1h Z2VfZGF0YV91cGRhdGVfYWRkKHNtYXJ0RGF0YS0+aW1hZ2UsIHJlY3QueCgpLCByZWN0LnkoKSwg cmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKKworICAgIHJldHVybiB0cnVlOworfQorCitF aW5hX0Jvb2wgZXdrX3ZpZXdfaW1hZ2VfZGF0YV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHZv aWQqIGltYWdlRGF0YSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKK3sKKyAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSwgZmFsc2UpOworICAgIGlmICghaW1hZ2VE YXRhIHx8ICFzbWFydERhdGEtPmltYWdlKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBl dmFzX29iamVjdF9yZXNpemUoc21hcnREYXRhLT5pbWFnZSwgc2l6ZS53aWR0aCgpLCBzaXplLmhl aWdodCgpKTsKKyAgICBldmFzX29iamVjdF9pbWFnZV9zaXplX3NldChzbWFydERhdGEtPmltYWdl LCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOworICAgIGV2YXNfb2JqZWN0X2ltYWdlX2Rh dGFfY29weV9zZXQoc21hcnREYXRhLT5pbWFnZSwgaW1hZ2VEYXRhKTsKKworICAgIHJldHVybiB0 cnVlOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NhaXJvL0JhY2tp bmdTdG9yZUNhaXJvLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jYWlyby9CYWNraW5n U3RvcmVDYWlyby5jcHAKaW5kZXggNTE2MDhhNS4uZmVjODJiNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJvLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2Fpcm8vQmFja2luZ1N0b3JlQ2Fpcm8uY3BwCkBAIC0zMyw2 ICszMywxMCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CiAjaW5jbHVk ZSA8Y2Fpcm8vY2Fpcm8uaD4KIAorI2lmIFBMQVRGT1JNKEVGTCkKKyNpbmNsdWRlICJld2tfcHJp dmF0ZS5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKQEAgLTY0LDYgKzY4LDExIEBAIHZvaWQgQmFja2luZ1N0b3JlOjppbmNvcnBvcmF0 ZVVwZGF0ZShTaGFyZWFibGVCaXRtYXAqIGJpdG1hcCwgY29uc3QgVXBkYXRlSW5mbyYKICAgICAg ICAgc3JjUmVjdC5tb3ZlKC11cGRhdGVSZWN0TG9jYXRpb24ueCgpLCAtdXBkYXRlUmVjdExvY2F0 aW9uLnkoKSk7CiAgICAgICAgIGJpdG1hcC0+cGFpbnQoZ3JhcGhpY3NDb250ZXh0LCB1cGRhdGVS ZWN0LmxvY2F0aW9uKCksIHNyY1JlY3QpOwogICAgIH0KKworI2lmIFBMQVRGT1JNKEVGTCkKKyAg ICAvLyBVcGRhdGUgZXdrX3ZpZXcgd2l0aCBuZXcgYmFja2luZ1N0b3JlIGltYWdlLgorICAgIGV3 a192aWV3X2ltYWdlX2RhdGFfc2V0KG1fd2ViUGFnZVByb3h5LT52aWV3V2lkZ2V0KCksIGNhaXJv X2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEobV9iYWNraW5nU3RvcmUtPmNhaXJvU3VyZmFjZSgpKSwg bV9zaXplKTsKKyNlbmRpZgogfQogCiB2b2lkIEJhY2tpbmdTdG9yZTo6c2Nyb2xsKGNvbnN0IElu dFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0IEludFNpemUmIHNjcm9sbE9mZnNldCkK 122153 2012-01-11 19:00:15 -0800 2012-01-12 00:43:41 -0800 patch to update and show ewk_view. update_and_show_ewk_view.patch text/plain 6009 enmi.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4MjM5MDY0Li5kM2I2NDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDEtMTEgIEV1bm1pIExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gVXBkYXRlIGFuZCBzaG93IGV3a192aWV3IHdpdGggdXBkYXRlZCB3 ZWJwYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzYwMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV cGRhdGUgZXdrX3ZpZXcgd2l0aCBCYWNraW5nU3RvcmUgaW1hZ2Ugd2hpY2ggaXMgcmVuZGVyZWQg d2VicGFnZQorICAgICAgICBpbWFnZSBieSBXZWJQcm9jZXNzLCBhbmQgc2hvdyB1cGRhdGVkIGlt YWdlJ3MgYXJlYSB3aGVuCisgICAgICAgIFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNw bGF5KCkgaXMgY2FsbGVkLgorICAgICAgICBUaGUgZXdrX3ZpZXdfZGlzcGxheSgpIGZ1bmN0aW9u IGlzIHVzZWQgdG8gZGlzcGxheSB1cGRhdGVkIGFyZWEgb2YKKyAgICAgICAgZXZhc19vYmplY3Rf aW1hZ2UgYW5kIHRoZSBld2tfdmlld19pbWFnZV9kYXRhX3NldCgpIGZ1bmN0aW9uIGlzIHVzZWQK KyAgICAgICAgdG8gc2V0IGV2YXNfb2JqZWN0X2ltYWdlJ3MgZGF0YSB3aXRoIHJlbmRlcmVkIHdl YnBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfcHJpdmF0ZS5oOiBBZGRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19h ZGQpOgorICAgICAgICAoZXdrX3ZpZXdfZGlzcGxheSk6CisgICAgICAgIChld2tfdmlld19pbWFn ZV9kYXRhX3NldCk6CisgICAgICAgICogVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJv LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QmFja2luZ1N0b3JlOjppbmNvcnBvcmF0ZVVwZGF0ZSk6 CisKIDIwMTItMDEtMTEgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIFtXSzJdIFNoYXJlIGNhaXJvIHNwZWNpZmljIGNvZGVzIHdpdGggRUZMIHBvcnQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1w bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5j cHAKaW5kZXggOWQ5ZDA5ZC4uYTU2MjY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2lu Y2x1ZGUgIldlYkNvbnRleHQuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudVByb3h5LmgiCiAj aW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKIAogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTU2LDcgKzU3LDcgQEAgUGFzc093blB0cjxEcmF3 aW5nQXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCiAK IHZvaWQgUGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgcmVjdCkKIHsKLSAgICBldmFzX29iamVjdF9pbWFnZV9kYXRhX3VwZGF0ZV9hZGQo bV92aWV3V2lkZ2V0LCByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWln aHQoKSk7CisgICAgZXdrX3ZpZXdfZGlzcGxheShtX3ZpZXdXaWRnZXQsIHJlY3QpOwogfQogCiB2 b2lkIFBhZ2VDbGllbnRJbXBsOjpkaXNwbGF5VmlldygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ByaXZhdGUuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi5hMmNiNzFhCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ByaXZhdGUuaApAQCAtMCwwICsxLDM0IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDEyIFNhbXN1bmcgRWxlY3Ryb25pY3MKKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkg aXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICog TGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0 aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55 IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRo ZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFO VFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklM SVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAq IExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAq IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVy YWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZp bGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogQm9z dG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisgKgorICovCisKKyNpZm5kZWYgZXdrX3ByaXZhdGVf aAorI2RlZmluZSBld2tfcHJpdmF0ZV9oCisKKyNpbmNsdWRlIDxFdmFzLmg+CisKK25hbWVzcGFj ZSBXZWJDb3JlIHsKK2NsYXNzIEludFJlY3Q7CitjbGFzcyBJbnRTaXplOworfQorCitib29sIGV3 a192aWV3X2Rpc3BsYXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmIHJlY3QpOworYm9vbCBld2tfdmlld19pbWFnZV9kYXRhX3NldChFdmFzX09iamVjdCogZXdr Vmlldywgdm9pZCogaW1hZ2VEYXRhLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKTsKKwor I2VuZGlmIC8vIGV3a19wcml2YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmNwcAppbmRleCA1OTJmNTgwLi5mZjc0YjZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC00NzksNyArNDc5LDcgQEAg RXZhc19PYmplY3QqIGV3a192aWV3X2FkZChFdmFzKiBjYW52YXMsIFdLQ29udGV4dFJlZiBjb250 ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZgogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICBw cml2LT5wYWdlQ2xpZW50ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJl ZiksIHRvSW1wbChwYWdlR3JvdXBSZWYpLCBzbWFydERhdGEtPmltYWdlKTsKKyAgICBwcml2LT5w YWdlQ2xpZW50ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIHRv SW1wbChwYWdlR3JvdXBSZWYpLCBld2tWaWV3KTsKIAogICAgIHJldHVybiBld2tWaWV3OwogfQpA QCAtNDkxLDMgKzQ5MSwyNyBAQCBXS1BhZ2VSZWYgZXdrX3ZpZXdfcGFnZV9nZXQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcpCiAKICAgICByZXR1cm4gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgp KTsKIH0KKworYm9vbCBld2tfdmlld19kaXNwbGF5KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25z dCBJbnRSZWN0JiByZWN0KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmll dywgc21hcnREYXRhLCBmYWxzZSk7CisgICAgaWYgKCFzbWFydERhdGEtPmltYWdlKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBldmFzX29iamVjdF9pbWFnZV9kYXRhX3VwZGF0ZV9hZGQo c21hcnREYXRhLT5pbWFnZSwgcmVjdC54KCksIHJlY3QueSgpLCByZWN0LndpZHRoKCksIHJlY3Qu aGVpZ2h0KCkpOworCisgICAgcmV0dXJuIHRydWU7Cit9CisKK2Jvb2wgZXdrX3ZpZXdfaW1hZ2Vf ZGF0YV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHZvaWQqIGltYWdlRGF0YSwgY29uc3QgSW50 U2l6ZSYgc2l6ZSkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNt YXJ0RGF0YSwgZmFsc2UpOworICAgIGlmICghaW1hZ2VEYXRhIHx8ICFzbWFydERhdGEtPmltYWdl KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBldmFzX29iamVjdF9yZXNpemUoc21hcnRE YXRhLT5pbWFnZSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKKyAgICBldmFzX29iamVj dF9pbWFnZV9zaXplX3NldChzbWFydERhdGEtPmltYWdlLCBzaXplLndpZHRoKCksIHNpemUuaGVp Z2h0KCkpOworICAgIGV2YXNfb2JqZWN0X2ltYWdlX2RhdGFfY29weV9zZXQoc21hcnREYXRhLT5p bWFnZSwgaW1hZ2VEYXRhKTsKKworICAgIHJldHVybiB0cnVlOworfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJvLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9jYWlyby9CYWNraW5nU3RvcmVDYWlyby5jcHAKaW5kZXggNTE2 MDhhNS4uZmVjODJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NhaXJv L0JhY2tpbmdTdG9yZUNhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2Fp cm8vQmFja2luZ1N0b3JlQ2Fpcm8uY3BwCkBAIC0zMyw2ICszMywxMCBAQAogI2luY2x1ZGUgPFdl YkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CiAjaW5jbHVkZSA8Y2Fpcm8vY2Fpcm8uaD4KIAorI2lm IFBMQVRGT1JNKEVGTCkKKyNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgorI2VuZGlmCisKIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTY0LDYgKzY4LDEx IEBAIHZvaWQgQmFja2luZ1N0b3JlOjppbmNvcnBvcmF0ZVVwZGF0ZShTaGFyZWFibGVCaXRtYXAq IGJpdG1hcCwgY29uc3QgVXBkYXRlSW5mbyYKICAgICAgICAgc3JjUmVjdC5tb3ZlKC11cGRhdGVS ZWN0TG9jYXRpb24ueCgpLCAtdXBkYXRlUmVjdExvY2F0aW9uLnkoKSk7CiAgICAgICAgIGJpdG1h cC0+cGFpbnQoZ3JhcGhpY3NDb250ZXh0LCB1cGRhdGVSZWN0LmxvY2F0aW9uKCksIHNyY1JlY3Qp OwogICAgIH0KKworI2lmIFBMQVRGT1JNKEVGTCkKKyAgICAvLyBVcGRhdGUgZXdrX3ZpZXcgd2l0 aCBuZXcgYmFja2luZ1N0b3JlIGltYWdlLgorICAgIGV3a192aWV3X2ltYWdlX2RhdGFfc2V0KG1f d2ViUGFnZVByb3h5LT52aWV3V2lkZ2V0KCksIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEo bV9iYWNraW5nU3RvcmUtPmNhaXJvU3VyZmFjZSgpKSwgbV9zaXplKTsKKyNlbmRpZgogfQogCiB2 b2lkIEJhY2tpbmdTdG9yZTo6c2Nyb2xsKGNvbnN0IEludFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0 IEludFNpemUmIHNjcm9sbE9mZnNldCkK 122182 2012-01-12 00:43:41 -0800 2012-01-12 03:10:43 -0800 patch to update and show ewk_view. update_and_show_ewk_view.patch text/plain 5943 enmi.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4MjM5MDY0Li5kM2I2NDNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDEtMTEgIEV1bm1pIExlZSAgPGV1bm1pMTUubGVlQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gVXBkYXRlIGFuZCBzaG93IGV3a192aWV3IHdpdGggdXBkYXRlZCB3 ZWJwYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzYwMjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV cGRhdGUgZXdrX3ZpZXcgd2l0aCBCYWNraW5nU3RvcmUgaW1hZ2Ugd2hpY2ggaXMgcmVuZGVyZWQg d2VicGFnZQorICAgICAgICBpbWFnZSBieSBXZWJQcm9jZXNzLCBhbmQgc2hvdyB1cGRhdGVkIGlt YWdlJ3MgYXJlYSB3aGVuCisgICAgICAgIFBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNw bGF5KCkgaXMgY2FsbGVkLgorICAgICAgICBUaGUgZXdrX3ZpZXdfZGlzcGxheSgpIGZ1bmN0aW9u IGlzIHVzZWQgdG8gZGlzcGxheSB1cGRhdGVkIGFyZWEgb2YKKyAgICAgICAgZXZhc19vYmplY3Rf aW1hZ2UgYW5kIHRoZSBld2tfdmlld19pbWFnZV9kYXRhX3NldCgpIGZ1bmN0aW9uIGlzIHVzZWQK KyAgICAgICAgdG8gc2V0IGV2YXNfb2JqZWN0X2ltYWdlJ3MgZGF0YSB3aXRoIHJlbmRlcmVkIHdl YnBhZ2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRWaWV3TmVlZHNEaXNwbGF5KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfcHJpdmF0ZS5oOiBBZGRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19h ZGQpOgorICAgICAgICAoZXdrX3ZpZXdfZGlzcGxheSk6CisgICAgICAgIChld2tfdmlld19pbWFn ZV9kYXRhX3NldCk6CisgICAgICAgICogVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJv LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QmFja2luZ1N0b3JlOjppbmNvcnBvcmF0ZVVwZGF0ZSk6 CisKIDIwMTItMDEtMTEgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgogCiAg ICAgICAgIFtXSzJdIFNoYXJlIGNhaXJvIHNwZWNpZmljIGNvZGVzIHdpdGggRUZMIHBvcnQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1w bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9QYWdlQ2xpZW50SW1wbC5j cHAKaW5kZXggOWQ5ZDA5ZC4uYTU2MjY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL1BhZ2VDbGllbnRJbXBsLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2lu Y2x1ZGUgIldlYkNvbnRleHQuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0TWVudVByb3h5LmgiCiAj aW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKIAogdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTU2LDcgKzU3LDcgQEAgUGFzc093blB0cjxEcmF3 aW5nQXJlYVByb3h5PiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlRHJhd2luZ0FyZWFQcm94eSgpCiAK IHZvaWQgUGFnZUNsaWVudEltcGw6OnNldFZpZXdOZWVkc0Rpc3BsYXkoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgcmVjdCkKIHsKLSAgICBldmFzX29iamVjdF9pbWFnZV9kYXRhX3VwZGF0ZV9hZGQo bV92aWV3V2lkZ2V0LCByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWln aHQoKSk7CisgICAgZXdrX3ZpZXdfZGlzcGxheShtX3ZpZXdXaWRnZXQsIHJlY3QpOwogfQogCiB2 b2lkIFBhZ2VDbGllbnRJbXBsOjpkaXNwbGF5VmlldygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3ByaXZhdGUuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi5kMzMxZDk5Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ByaXZhdGUuaApAQCAtMCwwICsxLDM0IEBACisvKgorICogQ29weXJp Z2h0IChDKSAyMDEyIFNhbXN1bmcgRWxlY3Ryb25pY3MKKyAqCisgKiBUaGlzIGxpYnJhcnkgaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgKiBtb2RpZnkg aXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYworICog TGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0 aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55 IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRo ZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisgKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFO VFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICogTUVSQ0hBTlRBQklM SVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAq IExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAq IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVy YWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZp bGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRvCisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogQm9z dG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisgKgorICovCisKKyNpZm5kZWYgZXdrX3ByaXZhdGVf aAorI2RlZmluZSBld2tfcHJpdmF0ZV9oCisKKyNpbmNsdWRlIDxFdmFzLmg+CisKK25hbWVzcGFj ZSBXZWJDb3JlIHsKK2NsYXNzIEludFJlY3Q7CitjbGFzcyBJbnRTaXplOworfQorCit2b2lkIGV3 a192aWV3X2Rpc3BsYXkoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmIHJlY3QpOwordm9pZCBld2tfdmlld19pbWFnZV9kYXRhX3NldChFdmFzX09iamVjdCogZXdr Vmlldywgdm9pZCogaW1hZ2VEYXRhLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKTsKKwor I2VuZGlmIC8vIGV3a19wcml2YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a192aWV3LmNwcAppbmRleCA1OTJmNTgwLi4yNjljMDcyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC00NzksNyArNDc5LDcgQEAg RXZhc19PYmplY3QqIGV3a192aWV3X2FkZChFdmFzKiBjYW52YXMsIFdLQ29udGV4dFJlZiBjb250 ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZgogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICBw cml2LT5wYWdlQ2xpZW50ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJl ZiksIHRvSW1wbChwYWdlR3JvdXBSZWYpLCBzbWFydERhdGEtPmltYWdlKTsKKyAgICBwcml2LT5w YWdlQ2xpZW50ID0gUGFnZUNsaWVudEltcGw6OmNyZWF0ZSh0b0ltcGwoY29udGV4dFJlZiksIHRv SW1wbChwYWdlR3JvdXBSZWYpLCBld2tWaWV3KTsKIAogICAgIHJldHVybiBld2tWaWV3OwogfQpA QCAtNDkxLDMgKzQ5MSwyMyBAQCBXS1BhZ2VSZWYgZXdrX3ZpZXdfcGFnZV9nZXQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcpCiAKICAgICByZXR1cm4gdG9BUEkocHJpdi0+cGFnZUNsaWVudC0+cGFnZSgp KTsKIH0KKwordm9pZCBld2tfdmlld19kaXNwbGF5KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25z dCBJbnRSZWN0JiByZWN0KQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmll dywgc21hcnREYXRhKTsKKyAgICBpZiAoIXNtYXJ0RGF0YS0+aW1hZ2UpCisgICAgICAgIHJldHVy bjsKKworICAgIGV2YXNfb2JqZWN0X2ltYWdlX2RhdGFfdXBkYXRlX2FkZChzbWFydERhdGEtPmlt YWdlLCByZWN0LngoKSwgcmVjdC55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7Cit9 CisKK3ZvaWQgZXdrX3ZpZXdfaW1hZ2VfZGF0YV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHZv aWQqIGltYWdlRGF0YSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKK3sKKyAgICBFV0tfVklFV19TRF9H RVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNtYXJ0RGF0YSk7CisgICAgaWYgKCFpbWFnZURhdGEgfHwg IXNtYXJ0RGF0YS0+aW1hZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIGV2YXNfb2JqZWN0X3Jl c2l6ZShzbWFydERhdGEtPmltYWdlLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOworICAg IGV2YXNfb2JqZWN0X2ltYWdlX3NpemVfc2V0KHNtYXJ0RGF0YS0+aW1hZ2UsIHNpemUud2lkdGgo KSwgc2l6ZS5oZWlnaHQoKSk7CisgICAgZXZhc19vYmplY3RfaW1hZ2VfZGF0YV9jb3B5X3NldChz bWFydERhdGEtPmltYWdlLCBpbWFnZURhdGEpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJvLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9jYWlyby9CYWNraW5nU3RvcmVDYWlyby5jcHAKaW5kZXggNTE2MDhhNS4uZmVj ODJiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdT dG9yZUNhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2Fpcm8vQmFja2lu Z1N0b3JlQ2Fpcm8uY3BwCkBAIC0zMyw2ICszMywxMCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvR3Jh cGhpY3NDb250ZXh0Lmg+CiAjaW5jbHVkZSA8Y2Fpcm8vY2Fpcm8uaD4KIAorI2lmIFBMQVRGT1JN KEVGTCkKKyNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgorI2VuZGlmCisKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTY0LDYgKzY4LDExIEBAIHZvaWQg QmFja2luZ1N0b3JlOjppbmNvcnBvcmF0ZVVwZGF0ZShTaGFyZWFibGVCaXRtYXAqIGJpdG1hcCwg Y29uc3QgVXBkYXRlSW5mbyYKICAgICAgICAgc3JjUmVjdC5tb3ZlKC11cGRhdGVSZWN0TG9jYXRp b24ueCgpLCAtdXBkYXRlUmVjdExvY2F0aW9uLnkoKSk7CiAgICAgICAgIGJpdG1hcC0+cGFpbnQo Z3JhcGhpY3NDb250ZXh0LCB1cGRhdGVSZWN0LmxvY2F0aW9uKCksIHNyY1JlY3QpOwogICAgIH0K KworI2lmIFBMQVRGT1JNKEVGTCkKKyAgICAvLyBVcGRhdGUgZXdrX3ZpZXcgd2l0aCBuZXcgYmFj a2luZ1N0b3JlIGltYWdlLgorICAgIGV3a192aWV3X2ltYWdlX2RhdGFfc2V0KG1fd2ViUGFnZVBy b3h5LT52aWV3V2lkZ2V0KCksIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2RhdGEobV9iYWNraW5n U3RvcmUtPmNhaXJvU3VyZmFjZSgpKSwgbV9zaXplKTsKKyNlbmRpZgogfQogCiB2b2lkIEJhY2tp bmdTdG9yZTo6c2Nyb2xsKGNvbnN0IEludFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0IEludFNpemUm IHNjcm9sbE9mZnNldCkK