70004 2011-10-12 23:59:37 -0700 [EFL] Change the behavior of smart_zoom. 2011-10-16 17:34:34 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED LATER P2 Normal --- 70078 1 ryuan.choi ryuan.choi gyuyoung.kim leandro lucas.de.marchi rakuco oldest_to_newest 483027 0 ryuan.choi 2011-10-12 23:59:37 -0700 IMO, smart_zoom of ewk_view is for ewk_tiled_backing_store to support proportional scaling. So, Using ewk_view_scale_set is better than ewk_frame_page_zoom_set. 483031 1 110803 ryuan.choi 2011-10-13 00:02:41 -0700 Created attachment 110803 Patch 483040 2 110807 ryuan.choi 2011-10-13 00:31:32 -0700 Created attachment 110807 Patch 483144 3 110807 rakuco 2011-10-13 05:49:29 -0700 Comment on attachment 110807 Patch LGTM if zooming (the animations, etc) still works fine after this change. 483161 4 rakuco 2011-10-13 06:56:10 -0700 Oh, and please adjust Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp as well. 483262 5 110863 ryuan.choi 2011-10-13 10:09:47 -0700 Created attachment 110863 Patch 483316 6 110863 rakuco 2011-10-13 11:01:59 -0700 Comment on attachment 110863 Patch Some of my thoughts here may be a bit late now that r97043 is already in, but I feel the discussion is still important. Bug 62842 renamed the current existing zooming functions in ewk_view and added another function to scale pages. So far, so good. However, I still don't buy the argument for: a) Removing ewk_view_zoom_set It is a much more predictable name for zooming, the smart object has a smart_zoom_set member and in the end if one wants to zoom, ewk_view_zoom_set makes much more sense. b) Moving most of its behaviour to ewk_view_scale_set while making scaling the default zooming algorithm. https://bugs.webkit.org/show_bug.cgi?id=62842#c9 said: "Not everyone is mobile and want to scale page on zoom. How about desktop users that want text-only zoom? How about regular zoom that uses proper font size instead of scaled vectors? Users of low-end hardware, like some TVs will be hurt by such behavior". From what I see, this statement was not answered and this patch makes scaling the default zooming algorithm. The reason given in the ChangeLog was that "smart_zoom is for ewk_tiled_backing_store to support proportional scaling"; if this is the sole reason for changing the default behaviour here, I wonder if it does not make sense to fix it elsewhere and not change the current expectations. I suggest the following: a) Keep ewk_view_zoom_{get,set} with their current behaviour untouched. b) Verify whether the centering code currently in ewk_view_scale_set is really needed. I suspect just calling Page::setPageScaleFactor without any adjustment should work just fine. c) Change the tiled backing store to call the scaling code if it is indeed better for it in terms of performance. 483642 7 ryuan.choi 2011-10-13 16:43:41 -0700 (In reply to comment #6) > (From update of attachment 110863 [details]) > > I suggest the following: > > a) Keep ewk_view_zoom_{get,set} with their current behaviour untouched. > b) Verify whether the centering code currently in ewk_view_scale_set is really needed. I suspect just calling Page::setPageScaleFactor without any adjustment should work just fine. I agree. If then, I'll create new bug to remove centering code from ewk_view_scale_set. > c) Change the tiled backing store to call the scaling code if it is indeed better for it in terms of performance. For the performance, Page::setPageScaleFactor and page-zoom are not comparable. It probably depends on contents. But, I can say; 1) Performance between setPageScaleFactor and cairo scaled patch is almost same. (IIRC, cairo scaled patch is not contributed, because of may webcore changes.) 2) page zoom can't support proportional scaling. 483900 8 rakuco 2011-10-14 04:36:15 -0700 OK, so there's no need for this patch anymore? 484851 9 ryuan.choi 2011-10-16 17:34:19 -0700 (In reply to comment #8) > OK, so there's no need for this patch anymore? I still want this changes, but I need to investigate little bit more. So I will close and reopen if needed. 110803 2011-10-13 00:02:41 -0700 2011-10-13 00:31:26 -0700 Patch bug-70004-20111013160239.patch text/plain 9759 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogOTczNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCBkODg3YmI4OWJj NTkzNDJmYzdiMzE3MzA1Mzk2MWJjMDMyYjc3NTQ5Li5jNjM1NTEzZmVhMWM2NjU0MGRlOTY1ODVk Mzc2OGFiMjlkZDUyMmMyIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEt MTAtMTMgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdIENoYW5nZSB0aGUgQ2hhbmdlIHRoZSBiZWhhdmlvciBvZiBzbWFydF96b29tLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzAwMDQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBcyBhIHNlY29uZCBzdGVw IHRvIHJlZmFjdG9yIHpvb20sIGNoYW5nZSB0aGUgYmVoYXZpb3Igb2Ygc21hcnRfem9vbSBmcm9t CisgICAgICAgIGV3a19mcmFtZV9wYWdlX3pvb21fe2dldHxzZXR9IHRvIGV3a192aWV3X3NjYWxl X3tnZXR8c2V0fS4KKyAgICAgICAgQmVjYXVzZSBzbWFydF96b29tIGlzIGZvciBld2tfdGlsZWRf YmFja2luZ3N0b3JlIHRvIHN1cHBvcnQgcHJvcG9ydGlvbmFsIHNjYWxpbmcsCisgICAgICAgIHVz aW5nIGV3a192aWV3X3NjYWxlX3tnZXR8c2V0fSBpcyBiZXR0ZXIgdGhhbiBld2tfdmlld19wYWdl X3pvb21fe2dldHxzZXR9LgorCisgICAgICAgIEluIGFkZGl0aW9uLCByZW1vdmUgZXdrX3ZpZXdf em9vbV97Z2V0fHNldH0gYmVjYXVzZSBvdGhlciB6b29tIHJlbGF0ZWQgQVBJcworICAgICAgICBm dWxseSBjb3ZlcmVkLgorCisgICAgICAgICogZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9l d2tfdmlld19zbWFydF96b29tX3NldCk6CisgICAgICAgIChfZXdrX3ZpZXdfem9vbV9hbmltYXRv cl9jYik6CisgICAgICAgIChld2tfdmlld19zY2FsZV9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdf em9vbV93ZWFrX3NldCk6CisgICAgICAgIChld2tfdmlld196b29tX2FuaW1hdGVkX3NldCk6Cisg ICAgICAgIChld2tfdmlld19wcmVfcmVuZGVyX3JlZ2lvbik6CisgICAgICAgIChld2tfdmlld19w cmVfcmVuZGVyX3JlbGF0aXZlX3JhZGl1cyk6CisKIDIwMTEtMTAtMTIgIEpvc2VwaCBQZWNvcmFy byAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBQYXNzIFBhcnNlZCBBY2NlcHQgQXR0 cmlidXRlIE1JTUUgVHlwZXMgdG8gV2ViS2l0IENsaWVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuY3BwCmluZGV4IGYxOTczZTQzZGQ0ZTdhYzBhNmFiZmNhMDFkNTY3ZjgwYjQzZWQ3NTUuLmZj NDNmMDg2Y2RjYzM2NDRhZTFjYWYyYjJhNzQxNTk4NTY4YTM3Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcApAQCAtOTE5LDMwICs5MTksMTkgQEAgc3RhdGljIEVpbmFfQm9vbCBfZXdr X3ZpZXdfc21hcnRfY29udGVudHNfcmVzaXplKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0 YSwKIAogc3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfc21hcnRfem9vbV9zZXQoRXdrX1ZpZXdf U21hcnRfRGF0YSogc21hcnREYXRhLCBmbG9hdCB6b29tLCBFdmFzX0Nvb3JkIGNlbnRlclgsIEV2 YXNfQ29vcmQgY2VudGVyWSkKIHsKLSAgICBkb3VibGUgcHgsIHB5OwotICAgIEV2YXNfQ29vcmQg eCwgeSwgdywgaDsKLSAgICBFaW5hX0Jvb2wgcmV0OwotCi0gICAgZXdrX2ZyYW1lX3Njcm9sbF9z aXplX2dldChzbWFydERhdGEtPm1haW5fZnJhbWUsICZ3LCAmaCk7Ci0gICAgZXdrX2ZyYW1lX3Nj cm9sbF9wb3NfZ2V0KHNtYXJ0RGF0YS0+bWFpbl9mcmFtZSwgJngsICZ5KTsKKyAgICBFV0tfVklF V19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBFSU5BX0ZBTFNFKTsKIAotICAg IGlmICh3ICsgc21hcnREYXRhLT52aWV3LncgPiAwKQotICAgICAgICBweCA9IHN0YXRpY19jYXN0 PGRvdWJsZT4oeCArIGNlbnRlclgpIC8gKHcgKyBzbWFydERhdGEtPnZpZXcudyk7Ci0gICAgZWxz ZQotICAgICAgICBweCA9IDAuMDsKLQotICAgIGlmIChoICsgc21hcnREYXRhLT52aWV3LmggPiAw KQotICAgICAgICBweSA9IHN0YXRpY19jYXN0PGRvdWJsZT4oeSArIGNlbnRlclkpIC8gKGggKyBz bWFydERhdGEtPnZpZXcuaCk7Ci0gICAgZWxzZQotICAgICAgICBweSA9IDAuMDsKKyAgICBmbG9h dCBjdXJyZW50U2NhbGVGYWN0b3IgPSBld2tfdmlld19zY2FsZV9nZXQoc21hcnREYXRhLT5zZWxm KTsKKyAgICBpZiAoY3VycmVudFNjYWxlRmFjdG9yID09IC0xKQorICAgICAgICByZXR1cm4gRUlO QV9GQUxTRTsKIAotICAgIHJldCA9IGV3a19mcmFtZV9wYWdlX3pvb21fc2V0KHNtYXJ0RGF0YS0+ bWFpbl9mcmFtZSwgem9vbSk7CisgICAgaW50IHgsIHk7CisgICAgZXdrX2ZyYW1lX3Njcm9sbF9w b3NfZ2V0KHNtYXJ0RGF0YS0+bWFpbl9mcmFtZSwgJngsICZ5KTsKIAotICAgIGV3a19mcmFtZV9z Y3JvbGxfc2l6ZV9nZXQoc21hcnREYXRhLT5tYWluX2ZyYW1lLCAmdywgJmgpOwotICAgIHggPSAo dyArIHNtYXJ0RGF0YS0+dmlldy53KSAqIHB4IC0gY2VudGVyWDsKLSAgICB5ID0gKGggKyBzbWFy dERhdGEtPnZpZXcuaCkgKiBweSAtIGNlbnRlclk7Ci0gICAgZXdrX2ZyYW1lX3Njcm9sbF9zZXQo c21hcnREYXRhLT5tYWluX2ZyYW1lLCB4LCB5KTsKLSAgICByZXR1cm4gcmV0OworICAgIHggPSBz dGF0aWNfY2FzdDxpbnQ+KCgoeCArIGNlbnRlclgpIC8gY3VycmVudFNjYWxlRmFjdG9yKSAqIHpv b20pIC0gY2VudGVyWDsKKyAgICB5ID0gc3RhdGljX2Nhc3Q8aW50PigoKHkgKyBjZW50ZXJZKSAv IGN1cnJlbnRTY2FsZUZhY3RvcikgKiB6b29tKSAtIGNlbnRlclk7CisgICAgcHJpdi0+cGFnZS0+ c2V0UGFnZVNjYWxlRmFjdG9yKHpvb20sIFdlYkNvcmU6OkxheW91dFBvaW50KHgsIHkpKTsKKyAg ICByZXR1cm4gRUlOQV9UUlVFOwogfQogCiBzdGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfZmx1 c2goRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQpAQCAtMTAyMiw3ICsxMDExLDcgQEAg c3RhdGljIEVpbmFfQm9vbCBfZXdrX3ZpZXdfem9vbV9hbmltYXRvcl9jYih2b2lkKiBkYXRhKQog ICAgIGlmICgobm93ID49IHByaXYtPmFuaW1hdGVkX3pvb20udGltZS5lbmQpCiAgICAgICAgIHx8 IChub3cgPCBwcml2LT5hbmltYXRlZF96b29tLnRpbWUuc3RhcnQpKSB7CiAgICAgICAgIF9ld2tf dmlld196b29tX2FuaW1hdGVkX2ZpbmlzaChzZCk7Ci0gICAgICAgIGV3a192aWV3X3pvb21fc2V0 KHNkLT5zZWxmLCBwcml2LT5hbmltYXRlZF96b29tLnpvb20uZW5kLCBjeCwgY3kpOworICAgICAg ICBld2tfdmlld19zY2FsZV9zZXQoc2QtPnNlbGYsIHByaXYtPmFuaW1hdGVkX3pvb20uem9vbS5l bmQsIGN4LCBjeSk7CiAgICAgICAgIHNkLT5hcGktPnNjLmNhbGN1bGF0ZShzZC0+c2VsZik7CiAg ICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwogICAgIH0KQEAgLTE1MzgsMzggKzE1MjcsNiBAQCBF d2tfSGlzdG9yeSogZXdrX3ZpZXdfaGlzdG9yeV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1Zp ZXcpCiAgICAgcmV0dXJuIHByaXYtPmhpc3Rvcnk7CiB9CiAKLWZsb2F0IGV3a192aWV3X3pvb21f Z2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQotewotICAgIEVXS19WSUVXX1NEX0dFVF9P Ul9SRVRVUk4oZXdrVmlldywgc2QsIC0xLjApOwotICAgIHJldHVybiBld2tfZnJhbWVfcGFnZV96 b29tX2dldChzZC0+bWFpbl9mcmFtZSk7Ci19Ci0KLUVpbmFfQm9vbCBld2tfdmlld196b29tX3Nl dChFdmFzX09iamVjdCogZXdrVmlldywgZmxvYXQgem9vbSwgRXZhc19Db29yZCBjeCwgRXZhc19D b29yZCBjeSkKLXsKLSAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcsIHNkLCBF SU5BX0ZBTFNFKTsKLSAgICBFV0tfVklFV19QUklWX0dFVChzZCwgcHJpdik7Ci0KLSAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2QtPmFwaSwgRUlOQV9GQUxTRSk7Ci0gICAgRUlO QV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHNkLT5hcGktPnpvb21fc2V0LCBFSU5BX0ZBTFNF KTsKLQotICAgIGlmICghcHJpdi0+c2V0dGluZ3Muem9vbV9yYW5nZS51c2VyX3NjYWxhYmxlKSB7 Ci0gICAgICAgIFdSTigidXNlclNjYWxhYmxlIGlzIGZhbHNlIik7Ci0gICAgICAgIHJldHVybiBF SU5BX0ZBTFNFOwotICAgIH0KLQotICAgIGlmICh6b29tIDwgcHJpdi0+c2V0dGluZ3Muem9vbV9y YW5nZS5taW5fc2NhbGUpIHsKLSAgICAgICAgV1JOKCJ6b29tIGxldmVsIGlzIDwgJWYgOiAlZiIs IHByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UubWluX3NjYWxlLCB6b29tKTsKLSAgICAgICAgcmV0 dXJuIEVJTkFfRkFMU0U7Ci0gICAgfQotICAgIGlmICh6b29tID4gcHJpdi0+c2V0dGluZ3Muem9v bV9yYW5nZS5tYXhfc2NhbGUpIHsKLSAgICAgICAgV1JOKCJ6b29tIGxldmVsIGlzID4gJWYgOiAl ZiIsIHByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UubWF4X3NjYWxlLCB6b29tKTsKLSAgICAgICAg cmV0dXJuIEVJTkFfRkFMU0U7Ci0gICAgfQotCi0gICAgX2V3a192aWV3X3pvb21fYW5pbWF0ZWRf bWFya19zdG9wKHNkKTsKLSAgICByZXR1cm4gc2QtPmFwaS0+em9vbV9zZXQoc2QsIHpvb20sIGN4 LCBjeSk7Ci19Ci0KIGZsb2F0IGV3a192aWV3X3BhZ2Vfem9vbV9nZXQoY29uc3QgRXZhc19PYmpl Y3QqIGV3a1ZpZXcpCiB7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBz ZCwgLTEuMCk7CkBAIC0xNTk0LDE3ICsxNTUxLDE4IEBAIEVpbmFfQm9vbCBld2tfdmlld19zY2Fs ZV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHNjYWxlRmFjdG9yLCBFdmFzX0Nvb3Jk CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzZCwgRUlOQV9GQUxTRSk7 CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsK IAotICAgIGZsb2F0IGN1cnJlbnRTY2FsZUZhY3RvciA9IGV3a192aWV3X3NjYWxlX2dldChld2tW aWV3KTsKLSAgICBpZiAoY3VycmVudFNjYWxlRmFjdG9yID09IC0xKQotICAgICAgICByZXR1cm4g RUlOQV9GQUxTRTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoc2QtPmFwaSwg RUlOQV9GQUxTRSk7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHNkLT5hcGkt Pnpvb21fc2V0LCBFSU5BX0ZBTFNFKTsKIAotICAgIGludCB4LCB5OwotICAgIGV3a19mcmFtZV9z Y3JvbGxfcG9zX2dldChzZC0+bWFpbl9mcmFtZSwgJngsICZ5KTsKKyAgICBpZiAoIXByaXYtPnNl dHRpbmdzLnpvb21fcmFuZ2UudXNlcl9zY2FsYWJsZSkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFM U0U7CisgICAgaWYgKHNjYWxlRmFjdG9yIDwgcHJpdi0+c2V0dGluZ3Muem9vbV9yYW5nZS5taW5f c2NhbGUpCisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworICAgIGlmIChzY2FsZUZhY3RvciA+ IHByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UubWF4X3NjYWxlKQorICAgICAgICByZXR1cm4gRUlO QV9GQUxTRTsKIAotICAgIHggPSBzdGF0aWNfY2FzdDxpbnQ+KCgoeCArIGN4KSAvIGN1cnJlbnRT Y2FsZUZhY3RvcikgKiBzY2FsZUZhY3RvcikgLSBjeDsKLSAgICB5ID0gc3RhdGljX2Nhc3Q8aW50 PigoKHkgKyBjeSkgLyBjdXJyZW50U2NhbGVGYWN0b3IpICogc2NhbGVGYWN0b3IpIC0gY3k7Ci0g ICAgcHJpdi0+cGFnZS0+c2V0UGFnZVNjYWxlRmFjdG9yKHNjYWxlRmFjdG9yLCBXZWJDb3JlOjpM YXlvdXRQb2ludCh4LCB5KSk7Ci0gICAgcmV0dXJuIEVJTkFfVFJVRTsKKyAgICBfZXdrX3ZpZXdf em9vbV9hbmltYXRlZF9tYXJrX3N0b3Aoc2QpOworICAgIHJldHVybiBzZC0+YXBpLT56b29tX3Nl dChzZCwgc2NhbGVGYWN0b3IsIGN4LCBjeSk7CiB9CiAKIGZsb2F0IGV3a192aWV3X3RleHRfem9v bV9nZXQoY29uc3QgRXZhc19PYmplY3QqIGV3a1ZpZXcpCkBAIC0xNjU5LDcgKzE2MTcsNyBAQCBF aW5hX0Jvb2wgZXdrX3ZpZXdfem9vbV93ZWFrX3NldChFdmFzX09iamVjdCogZXdrVmlldywgZmxv YXQgem9vbSwgRXZhc19Db29yZCBjZQogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKICAgICB9 CiAKLSAgICBzZC0+YW5pbWF0ZWRfem9vbS56b29tLnN0YXJ0ID0gZXdrX2ZyYW1lX3BhZ2Vfem9v bV9nZXQoc2QtPm1haW5fZnJhbWUpOworICAgIHNkLT5hbmltYXRlZF96b29tLnpvb20uc3RhcnQg PSBld2tfdmlld19zY2FsZV9nZXQoZXdrVmlldyk7CiAgICAgc2QtPmFuaW1hdGVkX3pvb20uem9v bS5lbmQgPSB6b29tOwogICAgIHNkLT5hbmltYXRlZF96b29tLnpvb20uY3VycmVudCA9IHpvb207 CiAgICAgcmV0dXJuIHNkLT5hcGktPnpvb21fd2Vha19zZXQoc2QsIHpvb20sIGNlbnRlclgsIGNl bnRlclkpOwpAQCAtMTcxOCw3ICsxNjc2LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3pvb21fYW5p bWF0ZWRfc2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBmbG9hdCB6b29tLCBmbG9hdCBkdXIKICAg ICBpZiAocHJpdi0+YW5pbWF0ZWRfem9vbS5hbmltYXRvcikKICAgICAgICAgcHJpdi0+YW5pbWF0 ZWRfem9vbS56b29tLnN0YXJ0ID0gX2V3a192aWV3X3pvb21fYW5pbWF0ZWRfY3VycmVudChwcml2 KTsKICAgICBlbHNlIHsKLSAgICAgICAgcHJpdi0+YW5pbWF0ZWRfem9vbS56b29tLnN0YXJ0ID0g ZXdrX2ZyYW1lX3BhZ2Vfem9vbV9nZXQoc2QtPm1haW5fZnJhbWUpOworICAgICAgICBwcml2LT5h bmltYXRlZF96b29tLnpvb20uc3RhcnQgPSBld2tfdmlld19zY2FsZV9nZXQoZXdrVmlldyk7CiAg ICAgICAgIF9ld2tfdmlld196b29tX2FuaW1hdGlvbl9zdGFydChzZCk7CiAgICAgfQogCkBAIC0x NzU2LDcgKzE3MTQsNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcHJlX3JlbmRlcl9yZWdpb24oRXZh c19PYmplY3QqIGV3a1ZpZXcsIEV2YXNfQ29vcmQgeCwgRXZhc19DbwogICAgIGlmIChwcml2LT5h bmltYXRlZF96b29tLmFuaW1hdG9yKQogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKIAotICAg IGN1cl96b29tID0gZXdrX2ZyYW1lX3BhZ2Vfem9vbV9nZXQoc2QtPm1haW5fZnJhbWUpOworICAg IGN1cl96b29tID0gZXdrX3ZpZXdfc2NhbGVfZ2V0KGV3a1ZpZXcpOwogCiAgICAgaWYgKGN1cl96 b29tIDwgMC4wMDAwMSkKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CkBAIC0xNzk1LDcgKzE3 NTMsNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcHJlX3JlbmRlcl9yZWxhdGl2ZV9yYWRpdXMoRXZh c19PYmplY3QqIGV3a1ZpZXcsIHVuc2lnbmVkIGludAogICAgIGlmIChwcml2LT5hbmltYXRlZF96 b29tLmFuaW1hdG9yKQogICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKIAotICAgIGN1cl96b29t ID0gZXdrX2ZyYW1lX3BhZ2Vfem9vbV9nZXQoc2QtPm1haW5fZnJhbWUpOworICAgIGN1cl96b29t ID0gZXdrX3ZpZXdfc2NhbGVfZ2V0KGV3a1ZpZXcpOwogICAgIHJldHVybiBzZC0+YXBpLT5wcmVf cmVuZGVyX3JlbGF0aXZlX3JhZGl1cyhzZCwgbnVtYmVyLCBjdXJfem9vbSk7CiB9CiAKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyZjRiZDBkNzA5 MmU3Yzk2NTE0YWNjZDk0YTI3NjkwZDIwM2ZmOTg3Li5mZDdmMmY0ZTIyZjMzYmVhMjcwMDFjODc1 MTk1MjIxNmVlZTZjMjljIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMTAtMTMgIFJ5dWFuIENob2kgIDxyeXVh bi5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtFRkxdIENoYW5nZSB0aGUgQ2hhbmdlIHRo ZSBiZWhhdmlvciBvZiBzbWFydF96b29tLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzAwMDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBDaGFuZ2UgZXdrX3ZpZXdfem9vbV97Z2V0fHNldH0gdG8gZXdrX3Zp ZXdfc2NhbGVfe2dldHxzZXR9IGJlY2F1c2UgdGhleQorICAgICAgICBhcmUgcmVtb3ZlZC4KKwor ICAgICAgICAqIEVXZWJMYXVuY2hlci9tYWluLmM6CisgICAgICAgICh2aWV3cG9ydF9zZXQpOgor ICAgICAgICAob25fbG9hZF9maW5pc2hlZCk6CisKIDIwMTEtMTAtMTIgIEx1Y2FzIEZvcnNjaGxl ciAgPGxmb3JzY2hsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBraWxsLW9sZC1wcm9j ZXNzZXMgbG9naWMuCmRpZmYgLS1naXQgYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvVG9v bHMvRVdlYkxhdW5jaGVyL21haW4uYwppbmRleCA0MTNmMTQ2NTdhMmQ1ZmEyMjgwMmY4ODVmMmYz NWNkOWRmNWFhNDVmLi5iYmQwYTViNzdlN2IwOTM5NWM0MWEzY2NkMzIxNWRkYjFjOWE0ZjUwIDEw MDY0NAotLS0gYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCisrKyBiL1Rvb2xzL0VXZWJMYXVu Y2hlci9tYWluLmMKQEAgLTI3MSw3ICsyNzEsNyBAQCB2aWV3cG9ydF9zZXQoKQogICAgIGFwcCA9 IChFTGF1bmNoZXIqKSBlaW5hX2xpc3RfZGF0YV9nZXQod2luZG93cyk7CiAKICAgICBld2tfdmll d19maXhlZF9sYXlvdXRfc2l6ZV9zZXQoYXBwLT5icm93c2VyLCBhcHAtPnZpZXdwb3J0LncsIGFw cC0+dmlld3BvcnQuaCk7Ci0gICAgZXdrX3ZpZXdfem9vbV9zZXQoYXBwLT5icm93c2VyLCBhcHAt PnZpZXdwb3J0LmluaXRTY2FsZSwgMCwgMCk7CisgICAgZXdrX3ZpZXdfc2NhbGVfc2V0KGFwcC0+ YnJvd3NlciwgYXBwLT52aWV3cG9ydC5pbml0U2NhbGUsIDAsIDApOwogICAgIGlmICghZXdrX3Zp ZXdfem9vbV9yYW5nZV9zZXQoYXBwLT5icm93c2VyLCBhcHAtPnZpZXdwb3J0Lm1pblNjYWxlLCBh cHAtPnZpZXdwb3J0Lm1heFNjYWxlKSkKICAgICAgICAgaW5mbygiIEZhaWwgdG8gc2V0IHpvb20g cmFuZ2UuIG1pblNjYWxlID0gJWYsIG1heFNjYWxlID0gJWZcbiIsIGFwcC0+dmlld3BvcnQubWlu U2NhbGUsIGFwcC0+dmlld3BvcnQubWF4U2NhbGUpOwogICAgIGV3a192aWV3X3VzZXJfc2NhbGFi bGVfc2V0KGFwcC0+YnJvd3NlciwgYXBwLT52aWV3cG9ydC51c2VyU2NhbGFibGUpOwpAQCAtMzA4 LDcgKzMwOCw3IEBAIG9uX2xvYWRfZmluaXNoZWQodm9pZCAqdXNlcl9kYXRhLCBFdmFzX09iamVj dCAqd2Vidmlldywgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgaW5mbygiRmFpbGVkIGxvYWRp bmcgcGFnZTogJWQgJXMgXCIlc1wiLCB1cmw9JXNcbiIsCiAgICAgICAgICAgICAgZXJyLT5jb2Rl LCBlcnItPmRvbWFpbiwgZXJyLT5kZXNjcmlwdGlvbiwgZXJyLT5mYWlsaW5nX3VybCk7CiAKLSAg ICBjdXJyZW50Wm9vbSA9IGV3a192aWV3X3pvb21fZ2V0KHdlYnZpZXcpOworICAgIGN1cnJlbnRa b29tID0gZXdrX3ZpZXdfc2NhbGVfZ2V0KHdlYnZpZXcpOwogICAgIGN1cnJlbnRab29tTGV2ZWwg PSBuZWFyZXN0X3pvb21fbGV2ZWxfZ2V0KGN1cnJlbnRab29tKTsKICAgICBpbmZvKCJXZWJDb3Jl IFpvb209JWYsIGN1cnJlbnRab29tTGV2ZWw9JWRcbiIsIGN1cnJlbnRab29tLCBjdXJyZW50Wm9v bUxldmVsKTsKIH0K 110807 2011-10-13 00:31:32 -0700 2011-10-13 10:09:40 -0700 Patch bug-70004-20111013163129.patch text/plain 9737 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogOTczNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCBkODg3YmI4OWJj NTkzNDJmYzdiMzE3MzA1Mzk2MWJjMDMyYjc3NTQ5Li42MGIxNDdjMzFmZDc0ZmEyMjE3ZTFlZDYx MWQxZGQ5Yzg4NWFmZWM1IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEt MTAtMTMgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdIENoYW5nZSB0aGUgYmVoYXZpb3Igb2Ygc21hcnRfem9vbS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMDA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgYSBzZWNvbmQgc3RlcCB0byByZWZhY3Rv ciB6b29tLCBjaGFuZ2UgdGhlIGJlaGF2aW9yIG9mIHNtYXJ0X3pvb20gZnJvbQorICAgICAgICBl d2tfZnJhbWVfcGFnZV96b29tX3tnZXR8c2V0fSB0byBld2tfdmlld19zY2FsZV97Z2V0fHNldH0u CisgICAgICAgIEJlY2F1c2Ugc21hcnRfem9vbSBpcyBmb3IgZXdrX3RpbGVkX2JhY2tpbmdzdG9y ZSB0byBzdXBwb3J0IHByb3BvcnRpb25hbCBzY2FsaW5nLAorICAgICAgICB1c2luZyBld2tfdmll d19zY2FsZV97Z2V0fHNldH0gaXMgYmV0dGVyIHRoYW4gZXdrX3ZpZXdfcGFnZV96b29tX3tnZXR8 c2V0fS4KKworICAgICAgICBJbiBhZGRpdGlvbiwgcmVtb3ZlIGV3a192aWV3X3pvb21fe2dldHxz ZXR9IGJlY2F1c2Ugb3RoZXIgem9vbSByZWxhdGVkIEFQSXMKKyAgICAgICAgZnVsbHkgY292ZXJl ZC4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChfZXdrX3ZpZXdfc21h cnRfem9vbV9zZXQpOgorICAgICAgICAoX2V3a192aWV3X3pvb21fYW5pbWF0b3JfY2IpOgorICAg ICAgICAoZXdrX3ZpZXdfc2NhbGVfc2V0KToKKyAgICAgICAgKGV3a192aWV3X3pvb21fd2Vha19z ZXQpOgorICAgICAgICAoZXdrX3ZpZXdfem9vbV9hbmltYXRlZF9zZXQpOgorICAgICAgICAoZXdr X3ZpZXdfcHJlX3JlbmRlcl9yZWdpb24pOgorICAgICAgICAoZXdrX3ZpZXdfcHJlX3JlbmRlcl9y ZWxhdGl2ZV9yYWRpdXMpOgorCiAyMDExLTEwLTEyICBKb3NlcGggUGVjb3Jhcm8gIDxqb2VwZWNr QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUGFzcyBQYXJzZWQgQWNjZXB0IEF0dHJpYnV0ZSBNSU1F IFR5cGVzIHRvIFdlYktpdCBDbGllbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRl eCBmMTk3M2U0M2RkNGU3YWMwYTZhYmZjYTAxZDU2N2Y4MGI0M2VkNzU1Li5mYzQzZjA4NmNkY2Mz NjQ0YWUxY2FmMmIyYTc0MTU5ODU2OGEzN2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5j cHAKQEAgLTkxOSwzMCArOTE5LDE5IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0 X2NvbnRlbnRzX3Jlc2l6ZShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsCiAKIHN0YXRp YyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X3pvb21fc2V0KEV3a19WaWV3X1NtYXJ0X0RhdGEq IHNtYXJ0RGF0YSwgZmxvYXQgem9vbSwgRXZhc19Db29yZCBjZW50ZXJYLCBFdmFzX0Nvb3JkIGNl bnRlclkpCiB7Ci0gICAgZG91YmxlIHB4LCBweTsKLSAgICBFdmFzX0Nvb3JkIHgsIHksIHcsIGg7 Ci0gICAgRWluYV9Cb29sIHJldDsKLQotICAgIGV3a19mcmFtZV9zY3JvbGxfc2l6ZV9nZXQoc21h cnREYXRhLT5tYWluX2ZyYW1lLCAmdywgJmgpOwotICAgIGV3a19mcmFtZV9zY3JvbGxfcG9zX2dl dChzbWFydERhdGEtPm1haW5fZnJhbWUsICZ4LCAmeSk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRf T1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgRUlOQV9GQUxTRSk7CiAKLSAgICBpZiAodyArIHNt YXJ0RGF0YS0+dmlldy53ID4gMCkKLSAgICAgICAgcHggPSBzdGF0aWNfY2FzdDxkb3VibGU+KHgg KyBjZW50ZXJYKSAvICh3ICsgc21hcnREYXRhLT52aWV3LncpOwotICAgIGVsc2UKLSAgICAgICAg cHggPSAwLjA7Ci0KLSAgICBpZiAoaCArIHNtYXJ0RGF0YS0+dmlldy5oID4gMCkKLSAgICAgICAg cHkgPSBzdGF0aWNfY2FzdDxkb3VibGU+KHkgKyBjZW50ZXJZKSAvIChoICsgc21hcnREYXRhLT52 aWV3LmgpOwotICAgIGVsc2UKLSAgICAgICAgcHkgPSAwLjA7CisgICAgZmxvYXQgY3VycmVudFNj YWxlRmFjdG9yID0gZXdrX3ZpZXdfc2NhbGVfZ2V0KHNtYXJ0RGF0YS0+c2VsZik7CisgICAgaWYg KGN1cnJlbnRTY2FsZUZhY3RvciA9PSAtMSkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAK LSAgICByZXQgPSBld2tfZnJhbWVfcGFnZV96b29tX3NldChzbWFydERhdGEtPm1haW5fZnJhbWUs IHpvb20pOworICAgIGludCB4LCB5OworICAgIGV3a19mcmFtZV9zY3JvbGxfcG9zX2dldChzbWFy dERhdGEtPm1haW5fZnJhbWUsICZ4LCAmeSk7CiAKLSAgICBld2tfZnJhbWVfc2Nyb2xsX3NpemVf Z2V0KHNtYXJ0RGF0YS0+bWFpbl9mcmFtZSwgJncsICZoKTsKLSAgICB4ID0gKHcgKyBzbWFydERh dGEtPnZpZXcudykgKiBweCAtIGNlbnRlclg7Ci0gICAgeSA9IChoICsgc21hcnREYXRhLT52aWV3 LmgpICogcHkgLSBjZW50ZXJZOwotICAgIGV3a19mcmFtZV9zY3JvbGxfc2V0KHNtYXJ0RGF0YS0+ bWFpbl9mcmFtZSwgeCwgeSk7Ci0gICAgcmV0dXJuIHJldDsKKyAgICB4ID0gc3RhdGljX2Nhc3Q8 aW50PigoKHggKyBjZW50ZXJYKSAvIGN1cnJlbnRTY2FsZUZhY3RvcikgKiB6b29tKSAtIGNlbnRl clg7CisgICAgeSA9IHN0YXRpY19jYXN0PGludD4oKCh5ICsgY2VudGVyWSkgLyBjdXJyZW50U2Nh bGVGYWN0b3IpICogem9vbSkgLSBjZW50ZXJZOworICAgIHByaXYtPnBhZ2UtPnNldFBhZ2VTY2Fs ZUZhY3Rvcih6b29tLCBXZWJDb3JlOjpMYXlvdXRQb2ludCh4LCB5KSk7CisgICAgcmV0dXJuIEVJ TkFfVFJVRTsKIH0KIAogc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0X2ZsdXNoKEV3a19WaWV3 X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKQEAgLTEwMjIsNyArMTAxMSw3IEBAIHN0YXRpYyBFaW5h X0Jvb2wgX2V3a192aWV3X3pvb21fYW5pbWF0b3JfY2Iodm9pZCogZGF0YSkKICAgICBpZiAoKG5v dyA+PSBwcml2LT5hbmltYXRlZF96b29tLnRpbWUuZW5kKQogICAgICAgICB8fCAobm93IDwgcHJp di0+YW5pbWF0ZWRfem9vbS50aW1lLnN0YXJ0KSkgewogICAgICAgICBfZXdrX3ZpZXdfem9vbV9h bmltYXRlZF9maW5pc2goc2QpOwotICAgICAgICBld2tfdmlld196b29tX3NldChzZC0+c2VsZiwg cHJpdi0+YW5pbWF0ZWRfem9vbS56b29tLmVuZCwgY3gsIGN5KTsKKyAgICAgICAgZXdrX3ZpZXdf c2NhbGVfc2V0KHNkLT5zZWxmLCBwcml2LT5hbmltYXRlZF96b29tLnpvb20uZW5kLCBjeCwgY3kp OwogICAgICAgICBzZC0+YXBpLT5zYy5jYWxjdWxhdGUoc2QtPnNlbGYpOwogICAgICAgICByZXR1 cm4gRUlOQV9GQUxTRTsKICAgICB9CkBAIC0xNTM4LDM4ICsxNTI3LDYgQEAgRXdrX0hpc3Rvcnkq IGV3a192aWV3X2hpc3RvcnlfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIHJl dHVybiBwcml2LT5oaXN0b3J5OwogfQogCi1mbG9hdCBld2tfdmlld196b29tX2dldChjb25zdCBF dmFzX09iamVjdCogZXdrVmlldykKLXsKLSAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3 a1ZpZXcsIHNkLCAtMS4wKTsKLSAgICByZXR1cm4gZXdrX2ZyYW1lX3BhZ2Vfem9vbV9nZXQoc2Qt Pm1haW5fZnJhbWUpOwotfQotCi1FaW5hX0Jvb2wgZXdrX3ZpZXdfem9vbV9zZXQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIGZsb2F0IHpvb20sIEV2YXNfQ29vcmQgY3gsIEV2YXNfQ29vcmQgY3kpCi17 Ci0gICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzZCwgRUlOQV9GQUxTRSk7 Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVQoc2QsIHByaXYpOwotCi0gICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk5fVkFMKHNkLT5hcGksIEVJTkFfRkFMU0UpOwotICAgIEVJTkFfU0FGRVRZX09O X05VTExfUkVUVVJOX1ZBTChzZC0+YXBpLT56b29tX3NldCwgRUlOQV9GQUxTRSk7Ci0KLSAgICBp ZiAoIXByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UudXNlcl9zY2FsYWJsZSkgewotICAgICAgICBX Uk4oInVzZXJTY2FsYWJsZSBpcyBmYWxzZSIpOwotICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsK LSAgICB9Ci0KLSAgICBpZiAoem9vbSA8IHByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UubWluX3Nj YWxlKSB7Ci0gICAgICAgIFdSTigiem9vbSBsZXZlbCBpcyA8ICVmIDogJWYiLCBwcml2LT5zZXR0 aW5ncy56b29tX3JhbmdlLm1pbl9zY2FsZSwgem9vbSk7Ci0gICAgICAgIHJldHVybiBFSU5BX0ZB TFNFOwotICAgIH0KLSAgICBpZiAoem9vbSA+IHByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UubWF4 X3NjYWxlKSB7Ci0gICAgICAgIFdSTigiem9vbSBsZXZlbCBpcyA+ICVmIDogJWYiLCBwcml2LT5z ZXR0aW5ncy56b29tX3JhbmdlLm1heF9zY2FsZSwgem9vbSk7Ci0gICAgICAgIHJldHVybiBFSU5B X0ZBTFNFOwotICAgIH0KLQotICAgIF9ld2tfdmlld196b29tX2FuaW1hdGVkX21hcmtfc3RvcChz ZCk7Ci0gICAgcmV0dXJuIHNkLT5hcGktPnpvb21fc2V0KHNkLCB6b29tLCBjeCwgY3kpOwotfQot CiBmbG9hdCBld2tfdmlld19wYWdlX3pvb21fZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3 KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc2QsIC0xLjApOwpA QCAtMTU5NCwxNyArMTU1MSwxOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2NhbGVfc2V0KEV2YXNf T2JqZWN0KiBld2tWaWV3LCBmbG9hdCBzY2FsZUZhY3RvciwgRXZhc19Db29yZAogICAgIEVXS19W SUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc2QsIEVJTkFfRkFMU0UpOwogICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CiAKLSAgICBmbG9h dCBjdXJyZW50U2NhbGVGYWN0b3IgPSBld2tfdmlld19zY2FsZV9nZXQoZXdrVmlldyk7Ci0gICAg aWYgKGN1cnJlbnRTY2FsZUZhY3RvciA9PSAtMSkKLSAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7 CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHNkLT5hcGksIEVJTkFfRkFMU0Up OworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZC0+YXBpLT56b29tX3NldCwg RUlOQV9GQUxTRSk7CiAKLSAgICBpbnQgeCwgeTsKLSAgICBld2tfZnJhbWVfc2Nyb2xsX3Bvc19n ZXQoc2QtPm1haW5fZnJhbWUsICZ4LCAmeSk7CisgICAgaWYgKCFwcml2LT5zZXR0aW5ncy56b29t X3JhbmdlLnVzZXJfc2NhbGFibGUpCisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworICAgIGlm IChzY2FsZUZhY3RvciA8IHByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UubWluX3NjYWxlKQorICAg ICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKyAgICBpZiAoc2NhbGVGYWN0b3IgPiBwcml2LT5zZXR0 aW5ncy56b29tX3JhbmdlLm1heF9zY2FsZSkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAK LSAgICB4ID0gc3RhdGljX2Nhc3Q8aW50PigoKHggKyBjeCkgLyBjdXJyZW50U2NhbGVGYWN0b3Ip ICogc2NhbGVGYWN0b3IpIC0gY3g7Ci0gICAgeSA9IHN0YXRpY19jYXN0PGludD4oKCh5ICsgY3kp IC8gY3VycmVudFNjYWxlRmFjdG9yKSAqIHNjYWxlRmFjdG9yKSAtIGN5OwotICAgIHByaXYtPnBh Z2UtPnNldFBhZ2VTY2FsZUZhY3RvcihzY2FsZUZhY3RvciwgV2ViQ29yZTo6TGF5b3V0UG9pbnQo eCwgeSkpOwotICAgIHJldHVybiBFSU5BX1RSVUU7CisgICAgX2V3a192aWV3X3pvb21fYW5pbWF0 ZWRfbWFya19zdG9wKHNkKTsKKyAgICByZXR1cm4gc2QtPmFwaS0+em9vbV9zZXQoc2QsIHNjYWxl RmFjdG9yLCBjeCwgY3kpOwogfQogCiBmbG9hdCBld2tfdmlld190ZXh0X3pvb21fZ2V0KGNvbnN0 IEV2YXNfT2JqZWN0KiBld2tWaWV3KQpAQCAtMTY1OSw3ICsxNjE3LDcgQEAgRWluYV9Cb29sIGV3 a192aWV3X3pvb21fd2Vha19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHpvb20sIEV2 YXNfQ29vcmQgY2UKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAgICAgfQogCi0gICAgc2Qt PmFuaW1hdGVkX3pvb20uem9vbS5zdGFydCA9IGV3a19mcmFtZV9wYWdlX3pvb21fZ2V0KHNkLT5t YWluX2ZyYW1lKTsKKyAgICBzZC0+YW5pbWF0ZWRfem9vbS56b29tLnN0YXJ0ID0gZXdrX3ZpZXdf c2NhbGVfZ2V0KGV3a1ZpZXcpOwogICAgIHNkLT5hbmltYXRlZF96b29tLnpvb20uZW5kID0gem9v bTsKICAgICBzZC0+YW5pbWF0ZWRfem9vbS56b29tLmN1cnJlbnQgPSB6b29tOwogICAgIHJldHVy biBzZC0+YXBpLT56b29tX3dlYWtfc2V0KHNkLCB6b29tLCBjZW50ZXJYLCBjZW50ZXJZKTsKQEAg LTE3MTgsNyArMTY3Niw3IEBAIEVpbmFfQm9vbCBld2tfdmlld196b29tX2FuaW1hdGVkX3NldChF dmFzX09iamVjdCogZXdrVmlldywgZmxvYXQgem9vbSwgZmxvYXQgZHVyCiAgICAgaWYgKHByaXYt PmFuaW1hdGVkX3pvb20uYW5pbWF0b3IpCiAgICAgICAgIHByaXYtPmFuaW1hdGVkX3pvb20uem9v bS5zdGFydCA9IF9ld2tfdmlld196b29tX2FuaW1hdGVkX2N1cnJlbnQocHJpdik7CiAgICAgZWxz ZSB7Ci0gICAgICAgIHByaXYtPmFuaW1hdGVkX3pvb20uem9vbS5zdGFydCA9IGV3a19mcmFtZV9w YWdlX3pvb21fZ2V0KHNkLT5tYWluX2ZyYW1lKTsKKyAgICAgICAgcHJpdi0+YW5pbWF0ZWRfem9v bS56b29tLnN0YXJ0ID0gZXdrX3ZpZXdfc2NhbGVfZ2V0KGV3a1ZpZXcpOwogICAgICAgICBfZXdr X3ZpZXdfem9vbV9hbmltYXRpb25fc3RhcnQoc2QpOwogICAgIH0KIApAQCAtMTc1Niw3ICsxNzE0 LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3ByZV9yZW5kZXJfcmVnaW9uKEV2YXNfT2JqZWN0KiBl d2tWaWV3LCBFdmFzX0Nvb3JkIHgsIEV2YXNfQ28KICAgICBpZiAocHJpdi0+YW5pbWF0ZWRfem9v bS5hbmltYXRvcikKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAKLSAgICBjdXJfem9vbSA9 IGV3a19mcmFtZV9wYWdlX3pvb21fZ2V0KHNkLT5tYWluX2ZyYW1lKTsKKyAgICBjdXJfem9vbSA9 IGV3a192aWV3X3NjYWxlX2dldChld2tWaWV3KTsKIAogICAgIGlmIChjdXJfem9vbSA8IDAuMDAw MDEpCiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwpAQCAtMTc5NSw3ICsxNzUzLDcgQEAgRWlu YV9Cb29sIGV3a192aWV3X3ByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzKEV2YXNfT2JqZWN0KiBl d2tWaWV3LCB1bnNpZ25lZCBpbnQKICAgICBpZiAocHJpdi0+YW5pbWF0ZWRfem9vbS5hbmltYXRv cikKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAKLSAgICBjdXJfem9vbSA9IGV3a19mcmFt ZV9wYWdlX3pvb21fZ2V0KHNkLT5tYWluX2ZyYW1lKTsKKyAgICBjdXJfem9vbSA9IGV3a192aWV3 X3NjYWxlX2dldChld2tWaWV3KTsKICAgICByZXR1cm4gc2QtPmFwaS0+cHJlX3JlbmRlcl9yZWxh dGl2ZV9yYWRpdXMoc2QsIG51bWJlciwgY3VyX3pvb20pOwogfQogCmRpZmYgLS1naXQgYS9Ub29s cy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmY0YmQwZDcwOTJlN2M5NjUxNGFj Y2Q5NGEyNzY5MGQyMDNmZjk4Ny4uMzg2ZjBlOTk3ZTRiOTE0OThkZGU5NDk1MTE4OGE3YWY0YWNh MTk3ZSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDExLTEwLTEzICBSeXVhbiBDaG9pICA8cnl1YW4uY2hvaUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXSBDaGFuZ2UgdGhlIGJlaGF2aW9yIG9mIHNtYXJ0X3pv b20uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDAw NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5n ZSBld2tfdmlld196b29tX3tnZXR8c2V0fSB0byBld2tfdmlld19zY2FsZV97Z2V0fHNldH0gYmVj YXVzZSB0aGV5CisgICAgICAgIGFyZSByZW1vdmVkLgorCisgICAgICAgICogRVdlYkxhdW5jaGVy L21haW4uYzoKKyAgICAgICAgKHZpZXdwb3J0X3NldCk6CisgICAgICAgIChvbl9sb2FkX2Zpbmlz aGVkKToKKwogMjAxMS0xMC0xMiAgTHVjYXMgRm9yc2NobGVyICA8bGZvcnNjaGxlckBhcHBsZS5j b20+CiAKICAgICAgICAgVXBkYXRlIGtpbGwtb2xkLXByb2Nlc3NlcyBsb2dpYy4KZGlmZiAtLWdp dCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMgYi9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5j CmluZGV4IDQxM2YxNDY1N2EyZDVmYTIyODAyZjg4NWYyZjM1Y2Q5ZGY1YWE0NWYuLmJiZDBhNWI3 N2U3YjA5Mzk1YzQxYTNjY2QzMjE1ZGRiMWM5YTRmNTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0VXZWJM YXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwpAQCAtMjcxLDcg KzI3MSw3IEBAIHZpZXdwb3J0X3NldCgpCiAgICAgYXBwID0gKEVMYXVuY2hlciopIGVpbmFfbGlz dF9kYXRhX2dldCh3aW5kb3dzKTsKIAogICAgIGV3a192aWV3X2ZpeGVkX2xheW91dF9zaXplX3Nl dChhcHAtPmJyb3dzZXIsIGFwcC0+dmlld3BvcnQudywgYXBwLT52aWV3cG9ydC5oKTsKLSAgICBl d2tfdmlld196b29tX3NldChhcHAtPmJyb3dzZXIsIGFwcC0+dmlld3BvcnQuaW5pdFNjYWxlLCAw LCAwKTsKKyAgICBld2tfdmlld19zY2FsZV9zZXQoYXBwLT5icm93c2VyLCBhcHAtPnZpZXdwb3J0 LmluaXRTY2FsZSwgMCwgMCk7CiAgICAgaWYgKCFld2tfdmlld196b29tX3JhbmdlX3NldChhcHAt PmJyb3dzZXIsIGFwcC0+dmlld3BvcnQubWluU2NhbGUsIGFwcC0+dmlld3BvcnQubWF4U2NhbGUp KQogICAgICAgICBpbmZvKCIgRmFpbCB0byBzZXQgem9vbSByYW5nZS4gbWluU2NhbGUgPSAlZiwg bWF4U2NhbGUgPSAlZlxuIiwgYXBwLT52aWV3cG9ydC5taW5TY2FsZSwgYXBwLT52aWV3cG9ydC5t YXhTY2FsZSk7CiAgICAgZXdrX3ZpZXdfdXNlcl9zY2FsYWJsZV9zZXQoYXBwLT5icm93c2VyLCBh cHAtPnZpZXdwb3J0LnVzZXJTY2FsYWJsZSk7CkBAIC0zMDgsNyArMzA4LDcgQEAgb25fbG9hZF9m aW5pc2hlZCh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICp3ZWJ2aWV3LCB2b2lkICpldmVu dF9pbmZvKQogICAgICAgICBpbmZvKCJGYWlsZWQgbG9hZGluZyBwYWdlOiAlZCAlcyBcIiVzXCIs IHVybD0lc1xuIiwKICAgICAgICAgICAgICBlcnItPmNvZGUsIGVyci0+ZG9tYWluLCBlcnItPmRl c2NyaXB0aW9uLCBlcnItPmZhaWxpbmdfdXJsKTsKIAotICAgIGN1cnJlbnRab29tID0gZXdrX3Zp ZXdfem9vbV9nZXQod2Vidmlldyk7CisgICAgY3VycmVudFpvb20gPSBld2tfdmlld19zY2FsZV9n ZXQod2Vidmlldyk7CiAgICAgY3VycmVudFpvb21MZXZlbCA9IG5lYXJlc3Rfem9vbV9sZXZlbF9n ZXQoY3VycmVudFpvb20pOwogICAgIGluZm8oIldlYkNvcmUgWm9vbT0lZiwgY3VycmVudFpvb21M ZXZlbD0lZFxuIiwgY3VycmVudFpvb20sIGN1cnJlbnRab29tTGV2ZWwpOwogfQo= 110863 2011-10-13 10:09:47 -0700 2011-10-16 17:34:34 -0700 Patch bug-70004-20111014020944.patch text/plain 10622 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogOTczNjcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwppbmRleCA2YTg0ZTgxNGJk ZDNkZjQzNGE0Y2YyYmNmM2Q5ZTg1NzU5NzM1OTM5Li5iZmY1M2QyMjc0YzFlNmEwZmI0MTNkMTE4 NDU5YjgyOGU2YWNiOWY3IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEt MTAtMTMgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtF RkxdIENoYW5nZSB0aGUgYmVoYXZpb3Igb2Ygc21hcnRfem9vbS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMDA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXMgYSBzZWNvbmQgc3RlcCB0byByZWZhY3Rv ciB6b29tLCBjaGFuZ2UgdGhlIGJlaGF2aW9yIG9mIHNtYXJ0X3pvb20gZnJvbQorICAgICAgICBl d2tfZnJhbWVfcGFnZV96b29tX3tnZXR8c2V0fSB0byBld2tfdmlld19zY2FsZV97Z2V0fHNldH0u CisgICAgICAgIEJlY2F1c2Ugc21hcnRfem9vbSBpcyBmb3IgZXdrX3RpbGVkX2JhY2tpbmdzdG9y ZSB0byBzdXBwb3J0IHByb3BvcnRpb25hbCBzY2FsaW5nLAorICAgICAgICB1c2luZyBld2tfdmll d19zY2FsZV97Z2V0fHNldH0gaXMgYmV0dGVyIHRoYW4gZXdrX3ZpZXdfcGFnZV96b29tX3tnZXR8 c2V0fS4KKworICAgICAgICBJbiBhZGRpdGlvbiwgcmVtb3ZlIGV3a192aWV3X3pvb21fe2dldHxz ZXR9IGJlY2F1c2Ugb3RoZXIgem9vbSByZWxhdGVkIEFQSXMKKyAgICAgICAgZnVsbHkgY292ZXJl ZC4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChfZXdrX3ZpZXdfc21h cnRfem9vbV9zZXQpOgorICAgICAgICAoX2V3a192aWV3X3pvb21fYW5pbWF0b3JfY2IpOgorICAg ICAgICAoZXdrX3ZpZXdfc2NhbGVfc2V0KToKKyAgICAgICAgKGV3a192aWV3X3pvb21fd2Vha19z ZXQpOgorICAgICAgICAoZXdrX3ZpZXdfem9vbV9hbmltYXRlZF9zZXQpOgorICAgICAgICAoZXdr X3ZpZXdfcHJlX3JlbmRlcl9yZWdpb24pOgorICAgICAgICAoZXdrX3ZpZXdfcHJlX3JlbmRlcl9y ZWxhdGl2ZV9yYWRpdXMpOgorCiAyMDExLTEwLTEzICBMZWFuZHJvIFBlcmVpcmEgIDxsZWFuZHJv QHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFVucmV2aWV3ZWQ7IHJldmVydCBzb21lIGNoYW5n ZXMgaW50cm9kdWNlZCBpbiByOTczMjkgd2hpY2ggYXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmNwcAppbmRleCBkNTgzNTYwNjFiNzQzYmEzMmZmYjRiY2RmOWNkOTU2Njg2MjRiNmVjLi4xMmEz NWE2ZTZiNjViZTc3ZTEzOTI5ODdlZDc4MTdjZDczMjQ4ZTdjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdmlldy5jcHAKQEAgLTkxOSwzMCArOTE5LDE5IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192 aWV3X3NtYXJ0X2NvbnRlbnRzX3Jlc2l6ZShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEs CiAKIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3NtYXJ0X3pvb21fc2V0KEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSwgZmxvYXQgem9vbSwgRXZhc19Db29yZCBjZW50ZXJYLCBFdmFz X0Nvb3JkIGNlbnRlclkpCiB7Ci0gICAgZG91YmxlIHB4LCBweTsKLSAgICBFdmFzX0Nvb3JkIHgs IHksIHcsIGg7Ci0gICAgRWluYV9Cb29sIHJldDsKLQotICAgIGV3a19mcmFtZV9zY3JvbGxfc2l6 ZV9nZXQoc21hcnREYXRhLT5tYWluX2ZyYW1lLCAmdywgJmgpOwotICAgIGV3a19mcmFtZV9zY3Jv bGxfcG9zX2dldChzbWFydERhdGEtPm1haW5fZnJhbWUsICZ4LCAmeSk7CisgICAgRVdLX1ZJRVdf UFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgRUlOQV9GQUxTRSk7CiAKLSAgICBp ZiAodyArIHNtYXJ0RGF0YS0+dmlldy53ID4gMCkKLSAgICAgICAgcHggPSBzdGF0aWNfY2FzdDxk b3VibGU+KHggKyBjZW50ZXJYKSAvICh3ICsgc21hcnREYXRhLT52aWV3LncpOwotICAgIGVsc2UK LSAgICAgICAgcHggPSAwLjA7Ci0KLSAgICBpZiAoaCArIHNtYXJ0RGF0YS0+dmlldy5oID4gMCkK LSAgICAgICAgcHkgPSBzdGF0aWNfY2FzdDxkb3VibGU+KHkgKyBjZW50ZXJZKSAvIChoICsgc21h cnREYXRhLT52aWV3LmgpOwotICAgIGVsc2UKLSAgICAgICAgcHkgPSAwLjA7CisgICAgZmxvYXQg Y3VycmVudFNjYWxlRmFjdG9yID0gZXdrX3ZpZXdfc2NhbGVfZ2V0KHNtYXJ0RGF0YS0+c2VsZik7 CisgICAgaWYgKGN1cnJlbnRTY2FsZUZhY3RvciA9PSAtMSkKKyAgICAgICAgcmV0dXJuIEVJTkFf RkFMU0U7CiAKLSAgICByZXQgPSBld2tfZnJhbWVfcGFnZV96b29tX3NldChzbWFydERhdGEtPm1h aW5fZnJhbWUsIHpvb20pOworICAgIGludCB4LCB5OworICAgIGV3a19mcmFtZV9zY3JvbGxfcG9z X2dldChzbWFydERhdGEtPm1haW5fZnJhbWUsICZ4LCAmeSk7CiAKLSAgICBld2tfZnJhbWVfc2Ny b2xsX3NpemVfZ2V0KHNtYXJ0RGF0YS0+bWFpbl9mcmFtZSwgJncsICZoKTsKLSAgICB4ID0gKHcg KyBzbWFydERhdGEtPnZpZXcudykgKiBweCAtIGNlbnRlclg7Ci0gICAgeSA9IChoICsgc21hcnRE YXRhLT52aWV3LmgpICogcHkgLSBjZW50ZXJZOwotICAgIGV3a19mcmFtZV9zY3JvbGxfc2V0KHNt YXJ0RGF0YS0+bWFpbl9mcmFtZSwgeCwgeSk7Ci0gICAgcmV0dXJuIHJldDsKKyAgICB4ID0gc3Rh dGljX2Nhc3Q8aW50PigoKHggKyBjZW50ZXJYKSAvIGN1cnJlbnRTY2FsZUZhY3RvcikgKiB6b29t KSAtIGNlbnRlclg7CisgICAgeSA9IHN0YXRpY19jYXN0PGludD4oKCh5ICsgY2VudGVyWSkgLyBj dXJyZW50U2NhbGVGYWN0b3IpICogem9vbSkgLSBjZW50ZXJZOworICAgIHByaXYtPnBhZ2UtPnNl dFBhZ2VTY2FsZUZhY3Rvcih6b29tLCBXZWJDb3JlOjpMYXlvdXRQb2ludCh4LCB5KSk7CisgICAg cmV0dXJuIEVJTkFfVFJVRTsKIH0KIAogc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0X2ZsdXNo KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKQEAgLTEwMjIsNyArMTAxMSw3IEBAIHN0 YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3pvb21fYW5pbWF0b3JfY2Iodm9pZCogZGF0YSkKICAg ICBpZiAoKG5vdyA+PSBwcml2LT5hbmltYXRlZF96b29tLnRpbWUuZW5kKQogICAgICAgICB8fCAo bm93IDwgcHJpdi0+YW5pbWF0ZWRfem9vbS50aW1lLnN0YXJ0KSkgewogICAgICAgICBfZXdrX3Zp ZXdfem9vbV9hbmltYXRlZF9maW5pc2goc2QpOwotICAgICAgICBld2tfdmlld196b29tX3NldChz ZC0+c2VsZiwgcHJpdi0+YW5pbWF0ZWRfem9vbS56b29tLmVuZCwgY3gsIGN5KTsKKyAgICAgICAg ZXdrX3ZpZXdfc2NhbGVfc2V0KHNkLT5zZWxmLCBwcml2LT5hbmltYXRlZF96b29tLnpvb20uZW5k LCBjeCwgY3kpOwogICAgICAgICBzZC0+YXBpLT5zYy5jYWxjdWxhdGUoc2QtPnNlbGYpOwogICAg ICAgICByZXR1cm4gRUlOQV9GQUxTRTsKICAgICB9CkBAIC0xNTM4LDM4ICsxNTI3LDYgQEAgRXdr X0hpc3RvcnkqIGV3a192aWV3X2hpc3RvcnlfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3 KQogICAgIHJldHVybiBwcml2LT5oaXN0b3J5OwogfQogCi1mbG9hdCBld2tfdmlld196b29tX2dl dChjb25zdCBFdmFzX09iamVjdCogZXdrVmlldykKLXsKLSAgICBFV0tfVklFV19TRF9HRVRfT1Jf UkVUVVJOKGV3a1ZpZXcsIHNkLCAtMS4wKTsKLSAgICByZXR1cm4gZXdrX2ZyYW1lX3BhZ2Vfem9v bV9nZXQoc2QtPm1haW5fZnJhbWUpOwotfQotCi1FaW5hX0Jvb2wgZXdrX3ZpZXdfem9vbV9zZXQo RXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0IHpvb20sIEV2YXNfQ29vcmQgY3gsIEV2YXNfQ29v cmQgY3kpCi17Ci0gICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzZCwgRUlO QV9GQUxTRSk7Ci0gICAgRVdLX1ZJRVdfUFJJVl9HRVQoc2QsIHByaXYpOwotCi0gICAgRUlOQV9T QUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHNkLT5hcGksIEVJTkFfRkFMU0UpOwotICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZC0+YXBpLT56b29tX3NldCwgRUlOQV9GQUxTRSk7 Ci0KLSAgICBpZiAoIXByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UudXNlcl9zY2FsYWJsZSkgewot ICAgICAgICBXUk4oInVzZXJTY2FsYWJsZSBpcyBmYWxzZSIpOwotICAgICAgICByZXR1cm4gRUlO QV9GQUxTRTsKLSAgICB9Ci0KLSAgICBpZiAoem9vbSA8IHByaXYtPnNldHRpbmdzLnpvb21fcmFu Z2UubWluX3NjYWxlKSB7Ci0gICAgICAgIFdSTigiem9vbSBsZXZlbCBpcyA8ICVmIDogJWYiLCBw cml2LT5zZXR0aW5ncy56b29tX3JhbmdlLm1pbl9zY2FsZSwgem9vbSk7Ci0gICAgICAgIHJldHVy biBFSU5BX0ZBTFNFOwotICAgIH0KLSAgICBpZiAoem9vbSA+IHByaXYtPnNldHRpbmdzLnpvb21f cmFuZ2UubWF4X3NjYWxlKSB7Ci0gICAgICAgIFdSTigiem9vbSBsZXZlbCBpcyA+ICVmIDogJWYi LCBwcml2LT5zZXR0aW5ncy56b29tX3JhbmdlLm1heF9zY2FsZSwgem9vbSk7Ci0gICAgICAgIHJl dHVybiBFSU5BX0ZBTFNFOwotICAgIH0KLQotICAgIF9ld2tfdmlld196b29tX2FuaW1hdGVkX21h cmtfc3RvcChzZCk7Ci0gICAgcmV0dXJuIHNkLT5hcGktPnpvb21fc2V0KHNkLCB6b29tLCBjeCwg Y3kpOwotfQotCiBmbG9hdCBld2tfdmlld19wYWdlX3pvb21fZ2V0KGNvbnN0IEV2YXNfT2JqZWN0 KiBld2tWaWV3KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc2Qs IC0xLjApOwpAQCAtMTU5NCwxNyArMTU1MSwxOCBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2NhbGVf c2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBmbG9hdCBzY2FsZUZhY3RvciwgRXZhc19Db29yZAog ICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc2QsIEVJTkFfRkFMU0UpOwog ICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9GQUxTRSk7CiAK LSAgICBmbG9hdCBjdXJyZW50U2NhbGVGYWN0b3IgPSBld2tfdmlld19zY2FsZV9nZXQoZXdrVmll dyk7Ci0gICAgaWYgKGN1cnJlbnRTY2FsZUZhY3RvciA9PSAtMSkKLSAgICAgICAgcmV0dXJuIEVJ TkFfRkFMU0U7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHNkLT5hcGksIEVJ TkFfRkFMU0UpOworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChzZC0+YXBpLT56 b29tX3NldCwgRUlOQV9GQUxTRSk7CiAKLSAgICBpbnQgeCwgeTsKLSAgICBld2tfZnJhbWVfc2Ny b2xsX3Bvc19nZXQoc2QtPm1haW5fZnJhbWUsICZ4LCAmeSk7CisgICAgaWYgKCFwcml2LT5zZXR0 aW5ncy56b29tX3JhbmdlLnVzZXJfc2NhbGFibGUpCisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNF OworICAgIGlmIChzY2FsZUZhY3RvciA8IHByaXYtPnNldHRpbmdzLnpvb21fcmFuZ2UubWluX3Nj YWxlKQorICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKyAgICBpZiAoc2NhbGVGYWN0b3IgPiBw cml2LT5zZXR0aW5ncy56b29tX3JhbmdlLm1heF9zY2FsZSkKKyAgICAgICAgcmV0dXJuIEVJTkFf RkFMU0U7CiAKLSAgICB4ID0gc3RhdGljX2Nhc3Q8aW50PigoKHggKyBjeCkgLyBjdXJyZW50U2Nh bGVGYWN0b3IpICogc2NhbGVGYWN0b3IpIC0gY3g7Ci0gICAgeSA9IHN0YXRpY19jYXN0PGludD4o KCh5ICsgY3kpIC8gY3VycmVudFNjYWxlRmFjdG9yKSAqIHNjYWxlRmFjdG9yKSAtIGN5OwotICAg IHByaXYtPnBhZ2UtPnNldFBhZ2VTY2FsZUZhY3RvcihzY2FsZUZhY3RvciwgV2ViQ29yZTo6TGF5 b3V0UG9pbnQoeCwgeSkpOwotICAgIHJldHVybiBFSU5BX1RSVUU7CisgICAgX2V3a192aWV3X3pv b21fYW5pbWF0ZWRfbWFya19zdG9wKHNkKTsKKyAgICByZXR1cm4gc2QtPmFwaS0+em9vbV9zZXQo c2QsIHNjYWxlRmFjdG9yLCBjeCwgY3kpOwogfQogCiBmbG9hdCBld2tfdmlld190ZXh0X3pvb21f Z2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3KQpAQCAtMTY1OSw3ICsxNjE3LDcgQEAgRWlu YV9Cb29sIGV3a192aWV3X3pvb21fd2Vha19zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGZsb2F0 IHpvb20sIEV2YXNfQ29vcmQgY2UKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAgICAgfQog Ci0gICAgc2QtPmFuaW1hdGVkX3pvb20uem9vbS5zdGFydCA9IGV3a19mcmFtZV9wYWdlX3pvb21f Z2V0KHNkLT5tYWluX2ZyYW1lKTsKKyAgICBzZC0+YW5pbWF0ZWRfem9vbS56b29tLnN0YXJ0ID0g ZXdrX3ZpZXdfc2NhbGVfZ2V0KGV3a1ZpZXcpOwogICAgIHNkLT5hbmltYXRlZF96b29tLnpvb20u ZW5kID0gem9vbTsKICAgICBzZC0+YW5pbWF0ZWRfem9vbS56b29tLmN1cnJlbnQgPSB6b29tOwog ICAgIHJldHVybiBzZC0+YXBpLT56b29tX3dlYWtfc2V0KHNkLCB6b29tLCBjZW50ZXJYLCBjZW50 ZXJZKTsKQEAgLTE3MTgsNyArMTY3Niw3IEBAIEVpbmFfQm9vbCBld2tfdmlld196b29tX2FuaW1h dGVkX3NldChFdmFzX09iamVjdCogZXdrVmlldywgZmxvYXQgem9vbSwgZmxvYXQgZHVyCiAgICAg aWYgKHByaXYtPmFuaW1hdGVkX3pvb20uYW5pbWF0b3IpCiAgICAgICAgIHByaXYtPmFuaW1hdGVk X3pvb20uem9vbS5zdGFydCA9IF9ld2tfdmlld196b29tX2FuaW1hdGVkX2N1cnJlbnQocHJpdik7 CiAgICAgZWxzZSB7Ci0gICAgICAgIHByaXYtPmFuaW1hdGVkX3pvb20uem9vbS5zdGFydCA9IGV3 a19mcmFtZV9wYWdlX3pvb21fZ2V0KHNkLT5tYWluX2ZyYW1lKTsKKyAgICAgICAgcHJpdi0+YW5p bWF0ZWRfem9vbS56b29tLnN0YXJ0ID0gZXdrX3ZpZXdfc2NhbGVfZ2V0KGV3a1ZpZXcpOwogICAg ICAgICBfZXdrX3ZpZXdfem9vbV9hbmltYXRpb25fc3RhcnQoc2QpOwogICAgIH0KIApAQCAtMTc1 Niw3ICsxNzE0LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3ByZV9yZW5kZXJfcmVnaW9uKEV2YXNf T2JqZWN0KiBld2tWaWV3LCBFdmFzX0Nvb3JkIHgsIEV2YXNfQ28KICAgICBpZiAocHJpdi0+YW5p bWF0ZWRfem9vbS5hbmltYXRvcikKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAKLSAgICBj dXJfem9vbSA9IGV3a19mcmFtZV9wYWdlX3pvb21fZ2V0KHNkLT5tYWluX2ZyYW1lKTsKKyAgICBj dXJfem9vbSA9IGV3a192aWV3X3NjYWxlX2dldChld2tWaWV3KTsKIAogICAgIGlmIChjdXJfem9v bSA8IDAuMDAwMDEpCiAgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOwpAQCAtMTc5NSw3ICsxNzUz LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3ByZV9yZW5kZXJfcmVsYXRpdmVfcmFkaXVzKEV2YXNf T2JqZWN0KiBld2tWaWV3LCB1bnNpZ25lZCBpbnQKICAgICBpZiAocHJpdi0+YW5pbWF0ZWRfem9v bS5hbmltYXRvcikKICAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CiAKLSAgICBjdXJfem9vbSA9 IGV3a19mcmFtZV9wYWdlX3pvb21fZ2V0KHNkLT5tYWluX2ZyYW1lKTsKKyAgICBjdXJfem9vbSA9 IGV3a192aWV3X3NjYWxlX2dldChld2tWaWV3KTsKICAgICByZXR1cm4gc2QtPmFwaS0+cHJlX3Jl bmRlcl9yZWxhdGl2ZV9yYWRpdXMoc2QsIG51bWJlciwgY3VyX3pvb20pOwogfQogCmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWNmNTZiZjk3ZmZj MDA2OGQzNTRiNmYzOWI3YzBkYzAyMDYyNzhkOS4uNzg2M2Y1ZTAyMTllYmIyZGRiNDI1OGRjMjEy NDY3MDY2OGRhNGJmOCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDExLTEwLTEzICBSeXVhbiBDaG9pICA8cnl1YW4u Y2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBDaGFuZ2UgdGhlIGJlaGF2aW9yIG9m IHNtYXJ0X3pvb20uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03MDAwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIENoYW5nZSBld2tfdmlld196b29tX3tnZXR8c2V0fSB0byBld2tfdmlld19zY2FsZV97Z2V0 fHNldH0gYmVjYXVzZSB0aGV5CisgICAgICAgIGFyZSByZW1vdmVkLgorCisgICAgICAgICogRHVt cFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcDoKKyAgICAgICAgKER1bXBS ZW5kZXJUcmVlQ2hyb21lOjpyZXNldERlZmF1bHRzVG9Db25zaXN0ZW50VmFsdWVzKToKKyAgICAg ICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAodmlld3BvcnRfc2V0KToKKyAgICAg ICAgKG9uX2xvYWRfZmluaXNoZWQpOgorCiAyMDExLTEwLTEzICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIEEgRFJUIGZpeCBmb3Igcjk3MzQ4 LgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hy b21lLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZUNocm9tZS5j cHAKaW5kZXggNWNmMTM1ZTRiZWRhYjBmYTQ5Y2E3MDc4N2E3YzI1Y2UwNzBjN2U1Yi4uZWMwNTFm OTc3MWRkOTQzZmUwZjI0YTY5MzA0ZWRlZmNjODc3YTlkZSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlQ2hyb21lLmNwcAorKysgYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9lZmwvRHVtcFJlbmRlclRyZWVDaHJvbWUuY3BwCkBAIC0xNzIsNyArMTcyLDcg QEAgdm9pZCBEdW1wUmVuZGVyVHJlZUNocm9tZTo6cmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZh bHVlcygpCiAgICAgZXdrX3ZpZXdfc2V0dGluZ19zY3JpcHRzX3dpbmRvd19vcGVuX3NldChtYWlu VmlldygpLCBFSU5BX1RSVUUpOwogICAgIGV3a192aWV3X3NldHRpbmdfc2NyaXB0c19jYW5fY2xv c2Vfd2luZG93c19zZXQobWFpblZpZXcoKSwgRUlOQV9UUlVFKTsKIAotICAgIGV3a192aWV3X3pv b21fc2V0KG1haW5WaWV3KCksIDEuMCwgMCwgMCk7CisgICAgZXdrX3ZpZXdfc2NhbGVfc2V0KG1h aW5WaWV3KCksIDEuMCwgMCwgMCk7CiAgICAgZXdrX3ZpZXdfcGFnZV9zY2FsZShtYWluVmlldygp LCAxLjAsIDAsIDApOwogCiAgICAgRXdrX0hpc3RvcnkqIGhpc3RvcnkgPSBld2tfdmlld19oaXN0 b3J5X2dldChtYWluVmlldygpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWlu LmMgYi9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCmluZGV4IDQxM2YxNDY1N2EyZDVmYTIyODAy Zjg4NWYyZjM1Y2Q5ZGY1YWE0NWYuLmJiZDBhNWI3N2U3YjA5Mzk1YzQxYTNjY2QzMjE1ZGRiMWM5 YTRmNTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMv RVdlYkxhdW5jaGVyL21haW4uYwpAQCAtMjcxLDcgKzI3MSw3IEBAIHZpZXdwb3J0X3NldCgpCiAg ICAgYXBwID0gKEVMYXVuY2hlciopIGVpbmFfbGlzdF9kYXRhX2dldCh3aW5kb3dzKTsKIAogICAg IGV3a192aWV3X2ZpeGVkX2xheW91dF9zaXplX3NldChhcHAtPmJyb3dzZXIsIGFwcC0+dmlld3Bv cnQudywgYXBwLT52aWV3cG9ydC5oKTsKLSAgICBld2tfdmlld196b29tX3NldChhcHAtPmJyb3dz ZXIsIGFwcC0+dmlld3BvcnQuaW5pdFNjYWxlLCAwLCAwKTsKKyAgICBld2tfdmlld19zY2FsZV9z ZXQoYXBwLT5icm93c2VyLCBhcHAtPnZpZXdwb3J0LmluaXRTY2FsZSwgMCwgMCk7CiAgICAgaWYg KCFld2tfdmlld196b29tX3JhbmdlX3NldChhcHAtPmJyb3dzZXIsIGFwcC0+dmlld3BvcnQubWlu U2NhbGUsIGFwcC0+dmlld3BvcnQubWF4U2NhbGUpKQogICAgICAgICBpbmZvKCIgRmFpbCB0byBz ZXQgem9vbSByYW5nZS4gbWluU2NhbGUgPSAlZiwgbWF4U2NhbGUgPSAlZlxuIiwgYXBwLT52aWV3 cG9ydC5taW5TY2FsZSwgYXBwLT52aWV3cG9ydC5tYXhTY2FsZSk7CiAgICAgZXdrX3ZpZXdfdXNl cl9zY2FsYWJsZV9zZXQoYXBwLT5icm93c2VyLCBhcHAtPnZpZXdwb3J0LnVzZXJTY2FsYWJsZSk7 CkBAIC0zMDgsNyArMzA4LDcgQEAgb25fbG9hZF9maW5pc2hlZCh2b2lkICp1c2VyX2RhdGEsIEV2 YXNfT2JqZWN0ICp3ZWJ2aWV3LCB2b2lkICpldmVudF9pbmZvKQogICAgICAgICBpbmZvKCJGYWls ZWQgbG9hZGluZyBwYWdlOiAlZCAlcyBcIiVzXCIsIHVybD0lc1xuIiwKICAgICAgICAgICAgICBl cnItPmNvZGUsIGVyci0+ZG9tYWluLCBlcnItPmRlc2NyaXB0aW9uLCBlcnItPmZhaWxpbmdfdXJs KTsKIAotICAgIGN1cnJlbnRab29tID0gZXdrX3ZpZXdfem9vbV9nZXQod2Vidmlldyk7CisgICAg Y3VycmVudFpvb20gPSBld2tfdmlld19zY2FsZV9nZXQod2Vidmlldyk7CiAgICAgY3VycmVudFpv b21MZXZlbCA9IG5lYXJlc3Rfem9vbV9sZXZlbF9nZXQoY3VycmVudFpvb20pOwogICAgIGluZm8o IldlYkNvcmUgWm9vbT0lZiwgY3VycmVudFpvb21MZXZlbD0lZFxuIiwgY3VycmVudFpvb20sIGN1 cnJlbnRab29tTGV2ZWwpOwogfQo=