134372 2014-06-26 18:18:08 -0700 [WK2] Pinch-zoom shadows can overlap headers and footers 2014-06-26 19:06:09 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bunhere cdumez commit-queue esprehn+autocc glenn gyuyoung.kim kondapallykalyan mitz sergio simon.fraser oldest_to_newest 1018823 0 thorton 2014-06-26 18:18:08 -0700 <rdar://problem/16004095> 1018832 1 233953 thorton 2014-06-26 18:48:16 -0700 Created attachment 233953 patch 1018834 2 thorton 2014-06-26 19:06:09 -0700 http://trac.webkit.org/changeset/170514 233953 2014-06-26 18:48:16 -0700 2014-06-26 19:00:15 -0700 patch shadow.diff text/plain 12331 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5NzQ5YjgyLi45ZmI3NmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTQtMDYtMjYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW1dLMl0gUGluY2gtem9vbSBzaGFkb3dzIGNhbiBvdmVybGFwIGhlYWRlcnMgYW5k IGZvb3RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNDM3MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTYwMDQwOTU+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJGb3JIZWFkZXIpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVMYXllckZvckZvb3Rl cik6CisgICAgICAgIFB1dCBoZWFkZXIvZm9vdGVyIGxheWVycyBpbiBmcm9udCBvZiB0aGUgcm9v dCBjb250ZW50IGxheWVyIGluc3RlYWQgb2YgYmVoaW5kLgorICAgICAgICBJZGVhbGx5IG5vdGhp bmcgd291bGQgZXZlciBvdmVybGFwIHRoZW0sIGJ1dCB0aGlzIHdpbGwgZ2l2ZSB0aGVtIHByZWNl ZGVuY2UgcmVnYXJkbGVzcy4KKwogMjAxNC0wNi0yNSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBs ZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggaW4gU2Nyb2xsaW5nVHJlZTo6aXNSdWJiZXJCYW5kSW5Q cm9ncmVzcygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGZkZWUyOTEuLjU3MmRlNjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZXhwLmluCkBAIC0xNDA1LDYgKzE0MDUsNyBAQCBfX1pON1dlYkNvcmU5RnJhbWVW aWV3MjRwYWludENvbnRlbnRzRm9yU25hcHNob3RFUE5TXzE1R3JhcGhpY3NDb250ZXh0RVJLTlNf N0ludAogX19aTjdXZWJDb3JlOUZyYW1lVmlldzI0c2V0U2Nyb2xsUGlubmluZ0JlaGF2aW9yRU5T XzIxU2Nyb2xsUGlubmluZ0JlaGF2aW9yRQogX19aTjdXZWJDb3JlOUZyYW1lVmlldzI2YWRqdXN0 UGFnZUhlaWdodERlcHJlY2F0ZWRFUGZmZmYKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyNmFkanVz dFRpbGVkQmFja2luZ0NvdmVyYWdlRXYKK19fWk43V2ViQ29yZTlGcmFtZVZpZXcyOHlQb3NpdGlv bkZvclJvb3RDb250ZW50TGF5ZXJFUktOU18xMEZsb2F0UG9pbnRFZmYKIF9fWk43V2ViQ29yZTlG cmFtZVZpZXcyOXNldEF1dG9TaXplRml4ZWRNaW5pbXVtSGVpZ2h0RWkKIF9fWk43V2ViQ29yZTlG cmFtZVZpZXcyOXNldFNob3VsZFVwZGF0ZVdoaWxlT2Zmc2NyZWVuRWIKIF9fWk43V2ViQ29yZTlG cmFtZVZpZXczMXNldFZpc3VhbFVwZGF0ZXNBbGxvd2VkQnlDbGllbnRFYgpAQCAtMTk5OCw2ICsx OTk5LDcgQEAgX19aTks3V2ViQ29yZTlGcmFtZVZpZXcxMnRpbGVkQmFja2luZ0V2CiBfX1pOSzdX ZWJDb3JlOUZyYW1lVmlldzEzaXNUcmFuc3BhcmVudEV2CiBfX1pOSzdXZWJDb3JlOUZyYW1lVmll dzEzcGFpbnRCZWhhdmlvckV2CiBfX1pOSzdXZWJDb3JlOUZyYW1lVmlldzE0ZGlkRmlyc3RMYXlv dXRFdgorX19aTks3V2ViQ29yZTlGcmFtZVZpZXcxNXRvcENvbnRlbnRJbnNldEV2CiBfX1pOSzdX ZWJDb3JlOUZyYW1lVmlldzE3Y29udmVydFRvUmVuZGVyZXJFUEtOU18xM1JlbmRlckVsZW1lbnRF UktOU183SW50UmVjdEUKIF9fWk5LN1dlYkNvcmU5RnJhbWVWaWV3MTdjb252ZXJ0VG9SZW5kZXJl ckVQS05TXzEzUmVuZGVyRWxlbWVudEVSS05TXzhJbnRQb2ludEUKIF9fWk5LN1dlYkNvcmU5RnJh bWVWaWV3MTliYXNlQmFja2dyb3VuZENvbG9yRXYKQEAgLTI0MDgsNiArMjQxMCwxMSBAQCBfX1pO N1dlYkNvcmU3SW50U2l6ZUMxRVJLN19OU1NpemUKIF9fWk5LN1dlYkNvcmU3SW50U2l6ZWN2N19O U1NpemVFdgogI2VuZGlmCiAKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lP Tl9NSU5fUkVRVUlSRUQgPj0gMTAxMDAKK19fWk43V2ViQ29yZTMyc2hvdWxkUmVnaXN0ZXJJbnNl cnRpb25VbmRvR3JvdXBFUDE4TlNBdHRyaWJ1dGVkU3RyaW5nCitfX1pON1dlYkNvcmU0NHJlZ2lz dGVySW5zZXJ0aW9uVW5kb0dyb3VwaW5nV2l0aFVuZG9NYW5hZ2VyRVAxM05TVW5kb01hbmFnZXIK KyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JF UVVJUkVEID49IDEwODAKIF9fWk43V2ViQ29yZTI0VGV4dEFsdGVybmF0aXZlV2l0aFJhbmdlQzFF UDE4TlNUZXh0QWx0ZXJuYXRpdmVzOF9OU1JhbmdlCiBfX1pON1dlYkNvcmUyN0FsdGVybmF0aXZl VGV4dFVJQ29udHJvbGxlcjE1YWRkQWx0ZXJuYXRpdmVzRVJLTjNXVEY5UmV0YWluUHRySTE4TlNU ZXh0QWx0ZXJuYXRpdmVzRUUKQEAgLTI0MjcsMTEgKzI0MzQsNiBAQCBfd2tOU1JlYm91bmREZWx0 YUZvckVsYXN0aWNEZWx0YQogX3drQ3JlYXRlTWVtb3J5U3RhdHVzUHJlc3N1cmVDcml0aWNhbERp c3BhdGNoT25NYWluUXVldWUKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwCi1fX1pON1dlYkNvcmUzMnNob3VsZFJl Z2lzdGVySW5zZXJ0aW9uVW5kb0dyb3VwRVAxOE5TQXR0cmlidXRlZFN0cmluZwotX19aTjdXZWJD b3JlNDRyZWdpc3Rlckluc2VydGlvblVuZG9Hcm91cGluZ1dpdGhVbmRvTWFuYWdlckVQMTNOU1Vu ZG9NYW5hZ2VyCi0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKE1BQykgfHwgUExBVEZPUk0oSU9TX1NJ TVVMQVRPUikKIF93a1NldENyYXNoUmVwb3J0QXBwbGljYXRpb25TcGVjaWZpY0luZm9ybWF0aW9u CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKaW5kZXggMmQ5Njc5Ni4uZWIzZTUwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTMwMDEsNyArMzAw MSw3IEBAIEdyYXBoaWNzTGF5ZXIqIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlTGF5ZXJG b3JIZWFkZXIoYm9vbCB3YW50c0xheWVyKQogI2lmbmRlZiBOREVCVUcKICAgICAgICAgbV9sYXll ckZvckhlYWRlci0+c2V0TmFtZSgiaGVhZGVyIik7CiAjZW5kaWYKLSAgICAgICAgbV9zY3JvbGxM YXllci0+YWRkQ2hpbGRCZWxvdyhtX2xheWVyRm9ySGVhZGVyLmdldCgpLCBtX3Jvb3RDb250ZW50 TGF5ZXIuZ2V0KCkpOworICAgICAgICBtX3Njcm9sbExheWVyLT5hZGRDaGlsZEFib3ZlKG1fbGF5 ZXJGb3JIZWFkZXIuZ2V0KCksIG1fcm9vdENvbnRlbnRMYXllci5nZXQoKSk7CiAgICAgICAgIG1f cmVuZGVyVmlldy5mcmFtZVZpZXcoKS5hZGRQYWludFBlbmRpbmdNaWxlc3RvbmVzKERpZEZpcnN0 Rmx1c2hGb3JIZWFkZXJMYXllcik7CiAgICAgfQogCkBAIC0zMDQyLDcgKzMwNDIsNyBAQCBHcmFw aGljc0xheWVyKiBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUxheWVyRm9yRm9vdGVyKGJv b2wgd2FudHNMYXllcikKICNpZm5kZWYgTkRFQlVHCiAgICAgICAgIG1fbGF5ZXJGb3JGb290ZXIt PnNldE5hbWUoImZvb3RlciIpOwogI2VuZGlmCi0gICAgICAgIG1fc2Nyb2xsTGF5ZXItPmFkZENo aWxkQmVsb3cobV9sYXllckZvckZvb3Rlci5nZXQoKSwgbV9yb290Q29udGVudExheWVyLmdldCgp KTsKKyAgICAgICAgbV9zY3JvbGxMYXllci0+YWRkQ2hpbGRBYm92ZShtX2xheWVyRm9yRm9vdGVy LmdldCgpLCBtX3Jvb3RDb250ZW50TGF5ZXIuZ2V0KCkpOwogICAgIH0KIAogICAgIGZsb2F0IHRv dGFsQ29udGVudEhlaWdodCA9IG1fcm9vdENvbnRlbnRMYXllci0+c2l6ZSgpLmhlaWdodCgpICsg bV9yZW5kZXJWaWV3LmZyYW1lVmlldygpLmhlYWRlckhlaWdodCgpICsgbV9yZW5kZXJWaWV3LmZy YW1lVmlldygpLmZvb3RlckhlaWdodCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDE2MWY4NGEuLjk4YmRiNTUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxNC0wNi0yNiAgVGltIEhvcnRvbiAgPHRp bW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXSBQaW5jaC16b29tIHNoYWRv d3MgY2FuIG92ZXJsYXAgaGVhZGVycyBhbmQgZm9vdGVycworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0MzcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8xNjAwNDA5NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWEubW06CisgICAgICAgIChXZWJLaXQ6OnNoYWRvd0xheWVyUG9zaXRpb25Gb3JGcmFtZSk6Cisg ICAgICAgIChXZWJLaXQ6OnNoYWRvd0xheWVyQm91bmRzRm9yRnJhbWUpOgorICAgICAgICBDb21w dXRlIHRoZSBpbml0aWFsIHNoYWRvdyBsYXllciBhbmQgc2hhZG93IGJvdW5kcyBleGFjdGx5IGFz IFJlbmRlckxheWVyQ29tcG9zaXRvciBkb2VzCisgICAgICAgIChpbiB1cGRhdGVSb290TGF5ZXJQ b3NpdGlvbiBhbmQgZnJpZW5kcykuIEFsc28sIGNsaXAgdGhlIHNoYWRvdyBsYXllciB0byB0aGUg b2xkIGRvY3VtZW50IHJlY3QsCisgICAgICAgIG90aGVyd2lzZSBpdCBjYW4gZXh0ZW5kIG92ZXIg dG9wIG9mIHRoZSBoZWFkZXIvZm9vdGVycy4gVGhlIGNvbnRlbnQgaXMgYXV0b21hdGljYWxseSBj bGlwcGVkIHRvCisgICAgICAgIHRoaXMgcmVjdCBieSB0aGUgcm9vdCBjb250ZW50IGxheWVyLCBi dXQgdGhlIHNoYWRvdyBpcyBvdXRzaWRlIG9mIHRoYXQuCisKKyAgICAgICAgKFdlYktpdDo6VGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmFwcGx5VHJhbnNpZW50Wm9vbVRvTGF5ZXJzKToK KyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNvbW1pdFRy YW5zaWVudFpvb20pOgorICAgICAgICBQYXNzIGFsbCBvZiB0aGUgYXJndW1lbnRzIHRvIGNvbnN0 cmFpblNjcm9sbFBvc2l0aW9uRm9yT3ZlcmhhbmcsIG5vdCBqdXN0IGhhbGYgb2YgdGhlbS4KKyAg ICAgICAgVGhlcmUncyBzdGlsbCBhIGJ1ZyB3aGVyZSB3ZSBjb25zdHJhaW4gaW5jb3JyZWN0bHkg d2l0aCBoZWFkZXIvZm9vdGVyIGxheWVycywgYnV0IHRoYXQKKyAgICAgICAgd2lsbCBiZSBhZGRy ZXNzZWQgZWxzZXdoZXJlLgorCisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjphcHBseVRyYW5zaWVudFpvb21Ub1BhZ2UpOgorICAgICAgICBNYWtlIHVzZSBv ZiB0aGUgbmV3IGhlbHBlcnMuCisKIDIwMTQtMDYtMjUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hv cnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl0gU2hhZG93IGxheWVyIGlzIGluIHRoZSB3 cm9uZyBwbGFjZSB3aGlsZSBwaW5jaC16b29taW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1t IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYS5tbQppbmRleCA1ZDRjMzg0Li5lZGQ2MDdiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdp bmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTUyNCw2ICs1MjQsMjQgQEAgUGxhdGZv cm1DQUxheWVyKiBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2hhZG93TGF5ZXJGb3JU cmFuc2llbnRab29tKCkgY28KIAogICAgIHJldHVybiBudWxscHRyOwogfQorICAgIAorc3RhdGlj IEZsb2F0UG9pbnQgc2hhZG93TGF5ZXJQb3NpdGlvbkZvckZyYW1lKEZyYW1lVmlldyYgZnJhbWVW aWV3LCBGbG9hdFBvaW50IG9yaWdpbikKK3sKKyAgICBGbG9hdFBvaW50IHBvc2l0aW9uID0gZnJh bWVWaWV3LnJlbmRlclZpZXcoKS0+ZG9jdW1lbnRSZWN0KCkubG9jYXRpb24oKSArIEZsb2F0UG9p bnQoMCwgRnJhbWVWaWV3Ojp5UG9zaXRpb25Gb3JSb290Q29udGVudExheWVyKGZyYW1lVmlldy5z Y3JvbGxQb3NpdGlvbigpLCBmcmFtZVZpZXcudG9wQ29udGVudEluc2V0KCksIGZyYW1lVmlldy5o ZWFkZXJIZWlnaHQoKSkpOworCisgICAgcmV0dXJuIHBvc2l0aW9uICsgb3JpZ2luLmV4cGFuZGVk VG8oRmxvYXRQb2ludCgpKTsKK30KKworc3RhdGljIEZsb2F0UmVjdCBzaGFkb3dMYXllckJvdW5k c0ZvckZyYW1lKEZyYW1lVmlldyYgZnJhbWVWaWV3LCBmbG9hdCB0cmFuc2llbnRTY2FsZSkKK3sK KyAgICBGbG9hdFJlY3QgY2xpcExheWVyRnJhbWUoZnJhbWVWaWV3LnJlbmRlclZpZXcoKS0+ZG9j dW1lbnRSZWN0KCkpOworICAgIEZsb2F0UmVjdCBzaGFkb3dMYXllckZyYW1lID0gY2xpcExheWVy RnJhbWU7CisgICAgCisgICAgc2hhZG93TGF5ZXJGcmFtZS5zY2FsZSh0cmFuc2llbnRTY2FsZSAv IGZyYW1lVmlldy5mcmFtZSgpLnBhZ2UoKS0+cGFnZVNjYWxlRmFjdG9yKCkpOworICAgIHNoYWRv d0xheWVyRnJhbWUuaW50ZXJzZWN0KGNsaXBMYXllckZyYW1lKTsKKyAgICAKKyAgICByZXR1cm4g c2hhZG93TGF5ZXJGcmFtZTsKK30KIAogdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YTo6YXBwbHlUcmFuc2llbnRab29tVG9MYXllcnMoZG91YmxlIHNjYWxlLCBGbG9hdFBvaW50IG9y aWdpbikKIHsKQEAgLTU0MCwxNCArNTU4LDExIEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWE6OmFwcGx5VHJhbnNpZW50Wm9vbVRvTGF5ZXJzKGRvdWJsZSBzY2FsZSwgRmxvCiAg ICAgem9vbUxheWVyLT5zZXRUcmFuc2Zvcm0odHJhbnNmb3JtKTsKICAgICB6b29tTGF5ZXItPnNl dEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsKICAgICB6b29tTGF5ZXItPnNldFBvc2l0aW9u KEZsb2F0UG9pbnQzRCgpKTsKLQorICAgIAogICAgIGlmIChQbGF0Zm9ybUNBTGF5ZXIqIHNoYWRv d0xheWVyID0gc2hhZG93TGF5ZXJGb3JUcmFuc2llbnRab29tKCkpIHsKLSAgICAgICAgUmVuZGVy VmlldyogcmVuZGVyVmlldyA9IG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCktPnJlbmRlclZpZXco KTsKLSAgICAgICAgRmxvYXRSZWN0IHNoYWRvd0JvdW5kcyA9IEZsb2F0UmVjdChGbG9hdFBvaW50 KCksIHRvRmxvYXRTaXplKHJlbmRlclZpZXctPmxheW91dE92ZXJmbG93UmVjdCgpLm1heFhNYXhZ Q29ybmVyKCkpKTsKLSAgICAgICAgc2hhZG93Qm91bmRzLnNjYWxlKHNjYWxlKTsKLQotICAgICAg ICBzaGFkb3dMYXllci0+c2V0Qm91bmRzKHNoYWRvd0JvdW5kcyk7Ci0gICAgICAgIHNoYWRvd0xh eWVyLT5zZXRQb3NpdGlvbihvcmlnaW4pOworICAgICAgICBGcmFtZVZpZXcmIGZyYW1lVmlldyA9 ICptX3dlYlBhZ2UubWFpbkZyYW1lVmlldygpOworICAgICAgICBzaGFkb3dMYXllci0+c2V0Qm91 bmRzKHNoYWRvd0xheWVyQm91bmRzRm9yRnJhbWUoZnJhbWVWaWV3LCBzY2FsZSkpOworICAgICAg ICBzaGFkb3dMYXllci0+c2V0UG9zaXRpb24oc2hhZG93TGF5ZXJQb3NpdGlvbkZvckZyYW1lKGZy YW1lVmlldywgb3JpZ2luKSk7CiAgICAgfQogCiAgICAgbV90cmFuc2llbnRab29tU2NhbGUgPSBz Y2FsZTsKQEAgLTU4NCwyMCArNTk5LDE5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0FCYXNpY0FuaW1h dGlvbj4gdHJhbnNpZW50Wm9vbVNuYXBBbmltYXRpb25Gb3JLZXlQYXRoKFN0cmluZyBrCiAKIHZv aWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNvbW1pdFRyYW5zaWVudFpvb20oZG91 YmxlIHNjYWxlLCBGbG9hdFBvaW50IG9yaWdpbikKIHsKLSAgICBGcmFtZVZpZXcqIGZyYW1lVmll dyA9IG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCk7Ci0gICAgRmxvYXRSZWN0IHZpc2libGVDb250 ZW50UmVjdCA9IGZyYW1lVmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkaW5nU2Nyb2xsYmFy cygpOworICAgIEZyYW1lVmlldyYgZnJhbWVWaWV3ID0gKm1fd2ViUGFnZS5tYWluRnJhbWVWaWV3 KCk7CisgICAgRmxvYXRSZWN0IHZpc2libGVDb250ZW50UmVjdCA9IGZyYW1lVmlldy52aXNpYmxl Q29udGVudFJlY3RJbmNsdWRpbmdTY3JvbGxiYXJzKCk7CiAKICAgICBGbG9hdFBvaW50IGNvbnN0 cmFpbmVkT3JpZ2luID0gdmlzaWJsZUNvbnRlbnRSZWN0LmxvY2F0aW9uKCk7CiAgICAgY29uc3Ry YWluZWRPcmlnaW4ubW92ZUJ5KC1vcmlnaW4pOwogCi0gICAgUmVuZGVyVmlldyogcmVuZGVyVmll dyA9IGZyYW1lVmlldy0+cmVuZGVyVmlldygpOwotICAgIEludFJlY3QgZG9jdW1lbnRSZWN0ID0g cmVuZGVyVmlldy0+dW5zY2FsZWREb2N1bWVudFJlY3QoKTsKLSAgICBkb2N1bWVudFJlY3Quc2Nh bGUoc2NhbGUpOworICAgIEludFNpemUgc2NhbGVkVG90YWxDb250ZW50c1NpemUgPSBmcmFtZVZp ZXcudG90YWxDb250ZW50c1NpemUoKTsKKyAgICBzY2FsZWRUb3RhbENvbnRlbnRzU2l6ZS5zY2Fs ZShzY2FsZSAvIG1fd2ViUGFnZS5wYWdlU2NhbGVGYWN0b3IoKSk7CiAKICAgICAvLyBTY2FsaW5n IG1heSBoYXZlIGV4cG9zZWQgdGhlIG92ZXJoYW5nIGFyZWEsIHNvIHdlIG5lZWQgdG8gY29uc3Ry YWluIHRoZSBmaW5hbAogICAgIC8vIGxheWVyIHBvc2l0aW9uIGV4YWN0bHkgbGlrZSBzY3JvbGxp bmcgd2lsbCBvbmNlIGl0J3MgY29tbWl0dGVkLCB0byBlbnN1cmUgdGhhdAogICAgIC8vIHNjcm9s bGluZyBkb2Vzbid0IG1ha2UgdGhlIHZpZXcganVtcC4KLSAgICBjb25zdHJhaW5lZE9yaWdpbiA9 IFNjcm9sbGFibGVBcmVhOjpjb25zdHJhaW5TY3JvbGxQb3NpdGlvbkZvck92ZXJoYW5nKHJvdW5k ZWRJbnRSZWN0KHZpc2libGVDb250ZW50UmVjdCksIGRvY3VtZW50UmVjdC5zaXplKCksIHJvdW5k ZWRJbnRQb2ludChjb25zdHJhaW5lZE9yaWdpbiksIEludFBvaW50KCksIDAsIDApOworICAgIGNv bnN0cmFpbmVkT3JpZ2luID0gU2Nyb2xsYWJsZUFyZWE6OmNvbnN0cmFpblNjcm9sbFBvc2l0aW9u Rm9yT3Zlcmhhbmcocm91bmRlZEludFJlY3QodmlzaWJsZUNvbnRlbnRSZWN0KSwgc2NhbGVkVG90 YWxDb250ZW50c1NpemUsIHJvdW5kZWRJbnRQb2ludChjb25zdHJhaW5lZE9yaWdpbiksIGZyYW1l Vmlldy5zY3JvbGxPcmlnaW4oKSwgZnJhbWVWaWV3LmhlYWRlckhlaWdodCgpLCBmcmFtZVZpZXcu Zm9vdGVySGVpZ2h0KCkpOwogICAgIGNvbnN0cmFpbmVkT3JpZ2luLm1vdmVCeSgtdmlzaWJsZUNv bnRlbnRSZWN0LmxvY2F0aW9uKCkpOwogICAgIGNvbnN0cmFpbmVkT3JpZ2luID0gLWNvbnN0cmFp bmVkT3JpZ2luOwogCkBAIC02MzIsMTQgKzY0NiwxMyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhOjpjb21taXRUcmFuc2llbnRab29tKGRvdWJsZSBzY2FsZSwgRmxvYXRQb2lu dAogICAgIHpvb21MYXllci0+YWRkQW5pbWF0aW9uRm9yS2V5KCJ0cmFuc2llbnRab29tQ29tbWl0 IiwgcmVuZGVyVmlld0FuaW1hdGlvbi5nZXQoKSk7CiAKICAgICBpZiAoc2hhZG93Q0FMYXllcikg ewotICAgICAgICBGbG9hdFJlY3Qgc2hhZG93Qm91bmRzID0gRmxvYXRSZWN0KEZsb2F0UG9pbnQo KSwgdG9GbG9hdFNpemUocmVuZGVyVmlldy0+bGF5b3V0T3ZlcmZsb3dSZWN0KCkubWF4WE1heFlD b3JuZXIoKSkpOwotICAgICAgICBzaGFkb3dCb3VuZHMuc2NhbGUoc2NhbGUpOworICAgICAgICBG bG9hdFJlY3Qgc2hhZG93Qm91bmRzID0gc2hhZG93TGF5ZXJCb3VuZHNGb3JGcmFtZShmcmFtZVZp ZXcsIHNjYWxlKTsKICAgICAgICAgUmV0YWluUHRyPENHUGF0aFJlZj4gc2hhZG93UGF0aCA9IGFk b3B0Q0YoQ0dQYXRoQ3JlYXRlV2l0aFJlY3Qoc2hhZG93Qm91bmRzLCBOVUxMKSkuZ2V0KCk7CiAK ICAgICAgICAgUmV0YWluUHRyPENBQmFzaWNBbmltYXRpb24+IHNoYWRvd0JvdW5kc0FuaW1hdGlv biA9IHRyYW5zaWVudFpvb21TbmFwQW5pbWF0aW9uRm9yS2V5UGF0aCgiYm91bmRzIik7CiAgICAg ICAgIFtzaGFkb3dCb3VuZHNBbmltYXRpb24gc2V0VG9WYWx1ZTpbTlNWYWx1ZSB2YWx1ZVdpdGhS ZWN0OnNoYWRvd0JvdW5kc11dOwogICAgICAgICBSZXRhaW5QdHI8Q0FCYXNpY0FuaW1hdGlvbj4g c2hhZG93UG9zaXRpb25BbmltYXRpb24gPSB0cmFuc2llbnRab29tU25hcEFuaW1hdGlvbkZvcktl eVBhdGgoInBvc2l0aW9uIik7Ci0gICAgICAgIFtzaGFkb3dQb3NpdGlvbkFuaW1hdGlvbiBzZXRU b1ZhbHVlOltOU1ZhbHVlIHZhbHVlV2l0aFBvaW50OmNvbnN0cmFpbmVkT3JpZ2luXV07CisgICAg ICAgIFtzaGFkb3dQb3NpdGlvbkFuaW1hdGlvbiBzZXRUb1ZhbHVlOltOU1ZhbHVlIHZhbHVlV2l0 aFBvaW50OnNoYWRvd0xheWVyUG9zaXRpb25Gb3JGcmFtZShmcmFtZVZpZXcsIGNvbnN0cmFpbmVk T3JpZ2luKV1dOwogICAgICAgICBSZXRhaW5QdHI8Q0FCYXNpY0FuaW1hdGlvbj4gc2hhZG93UGF0 aEFuaW1hdGlvbiA9IHRyYW5zaWVudFpvb21TbmFwQW5pbWF0aW9uRm9yS2V5UGF0aCgic2hhZG93 UGF0aCIpOwogICAgICAgICBbc2hhZG93UGF0aEFuaW1hdGlvbiBzZXRUb1ZhbHVlOihpZClzaGFk b3dQYXRoLmdldCgpXTsKIApAQCAtNjU4LDE2ICs2NzEsMTYgQEAgdm9pZCBUaWxlZENvcmVBbmlt YXRpb25EcmF3aW5nQXJlYTo6YXBwbHlUcmFuc2llbnRab29tVG9QYWdlKGRvdWJsZSBzY2FsZSwg RmxvYXQKICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBmaW5hbFRyYW5zZm9ybTsKICAgICBmaW5h bFRyYW5zZm9ybS5zY2FsZShzY2FsZSk7CiAgICAgbGF5ZXJGb3JUcmFuc2llbnRab29tKCktPnNl dFRyYW5zZm9ybShmaW5hbFRyYW5zZm9ybSk7CisgICAgCisgICAgRnJhbWVWaWV3JiBmcmFtZVZp ZXcgPSAqbV93ZWJQYWdlLm1haW5GcmFtZVZpZXcoKTsKIAogICAgIGlmIChQbGF0Zm9ybUNBTGF5 ZXIqIHNoYWRvd0xheWVyID0gc2hhZG93TGF5ZXJGb3JUcmFuc2llbnRab29tKCkpIHsKLSAgICAg ICAgUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCktPnJl bmRlclZpZXcoKTsKLSAgICAgICAgSW50UmVjdCBvdmVyZmxvd1JlY3QgPSByZW5kZXJWaWV3LT5w aXhlbFNuYXBwZWRMYXlvdXRPdmVyZmxvd1JlY3QoKTsKLSAgICAgICAgc2hhZG93TGF5ZXItPnNl dEJvdW5kcyhJbnRSZWN0KEludFBvaW50KCksIHRvSW50U2l6ZShvdmVyZmxvd1JlY3QubWF4WE1h eFlDb3JuZXIoKSkpKTsKLSAgICAgICAgc2hhZG93TGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9p bnQoKSk7CisgICAgICAgIHNoYWRvd0xheWVyLT5zZXRCb3VuZHMoc2hhZG93TGF5ZXJCb3VuZHNG b3JGcmFtZShmcmFtZVZpZXcsIDEpKTsKKyAgICAgICAgc2hhZG93TGF5ZXItPnNldFBvc2l0aW9u KHNoYWRvd0xheWVyUG9zaXRpb25Gb3JGcmFtZShmcmFtZVZpZXcsIEZsb2F0UG9pbnQoKSkpOwog ICAgIH0KIAogICAgIEZsb2F0UG9pbnQgdW5zY3JvbGxlZE9yaWdpbihvcmlnaW4pOwotICAgIEZs b2F0UmVjdCB1bm9ic2N1cmVkQ29udGVudFJlY3QgPSBtX3dlYlBhZ2UubWFpbkZyYW1lVmlldygp LT51bm9ic2N1cmVkQ29udGVudFJlY3RJbmNsdWRpbmdTY3JvbGxiYXJzKCk7CisgICAgRmxvYXRS ZWN0IHVub2JzY3VyZWRDb250ZW50UmVjdCA9IGZyYW1lVmlldy51bm9ic2N1cmVkQ29udGVudFJl Y3RJbmNsdWRpbmdTY3JvbGxiYXJzKCk7CiAgICAgdW5zY3JvbGxlZE9yaWdpbi5tb3ZlQnkoLXVu b2JzY3VyZWRDb250ZW50UmVjdC5sb2NhdGlvbigpKTsKICAgICBtX3dlYlBhZ2Uuc2NhbGVQYWdl KHNjYWxlLCByb3VuZGVkSW50UG9pbnQoLXVuc2Nyb2xsZWRPcmlnaW4pKTsKICAgICBtX3RyYW5z aWVudFpvb21TY2FsZSA9IDE7Cg==