84933 2012-04-26 00:11:08 -0700 [EFL] scrolling with fixed position does not work correctly when using ewk_view_tiled. 2014-01-20 02:17:22 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 ryuan.choi webkit-unassigned antognolli+webkit gyuyoung.kim hyuki.kim lucas.de.marchi rakuco t.morawski oldest_to_newest 610394 0 ryuan.choi 2012-04-26 00:11:08 -0700 For now, DRT/Efl can not pass compositing/geometry/fixed-position.html. It's because ewk_view_tiled does not know whether scrolled when scrolling as slow path. 610409 1 ryuan.choi 2012-04-26 00:42:20 -0700 IIRC, tomasz already fixed this issue in a local. 618397 2 140686 t.morawski 2012-05-08 01:15:41 -0700 Created attachment 140686 Fix for issue Patch for discussion. 618931 3 140686 ryuan.choi 2012-05-08 16:29:04 -0700 Comment on attachment 140686 Fix for issue View in context: https://bugs.webkit.org/attachment.cgi?id=140686&action=review Thanks for the patch. > Source/WebKit/efl/ChangeLog:9 > + Sets backing store's full offeset when ChromeClientEfl::invalidateContentsForSlowScroll is > + called. Could you explain more? And I think that this patch can fix compositing/geometry/fixed-position.html now. Could you rebase it and add some comment about it? > Source/WebKit/efl/ewk/ewk_view.h:145 > + void (*backing_store_offset_update)(Ewk_View_Smart_Data *sd); Are there any use case that any applications want to override this? IMO, it is better not to touch public structure if not. If you want to use it only for ewk_view_tiled, What do you think about just adding EWK_VIEW_TYPE_CHECK_OR_RETURN in ewk_view_scroll_offset_update like ewk_view_frame_view_creation_notify? 619330 4 t.morawski 2012-05-09 03:07:51 -0700 (In reply to comment #3) > If you want to use it only for ewk_view_tiled, > What do you think about just adding EWK_VIEW_TYPE_CHECK_OR_RETURN in ewk_view_scroll_offset_update > like ewk_view_frame_view_creation_notify? Yes, I agree that it should not be in public API. But current architecture doesn't allow solve this issue in proper way. Moreover, IMO any implementation that is in ewk_view.cpp file should be generic for all view type. I think it should be not allowed to put specific single/tiled view implementation in this file. For example it is not good to have ewk_view_frame_view_creation_notify implementation in ewk_view file and IMO it should be removed from there. I know the way that you proposed is simple but we need something what will simulate "protected" scope from C++ language. For example pointers to function that should not be in public API (not in _Ewk_View_Smart_Class) should be placed in new _Ewk_View_Private_Smart_Class structure in ewk_view_private.h file. This will solve this and similar issue (like ewk_view_frame_view_creation_notify). 619573 5 ryuan.choi 2012-05-09 09:28:26 -0700 (In reply to comment #4) > (In reply to comment #3) > > If you want to use it only for ewk_view_tiled, > > What do you think about just adding EWK_VIEW_TYPE_CHECK_OR_RETURN in ewk_view_scroll_offset_update > > like ewk_view_frame_view_creation_notify? > Yes, I agree that it should not be in public API. But current architecture doesn't allow solve this issue in proper way. Moreover, IMO any implementation that is in ewk_view.cpp file should be generic for all view type. I think it should be not allowed to put specific single/tiled view implementation in this file. For example it is not good to have ewk_view_frame_view_creation_notify implementation in ewk_view file and IMO it should be removed from there. I know the way that you proposed is simple but we need something what will simulate "protected" scope from C++ language. For example pointers to function that should not be in public API (not in _Ewk_View_Smart_Class) should be placed in new _Ewk_View_Private_Smart_Class structure in ewk_view_private.h file. This will solve this and similar issue (like ewk_view_frame_view_creation_notify) I also agree that it is not cool. But, I am now thinking that changing API for the internal requirements is worse and introducing additional structure for few function of ewk_view_tiled is over-implementation. I want to listen more opinion for this. Thanks. 620322 6 hyuki.kim 2012-05-10 00:28:15 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > If you want to use it only for ewk_view_tiled, > > > What do you think about just adding EWK_VIEW_TYPE_CHECK_OR_RETURN in ewk_view_scroll_offset_update > > > like ewk_view_frame_view_creation_notify? > > Yes, I agree that it should not be in public API. But current architecture doesn't allow solve this issue in proper way. Moreover, IMO any implementation that is in ewk_view.cpp file should be generic for all view type. I think it should be not allowed to put specific single/tiled view implementation in this file. For example it is not good to have ewk_view_frame_view_creation_notify implementation in ewk_view file and IMO it should be removed from there. I know the way that you proposed is simple but we need something what will simulate "protected" scope from C++ language. For example pointers to function that should not be in public API (not in _Ewk_View_Smart_Class) should be placed in new _Ewk_View_Private_Smart_Class structure in ewk_view_private.h file. This will solve this and similar issue (like ewk_view_frame_view_creation_notify) > > I also agree that it is not cool. > But, I am now thinking that changing API for the internal requirements is worse > and introducing additional structure for few function of ewk_view_tiled is over-implementation. > > I want to listen more opinion for this. > > Thanks. IMO, using smart change api for the object would be possible. :) 624091 7 antognolli+webkit 2012-05-15 08:01:35 -0700 This makes sense to me. But please, just make sure that it won't break anything else, since you are introducing an offset change in the middle of a repaint request, and the order that scrolls and repaints are processed used to make difference (I don't remember if in the end we fixed them to the order don't matter anymore). I guess that the layout tests should take care of checking for any regression regarding this. Other than that, the patch looks good. 635829 8 ryuan.choi 2012-05-29 03:42:09 -0700 (In reply to comment #7) > This makes sense to me. > > But please, just make sure that it won't break anything else, since you are introducing an offset change in the middle of a repaint request, and the order that scrolls and repaints are processed used to make difference (I don't remember if in the end we fixed them to the order don't matter anymore). > > I guess that the layout tests should take care of checking for any regression regarding this. > > Other than that, the patch looks good. If the major like current patch, I will follow it. Tomasz, could you rebase the patch ? 771568 9 140686 t.morawski 2012-11-19 23:29:16 -0800 Comment on attachment 140686 Fix for issue Patch doesn't fix the issue now. 140686 2012-05-08 01:15:41 -0700 2012-11-19 23:29:15 -0800 Fix for issue layout.patch text/plain 6599 t.morawski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA0ZGVhYmU5Li5iOTcyZDAzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDUtMDcgIFRvbWFzeiBNb3Jhd3NraSAgPHQubW9yYXdza2lA c2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gU2Nyb2xsaW5nIHdpdGggZml4ZWQgcG9zaXRp b24gZG9lcyBub3Qgd29yayBjb3JyZWN0bHkgd2hlbiB1c2luZyBld2tfdmlld190aWxlZC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0OTMzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0cyBiYWNraW5n IHN0b3JlJ3MgZnVsbCBvZmZlc2V0IHdoZW4gQ2hyb21lQ2xpZW50RWZsOjppbnZhbGlkYXRlQ29u dGVudHNGb3JTbG93U2Nyb2xsIGlzCisgICAgICAgIGNhbGxlZC4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVD bGllbnRFZmw6OmludmFsaWRhdGVDb250ZW50c0ZvclNsb3dTY3JvbGwpOgorICAgICAgICAqIGV3 ay9ld2tfcHJpdmF0ZS5oOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChf RXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKToKKyAgICAgICAgKGV3a192aWV3X3Njcm9sbF9vZmZzZXRf dXBkYXRlKToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuaDoKKyAgICAgICAgKiBld2svZXdrX3Zp ZXdfdGlsZWQuY3BwOgorICAgICAgICAoX2V3a192aWV3X3RpbGVkX3Njcm9sbF9vZmZzZXRfdXBk YXRlKTogQWRkZWQgbmV3IGZ1bmN0aW9uLgorICAgICAgICAoZXdrX3ZpZXdfdGlsZWRfc21hcnRf c2V0KToKKwogMjAxMi0wNS0wNiAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlh a292QGludGVsLmNvbT4KIAogICAgICAgICBbRUZMXSBFRkwncyBMYXlvdXRUZXN0Q29udHJvbGxl ciBzZXRKYXZhU2NyaXB0Q2FuQWNjZXNzQ2xpcGJvYXJkIGltcGxlbWVudGF0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3Bw IGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcApp bmRleCAxZTc2MTBhLi41NjdiMTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAKQEAgLTUxOCw2ICs1MTgsNyBAQCB2b2lk IENocm9tZUNsaWVudEVmbDo6aW52YWxpZGF0ZUNvbnRlbnRzQW5kUm9vdFZpZXcoY29uc3QgSW50 UmVjdCYgdXBkYXRlUmVjdCwgYgogCiB2b2lkIENocm9tZUNsaWVudEVmbDo6aW52YWxpZGF0ZUNv bnRlbnRzRm9yU2xvd1Njcm9sbChjb25zdCBJbnRSZWN0JiB1cGRhdGVSZWN0LCBib29sIGltbWVk aWF0ZSkKIHsKKyAgICBld2tfdmlld19zY3JvbGxfb2Zmc2V0X3VwZGF0ZShtX3ZpZXcpOwogICAg IGludmFsaWRhdGVDb250ZW50c0FuZFJvb3RWaWV3KHVwZGF0ZVJlY3QsIGltbWVkaWF0ZSk7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfcHJpdmF0ZS5oIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKaW5kZXggMjZkNDQ4ZC4uNWZiZmM2NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKQEAgLTE1NCw2ICsxNTQsNyBAQCBib29s IGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFdmFzX09iamVj dCogZnJhbWUsIGJvb2wgYWxsbwogCiB2b2lkIGV3a192aWV3X3JlcGFpbnQoRXZhc19PYmplY3Qq IGV3a1ZpZXcsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFdmFzX0Nvb3JkIHdpZHRoLCBF dmFzX0Nvb3JkIGhlaWdodCk7CiB2b2lkIGV3a192aWV3X3Njcm9sbChFdmFzX09iamVjdCogZXdr VmlldywgRXZhc19Db29yZCBkZWx0YVgsIEV2YXNfQ29vcmQgZGVsdGFZLCBFdmFzX0Nvb3JkIHNj cm9sbFgsIEV2YXNfQ29vcmQgc2Nyb2xsWSwgRXZhc19Db29yZCBzY3JvbGxXaWR0aCwgRXZhc19D b29yZCBzY3JvbGxIZWlnaHQsIEV2YXNfQ29vcmQgY2VudGVyWCwgRXZhc19Db29yZCBjZW50ZXJZ LCBFdmFzX0Nvb3JkIGNlbnRlclcsIEV2YXNfQ29vcmQgY2VudGVySGVpZ2h0KTsKK3ZvaWQgZXdr X3ZpZXdfc2Nyb2xsX29mZnNldF91cGRhdGUoRXZhc19PYmplY3QqIGV3a1ZpZXcpOwogV2ViQ29y ZTo6UGFnZSogZXdrX3ZpZXdfY29yZV9wYWdlX2dldChjb25zdCBFdmFzX09iamVjdCogZXdrVmll dyk7CiAKIFdURjo6UGFzc1JlZlB0cjxXZWJDb3JlOjpGcmFtZT4gZXdrX3ZpZXdfZnJhbWVfY3Jl YXRlKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFdmFzX09iamVjdCogZnJhbWUsIGNvbnN0IFdURjo6 U3RyaW5nJiBuYW1lLCBXZWJDb3JlOjpIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVu dCwgY29uc3QgV2ViQ29yZTo6S1VSTCYgdXJsLCBjb25zdCBXVEY6OlN0cmluZyYgcmVmZXJyZXIp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggN2EwZWUxZS4uZGJkNDE4YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC0zNTE1LDYgKzM1MTUsMjEgQEAgdm9pZCBl d2tfdmlld19zY3JvbGwoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEV2YXNfQ29vcmQgZGVsdGFYLCBF dmFzX0Nvb3JkIGRlbHRhWSwKICAgICBfZXdrX3ZpZXdfc21hcnRfY2hhbmdlZChzbWFydERhdGEp OwogfQogCisvKioKKyAqIEBpbnRlcm5hbAorICogVXBkYXRlcyBiYWNraW5nIHN0b3JlJ3Mgc2Ny b2xsIG9mZnNldC4KKyAqCisgKiBAcGFyYW0gZXdrVmlldyBWaWV3LgorICovCit2b2lkIGV3a192 aWV3X3Njcm9sbF9vZmZzZXRfdXBkYXRlKEV2YXNfT2JqZWN0KiBld2tWaWV3KQoreworICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhKTsKKyAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTihzbWFydERhdGEtPmFwaSk7CisgICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk4oc21hcnREYXRhLT5hcGktPmJhY2tpbmdfc3RvcmVfb2Zmc2V0X3VwZGF0ZSk7 CisKKyAgICBzbWFydERhdGEtPmFwaS0+YmFja2luZ19zdG9yZV9vZmZzZXRfdXBkYXRlKHNtYXJ0 RGF0YSk7Cit9CisKIFdlYkNvcmU6OlBhZ2UqIGV3a192aWV3X2NvcmVfcGFnZV9nZXQoY29uc3Qg RXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihl d2tWaWV3LCBzbWFydERhdGEsIDApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCA0ZDg3 NzI0Li5iYzQ1MDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtMTQyLDYgKzE0Miw3 IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3MgewogICAgIHZvaWQgKCp3aW5kb3dfY2xv c2UpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkKTsgLyoqPCBjbG9zZXMgYSB3aW5kb3cgKi8KICAg ICAvLyBob29rcyB0byBhbGxvdyBkaWZmZXJlbnQgYmFja2luZyBzdG9yZXMKICAgICBFdmFzX09i amVjdCAqKCpiYWNraW5nX3N0b3JlX2FkZCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QpOyAvKio8 IG11c3QgYmUgZGVmaW5lZCAqLworICAgIHZvaWQgKCpiYWNraW5nX3N0b3JlX29mZnNldF91cGRh dGUpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkKTsKICAgICBFaW5hX0Jvb2wgKCpzY3JvbGxzX3By b2Nlc3MpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkKTsgLyoqPCBtdXN0IGJlIGRlZmluZWQgKi8K ICAgICBFaW5hX0Jvb2wgKCpyZXBhaW50c19wcm9jZXNzKShFd2tfVmlld19TbWFydF9EYXRhICpz ZCk7IC8qKjwgbXVzdCBiZSBkZWZpbmVkICovCiAgICAgRWluYV9Cb29sICgqY29udGVudHNfcmVz aXplKShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgaW50IHcsIGludCBoKTsKQEAgLTE4Niw3ICsx ODcsNyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1NtYXJ0X0NsYXNzIHsKICAqIFRoZSB2ZXJzaW9uIHlv dSBoYXZlIHRvIHB1dCBpbnRvIHRoZSB2ZXJzaW9uIGZpZWxkCiAgKiBpbiB0aGUgQGEgRXdrX1Zp ZXdfU21hcnRfQ2xhc3Mgc3RydWN0dXJlLgogICovCi0jZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NM QVNTX1ZFUlNJT04gNFVMCisjZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX1ZFUlNJT04gNVVM CiAKIC8qKgogICogSW5pdGlhbGl6ZXMgYSB3aG9sZSBAYSBFd2tfVmlld19TbWFydF9DbGFzcyBz dHJ1Y3R1cmUuCkBAIC0xOTgsNyArMTk5LDcgQEAgc3RydWN0IF9Fd2tfVmlld19TbWFydF9DbGFz cyB7CiAgKiBAc2VlIEVXS19WSUVXX1NNQVJUX0NMQVNTX0lOSVRfVkVSU0lPTgogICogQHNlZSBF V0tfVklFV19TTUFSVF9DTEFTU19JTklUX05BTUVfVkVSU0lPTgogICovCi0jZGVmaW5lIEVXS19W SUVXX1NNQVJUX0NMQVNTX0lOSVQoc21hcnRfY2xhc3NfaW5pdCkge3NtYXJ0X2NsYXNzX2luaXQs IEVXS19WSUVXX1NNQVJUX0NMQVNTX1ZFUlNJT04sIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDB9CisjZGVmaW5lIEVXS19WSUVXX1NNQVJUX0NMQVNTX0lOSVQoc21h cnRfY2xhc3NfaW5pdCkge3NtYXJ0X2NsYXNzX2luaXQsIEVXS19WSUVXX1NNQVJUX0NMQVNTX1ZF UlNJT04sIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDB9CiAK IC8qKgogICogSW5pdGlhbGl6ZXMgdG8gemVybyBhIHdob2xlIEBhIEV3a19WaWV3X1NtYXJ0X0Ns YXNzIHN0cnVjdHVyZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmll d190aWxlZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3BwCmlu ZGV4IDM0MmNjNGUuLmYxODBiNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdmlld190aWxlZC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3X3Rp bGVkLmNwcApAQCAtMzQ4LDYgKzM0OCwxMyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld190 aWxlZF9zbWFydF9lbmFibGVfcmVuZGVyKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RAogICAg IHJldHVybiBld2tfdGlsZWRfYmFja2luZ19zdG9yZV9lbmFibGVfcmVuZGVyKHNtYXJ0RGF0YS0+ YmFja2luZ19zdG9yZSk7CiB9CiAKK3N0YXRpYyB2b2lkIF9ld2tfdmlld190aWxlZF9zY3JvbGxf b2Zmc2V0X3VwZGF0ZShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEpCit7CisgICAgaW50 IHNjcm9sbFgsIHNjcm9sbFk7CisgICAgZXdrX2ZyYW1lX3Njcm9sbF9wb3NfZ2V0KHNtYXJ0RGF0 YS0+bWFpbl9mcmFtZSwgJnNjcm9sbFgsICZzY3JvbGxZKTsKKyAgICBld2tfdGlsZWRfYmFja2lu Z19zdG9yZV9zY3JvbGxfZnVsbF9vZmZzZXRfc2V0KHNtYXJ0RGF0YS0+YmFja2luZ19zdG9yZSwg LXNjcm9sbFgsIC1zY3JvbGxZKTsKK30KKwogRWluYV9Cb29sIGV3a192aWV3X3RpbGVkX3NtYXJ0 X3NldChFd2tfVmlld19TbWFydF9DbGFzcyogYXBpKQogewogICAgIGlmICghZXdrX3ZpZXdfYmFz ZV9zbWFydF9zZXQoYXBpKSkKQEAgLTM2Miw2ICszNjksNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdf dGlsZWRfc21hcnRfc2V0KEV3a19WaWV3X1NtYXJ0X0NsYXNzKiBhcGkpCiAgICAgYXBpLT5zYy5h ZGQgPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfYWRkOwogCiAgICAgYXBpLT5iYWNraW5nX3N0b3Jl X2FkZCA9IF9ld2tfdmlld190aWxlZF9zbWFydF9iYWNraW5nX3N0b3JlX2FkZDsKKyAgICBhcGkt PmJhY2tpbmdfc3RvcmVfb2Zmc2V0X3VwZGF0ZSA9IF9ld2tfdmlld190aWxlZF9zY3JvbGxfb2Zm c2V0X3VwZGF0ZTsKICAgICBhcGktPnNjcm9sbHNfcHJvY2VzcyA9IF9ld2tfdmlld190aWxlZF9z bWFydF9zY3JvbGxzX3Byb2Nlc3M7CiAgICAgYXBpLT5yZXBhaW50c19wcm9jZXNzID0gX2V3a192 aWV3X3RpbGVkX3NtYXJ0X3JlcGFpbnRzX3Byb2Nlc3M7CiAgICAgYXBpLT5jb250ZW50c19yZXNp emUgPSBfZXdrX3ZpZXdfdGlsZWRfc21hcnRfY29udGVudHNfcmVzaXplOwo=