134218 2014-06-23 15:30:18 -0700 [WK2] Use the page background color instead of white when swipe snapshots were purged 2014-06-23 17:03:53 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin benjamin simon.fraser webkit-bug-importer oldest_to_newest 1017715 0 thorton 2014-06-23 15:30:18 -0700 It looks much nicer. 1017717 1 webkit-bug-importer 2014-06-23 15:32:01 -0700 <rdar://problem/17426454> 1017762 2 233652 thorton 2014-06-23 16:44:08 -0700 Created attachment 233652 patch 1017770 3 thorton 2014-06-23 17:03:53 -0700 http://trac.webkit.org/changeset/170335 233652 2014-06-23 16:44:08 -0700 2014-06-23 16:59:35 -0700 patch bgcolor.diff text/plain 11133 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1YjUwNTkzLi4zY2I5ODkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTQtMDYtMjMgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgorCisgICAgICAgIFtXSzJdIFVzZSB0aGUgcGFnZSBiYWNrZ3JvdW5kIGNvbG9yIGluc3RlYWQg b2Ygd2hpdGUgd2hlbiBzd2lwZSBzbmFwc2hvdHMgd2VyZSBwdXJnZWQgKDEzNDIxOCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDIxOAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTc0MjY0NTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKwogMjAxNC0wNi0yMyAgQ29t bWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjE3MDMyMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggMTBjMmE5Yi4u YmUwNjAwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTMxNSw2ICszMTUsNyBAQCBfX1pON1dl YkNvcmUxM1NRTFJlc3VsdERvbmVFCiBfX1pON1dlYkNvcmUxM1NlbGVjdGlvblJlY3RDMUVSS05T XzdJbnRSZWN0RWJpCiBfX1pON1dlYkNvcmUxM1N0eWxlZEVsZW1lbnQyMnNldElubGluZVN0eWxl UHJvcGVydHlFTlNfMTNDU1NQcm9wZXJ0eUlERVJLTjNXVEY2U3RyaW5nRWIKIF9fWk43V2ViQ29y ZTEzU3R5bGVkRWxlbWVudDIyc2V0SW5saW5lU3R5bGVQcm9wZXJ0eUVOU18xM0NTU1Byb3BlcnR5 SURFZE5TXzE3Q1NTUHJpbWl0aXZlVmFsdWU5VW5pdFR5cGVzRWIKK19fWk43V2ViQ29yZTEzY2Fj aGVkQ0dDb2xvckVSS05TXzVDb2xvckVOU18xMENvbG9yU3BhY2VFCiBfX1pON1dlYkNvcmUxM2Nv b2tpZXNGb3JET01FUktOU18yMU5ldHdvcmtTdG9yYWdlU2Vzc2lvbkVSS05TXzNVUkxFUzVfCiBf X1pON1dlYkNvcmUxM2NyZWF0ZVdyYXBwZXJFUE4zSlNDOUV4ZWNTdGF0ZUVQTlNfMTdKU0RPTUds b2JhbE9iamVjdEVQTlNfNE5vZGVFCiBfX1pON1dlYkNvcmUxM2NyZWF0ZVdyYXBwZXJFUk5TXzE3 SlNET01HbG9iYWxPYmplY3RFUk5TXzhOb2RlTGlzdEUKQEAgLTI3MjYsNiArMjcyNyw3IEBAIF9f Wk43V2ViQ29yZTlGcmFtZVZpZXczM3JlY3RGb3JWaWV3cG9ydENvbnN0cmFpbmVkT2JqZWN0c0VS S05TXzEwTGF5b3V0UmVjdEVSS05TCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MzZzY2hlZHVsZUxh eWVyRmx1c2hBbGxvd2luZ1Rocm90dGxpbmdFdgogX19aTjdXZWJDb3JlOVBhZ2VHcm91cDE3cmVt b3ZlVmlzaXRlZExpbmtFUktOU18zVVJMRQogX19aTks3V2ViQ29yZTEwRmxvYXRQb2ludGN2N0NH UG9pbnRFdgorX19aTks3V2ViQ29yZTEwU2Nyb2xsVmlldzE4ZXhwb3NlZENvbnRlbnRSZWN0RXYK IF9fWk5LN1dlYkNvcmUxMFNjcm9sbFZpZXcyMXVub2JzY3VyZWRDb250ZW50UmVjdEVOU18xNFNj cm9sbGFibGVBcmVhMzZWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnNFCiBfX1pO SzdXZWJDb3JlMTREb2N1bWVudExvYWRlcjE2cmVzcG9uc2VNSU1FVHlwZUV2CiBfX1pOSzdXZWJD b3JlMTRGcmFtZVNlbGVjdGlvbjE3d29yZE9mZnNldEluUmFuZ2VFUEtOU181UmFuZ2VFCkBAIC0y Nzc5LDcgKzI3ODEsNiBAQCBfX1pOSzdXZWJDb3JlOUZsb2F0U2l6ZWN2NkNHU2l6ZUV2CiBfX1pO SzdXZWJDb3JlOUZyYW1lVmlldzE3d2FzU2Nyb2xsZWRCeVVzZXJFdgogX19aTks3V2ViQ29yZTlG cmFtZVZpZXczMHZpZXdwb3J0Q29uc3RyYWluZWRPYmplY3RzUmVjdEV2CiBfX1pOSzdXZWJDb3Jl OVJlbmRlckJveDExYm9yZGVyUmFkaWlFdgotX19aTks3V2ViQ29yZTEwU2Nyb2xsVmlldzE4ZXhw b3NlZENvbnRlbnRSZWN0RXYKIF93ZWJUaHJlYWRTaG91bGRZaWVsZAogX3drRXhlY3V0YWJsZVdh c0xpbmtlZE9uT3JBZnRlcklPU1ZlcnNpb24KIF93a0dldEF2YWlsYWJsZVNjcmVlblNpemUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwppbmRleCA0Y2ZjZjYzLi41OWEyMmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTQtMDYtMjMgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgor CisgICAgICAgIFtXSzJdIFVzZSB0aGUgcGFnZSBiYWNrZ3JvdW5kIGNvbG9yIGluc3RlYWQgb2Yg d2hpdGUgd2hlbiBzd2lwZSBzbmFwc2hvdHMgd2VyZSBwdXJnZWQgKDEzNDIxOCkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDIxOAorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTc0MjY0NTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF91cGRhdGVTY3JvbGxWaWV3QmFja2dyb3VuZF0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgV2ViS2l0OjpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBfdGFrZVZpZXdTbmFwc2hvdF0pOgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tOgorICAgICAgICAo V2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0dXJlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1hYy5tbToKKyAgICAgICAg KFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpzaG91bGRVc2VTbmFwc2hvdEZvclNpemUp OgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0 dXJlKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpyZXRyaWV2ZVNu YXBzaG90Rm9ySXRlbSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL21hYy9WaWV3U25h cHNob3RTdG9yZS5oOgorICAgICAgICBTdG9yZSBhIGNvbG9yIGFsb25nIHdpdGggZWFjaCBzbmFw c2hvdC4KKyAgICAgICAgU2V0IHRoZSBiYWNrZ3JvdW5kIGNvbG9yIG9mIHRoZSBzd2lwZSBzbmFw c2hvdCBsYXllciBhY2NvcmRpbmdseS4KKwogMjAxNC0wNi0yMyAgRGFuIEJlcm5zdGVpbiAgPG1p dHpAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzQxMzQ5OD4gW0NvY29h XSBFeHBvc2UgV2ViUHJlZmVyZW5jZXM6Om9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxl ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpp bmRleCBkNWM0NWRkLi44ZTE5MmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtNjc0LDcgKzY3NCw3IEBAIHN0YXRpYyBDR0Zsb2F0 IGNvbnRlbnRab29tU2NhbGUoV0tXZWJWaWV3KiB3ZWJWaWV3KQogCiAgICAgX3Njcm9sbFZpZXdC YWNrZ3JvdW5kQ29sb3IgPSBjb2xvcjsKIAotICAgIFJldGFpblB0cjxVSUNvbG9yKj4gdWlCYWNr Z3JvdW5kQ29sb3IgPSBhZG9wdE5TKFtbVUlDb2xvciBhbGxvY10gaW5pdFdpdGhDR0NvbG9yOmNh Y2hlZENHQ29sb3IoY29sb3IsIFdlYkNvcmU6OkNvbG9yU3BhY2VEZXZpY2VSR0IpXSk7CisgICAg UmV0YWluUHRyPFVJQ29sb3I+IHVpQmFja2dyb3VuZENvbG9yID0gYWRvcHROUyhbW1VJQ29sb3Ig YWxsb2NdIGluaXRXaXRoQ0dDb2xvcjpjYWNoZWRDR0NvbG9yKGNvbG9yLCBXZWJDb3JlOjpDb2xv clNwYWNlRGV2aWNlUkdCKV0pOwogICAgIFtfc2Nyb2xsVmlldyBzZXRCYWNrZ3JvdW5kQ29sb3I6 dWlCYWNrZ3JvdW5kQ29sb3IuZ2V0KCldOwogfQogCkBAIC04NzQsNiArODc0LDcgQEAgc3RhdGlj IHZvaWQgY2hhbmdlQ29udGVudE9mZnNldEJvdW5kZWRJblZhbGlkUmFuZ2UoVUlTY3JvbGxWaWV3 ICpzY3JvbGxWaWV3LCBXZWIKIAogICAgIHNuYXBzaG90LnNpemUgPSBXZWJDb3JlOjpleHBhbmRl ZEludFNpemUoV2ViQ29yZTo6RmxvYXRTaXplKHNuYXBzaG90U2l6ZSkpOwogICAgIHNuYXBzaG90 LmltYWdlU2l6ZUluQnl0ZXMgPSBzbmFwc2hvdFNpemUud2lkdGggKiBzbmFwc2hvdFNpemUuaGVp Z2h0ICogNDsKKyAgICBzbmFwc2hvdC5iYWNrZ3JvdW5kQ29sb3IgPSBfcGFnZS0+cGFnZUV4dGVu ZGVkQmFja2dyb3VuZENvbG9yKCk7CiAKICAgICByZXR1cm4gc25hcHNob3Q7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5kZXggZGY0OTdhZC4uZGU0MTA1 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMzEx NSw2ICszMTE1LDcgQEAgc3RhdGljIHZvaWQgY3JlYXRlU2FuZGJveEV4dGVuc2lvbnNGb3JGaWxl VXBsb2FkKE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCwgU2FuZGIKICAgICBJbnRTaXplIGltYWdl U2l6ZShDR0ltYWdlR2V0V2lkdGgoY3JvcHBlZFNuYXBzaG90SW1hZ2UuZ2V0KCkpLCBDR0ltYWdl R2V0SGVpZ2h0KGNyb3BwZWRTbmFwc2hvdEltYWdlLmdldCgpKSk7CiAgICAgc25hcHNob3Quc2l6 ZSA9IGltYWdlU2l6ZTsKICAgICBzbmFwc2hvdC5pbWFnZVNpemVJbkJ5dGVzID0gaW1hZ2VTaXpl LndpZHRoKCkgKiBpbWFnZVNpemUuaGVpZ2h0KCkgKiA0OworICAgIHNuYXBzaG90LmJhY2tncm91 bmRDb2xvciA9IF9kYXRhLT5fcGFnZS0+cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCk7CiAK ICAgICByZXR1cm4gc25hcHNob3Q7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250cm9sbGVySU9TLm1tCmluZGV4IGI4N2JiNzUuLjFm YjVlZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmlld0dlc3R1 cmVDb250cm9sbGVySU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvVmll d0dlc3R1cmVDb250cm9sbGVySU9TLm1tCkBAIC0xNTcsMTYgKzE1NywyMCBAQCB2b2lkIFZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6YmVnaW5Td2lwZUdlc3R1cmUoX1VJTmF2aWdhdGlvbkludGVyYWN0 aXZlVHJhbnNpdGlvbgogICAgIFJldGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiBzbmFwc2hvdFZp ZXdDb250cm9sbGVyID0gYWRvcHROUyhbW1VJVmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsK ICAgICBtX3NuYXBzaG90VmlldyA9IGFkb3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRXaXRoRnJh bWU6bGl2ZVN3aXBlVmlld0ZyYW1lXSk7CiAKKyAgICBSZXRhaW5QdHI8VUlDb2xvcj4gYmFja2dy b3VuZENvbG9yID0gW1VJQ29sb3Igd2hpdGVDb2xvcl07CiAgICAgVmlld1NuYXBzaG90IHNuYXBz aG90OwotICAgIGlmIChWaWV3U25hcHNob3RTdG9yZTo6c2hhcmVkKCkuZ2V0U25hcHNob3QodGFy Z2V0SXRlbSwgc25hcHNob3QpICYmIHNuYXBzaG90Lmhhc0ltYWdlKCkpIHsKKyAgICBpZiAoVmll d1NuYXBzaG90U3RvcmU6OnNoYXJlZCgpLmdldFNuYXBzaG90KHRhcmdldEl0ZW0sIHNuYXBzaG90 KSkgewogICAgICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvciA9IG1fd2ViUGFnZVByb3h5LmRl dmljZVNjYWxlRmFjdG9yKCk7CiAgICAgICAgIEZsb2F0U2l6ZSBzd2lwZUxheWVyU2l6ZUluRGV2 aWNlQ29vcmRpbmF0ZXMobGl2ZVN3aXBlVmlld0ZyYW1lLnNpemUpOwogICAgICAgICBzd2lwZUxh eWVyU2l6ZUluRGV2aWNlQ29vcmRpbmF0ZXMuc2NhbGUoZGV2aWNlU2NhbGVGYWN0b3IpOwotICAg ICAgICBpZiAoc25hcHNob3Quc2l6ZSA9PSBzd2lwZUxheWVyU2l6ZUluRGV2aWNlQ29vcmRpbmF0 ZXMgJiYgZGV2aWNlU2NhbGVGYWN0b3IgPT0gc25hcHNob3QuZGV2aWNlU2NhbGVGYWN0b3IpCisg ICAgICAgIGlmIChzbmFwc2hvdC5oYXNJbWFnZSgpICYmIHNuYXBzaG90LnNpemUgPT0gc3dpcGVM YXllclNpemVJbkRldmljZUNvb3JkaW5hdGVzICYmIGRldmljZVNjYWxlRmFjdG9yID09IHNuYXBz aG90LmRldmljZVNjYWxlRmFjdG9yKQogICAgICAgICAgICAgW21fc25hcHNob3RWaWV3IGxheWVy XS5jb250ZW50cyA9IHNuYXBzaG90LmFzTGF5ZXJDb250ZW50cygpOworICAgICAgICBDb2xvciBj b3JlQ29sb3IgPSBzbmFwc2hvdC5iYWNrZ3JvdW5kQ29sb3I7CisgICAgICAgIGlmIChjb3JlQ29s b3IuaXNWYWxpZCgpKQorICAgICAgICAgICAgYmFja2dyb3VuZENvbG9yID0gYWRvcHROUyhbW1VJ Q29sb3IgYWxsb2NdIGluaXRXaXRoQ0dDb2xvcjpjYWNoZWRDR0NvbG9yKGNvcmVDb2xvciwgQ29s b3JTcGFjZURldmljZVJHQildKTsKICAgICB9CiAKLSAgICBbbV9zbmFwc2hvdFZpZXcgc2V0QmFj a2dyb3VuZENvbG9yOltVSUNvbG9yIHdoaXRlQ29sb3JdXTsKKyAgICBbbV9zbmFwc2hvdFZpZXcg c2V0QmFja2dyb3VuZENvbG9yOmJhY2tncm91bmRDb2xvci5nZXQoKV07CiAgICAgW21fc25hcHNo b3RWaWV3IGxheWVyXS5jb250ZW50c0dyYXZpdHkgPSBrQ0FHcmF2aXR5VG9wTGVmdDsKICAgICBb bV9zbmFwc2hvdFZpZXcgbGF5ZXJdLmNvbnRlbnRzU2NhbGUgPSBtX2xpdmVTd2lwZVZpZXcud2lu ZG93LnNjcmVlbi5zY2FsZTsKICAgICBbc25hcHNob3RWaWV3Q29udHJvbGxlciBzZXRWaWV3Om1f c25hcHNob3RWaWV3LmdldCgpXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCmluZGV4IDcyZDY4MmUuLmMxNmZmMzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVy LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xs ZXIuaApAQCAtMTMyLDcgKzEzMiw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBlbmRTd2lwZUdlc3R1 cmUoV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogdGFyZ2V0SXRlbSwgYm9vbCBjYW5jZWxsZWQpOwog ICAgIGJvb2wgZGVsdGFJc1N1ZmZpY2llbnRUb0JlZ2luU3dpcGUoTlNFdmVudCAqKTsKICAgICBi b29sIHNjcm9sbEV2ZW50Q2FuQmVjb21lU3dpcGUoTlNFdmVudCAqLCBTd2lwZURpcmVjdGlvbiYp OwotICAgIGJvb2wgcmV0cmlldmVTbmFwc2hvdEZvckl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRl bSogdGFyZ2V0SXRlbSwgV2ViQ29yZTo6RmxvYXRTaXplIHN3aXBlTGF5ZXJTaXplLCBmbG9hdCB0 b3BDb250ZW50SW5zZXQsIFZpZXdTbmFwc2hvdCYpOworICAgIGJvb2wgc2hvdWxkVXNlU25hcHNo b3RGb3JTaXplKFZpZXdTbmFwc2hvdCYsIFdlYkNvcmU6OkZsb2F0U2l6ZSBzd2lwZUxheWVyU2l6 ZSwgZmxvYXQgdG9wQ29udGVudEluc2V0KTsKIAogICAgIENBTGF5ZXIgKmRldGVybWluZVNuYXBz aG90TGF5ZXJQYXJlbnQoKSBjb25zdDsKICAgICBDQUxheWVyICpkZXRlcm1pbmVMYXllckFkamFj ZW50VG9TbmFwc2hvdEZvclBhcmVudChTd2lwZURpcmVjdGlvbiwgQ0FMYXllciAqc25hcHNob3RM YXllclBhcmVudCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tCmluZGV4IDlhNmI4NDYuLjE1NDkyOTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250 cm9sbGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1 cmVDb250cm9sbGVyTWFjLm1tCkBAIC00NTEsMTEgKzQ1MSw4IEBAIENBTGF5ZXIgKlZpZXdHZXN0 dXJlQ29udHJvbGxlcjo6ZGV0ZXJtaW5lTGF5ZXJBZGphY2VudFRvU25hcHNob3RGb3JQYXJlbnQo U3dpcGVECiAgICAgcmV0dXJuIGxheWVyQWRqYWNlbnRUb1NuYXBzaG90OwogfQogCi1ib29sIFZp ZXdHZXN0dXJlQ29udHJvbGxlcjo6cmV0cmlldmVTbmFwc2hvdEZvckl0ZW0oV2ViQmFja0Zvcndh cmRMaXN0SXRlbSogdGFyZ2V0SXRlbSwgRmxvYXRTaXplIHN3aXBlTGF5ZXJTaXplLCBmbG9hdCB0 b3BDb250ZW50SW5zZXQsIFZpZXdTbmFwc2hvdCYgc25hcHNob3QpCitib29sIFZpZXdHZXN0dXJl Q29udHJvbGxlcjo6c2hvdWxkVXNlU25hcHNob3RGb3JTaXplKFZpZXdTbmFwc2hvdCYgc25hcHNo b3QsIEZsb2F0U2l6ZSBzd2lwZUxheWVyU2l6ZSwgZmxvYXQgdG9wQ29udGVudEluc2V0KQogewot ICAgIGlmICghVmlld1NuYXBzaG90U3RvcmU6OnNoYXJlZCgpLmdldFNuYXBzaG90KHRhcmdldEl0 ZW0sIHNuYXBzaG90KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgZmxvYXQgZGV2aWNl U2NhbGVGYWN0b3IgPSBtX3dlYlBhZ2VQcm94eS5kZXZpY2VTY2FsZUZhY3RvcigpOwogICAgIGlm IChzbmFwc2hvdC5kZXZpY2VTY2FsZUZhY3RvciAhPSBkZXZpY2VTY2FsZUZhY3RvcikKICAgICAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtNTI4LDE1ICs1MjUsMjEgQEAgdm9pZCBWaWV3R2VzdHVyZUNv bnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdl dEl0ZW0KICAgICBDQUxheWVyICpzbmFwc2hvdExheWVyUGFyZW50ID0gZGV0ZXJtaW5lU25hcHNo b3RMYXllclBhcmVudCgpOwogICAgIGJvb2wgZ2VvbWV0cnlJc0ZsaXBwZWRUb1Jvb3QgPSBsYXll ckdlb21ldHJ5RmxpcHBlZFRvUm9vdChzbmFwc2hvdExheWVyUGFyZW50KTsKIAorICAgIFJldGFp blB0cjxDR0NvbG9yUmVmPiBiYWNrZ3JvdW5kQ29sb3IgPSBDR0NvbG9yR2V0Q29uc3RhbnRDb2xv cihrQ0dDb2xvcldoaXRlKTsKICAgICBWaWV3U25hcHNob3Qgc25hcHNob3Q7Ci0gICAgaWYgKHJl dHJpZXZlU25hcHNob3RGb3JJdGVtKHRhcmdldEl0ZW0sIHN3aXBlQXJlYS5zaXplKCksIHRvcENv bnRlbnRJbnNldCwgc25hcHNob3QpKSB7Ci0gICAgICAgIFttX3N3aXBlU25hcHNob3RMYXllciBz ZXRDb250ZW50czpzbmFwc2hvdC5hc0xheWVyQ29udGVudHMoKV07CisgICAgaWYgKFZpZXdTbmFw c2hvdFN0b3JlOjpzaGFyZWQoKS5nZXRTbmFwc2hvdCh0YXJnZXRJdGVtLCBzbmFwc2hvdCkpIHsK KyAgICAgICAgaWYgKHNob3VsZFVzZVNuYXBzaG90Rm9yU2l6ZShzbmFwc2hvdCwgc3dpcGVBcmVh LnNpemUoKSwgdG9wQ29udGVudEluc2V0KSkKKyAgICAgICAgICAgIFttX3N3aXBlU25hcHNob3RM YXllciBzZXRDb250ZW50czpzbmFwc2hvdC5hc0xheWVyQ29udGVudHMoKV07CisKKyAgICAgICAg Q29sb3IgY29yZUNvbG9yID0gc25hcHNob3QuYmFja2dyb3VuZENvbG9yOworICAgICAgICBpZiAo Y29yZUNvbG9yLmlzVmFsaWQoKSkKKyAgICAgICAgICAgIGJhY2tncm91bmRDb2xvciA9IGNhY2hl ZENHQ29sb3IoY29yZUNvbG9yLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKICNpZiBVU0VfSU9TVVJG QUNFX1ZJRVdfU05BUFNIT1RTCiAgICAgICAgIG1fY3VycmVudFN3aXBlU25hcHNob3RTdXJmYWNl ID0gc25hcHNob3Quc3VyZmFjZTsKICNlbmRpZgogICAgIH0KIAotICAgIFttX3N3aXBlTGF5ZXIg c2V0QmFja2dyb3VuZENvbG9yOkNHQ29sb3JHZXRDb25zdGFudENvbG9yKGtDR0NvbG9yV2hpdGUp XTsKKyAgICBbbV9zd2lwZUxheWVyIHNldEJhY2tncm91bmRDb2xvcjpiYWNrZ3JvdW5kQ29sb3Iu Z2V0KCldOwogICAgIFttX3N3aXBlTGF5ZXIgc2V0QW5jaG9yUG9pbnQ6Q0dQb2ludFplcm9dOwog ICAgIFttX3N3aXBlTGF5ZXIgc2V0RnJhbWU6c3dpcGVBcmVhXTsKICAgICBbbV9zd2lwZUxheWVy IHNldE5hbWU6QCJHZXN0dXJlIFN3aXBlIFJvb3QgTGF5ZXIiXTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90U3RvcmUuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvVmlld1NuYXBzaG90U3RvcmUuaAppbmRleCAxZDdiMzkxLi4zZmJh YTRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdTbmFwc2hv dFN0b3JlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3U25hcHNob3RT dG9yZS5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVmIFZpZXdTbmFwc2hvdFN0b3JlX2gKICNk ZWZpbmUgVmlld1NuYXBzaG90U3RvcmVfaAogCisjaW5jbHVkZSA8V2ViQ29yZS9Db2xvci5oPgog I2luY2x1ZGUgPFdlYkNvcmUvSW50U2l6ZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSU9TdXJmYWNl Lmg+CiAjaW5jbHVkZSA8Y2hyb25vPgpAQCAtNzAsNiArNzEsNyBAQCBzdHJ1Y3QgVmlld1NuYXBz aG90IHsKICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcjsKICAgICBXZWJDb3JlOjpJbnRTaXpl IHNpemU7CiAgICAgc2l6ZV90IGltYWdlU2l6ZUluQnl0ZXMgPSAwOworICAgIFdlYkNvcmU6OkNv bG9yIGJhY2tncm91bmRDb2xvcjsKIAogICAgIHZvaWQgY2xlYXJJbWFnZSgpOwogICAgIGJvb2wg aGFzSW1hZ2UoKSBjb25zdDsK