118174 2013-06-28 02:19:19 -0700 [wk2] WKView shouldn't force scrolling off if shouldClipToVisibleRect is set 2013-06-28 15:16:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca simon.fraser webkit-bug-importer oldest_to_newest 904509 0 thorton 2013-06-28 02:19:19 -0700 Instead, there should be (throughout the stack from WKView to TiledCoreAnimationDrawingArea) another property that clipsToExposedRect/shouldClipToVisibleRect should be keyed off of, instead of main frame scrollability. 904510 1 webkit-bug-importer 2013-06-28 02:19:37 -0700 <rdar://problem/14301175> 904528 2 205686 thorton 2013-06-28 03:05:40 -0700 Created attachment 205686 preliminary 904743 3 205737 thorton 2013-06-28 13:22:42 -0700 Created attachment 205737 patch 904773 4 thorton 2013-06-28 15:16:40 -0700 http://trac.webkit.org/changeset/152190 205686 2013-06-28 03:05:40 -0700 2013-06-28 13:22:42 -0700 preliminary cliptovisible-disambig.diff text/plain 12190 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCA4NDEwNzY3 Li4wNGJlZTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1t CkBAIC00MTUsNyArNDE1LDcgQEAgc3RydWN0IFdLVmlld0ludGVycHJldEtleUV2ZW50c1BhcmFt ZXRlcnMgewogICAgIGlmIChfZGF0YS0+X3VzZUNvbnRlbnRQcmVwYXJhdGlvblJlY3RGb3JWaXNp YmxlUmVjdCkKICAgICAgICAgZXhwb3NlZFJlY3QgPSBOU1VuaW9uUmVjdChfZGF0YS0+X2NvbnRl bnRQcmVwYXJhdGlvblJlY3QsIGV4cG9zZWRSZWN0KTsKIAotICAgIF9kYXRhLT5fcGFnZS0+dmll d0V4cG9zZWRSZWN0Q2hhbmdlZChleHBvc2VkUmVjdCk7CisgICAgX2RhdGEtPl9wYWdlLT52aWV3 RXhwb3NlZFJlY3RDaGFuZ2VkKGV4cG9zZWRSZWN0LCBfZGF0YS0+X2NsaXBzVG9WaXNpYmxlUmVj dCk7CiB9CiAKIC0gKHZvaWQpc2V0RnJhbWVTaXplOihOU1NpemUpc2l6ZQpAQCAtMzMyOCw2ICsz MzI4LDcgQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChO U1N0cmluZyAqcGF0aCkKICAgICBCT09MIGV4cGFuZHNUb0ZpdCA9IG1pbmltdW1TaXplRm9yQXV0 b0xheW91dC53aWR0aCA+IDA7CiAKICAgICBfZGF0YS0+X3BhZ2UtPnNldE1pbmltdW1MYXlvdXRT aXplKEludFNpemUobWluaW11bVNpemVGb3JBdXRvTGF5b3V0LndpZHRoLCBtaW5pbXVtU2l6ZUZv ckF1dG9MYXlvdXQuaGVpZ2h0KSk7CisgICAgX2RhdGEtPl9wYWdlLT5zZXRNYWluRnJhbWVJc1Nj cm9sbGFibGUoIWV4cGFuZHNUb0ZpdCk7CiAKICAgICBbc2VsZiBzZXRTaG91bGRDbGlwVG9WaXNp YmxlUmVjdDpleHBhbmRzVG9GaXRdOwogfQpAQCAtMzM0MCwxMSArMzM0MSw3IEBAIHN0YXRpYyBO U1N0cmluZyAqcGF0aFdpdGhVbmlxdWVGaWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAt ICh2b2lkKXNldFNob3VsZENsaXBUb1Zpc2libGVSZWN0OihCT09MKWNsaXBzVG9WaXNpYmxlUmVj dAogewogICAgIF9kYXRhLT5fY2xpcHNUb1Zpc2libGVSZWN0ID0gY2xpcHNUb1Zpc2libGVSZWN0 OwotCi0gICAgaWYgKGNsaXBzVG9WaXNpYmxlUmVjdCkKLSAgICAgICAgW3NlbGYgX3VwZGF0ZVZp ZXdFeHBvc2VkUmVjdF07Ci0KLSAgICBfZGF0YS0+X3BhZ2UtPnNldE1haW5GcmFtZUlzU2Nyb2xs YWJsZSghY2xpcHNUb1Zpc2libGVSZWN0KTsKKyAgICBbc2VsZiBfdXBkYXRlVmlld0V4cG9zZWRS ZWN0XTsKIH0KIAogLSAoTlNDb2xvciAqKXVuZGVybGF5Q29sb3IKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNGQyMjFkNC4uMWM3NTJkMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTMxMiw2ICszMTIsOCBAQCBX ZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50KiBwYWdlQ2xpZW50LCBQYXNzUmVm UHRyPFdlYlByb2Nlc3NQcm94eT4gcAogICAgICwgbV93YWl0aW5nRm9yRGlkVXBkYXRlSW5XaW5k b3dTdGF0ZShmYWxzZSkKICNpZiBQTEFURk9STShNQUMpCiAgICAgLCBtX2V4cG9zZWRSZWN0Q2hh bmdlZFRpbWVyKHRoaXMsICZXZWJQYWdlUHJveHk6OmV4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyRmly ZWQpCisgICAgLCBtX2NsaXBzVG9FeHBvc2VkUmVjdChmYWxzZSkKKyAgICAsIG1fbGFzdFNlbnRD bGlwc1RvRXhwb3NlZFJlY3QoZmFsc2UpCiAjZW5kaWYKICNpZiBFTkFCTEUoUEFHRV9WSVNJQklM SVRZX0FQSSkKICAgICAsIG1fdmlzaWJpbGl0eVN0YXRlKFBhZ2VWaXNpYmlsaXR5U3RhdGVWaXNp YmxlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDRkYjYyZTku LmE2NjZhZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTM4 OSw3ICszODksNyBAQCBwdWJsaWM6CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgdXBkYXRl V2luZG93SXNWaXNpYmxlKGJvb2wgd2luZG93SXNWaXNpYmxlKTsKICAgICB2b2lkIHdpbmRvd0Fu ZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdmlld0ZyYW1lSW5X aW5kb3dDb29yZGluYXRlcywgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgYWNjZXNzaWJpbGl0 eVZpZXdDb29yZGluYXRlcyk7Ci0gICAgdm9pZCB2aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKGNvbnN0 IFdlYkNvcmU6OkZsb2F0UmVjdCYgZXhwb3NlZFJlY3QpOworICAgIHZvaWQgdmlld0V4cG9zZWRS ZWN0Q2hhbmdlZChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGV4cG9zZWRSZWN0LCBib29sKTsK ICAgICB2b2lkIGV4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyRmlyZWQoV2ViQ29yZTo6VGltZXI8V2Vi UGFnZVByb3h5PiopOwogICAgIHZvaWQgc2V0TWFpbkZyYW1lSXNTY3JvbGxhYmxlKGJvb2wpOwog CkBAIC0xMjcyLDYgKzEyNzIsOCBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlRpbWVyPFdlYlBh Z2VQcm94eT4gbV9leHBvc2VkUmVjdENoYW5nZWRUaW1lcjsKICAgICBXZWJDb3JlOjpGbG9hdFJl Y3QgbV9leHBvc2VkUmVjdDsKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9sYXN0U2VudEV4cG9z ZWRSZWN0OworICAgIGJvb2wgbV9jbGlwc1RvRXhwb3NlZFJlY3Q7CisgICAgYm9vbCBtX2xhc3RT ZW50Q2xpcHNUb0V4cG9zZWRSZWN0OwogI2VuZGlmCiAKICNpZiBQTEFURk9STShRVCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KaW5kZXggODJm NDdjMC4uYTJmMDczMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X ZWJQYWdlUHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQ YWdlUHJveHlNYWMubW0KQEAgLTE1MywxMiArMTUzLDEzIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3 aW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZChjb25zdCBGbG9hdFJlY3QmIHZpZXdGcmFtZUluV2lu ZG93CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpXaW5kb3dBbmRWaWV3 RnJhbWVzQ2hhbmdlZCh3aW5kb3dGcmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMsIHdpbmRvd0ZyYW1l SW5VbmZsaXBwZWRTY3JlZW5Db29yZGluYXRlcywgdmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRl cywgYWNjZXNzaWJpbGl0eVZpZXdDb29yZGluYXRlcyksIG1fcGFnZUlEKTsKIH0KIAotdm9pZCBX ZWJQYWdlUHJveHk6OnZpZXdFeHBvc2VkUmVjdENoYW5nZWQoY29uc3QgRmxvYXRSZWN0JiBleHBv c2VkUmVjdCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojp2aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKGNvbnN0 IEZsb2F0UmVjdCYgZXhwb3NlZFJlY3QsIGJvb2wgY2xpcHNUb0V4cG9zZWRSZWN0KQogewogICAg IGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBtX2V4cG9zZWRSZWN0ID0g ZXhwb3NlZFJlY3Q7CisgICAgbV9jbGlwc1RvRXhwb3NlZFJlY3QgPSBjbGlwc1RvRXhwb3NlZFJl Y3Q7CiAKICAgICBpZiAoIW1fZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXIuaXNBY3RpdmUoKSkKICAg ICAgICAgbV9leHBvc2VkUmVjdENoYW5nZWRUaW1lci5zdGFydE9uZVNob3QoMCk7CkBAIC0xNjks MTEgKzE3MCwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXJG aXJlZChUaW1lcjxXZWJQYWdlUHJveHk+KikKICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgaWYgKG1fZXhwb3NlZFJlY3QgPT0gbV9sYXN0U2VudEV4cG9zZWRSZWN0 KQorICAgIGlmIChtX2V4cG9zZWRSZWN0ID09IG1fbGFzdFNlbnRFeHBvc2VkUmVjdCAmJiBtX2Ns aXBzVG9FeHBvc2VkUmVjdCA9PSBtX2xhc3RTZW50Q2xpcHNUb0V4cG9zZWRSZWN0KQogICAgICAg ICByZXR1cm47CiAKLSAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlZpZXdF eHBvc2VkUmVjdENoYW5nZWQobV9leHBvc2VkUmVjdCksIG1fcGFnZUlEKTsKKyAgICBwcm9jZXNz KCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlZpZXdFeHBvc2VkUmVjdENoYW5nZWQobV9leHBv c2VkUmVjdCwgbV9jbGlwc1RvRXhwb3NlZFJlY3QpLCBtX3BhZ2VJRCk7CiAgICAgbV9sYXN0U2Vu dEV4cG9zZWRSZWN0ID0gbV9leHBvc2VkUmVjdDsKKyAgICBtX2xhc3RTZW50Q2xpcHNUb0V4cG9z ZWRSZWN0ID0gbV9jbGlwc1RvRXhwb3NlZFJlY3Q7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpz ZXRNYWluRnJhbWVJc1Njcm9sbGFibGUoYm9vbCBpc1Njcm9sbGFibGUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCmluZGV4IDRjOGRiMTguLjYz YTFmYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3 aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5n QXJlYS5oCkBAIC04Niw5ICs4NiwxMCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIG1haW5G cmFtZUNvbnRlbnRTaXplQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpJbnRTaXplJikgeyB9CiAKICAg ICB2aXJ0dWFsIHZvaWQgc2V0RXhwb3NlZFJlY3QoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0Jikg eyB9CisgICAgdmlydHVhbCB2b2lkIHNldENsaXBzVG9FeHBvc2VkUmVjdChib29sKSB7IH0KICAg ICB2aXJ0dWFsIHZvaWQgbWFpbkZyYW1lU2Nyb2xsYWJpbGl0eUNoYW5nZWQoYm9vbCkgeyB9CiAK LSAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlU2Nyb2xsT2Zmc2V0Rm9yQW55RnJhbWUoKSB7fQor ICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VTY3JvbGxPZmZzZXRGb3JBbnlGcmFtZSgpIHsgfQog CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIHZpcnR1YWwgV2ViQ29yZTo6 R3JhcGhpY3NMYXllckZhY3RvcnkqIGdyYXBoaWNzTGF5ZXJGYWN0b3J5KCkgeyByZXR1cm4gMDsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4 IGVjY2I4M2MuLjM4NTU4Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKQEAgLTMxMDYsOSArMzEwNiwxMCBAQCB2b2lkIFdlYlBhZ2U6OndpbmRv d0FuZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IEZsb2F0UmVjdCYgd2luZG93RnJhbWVJblNjcmVl bkNvbwogfQogI2VuZGlmCiAKLXZvaWQgV2ViUGFnZTo6dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChj b25zdCBGbG9hdFJlY3QmIGV4cG9zZWRSZWN0KQordm9pZCBXZWJQYWdlOjp2aWV3RXhwb3NlZFJl Y3RDaGFuZ2VkKGNvbnN0IEZsb2F0UmVjdCYgZXhwb3NlZFJlY3QsIGJvb2wgY2xpcHNUb0V4cG9z ZWRSZWN0KQogewogICAgIG1fZHJhd2luZ0FyZWEtPnNldEV4cG9zZWRSZWN0KGV4cG9zZWRSZWN0 KTsKKyAgICBtX2RyYXdpbmdBcmVhLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QoY2xpcHNUb0V4cG9z ZWRSZWN0KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzZXRNYWluRnJhbWVJc1Njcm9sbGFibGUoYm9v bCBpc1Njcm9sbGFibGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuaAppbmRleCA3YmRmMDY5Li5lYmFjNDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKQEAgLTc4MCw3ICs3ODAsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgZHJhd1BhZ2VzVG9QREZGcm9tUERGRG9jdW1lbnQoQ0dDb250ZXh0UmVmLCBQREZEb2N1bWVu dCAqLCBjb25zdCBQcmludEluZm8mLCB1aW50MzJfdCBmaXJzdCwgdWludDMyX3QgY291bnQpOwog I2VuZGlmCiAKLSAgICB2b2lkIHZpZXdFeHBvc2VkUmVjdENoYW5nZWQoY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0JiBleHBvc2VkUmVjdCk7CisgICAgdm9pZCB2aWV3RXhwb3NlZFJlY3RDaGFuZ2Vk KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgZXhwb3NlZFJlY3QsIGJvb2wgY2xpcHNUb0V4cG9z ZWRSZWN0KTsKICAgICB2b2lkIHNldE1haW5GcmFtZUlzU2Nyb2xsYWJsZShib29sKTsKIAogICAg IHZvaWQgdW5hcHBseUVkaXRDb21tYW5kKHVpbnQ2NF90IGNvbW1hbmRJRCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmlu ZGV4IDI1ZWJkODYuLjI5MTI1MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCkBAIC0yNjcsNyArMjY3LDcgQEAgbWVz c2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAKICAgICBTZXRXaW5kb3dJc1Zpc2li bGUoYm9vbCB3aW5kb3dJc1Zpc2libGUpCiAgICAgV2luZG93QW5kVmlld0ZyYW1lc0NoYW5nZWQo V2ViQ29yZTo6RmxvYXRSZWN0IHdpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcywgV2ViQ29y ZTo6RmxvYXRSZWN0IHdpbmRvd0ZyYW1lSW5VbmZsaXBwZWRTY3JlZW5Db29yZGluYXRlcywgV2Vi Q29yZTo6RmxvYXRSZWN0IHZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMsIFdlYkNvcmU6OkZs b2F0UG9pbnQgYWNjZXNzaWJpbGl0eVZpZXdDb29yZGluYXRlcykKLSAgICBWaWV3RXhwb3NlZFJl Y3RDaGFuZ2VkKFdlYkNvcmU6OkZsb2F0UmVjdCBleHBvc2VkUmVjdCkKKyAgICBWaWV3RXhwb3Nl ZFJlY3RDaGFuZ2VkKFdlYkNvcmU6OkZsb2F0UmVjdCBleHBvc2VkUmVjdCwgYm9vbCBjbGlwc1Rv RXhwb3NlZFJlY3QpCiAgICAgU2V0TWFpbkZyYW1lSXNTY3JvbGxhYmxlKGJvb2wgaXNTY3JvbGxh YmxlKQogICAgIFJlZ2lzdGVyVUlQcm9jZXNzQWNjZXNzaWJpbGl0eVRva2VucyhDb3JlSVBDOjpE YXRhUmVmZXJlbmNlIGVsZW1lblRva2VuLCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIHdpbmRvd1Rv a2VuKQogICAgIEdldFN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQoKSAtPiAoV1RGOjpTdHJp bmcgc3RyaW5nVmFsdWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgK aW5kZXggM2VhNzk2NC4uN2UyYWQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWEuaApAQCAtNzYsNyArNzYsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBt YWluRnJhbWVDb250ZW50U2l6ZUNoYW5nZWQoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpIE9WRVJS SURFOwogCiAgICAgdmlydHVhbCB2b2lkIHNldEV4cG9zZWRSZWN0KGNvbnN0IFdlYkNvcmU6OkZs b2F0UmVjdCYpIE9WRVJSSURFOwotICAgIHZpcnR1YWwgdm9pZCBtYWluRnJhbWVTY3JvbGxhYmls aXR5Q2hhbmdlZChib29sKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q2xpcHNUb0V4 cG9zZWRSZWN0KGJvb2wpIE9WRVJSSURFOwogCiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVNj cm9sbE9mZnNldEZvckFueUZyYW1lKCkgT1ZFUlJJREU7CiAKQEAgLTEzMiw2ICsxMzIsNyBAQCBw cml2YXRlOgogICAgIGJvb2wgbV9oYXNSb290Q29tcG9zaXRpbmdMYXllcjsKIAogICAgIFdlYkNv cmU6OkZsb2F0UmVjdCBtX2V4cG9zZWRSZWN0OworICAgIGJvb2wgbV9jbGlwc1RvRXhwb3NlZFJl Y3Q7CiAKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fbGFzdFNlbnRJbnRyaW5zaWNDb250ZW50U2l6 ZTsKICAgICBXZWJDb3JlOjpUaW1lcjxUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYT4gbV91 cGRhdGVJbnRyaW5zaWNDb250ZW50U2l6ZVRpbWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5t bSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggMjRjZDlhMC4uZTM0YjdkNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCkBAIC03MCw2ICs3MCw3IEBAIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYShXZWJQ YWdlKiB3ZWJQYWdlLCBjCiAgICAgLCBtX2xheWVyVHJlZVN0YXRlSXNGcm96ZW4oZmFsc2UpCiAg ICAgLCBtX2xheWVyRmx1c2hTY2hlZHVsZXIodGhpcykKICAgICAsIG1faXNQYWludGluZ1N1c3Bl bmRlZCghcGFyYW1ldGVycy5pc1Zpc2libGUpCisgICAgLCBtX2NsaXBzVG9FeHBvc2VkUmVjdChm YWxzZSkKICAgICAsIG1fdXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lcih0aGlzLCAmVGls ZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZUludHJpbnNpY0NvbnRlbnRTaXplVGlt ZXJGaXJlZCkKIHsKICAgICBQYWdlKiBwYWdlID0gbV93ZWJQYWdlLT5jb3JlUGFnZSgpOwpAQCAt MzQ5LDggKzM1MCw4IEBAIGJvb2wgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmZsdXNo TGF5ZXJzKCkKICAgICB9CiAKICAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gZW5jbG9zaW5nSW50 UmVjdChtX3Jvb3RMYXllci5nZXQoKS5mcmFtZSk7Ci0gICAgaWYgKCFtX3dlYlBhZ2UtPm1haW5G cmFtZUlzU2Nyb2xsYWJsZSgpKQogICAgICAgICB2aXNpYmxlUmVjdC5pbnRlcnNlY3QoZW5jbG9z aW5nSW50UmVjdChtX2V4cG9zZWRSZWN0KSk7CisgICAgaWYgKG1fY2xpcHNUb0V4cG9zZWRSZWN0 KQogICAgIGZvciAoUGFnZU92ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVy bGF5TGF5ZXJzLmJlZ2luKCksIGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7IGl0ICE9 IGVuZDsgKytpdCkgewogICAgICAgICBHcmFwaGljc0xheWVyKiBsYXllciA9IGl0LT52YWx1ZS5n ZXQoKTsKICAgICAgICAgbGF5ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZSh2aXNpYmxlUmVjdCk7 CkBAIC00MTIsOCArNDEzLDkgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6 c2V0RXhwb3NlZFJlY3QoY29uc3QgRmxvYXRSZWN0JiBleHBvc2VkUmVjdCkKICAgICAgICAgICAg IHRpbGVkQmFja2luZy0+c2V0RXhwb3NlZFJlY3QoZXhwb3NlZFJlY3QpOwogfQogCi12b2lkIFRp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjptYWluRnJhbWVTY3JvbGxhYmlsaXR5Q2hhbmdl ZChib29sKQordm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Q2xpcHNUb0V4 cG9zZWRSZWN0KGJvb2wgY2xpcHNUb0V4cG9zZWRSZWN0KQogeworICAgIG1fY2xpcHNUb0V4cG9z ZWRSZWN0ID0gY2xpcHNUb0V4cG9zZWRSZWN0OwogICAgIHVwZGF0ZU1haW5GcmFtZUNsaXBzVG9F eHBvc2VkUmVjdCgpOwogfQogCkBAIC01MjQsMTQgKzUyNiwxMiBAQCB2b2lkIFRpbGVkQ29yZUFu aW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVMYXllckhvc3RpbmdDb250ZXh0KCkKIAogdm9pZCBU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlTWFpbkZyYW1lQ2xpcHNUb0V4cG9z ZWRSZWN0KCkKIHsKLSAgICBib29sIGlzU2Nyb2xsYWJsZSA9IG1fd2ViUGFnZS0+bWFpbkZyYW1l SXNTY3JvbGxhYmxlKCk7Ci0KICAgICBpZiAoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBt YWluRnJhbWVUaWxlZEJhY2tpbmcoKSkKLSAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRDbGlwc1Rv RXhwb3NlZFJlY3QoIWlzU2Nyb2xsYWJsZSk7CisgICAgICAgIHRpbGVkQmFja2luZy0+c2V0Q2xp cHNUb0V4cG9zZWRSZWN0KG1fY2xpcHNUb0V4cG9zZWRSZWN0KTsKIAogICAgIGZvciAoUGFnZU92 ZXJsYXlMYXllck1hcDo6aXRlcmF0b3IgaXQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmJlZ2luKCks IGVuZCA9IG1fcGFnZU92ZXJsYXlMYXllcnMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKICAgICAg ICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gaXQtPnZhbHVlLT50aWxlZEJhY2tp bmcoKSkKLSAgICAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0Q2xpcHNUb0V4cG9zZWRSZWN0KCFp c1Njcm9sbGFibGUpOworICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRDbGlwc1RvRXhwb3Nl ZFJlY3QobV9jbGlwc1RvRXhwb3NlZFJlY3QpOwogCiAgICAgRnJhbWUqIGZyYW1lID0gbV93ZWJQ YWdlLT5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQpAQCAtNTg5LDcg KzU4OSw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmNyZWF0ZVBhZ2VP dmVybGF5TGF5ZXIoUGFnZU92ZXJsYXkqIHBhZ2VPdmVyCiAKICAgICBpZiAoVGlsZWRCYWNraW5n KiB0aWxlZEJhY2tpbmcgPSBsYXllci0+dGlsZWRCYWNraW5nKCkpIHsKICAgICAgICAgdGlsZWRC YWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX2V4cG9zZWRSZWN0KTsKLSAgICAgICAgdGlsZWRCYWNr aW5nLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QoIW1fd2ViUGFnZS0+bWFpbkZyYW1lSXNTY3JvbGxh YmxlKCkpOworICAgICAgICB0aWxlZEJhY2tpbmctPnNldENsaXBzVG9FeHBvc2VkUmVjdChtX2Ns aXBzVG9FeHBvc2VkUmVjdCk7CiAgICAgfQogCiAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOwpA QCAtNjM3LDcgKzYzNyw3IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmRp ZENvbW1pdENoYW5nZXNGb3JMYXllcihjb25zdCBHcmFwaGljc0xheWVyCiAKICAgICBpZiAoVGls ZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcgPSBsYXllci0+dGlsZWRCYWNraW5nKCkpIHsKICAgICAg ICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX2V4cG9zZWRSZWN0KTsKLSAgICAgICAg dGlsZWRCYWNraW5nLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QoIW1fd2ViUGFnZS0+bWFpbkZyYW1l SXNTY3JvbGxhYmxlKCkpOworICAgICAgICB0aWxlZEJhY2tpbmctPnNldENsaXBzVG9FeHBvc2Vk UmVjdChtX2NsaXBzVG9FeHBvc2VkUmVjdCk7CiAgICAgfQogCiAgICAgbV9wYWdlT3ZlcmxheVBs YXRmb3JtTGF5ZXJzLnNldChsYXllciwgbGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7Cg== 205737 2013-06-28 13:22:42 -0700 2013-06-28 13:30:29 -0700 patch cliptovisible-disambig.diff text/plain 15149 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNjkxMjQwLi44NTBmYzM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTYg QEAKKzIwMTMtMDYtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gV0tWaWV3IHNob3VsZG4ndCBmb3JjZSBzY3JvbGxpbmcgb2ZmIGlmIHNo b3VsZENsaXBUb1Zpc2libGVSZWN0IGlzIHNldAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE4MTc0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNDMw MTE3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF91cGRhdGVW aWV3RXhwb3NlZFJlY3RdKToKKyAgICAgICAgUGFzcyB3aGV0aGVyIG9yIG5vdCBjbGlwcy10by12 aXNpYmxlUmVjdCBpcyBlbmFibGVkIGRvd24gdG8gdGhlIFdlYlBhZ2VQcm94eS4KKworICAgICAg ICAoLVtXS1ZpZXcgc2V0TWluaW11bVNpemVGb3JBdXRvTGF5b3V0Ol0pOgorICAgICAgICBEaXNh YmxlIHNjcm9sbGluZyB3aGVuIHVzaW5nIGF1dG9sYXlvdXQgaW5zdGVhZCBvZiB3aGVuIHVzaW5n IGNsaXBzLXRvLXZpc2libGVSZWN0LgorCisgICAgICAgICgtW1dLVmlldyBzZXRTaG91bGRDbGlw VG9WaXNpYmxlUmVjdDpdKToKKyAgICAgICAgQ2xpcHBpbmcgdG8gdGhlIFdLVmlldydzIHZpc2li bGVSZWN0IGRvZXMgbm90IHN0cmljdGx5IHJlcXVpcmUgc2Nyb2xsaW5nIHRvIGJlIGRpc2FibGVk LAorICAgICAgICBhbmQgaW4gZmFjdCB0aGVyZSBhcmUgY2FzZXMgKFJUTC9UQiBwYWdpbmF0aW9u KSB3aGVyZSB3ZSAqbXVzdCogc2Nyb2xsLCBldmVuIHdoZW4gdGhlIHZpZXcKKyAgICAgICAgaXMg YmlnIGVub3VnaCB0byBmaXQgdGhlIGNvbnRlbnQgKHRoZSBjYXNlIGNsaXAtdG8tdmlzaWJsZVJl Y3Qgd2FzIGFkZGVkIGZvcikuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dl YlBhZ2VQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp2aWV3RXhw b3NlZFJlY3RDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpleHBvc2Vk UmVjdENoYW5nZWRUaW1lckZpcmVkKToKKyAgICAgICAgS2VlcCB0cmFjayBvZiBhbmQgZm9yd2Fy ZCB0byB0aGUgZHJhd2luZyBhcmVhIHdoZXRoZXIgb3Igbm90IGNsaXBzLXRvLXZpc2libGVSZWN0 IGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWEu aDoKKyAgICAgICAgKFdlYktpdDo6RHJhd2luZ0FyZWE6OnNldENsaXBzVG9FeHBvc2VkUmVjdCk6 IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYTo6ZGlkQ2hhbmdlU2Nyb2xsT2Zm c2V0Rm9yQW55RnJhbWUpOiBBZGRlZCBhIG1pc3Npbmcgc3BhY2UuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnZp ZXdFeHBvc2VkUmVjdENoYW5nZWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46 CisgICAgICAgIEZvcndhcmQgY2xpcHMtdG8tdmlzaWJsZVJlY3QgZW5hYmxlZCBzdGF0ZSB0byB0 aGUgZHJhd2luZyBhcmVhLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oOgorICAgICAgICBBZGQgc3RvcmFnZSBmb3IgbV9j bGlwc1RvRXhwb3NlZFJlY3QuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEpOgor ICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6Zmx1c2hMYXll cnMpOgorICAgICAgICAoV2ViS2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0 Q2xpcHNUb0V4cG9zZWRSZWN0KToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWE6OnVwZGF0ZU1haW5GcmFtZUNsaXBzVG9FeHBvc2VkUmVjdCk6CisgICAgICAg IChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpjcmVhdGVQYWdlT3Zlcmxh eUxheWVyKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6 OmRpZENvbW1pdENoYW5nZXNGb3JMYXllcik6CisgICAgICAgIENoZWNrIG1fY2xpcHNUb0V4cG9z ZWRSZWN0IGluc3RlYWQgb2YgdGhlIG1haW4tZnJhbWUncyBpc1Njcm9sbGFibGUoKSB0byBkZXRl cm1pbmUKKyAgICAgICAgd2hldGhlciB3ZSBzaG91bGQgdGVsbCBvdXIgVGlsZWRCYWNraW5ncyB0 byBjbGlwIHRvIHRoZSBleHBvc2VkIHJlY3Qgd2UgcHJvdmlkZS4KKworICAgICAgICBXZSBkb24n dCBuZWVkIHRvIGxpc3RlbiB0byBtYWluRnJhbWVTY3JvbGxhYmlsaXR5Q2hhbmdlZCBhbnltb3Jl LgorCiAyMDEzLTA2LTI4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAK ICAgICAgICAgTWFrZSB0aGUgVUkgcHJvY2VzcyBydW4gdGhlIEphdmEgVXBkYXRlcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmluZGV4IDg0MTA3NjcuLjA0YmVl MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTQx NSw3ICs0MTUsNyBAQCBzdHJ1Y3QgV0tWaWV3SW50ZXJwcmV0S2V5RXZlbnRzUGFyYW1ldGVycyB7 CiAgICAgaWYgKF9kYXRhLT5fdXNlQ29udGVudFByZXBhcmF0aW9uUmVjdEZvclZpc2libGVSZWN0 KQogICAgICAgICBleHBvc2VkUmVjdCA9IE5TVW5pb25SZWN0KF9kYXRhLT5fY29udGVudFByZXBh cmF0aW9uUmVjdCwgZXhwb3NlZFJlY3QpOwogCi0gICAgX2RhdGEtPl9wYWdlLT52aWV3RXhwb3Nl ZFJlY3RDaGFuZ2VkKGV4cG9zZWRSZWN0KTsKKyAgICBfZGF0YS0+X3BhZ2UtPnZpZXdFeHBvc2Vk UmVjdENoYW5nZWQoZXhwb3NlZFJlY3QsIF9kYXRhLT5fY2xpcHNUb1Zpc2libGVSZWN0KTsKIH0K IAogLSAodm9pZClzZXRGcmFtZVNpemU6KE5TU2l6ZSlzaXplCkBAIC0zMzI4LDYgKzMzMjgsNyBA QCBzdGF0aWMgTlNTdHJpbmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5n ICpwYXRoKQogICAgIEJPT0wgZXhwYW5kc1RvRml0ID0gbWluaW11bVNpemVGb3JBdXRvTGF5b3V0 LndpZHRoID4gMDsKIAogICAgIF9kYXRhLT5fcGFnZS0+c2V0TWluaW11bUxheW91dFNpemUoSW50 U2l6ZShtaW5pbXVtU2l6ZUZvckF1dG9MYXlvdXQud2lkdGgsIG1pbmltdW1TaXplRm9yQXV0b0xh eW91dC5oZWlnaHQpKTsKKyAgICBfZGF0YS0+X3BhZ2UtPnNldE1haW5GcmFtZUlzU2Nyb2xsYWJs ZSghZXhwYW5kc1RvRml0KTsKIAogICAgIFtzZWxmIHNldFNob3VsZENsaXBUb1Zpc2libGVSZWN0 OmV4cGFuZHNUb0ZpdF07CiB9CkBAIC0zMzQwLDExICszMzQxLDcgQEAgc3RhdGljIE5TU3RyaW5n ICpwYXRoV2l0aFVuaXF1ZUZpbGVuYW1lRm9yUGF0aChOU1N0cmluZyAqcGF0aCkKIC0gKHZvaWQp c2V0U2hvdWxkQ2xpcFRvVmlzaWJsZVJlY3Q6KEJPT0wpY2xpcHNUb1Zpc2libGVSZWN0CiB7CiAg ICAgX2RhdGEtPl9jbGlwc1RvVmlzaWJsZVJlY3QgPSBjbGlwc1RvVmlzaWJsZVJlY3Q7Ci0KLSAg ICBpZiAoY2xpcHNUb1Zpc2libGVSZWN0KQotICAgICAgICBbc2VsZiBfdXBkYXRlVmlld0V4cG9z ZWRSZWN0XTsKLQotICAgIF9kYXRhLT5fcGFnZS0+c2V0TWFpbkZyYW1lSXNTY3JvbGxhYmxlKCFj bGlwc1RvVmlzaWJsZVJlY3QpOworICAgIFtzZWxmIF91cGRhdGVWaWV3RXhwb3NlZFJlY3RdOwog fQogCiAtIChOU0NvbG9yICopdW5kZXJsYXlDb2xvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAppbmRleCA0ZDIyMWQ0Li4xYzc1MmQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzEyLDYgKzMxMiw4IEBAIFdlYlBhZ2VQ cm94eTo6V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQqIHBhZ2VDbGllbnQsIFBhc3NSZWZQdHI8V2Vi UHJvY2Vzc1Byb3h5PiBwCiAgICAgLCBtX3dhaXRpbmdGb3JEaWRVcGRhdGVJbldpbmRvd1N0YXRl KGZhbHNlKQogI2lmIFBMQVRGT1JNKE1BQykKICAgICAsIG1fZXhwb3NlZFJlY3RDaGFuZ2VkVGlt ZXIodGhpcywgJldlYlBhZ2VQcm94eTo6ZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXJGaXJlZCkKKyAg ICAsIG1fY2xpcHNUb0V4cG9zZWRSZWN0KGZhbHNlKQorICAgICwgbV9sYXN0U2VudENsaXBzVG9F eHBvc2VkUmVjdChmYWxzZSkKICNlbmRpZgogI2lmIEVOQUJMRShQQUdFX1ZJU0lCSUxJVFlfQVBJ KQogICAgICwgbV92aXNpYmlsaXR5U3RhdGUoUGFnZVZpc2liaWxpdHlTdGF0ZVZpc2libGUpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggNGRiNjJlOS4uYTY2NmFm YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMzg5LDcgKzM4 OSw3IEBAIHB1YmxpYzoKICNpZiBQTEFURk9STShNQUMpCiAgICAgdm9pZCB1cGRhdGVXaW5kb3dJ c1Zpc2libGUoYm9vbCB3aW5kb3dJc1Zpc2libGUpOwogICAgIHZvaWQgd2luZG93QW5kVmlld0Zy YW1lc0NoYW5nZWQoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB2aWV3RnJhbWVJbldpbmRvd0Nv b3JkaW5hdGVzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBhY2Nlc3NpYmlsaXR5Vmlld0Nv b3JkaW5hdGVzKTsKLSAgICB2b2lkIHZpZXdFeHBvc2VkUmVjdENoYW5nZWQoY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0JiBleHBvc2VkUmVjdCk7CisgICAgdm9pZCB2aWV3RXhwb3NlZFJlY3RDaGFu Z2VkKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgZXhwb3NlZFJlY3QsIGJvb2wpOwogICAgIHZv aWQgZXhwb3NlZFJlY3RDaGFuZ2VkVGltZXJGaXJlZChXZWJDb3JlOjpUaW1lcjxXZWJQYWdlUHJv eHk+Kik7CiAgICAgdm9pZCBzZXRNYWluRnJhbWVJc1Njcm9sbGFibGUoYm9vbCk7CiAKQEAgLTEy NzIsNiArMTI3Miw4IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6VGltZXI8V2ViUGFnZVByb3h5 PiBtX2V4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyOwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX2V4 cG9zZWRSZWN0OwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX2xhc3RTZW50RXhwb3NlZFJlY3Q7 CisgICAgYm9vbCBtX2NsaXBzVG9FeHBvc2VkUmVjdDsKKyAgICBib29sIG1fbGFzdFNlbnRDbGlw c1RvRXhwb3NlZFJlY3Q7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKFFUKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0gYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRleCA4MmY0N2MwLi5h MmYwNzMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQ cm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94 eU1hYy5tbQpAQCAtMTUzLDEyICsxNTMsMTMgQEAgdm9pZCBXZWJQYWdlUHJveHk6OndpbmRvd0Fu ZFZpZXdGcmFtZXNDaGFuZ2VkKGNvbnN0IEZsb2F0UmVjdCYgdmlld0ZyYW1lSW5XaW5kb3cKICAg ICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OldpbmRvd0FuZFZpZXdGcmFtZXND aGFuZ2VkKHdpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcywgd2luZG93RnJhbWVJblVuZmxp cHBlZFNjcmVlbkNvb3JkaW5hdGVzLCB2aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzLCBhY2Nl c3NpYmlsaXR5Vmlld0Nvb3JkaW5hdGVzKSwgbV9wYWdlSUQpOwogfQogCi12b2lkIFdlYlBhZ2VQ cm94eTo6dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChjb25zdCBGbG9hdFJlY3QmIGV4cG9zZWRSZWN0 KQordm9pZCBXZWJQYWdlUHJveHk6OnZpZXdFeHBvc2VkUmVjdENoYW5nZWQoY29uc3QgRmxvYXRS ZWN0JiBleHBvc2VkUmVjdCwgYm9vbCBjbGlwc1RvRXhwb3NlZFJlY3QpCiB7CiAgICAgaWYgKCFp c1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fZXhwb3NlZFJlY3QgPSBleHBvc2Vk UmVjdDsKKyAgICBtX2NsaXBzVG9FeHBvc2VkUmVjdCA9IGNsaXBzVG9FeHBvc2VkUmVjdDsKIAog ICAgIGlmICghbV9leHBvc2VkUmVjdENoYW5nZWRUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICBt X2V4cG9zZWRSZWN0Q2hhbmdlZFRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKQEAgLTE2OSwxMSArMTcw LDEyIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpleHBvc2VkUmVjdENoYW5nZWRUaW1lckZpcmVkKFRp bWVyPFdlYlBhZ2VQcm94eT4qKQogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBpZiAobV9leHBvc2VkUmVjdCA9PSBtX2xhc3RTZW50RXhwb3NlZFJlY3QpCisgICAg aWYgKG1fZXhwb3NlZFJlY3QgPT0gbV9sYXN0U2VudEV4cG9zZWRSZWN0ICYmIG1fY2xpcHNUb0V4 cG9zZWRSZWN0ID09IG1fbGFzdFNlbnRDbGlwc1RvRXhwb3NlZFJlY3QpCiAgICAgICAgIHJldHVy bjsKIAotICAgIHByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Vmlld0V4cG9zZWRS ZWN0Q2hhbmdlZChtX2V4cG9zZWRSZWN0KSwgbV9wYWdlSUQpOworICAgIHByb2Nlc3MoKS0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZTo6Vmlld0V4cG9zZWRSZWN0Q2hhbmdlZChtX2V4cG9zZWRSZWN0 LCBtX2NsaXBzVG9FeHBvc2VkUmVjdCksIG1fcGFnZUlEKTsKICAgICBtX2xhc3RTZW50RXhwb3Nl ZFJlY3QgPSBtX2V4cG9zZWRSZWN0OworICAgIG1fbGFzdFNlbnRDbGlwc1RvRXhwb3NlZFJlY3Qg PSBtX2NsaXBzVG9FeHBvc2VkUmVjdDsKIH0KIAogdm9pZCBXZWJQYWdlUHJveHk6OnNldE1haW5G cmFtZUlzU2Nyb2xsYWJsZShib29sIGlzU2Nyb2xsYWJsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKaW5kZXggNGM4ZGIxOC4uNjNhMWZhYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVh LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgK QEAgLTg2LDkgKzg2LDEwIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgbWFpbkZyYW1lQ29u dGVudFNpemVDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6OkludFNpemUmKSB7IH0KIAogICAgIHZpcnR1 YWwgdm9pZCBzZXRFeHBvc2VkUmVjdChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSB7IH0KKyAg ICB2aXJ0dWFsIHZvaWQgc2V0Q2xpcHNUb0V4cG9zZWRSZWN0KGJvb2wpIHsgfQogICAgIHZpcnR1 YWwgdm9pZCBtYWluRnJhbWVTY3JvbGxhYmlsaXR5Q2hhbmdlZChib29sKSB7IH0KIAotICAgIHZp cnR1YWwgdm9pZCBkaWRDaGFuZ2VTY3JvbGxPZmZzZXRGb3JBbnlGcmFtZSgpIHt9CisgICAgdmly dHVhbCB2b2lkIGRpZENoYW5nZVNjcm9sbE9mZnNldEZvckFueUZyYW1lKCkgeyB9CiAKICNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdmlydHVhbCBXZWJDb3JlOjpHcmFwaGlj c0xheWVyRmFjdG9yeSogZ3JhcGhpY3NMYXllckZhY3RvcnkoKSB7IHJldHVybiAwOyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggYTllYjg0 My4uMGVkYTdiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcApAQCAtMzEwNiw5ICszMTA2LDEwIEBAIHZvaWQgV2ViUGFnZTo6d2luZG93QW5kVmll d0ZyYW1lc0NoYW5nZWQoY29uc3QgRmxvYXRSZWN0JiB3aW5kb3dGcmFtZUluU2NyZWVuQ29vCiB9 CiAjZW5kaWYKIAotdm9pZCBXZWJQYWdlOjp2aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKGNvbnN0IEZs b2F0UmVjdCYgZXhwb3NlZFJlY3QpCit2b2lkIFdlYlBhZ2U6OnZpZXdFeHBvc2VkUmVjdENoYW5n ZWQoY29uc3QgRmxvYXRSZWN0JiBleHBvc2VkUmVjdCwgYm9vbCBjbGlwc1RvRXhwb3NlZFJlY3Qp CiB7CiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0RXhwb3NlZFJlY3QoZXhwb3NlZFJlY3QpOworICAg IG1fZHJhd2luZ0FyZWEtPnNldENsaXBzVG9FeHBvc2VkUmVjdChjbGlwc1RvRXhwb3NlZFJlY3Qp OwogfQogCiB2b2lkIFdlYlBhZ2U6OnNldE1haW5GcmFtZUlzU2Nyb2xsYWJsZShib29sIGlzU2Ny b2xsYWJsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmlu ZGV4IDdiZGYwNjkuLmViYWM0NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaApAQCAtNzgwLDcgKzc4MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkcmF3 UGFnZXNUb1BERkZyb21QREZEb2N1bWVudChDR0NvbnRleHRSZWYsIFBERkRvY3VtZW50ICosIGNv bnN0IFByaW50SW5mbyYsIHVpbnQzMl90IGZpcnN0LCB1aW50MzJfdCBjb3VudCk7CiAjZW5kaWYK IAotICAgIHZvaWQgdmlld0V4cG9zZWRSZWN0Q2hhbmdlZChjb25zdCBXZWJDb3JlOjpGbG9hdFJl Y3QmIGV4cG9zZWRSZWN0KTsKKyAgICB2b2lkIHZpZXdFeHBvc2VkUmVjdENoYW5nZWQoY29uc3Qg V2ViQ29yZTo6RmxvYXRSZWN0JiBleHBvc2VkUmVjdCwgYm9vbCBjbGlwc1RvRXhwb3NlZFJlY3Qp OwogICAgIHZvaWQgc2V0TWFpbkZyYW1lSXNTY3JvbGxhYmxlKGJvb2wpOwogCiAgICAgdm9pZCB1 bmFwcGx5RWRpdENvbW1hbmQodWludDY0X3QgY29tbWFuZElEKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggMjVl YmQ4Ni4uMjkxMjUzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTI2Nyw3ICsyNjcsNyBAQCBtZXNzYWdlcyAt PiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKIAogICAgIFNldFdpbmRvd0lzVmlzaWJsZShib29s IHdpbmRvd0lzVmlzaWJsZSkKICAgICBXaW5kb3dBbmRWaWV3RnJhbWVzQ2hhbmdlZChXZWJDb3Jl OjpGbG9hdFJlY3Qgd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLCBXZWJDb3JlOjpGbG9h dFJlY3Qgd2luZG93RnJhbWVJblVuZmxpcHBlZFNjcmVlbkNvb3JkaW5hdGVzLCBXZWJDb3JlOjpG bG9hdFJlY3Qgdmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcywgV2ViQ29yZTo6RmxvYXRQb2lu dCBhY2Nlc3NpYmlsaXR5Vmlld0Nvb3JkaW5hdGVzKQotICAgIFZpZXdFeHBvc2VkUmVjdENoYW5n ZWQoV2ViQ29yZTo6RmxvYXRSZWN0IGV4cG9zZWRSZWN0KQorICAgIFZpZXdFeHBvc2VkUmVjdENo YW5nZWQoV2ViQ29yZTo6RmxvYXRSZWN0IGV4cG9zZWRSZWN0LCBib29sIGNsaXBzVG9FeHBvc2Vk UmVjdCkKICAgICBTZXRNYWluRnJhbWVJc1Njcm9sbGFibGUoYm9vbCBpc1Njcm9sbGFibGUpCiAg ICAgUmVnaXN0ZXJVSVByb2Nlc3NBY2Nlc3NpYmlsaXR5VG9rZW5zKENvcmVJUEM6OkRhdGFSZWZl cmVuY2UgZWxlbWVuVG9rZW4sIENvcmVJUEM6OkRhdGFSZWZlcmVuY2Ugd2luZG93VG9rZW4pCiAg ICAgR2V0U3RyaW5nU2VsZWN0aW9uRm9yUGFzdGVib2FyZCgpIC0+IChXVEY6OlN0cmluZyBzdHJp bmdWYWx1ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaAppbmRleCAz ZWE3OTY0Li43ZTJhZDAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmgKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJl YS5oCkBAIC03Niw3ICs3Niw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIG1haW5GcmFt ZUNvbnRlbnRTaXplQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpJbnRTaXplJikgT1ZFUlJJREU7CiAK ICAgICB2aXJ0dWFsIHZvaWQgc2V0RXhwb3NlZFJlY3QoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0 JikgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCB2b2lkIG1haW5GcmFtZVNjcm9sbGFiaWxpdHlDaGFu Z2VkKGJvb2wpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBzZXRDbGlwc1RvRXhwb3NlZFJl Y3QoYm9vbCkgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlU2Nyb2xsT2Zm c2V0Rm9yQW55RnJhbWUoKSBPVkVSUklERTsKIApAQCAtMTMyLDYgKzEzMiw3IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX2hhc1Jvb3RDb21wb3NpdGluZ0xheWVyOwogCiAgICAgV2ViQ29yZTo6Rmxv YXRSZWN0IG1fZXhwb3NlZFJlY3Q7CisgICAgYm9vbCBtX2NsaXBzVG9FeHBvc2VkUmVjdDsKIAog ICAgIFdlYkNvcmU6OkludFNpemUgbV9sYXN0U2VudEludHJpbnNpY0NvbnRlbnRTaXplOwogICAg IFdlYkNvcmU6OlRpbWVyPFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhPiBtX3VwZGF0ZUlu dHJpbnNpY0NvbnRlbnRTaXplVGltZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5tbQppbmRleCAyNGNkOWEwLi4zNGYyN2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVh Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3Jl QW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTcwLDYgKzcwLDcgQEAgVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UqIHdl YlBhZ2UsIGMKICAgICAsIG1fbGF5ZXJUcmVlU3RhdGVJc0Zyb3plbihmYWxzZSkKICAgICAsIG1f bGF5ZXJGbHVzaFNjaGVkdWxlcih0aGlzKQogICAgICwgbV9pc1BhaW50aW5nU3VzcGVuZGVkKCFw YXJhbWV0ZXJzLmlzVmlzaWJsZSkKKyAgICAsIG1fY2xpcHNUb0V4cG9zZWRSZWN0KGZhbHNlKQog ICAgICwgbV91cGRhdGVJbnRyaW5zaWNDb250ZW50U2l6ZVRpbWVyKHRoaXMsICZUaWxlZENvcmVB bmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlSW50cmluc2ljQ29udGVudFNpemVUaW1lckZpcmVk KQogewogICAgIFBhZ2UqIHBhZ2UgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCk7CkBAIC0zNDksOCAr MzUwLDkgQEAgYm9vbCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6Zmx1c2hMYXllcnMo KQogICAgIH0KIAogICAgIEludFJlY3QgdmlzaWJsZVJlY3QgPSBlbmNsb3NpbmdJbnRSZWN0KG1f cm9vdExheWVyLmdldCgpLmZyYW1lKTsKLSAgICBpZiAoIW1fd2ViUGFnZS0+bWFpbkZyYW1lSXNT Y3JvbGxhYmxlKCkpCisgICAgaWYgKG1fY2xpcHNUb0V4cG9zZWRSZWN0KQogICAgICAgICB2aXNp YmxlUmVjdC5pbnRlcnNlY3QoZW5jbG9zaW5nSW50UmVjdChtX2V4cG9zZWRSZWN0KSk7CisKICAg ICBmb3IgKFBhZ2VPdmVybGF5TGF5ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wYWdlT3ZlcmxheUxh eWVycy5iZWdpbigpLCBlbmQgPSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKICAgICAgICAgR3JhcGhpY3NMYXllciogbGF5ZXIgPSBpdC0+dmFsdWUuZ2V0KCk7 CiAgICAgICAgIGxheWVyLT5mbHVzaENvbXBvc2l0aW5nU3RhdGUodmlzaWJsZVJlY3QpOwpAQCAt NDEyLDggKzQxNCw5IEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldEV4 cG9zZWRSZWN0KGNvbnN0IEZsb2F0UmVjdCYgZXhwb3NlZFJlY3QpCiAgICAgICAgICAgICB0aWxl ZEJhY2tpbmctPnNldEV4cG9zZWRSZWN0KGV4cG9zZWRSZWN0KTsKIH0KIAotdm9pZCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6bWFpbkZyYW1lU2Nyb2xsYWJpbGl0eUNoYW5nZWQoYm9v bCkKK3ZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldENsaXBzVG9FeHBvc2Vk UmVjdChib29sIGNsaXBzVG9FeHBvc2VkUmVjdCkKIHsKKyAgICBtX2NsaXBzVG9FeHBvc2VkUmVj dCA9IGNsaXBzVG9FeHBvc2VkUmVjdDsKICAgICB1cGRhdGVNYWluRnJhbWVDbGlwc1RvRXhwb3Nl ZFJlY3QoKTsKIH0KIApAQCAtNTI0LDE0ICs1MjcsMTIgQEAgdm9pZCBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYTo6dXBkYXRlTGF5ZXJIb3N0aW5nQ29udGV4dCgpCiAKIHZvaWQgVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZU1haW5GcmFtZUNsaXBzVG9FeHBvc2VkUmVj dCgpCiB7Ci0gICAgYm9vbCBpc1Njcm9sbGFibGUgPSBtX3dlYlBhZ2UtPm1haW5GcmFtZUlzU2Ny b2xsYWJsZSgpOwotCiAgICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gbWFpbkZy YW1lVGlsZWRCYWNraW5nKCkpCi0gICAgICAgIHRpbGVkQmFja2luZy0+c2V0Q2xpcHNUb0V4cG9z ZWRSZWN0KCFpc1Njcm9sbGFibGUpOworICAgICAgICB0aWxlZEJhY2tpbmctPnNldENsaXBzVG9F eHBvc2VkUmVjdChtX2NsaXBzVG9FeHBvc2VkUmVjdCk7CiAKICAgICBmb3IgKFBhZ2VPdmVybGF5 TGF5ZXJNYXA6Oml0ZXJhdG9yIGl0ID0gbV9wYWdlT3ZlcmxheUxheWVycy5iZWdpbigpLCBlbmQg PSBtX3BhZ2VPdmVybGF5TGF5ZXJzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpCiAgICAgICAgIGlm IChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IGl0LT52YWx1ZS0+dGlsZWRCYWNraW5nKCkp Ci0gICAgICAgICAgICB0aWxlZEJhY2tpbmctPnNldENsaXBzVG9FeHBvc2VkUmVjdCghaXNTY3Jv bGxhYmxlKTsKKyAgICAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0Q2xpcHNUb0V4cG9zZWRSZWN0 KG1fY2xpcHNUb0V4cG9zZWRSZWN0KTsKIAogICAgIEZyYW1lKiBmcmFtZSA9IG1fd2ViUGFnZS0+ Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKQEAgLTU4OSw3ICs1OTAs NyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpjcmVhdGVQYWdlT3Zlcmxh eUxheWVyKFBhZ2VPdmVybGF5KiBwYWdlT3ZlcgogCiAgICAgaWYgKFRpbGVkQmFja2luZyogdGls ZWRCYWNraW5nID0gbGF5ZXItPnRpbGVkQmFja2luZygpKSB7CiAgICAgICAgIHRpbGVkQmFja2lu Zy0+c2V0RXhwb3NlZFJlY3QobV9leHBvc2VkUmVjdCk7Ci0gICAgICAgIHRpbGVkQmFja2luZy0+ c2V0Q2xpcHNUb0V4cG9zZWRSZWN0KCFtX3dlYlBhZ2UtPm1haW5GcmFtZUlzU2Nyb2xsYWJsZSgp KTsKKyAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3QobV9jbGlwc1Rv RXhwb3NlZFJlY3QpOwogICAgIH0KIAogICAgIFtDQVRyYW5zYWN0aW9uIGJlZ2luXTsKQEAgLTYz Nyw3ICs2MzgsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpkaWRDb21t aXRDaGFuZ2VzRm9yTGF5ZXIoY29uc3QgR3JhcGhpY3NMYXllcgogCiAgICAgaWYgKFRpbGVkQmFj a2luZyogdGlsZWRCYWNraW5nID0gbGF5ZXItPnRpbGVkQmFja2luZygpKSB7CiAgICAgICAgIHRp bGVkQmFja2luZy0+c2V0RXhwb3NlZFJlY3QobV9leHBvc2VkUmVjdCk7Ci0gICAgICAgIHRpbGVk QmFja2luZy0+c2V0Q2xpcHNUb0V4cG9zZWRSZWN0KCFtX3dlYlBhZ2UtPm1haW5GcmFtZUlzU2Ny b2xsYWJsZSgpKTsKKyAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRDbGlwc1RvRXhwb3NlZFJlY3Qo bV9jbGlwc1RvRXhwb3NlZFJlY3QpOwogICAgIH0KIAogICAgIG1fcGFnZU92ZXJsYXlQbGF0Zm9y bUxheWVycy5zZXQobGF5ZXIsIGxheWVyLT5wbGF0Zm9ybUxheWVyKCkpOwo=