136308 2014-08-27 14:07:36 -0700 WebKit2 swipe gesture should report the position of the snapshot to the client 2014-08-27 18:24:33 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue mitz simon.fraser oldest_to_newest 1031769 0 thorton 2014-08-27 14:07:36 -0700 Add SPI to tell the client where the snapshot is. rdar://problem/18105827 1031771 1 237248 thorton 2014-08-27 14:09:01 -0700 Created attachment 237248 patch 1031774 2 commit-queue 2014-08-27 14:11:59 -0700 Attachment 237248 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/mac/PageClientImpl.h:112: The parameter name "layer" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1031858 3 237248 simon.fraser 2014-08-27 17:39:27 -0700 Comment on attachment 237248 patch View in context: https://bugs.webkit.org/attachment.cgi?id=237248&action=review > Source/WebKit2/UIProcess/PageClient.h:234 > + virtual CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) = 0; const? > Source/WebKit2/UIProcess/WebPageProxy.h:512 > + CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *); const? > Source/WebKit2/UIProcess/mac/PageClientImpl.h:112 > + CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *layer); const? 1031869 4 thorton 2014-08-27 18:24:33 -0700 http://trac.webkit.org/changeset/173040 237248 2014-08-27 14:09:01 -0700 2014-08-27 17:39:27 -0700 patch snapshot-reporting.diff text/plain 11468 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkYzY2ZTM3Li41M2FmMTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEg QEAKKzIwMTQtMDgtMjcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgV2ViS2l0MiBzd2lwZSBnZXN0dXJlIHNob3VsZCByZXBvcnQgdGhlIHBvc2l0aW9u IG9mIHRoZSBzbmFwc2hvdCB0byB0aGUgY2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzYzMDgKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTgx MDU4MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF9zZXREaWRNb3ZlU3dpcGVT bmFwc2hvdENhbGxiYWNrOl0pOgorICAgICAgICBBZGQgX3NldERpZE1vdmVTd2lwZVNuYXBzaG90 Q2FsbGJhY2ssIGFuZCBwbHVtYiBpdCB0byBWaWV3R2VzdHVyZUNvbnRyb2xsZXIuCisgICAgICAg IENhbGxlcnMgcHJvdmlkZSBhIGJsb2NrIHdoaWNoIGlzIGNhbGxlZCB3aGVuZXZlciBWaWV3R2Vz dHVyZUNvbnRyb2xsZXIgbW92ZXMgdGhlCisgICAgICAgIHN3aXBlICpzbmFwc2hvdCogbGF5ZXIg YXJvdW5kLgorCisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9QYWdlQ2xp ZW50SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW06Cisg ICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpib3VuZHNPZkxheWVySW5MYXllckJhY2tl ZFdpbmRvd0Nvb3JkaW5hdGVzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94 eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpib3VuZHNPZkxheWVySW5M YXllckJhY2tlZFdpbmRvd0Nvb3JkaW5hdGVzKToKKyAgICAgICAgRXhwb3NlIGEgTWFjLW9ubHkg d2F5IHRvIGdldCB0aGUgYm91bmRzIG9mIGEgZ2l2ZW4gQ0FMYXllciBpbiB3aW5kb3cgY29vcmRp bmF0ZXMsCisgICAgICAgIHJlc3BlY3RpbmcgdHJhbnNmb3Jtcy4gVGhpcyBvbmx5IHdvcmtzIGZv ciBsYXllci1iYWNrZWQgd2luZG93cyBiZWNhdXNlCisgICAgICAgIGl0IHVzZXMgQ0EgaW4gb3Jk ZXIgdG8gZG8gdGhlIG1hcHBpbmcgcmVzcGVjdGluZyB0cmFuc2Zvcm1zLgorICAgICAgICAKKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tOgorICAgICAgICAoV2Vi S2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlZpZXdHZXN0dXJlQ29udHJvbGxlcik6CisgICAg ICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6flZpZXdHZXN0dXJlQ29udHJvbGxl cik6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6c2V0RGlkTW92ZVN3 aXBlU25hcHNob3RDYWxsYmFjayk6CisgICAgICAgIERvIHRoZSBCbG9ja19jb3B5IGFuZCBCbG9j a19yZWxlYXNlIGRhbmNlIHRvIGtlZXAgb3VyIGNvcHkgb2YgdGhlIGNhbGxiYWNrIGJsb2NrLgor CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6YmVnaW5Td2lwZUdlc3R1 cmUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmhhbmRsZVN3aXBl R2VzdHVyZSk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZGlkTW92 ZVN3aXBlU25hcHNob3RMYXllcik6CisgICAgICAgIFdoZW4gdGhlIHN3aXBlIHNuYXBzaG90IGxh eWVyIG1vdmVzIGFyb3VuZCwgY2FsbCB0aGUgYmxvY2suCisKIDIwMTQtMDgtMjYgIE1hdHQgTGls ZWsgIDxtcmxAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBXZWJLaXQgU1BJIHRvIGNvbnRyb2wg dGhlIG5hdmlnYXRvci5zdGFuZGFsb25lIHByb3BlcnR5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3UHJpdmF0ZS5oCmluZGV4IGY4YWFmMDAuLjNiNTJh MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3 UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3 UHJpdmF0ZS5oCkBAIC0xMTMsNiArMTEzLDggQEAKIC8vIFRoZSB0b3AgY29udGVudCBpbnNldCBp cyBhcHBsaWVkIGluIHRoZSB3aW5kb3cncyBjb29yZGluYXRlIHNwYWNlLCB0byB0aGUgdW5pb24g b2YgdGhlIGN1c3RvbSBzd2lwZSB2aWV3J3MgZnJhbWVzLgogLSAodm9pZClfc2V0Q3VzdG9tU3dp cGVWaWV3c1RvcENvbnRlbnRJbnNldDooZmxvYXQpdG9wQ29udGVudEluc2V0OwogLSAoQk9PTClf dHJ5VG9Td2lwZVdpdGhFdmVudDooTlNFdmVudCAqKWV2ZW50IGlnbm9yaW5nUGlubmVkU3RhdGU6 KEJPT0wpaWdub3JpbmdQaW5uZWRTdGF0ZTsKKy8vIFRoZSByZWN0IHJldHVybmVkIGlzIGFsd2F5 cyB0aGF0IG9mIHRoZSBzbmFwc2hvdCwgbm90IG5lY2Vzc2FyaWx5IHRoZSBzd2lwaW5nIGxheWVy LiBUaGlzIG9ubHkgd29ya3MgZm9yIGxheWVyLWJhY2tlZCB3aW5kb3dzLgorLSAodm9pZClfc2V0 RGlkTW92ZVN3aXBlU25hcHNob3RDYWxsYmFjazoodm9pZCheKShDR1JlY3Qgc3dpcGVTbmFwc2hv dFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzKSljYWxsYmFjazsKIAogI2VuZGlmCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQppbmRleCBiYmRlN2ZlLi43NThiYzkx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0K KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCkBAIC00MDgw LDYgKzQwODAsMTUgQEAgLSAoQk9PTClfdHJ5VG9Td2lwZVdpdGhFdmVudDooTlNFdmVudCAqKWV2 ZW50IGlnbm9yaW5nUGlubmVkU3RhdGU6KEJPT0wpaWdub3JpbmcKICAgICByZXR1cm4gaGFuZGxl ZEV2ZW50OwogfQogCistICh2b2lkKV9zZXREaWRNb3ZlU3dpcGVTbmFwc2hvdENhbGxiYWNrOih2 b2lkKF4pKENHUmVjdCkpY2FsbGJhY2sKK3sKKyAgICBpZiAoIV9kYXRhLT5fYWxsb3dzQmFja0Zv cndhcmROYXZpZ2F0aW9uR2VzdHVyZXMpCisgICAgICAgIHJldHVybjsKKworICAgIFtzZWxmIF9l bnN1cmVHZXN0dXJlQ29udHJvbGxlcl07CisgICAgX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxlci0+ c2V0RGlkTW92ZVN3aXBlU25hcHNob3RDYWxsYmFjayhjYWxsYmFjayk7Cit9CisKICNpZiBfX01B Q19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAogCiAtICh2b2lkKV9zZXRBdXRv bWF0aWNhbGx5QWRqdXN0c0NvbnRlbnRJbnNldHM6KEJPT0wpYXV0b21hdGljYWxseUFkanVzdHND b250ZW50SW5zZXRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNs aWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCBkNzgx ZmNmLi5hODkyZmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNs aWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKQEAgLTIz MSw2ICsyMzEsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHJlY29tbWVuZGVkU2Nyb2xs YmFyU3R5bGVEaWRDaGFuZ2UoaW50MzJfdCBuZXdTdHlsZSkgPSAwOwogICAgIHZpcnR1YWwgdm9p ZCByZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90KCkgPSAwOwogCisgICAgdmlydHVhbCBD R1JlY3QgYm91bmRzT2ZMYXllckluTGF5ZXJCYWNrZWRXaW5kb3dDb29yZGluYXRlcyhDQUxheWVy ICopID0gMDsKKwogICAgIHZpcnR1YWwgQ29sb3JTcGFjZURhdGEgY29sb3JTcGFjZSgpID0gMDsK IAogI2lmIFVTRShBUFBLSVQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK aW5kZXggNzcwOTQxZS4uMDJjYjY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaApAQCAtNTA5LDYgKzUwOSw3IEBAIHB1YmxpYzoKIAogICAgIFdLVmlldyogd2tWaWV3 KCkgY29uc3Q7CiAgICAgdm9pZCBpbnRyaW5zaWNDb250ZW50U2l6ZURpZENoYW5nZShjb25zdCBX ZWJDb3JlOjpJbnRTaXplJiBpbnRyaW5zaWNDb250ZW50U2l6ZSk7CisgICAgQ0dSZWN0IGJvdW5k c09mTGF5ZXJJbkxheWVyQmFja2VkV2luZG93Q29vcmRpbmF0ZXMoQ0FMYXllciAqKTsKICNlbmRp ZgogI2VuZGlmIC8vIFBMQVRGT1JNKENPQ09BKQogI2lmIFBMQVRGT1JNKEVGTCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwuaAppbmRleCA3NWViMjE0Li41 ODE0NjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGll bnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1w bC5oCkBAIC0xMDgsNyArMTA4LDkgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIFdlYkNvcmU6Oklu dFBvaW50IGFjY2Vzc2liaWxpdHlTY3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IFdlYkNvcmU6OkludFBv aW50JikgPSAwOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVjdCByb290Vmlld1RvQWNjZXNz aWJpbGl0eVNjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JikgPSAwOwogI2VuZGlmCi0gICAg ICAgIAorCisgICAgQ0dSZWN0IGJvdW5kc09mTGF5ZXJJbkxheWVyQmFja2VkV2luZG93Q29vcmRp bmF0ZXMoQ0FMYXllciAqbGF5ZXIpOworCiAgICAgdmlydHVhbCB2b2lkIGRvbmVXaXRoS2V5RXZl bnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYsIGJvb2wgd2FzRXZlbnRIYW5kbGVkKTsK IAogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxXZWJQb3B1cE1lbnVQcm94eT4gY3JlYXRlUG9wdXBN ZW51UHJveHkoV2ViUGFnZVByb3h5Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9QYWdlQ2xpZW50SW1wbC5tbQppbmRleCAzYzk2ZTdlLi5mNjZhMTE4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0KQEAgLTc0Miw2ICs3NDIs MTQgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6cmVtb3ZlTmF2aWdhdGlvbkdlc3R1cmVTbmFwc2hv dCgpCiAgICAgW21fd2tWaWV3IF9yZW1vdmVOYXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90XTsKIH0K IAorQ0dSZWN0IFBhZ2VDbGllbnRJbXBsOjpib3VuZHNPZkxheWVySW5MYXllckJhY2tlZFdpbmRv d0Nvb3JkaW5hdGVzKENBTGF5ZXIgKmxheWVyKQoreworICAgIENBTGF5ZXIgKndpbmRvd0NvbnRl bnRMYXllciA9IHN0YXRpY19jYXN0PE5TVmlldyAqPihtX3drVmlldy53aW5kb3cuY29udGVudFZp ZXcpLmxheWVyOworICAgIEFTU0VSVCh3aW5kb3dDb250ZW50TGF5ZXIpOworCisgICAgcmV0dXJu IFt3aW5kb3dDb250ZW50TGF5ZXIgY29udmVydFJlY3Q6bGF5ZXIuYm91bmRzIGZyb21MYXllcjps YXllcl07Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gUExBVEZPUk0o TUFDKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVy ZUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVD b250cm9sbGVyLmgKaW5kZXggODQzNTc1NC4uYjM5MDZkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCkBAIC0xMDAsNiAr MTAwLDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q3VzdG9tU3dpcGVWaWV3cyhWZWN0b3I8UmV0 YWluUHRyPE5TVmlldz4+IHZpZXdzKSB7IG1fY3VzdG9tU3dpcGVWaWV3cyA9IFdURjo6bW92ZSh2 aWV3cyk7IH0KICAgICB2b2lkIHNldEN1c3RvbVN3aXBlVmlld3NUb3BDb250ZW50SW5zZXQoZmxv YXQgdG9wQ29udGVudEluc2V0KSB7IG1fY3VzdG9tU3dpcGVWaWV3c1RvcENvbnRlbnRJbnNldCA9 IHRvcENvbnRlbnRJbnNldDsgfQogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCB3aW5kb3dSZWxhdGl2 ZUJvdW5kc0ZvckN1c3RvbVN3aXBlVmlld3MoKSBjb25zdDsKKyAgICB2b2lkIHNldERpZE1vdmVT d2lwZVNuYXBzaG90Q2FsbGJhY2sodm9pZCheKShDR1JlY3QpKTsKIAogICAgIHZvaWQgZW5kQWN0 aXZlR2VzdHVyZSgpOwogCkBAIC0xNDgsNiArMTQ5LDcgQEAgcHJpdmF0ZToKICAgICBDQUxheWVy ICpkZXRlcm1pbmVTbmFwc2hvdExheWVyUGFyZW50KCkgY29uc3Q7CiAgICAgQ0FMYXllciAqZGV0 ZXJtaW5lTGF5ZXJBZGphY2VudFRvU25hcHNob3RGb3JQYXJlbnQoU3dpcGVEaXJlY3Rpb24sIENB TGF5ZXIgKnNuYXBzaG90TGF5ZXJQYXJlbnQpIGNvbnN0OwogICAgIHZvaWQgYXBwbHlEZWJ1Z2dp bmdQcm9wZXJ0aWVzVG9Td2lwZVZpZXdzKCk7CisgICAgdm9pZCBkaWRNb3ZlU3dpcGVTbmFwc2hv dExheWVyKCk7CiAjZW5kaWYKIAogICAgIFdlYlBhZ2VQcm94eSYgbV93ZWJQYWdlUHJveHk7CkBA IC0xODksNiArMTkxLDggQEAgcHJpdmF0ZToKICAgICBTd2lwZURpcmVjdGlvbiBtX3BlbmRpbmdT d2lwZURpcmVjdGlvbjsKICAgICBXZWJDb3JlOjpGbG9hdFNpemUgbV9jdW11bGF0aXZlRGVsdGFG b3JQZW5kaW5nU3dpcGU7CiAKKyAgICB2b2lkIChebV9kaWRNb3ZlU3dpcGVTbmFwc2hvdENhbGxi YWNrKShDR1JlY3QpOworCiAgICAgYm9vbCBtX3Nob3VsZElnbm9yZVBpbm5lZFN0YXRlOwogCiAg ICAgYm9vbCBtX3N3aXBlV2FpdGluZ0ZvclZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQ7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlck1h Yy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVy TWFjLm1tCmluZGV4IDA0MWQ1MjEuLjliNzFiOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyTWFjLm1tCkBAIC0xMDYs NiArMTA2LDcgQEAgVmlld0dlc3R1cmVDb250cm9sbGVyOjpWaWV3R2VzdHVyZUNvbnRyb2xsZXIo V2ViUGFnZVByb3h5JiB3ZWJQYWdlUHJveHkpCiAgICAgLCBtX3N3aXBlVHJhbnNpdGlvblN0eWxl KFN3aXBlVHJhbnNpdGlvblN0eWxlOjpPdmVybGFwKQogICAgICwgbV9jdXN0b21Td2lwZVZpZXdz VG9wQ29udGVudEluc2V0KDApCiAgICAgLCBtX3BlbmRpbmdTd2lwZVJlYXNvbihQZW5kaW5nU3dp cGVSZWFzb246Ok5vbmUpCisgICAgLCBtX2RpZE1vdmVTd2lwZVNuYXBzaG90Q2FsbGJhY2sobnVs bHB0cikKICAgICAsIG1fc2hvdWxkSWdub3JlUGlubmVkU3RhdGUoZmFsc2UpCiAgICAgLCBtX3N3 aXBlV2FpdGluZ0ZvclZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQoZmFsc2UpCiAgICAgLCBtX3N3aXBl V2FpdGluZ0ZvclJlbmRlclRyZWVTaXplVGhyZXNob2xkKGZhbHNlKQpAQCAtMTIzLDYgKzEyNCwx MSBAQCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6On5WaWV3R2VzdHVyZUNvbnRyb2xsZXIoKQogICAg IGlmIChtX2FjdGl2ZUdlc3R1cmVUeXBlID09IFZpZXdHZXN0dXJlVHlwZTo6U3dpcGUpCiAgICAg ICAgIHJlbW92ZVN3aXBlU25hcHNob3QoKTsKIAorICAgIGlmIChtX2RpZE1vdmVTd2lwZVNuYXBz aG90Q2FsbGJhY2spIHsKKyAgICAgICAgQmxvY2tfcmVsZWFzZShtX2RpZE1vdmVTd2lwZVNuYXBz aG90Q2FsbGJhY2spOworICAgICAgICBtX2RpZE1vdmVTd2lwZVNuYXBzaG90Q2FsbGJhY2sgPSBu dWxscHRyOworICAgIH0KKwogICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3MoKS5yZW1vdmVNZXNz YWdlUmVjZWl2ZXIoTWVzc2FnZXM6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6bWVzc2FnZVJlY2Vp dmVyTmFtZSgpLCBtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKQEAgLTMxNSw2ICszMjEs MTMgQEAgYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmRlbHRhSXNTdWZmaWNpZW50VG9CZWdp blN3aXBlKE5TRXZlbnQgKmV2ZW50KQogICAgIHJldHVybiB0cnVlOwogfQogCit2b2lkIFZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6c2V0RGlkTW92ZVN3aXBlU25hcHNob3RDYWxsYmFjayh2b2lkKF5j YWxsYmFjaykoQ0dSZWN0KSkKK3sKKyAgICBpZiAobV9kaWRNb3ZlU3dpcGVTbmFwc2hvdENhbGxi YWNrKQorICAgICAgICBCbG9ja19yZWxlYXNlKG1fZGlkTW92ZVN3aXBlU25hcHNob3RDYWxsYmFj ayk7CisgICAgbV9kaWRNb3ZlU3dpcGVTbmFwc2hvdENhbGxiYWNrID0gQmxvY2tfY29weShjYWxs YmFjayk7Cit9CisKIGJvb2wgVmlld0dlc3R1cmVDb250cm9sbGVyOjpoYW5kbGVTY3JvbGxXaGVl bEV2ZW50KE5TRXZlbnQgKmV2ZW50KQogewogICAgIGlmIChldmVudC5waGFzZSA9PSBOU0V2ZW50 UGhhc2VFbmRlZCkgewpAQCAtNTk1LDYgKzYwOCw4IEBAIHZvaWQgVmlld0dlc3R1cmVDb250cm9s bGVyOjpiZWdpblN3aXBlR2VzdHVyZShXZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0YXJnZXRJdGVt CiAgICAgICAgIFtzbmFwc2hvdExheWVyUGFyZW50IGluc2VydFN1YmxheWVyOm1fc3dpcGVMYXll ci5nZXQoKSBiZWxvdzpsYXllckFkamFjZW50VG9TbmFwc2hvdF07CiAgICAgZWxzZQogICAgICAg ICBbc25hcHNob3RMYXllclBhcmVudCBpbnNlcnRTdWJsYXllcjptX3N3aXBlTGF5ZXIuZ2V0KCkg YWJvdmU6bGF5ZXJBZGphY2VudFRvU25hcHNob3RdOworCisgICAgZGlkTW92ZVN3aXBlU25hcHNo b3RMYXllcigpOwogfQogCiB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6aGFuZGxlU3dpcGVH ZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0sIGRvdWJsZSBwcm9ncmVz cywgU3dpcGVEaXJlY3Rpb24gZGlyZWN0aW9uKQpAQCAtNjEzLDggKzYyOCwxMCBAQCB2b2lkIFZp ZXdHZXN0dXJlQ29udHJvbGxlcjo6aGFuZGxlU3dpcGVHZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlz dEl0ZW0qIHRhcmdldEl0ZQogICAgIGRvdWJsZSBzd2lwaW5nTGF5ZXJPZmZzZXQgPSBmbG9vcih3 aWR0aCAqIHByb2dyZXNzKTsKIAogICAgIGlmIChtX3N3aXBlVHJhbnNpdGlvblN0eWxlID09IFN3 aXBlVHJhbnNpdGlvblN0eWxlOjpPdmVybGFwKSB7Ci0gICAgICAgIGlmIChkaXJlY3Rpb24gPT0g U3dpcGVEaXJlY3Rpb246OlJpZ2h0KQorICAgICAgICBpZiAoZGlyZWN0aW9uID09IFN3aXBlRGly ZWN0aW9uOjpSaWdodCkgewogICAgICAgICAgICAgW21fc3dpcGVMYXllciBzZXRUcmFuc2Zvcm06 Q0FUcmFuc2Zvcm0zRE1ha2VUcmFuc2xhdGlvbih3aWR0aCArIHN3aXBpbmdMYXllck9mZnNldCwg MCwgMCldOworICAgICAgICAgICAgZGlkTW92ZVN3aXBlU25hcHNob3RMYXllcigpOworICAgICAg ICB9CiAgICAgfSBlbHNlIGlmIChtX3N3aXBlVHJhbnNpdGlvblN0eWxlID09IFN3aXBlVHJhbnNp dGlvblN0eWxlOjpQdXNoKQogICAgICAgICBbbV9zd2lwZUxheWVyIHNldFRyYW5zZm9ybTpDQVRy YW5zZm9ybTNETWFrZVRyYW5zbGF0aW9uKChkaXJlY3Rpb24gPT0gU3dpcGVEaXJlY3Rpb246Okxl ZnQgPyAtd2lkdGggOiB3aWR0aCkgKyBzd2lwaW5nTGF5ZXJPZmZzZXQsIDAsIDApXTsKIApAQCAt NjI3LDYgKzY0NCwxNCBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6aGFuZGxlU3dpcGVH ZXN0dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZQogICAgIH0KIH0KIAordm9p ZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmRpZE1vdmVTd2lwZVNuYXBzaG90TGF5ZXIoKQorewor ICAgIGlmICghbV9kaWRNb3ZlU3dpcGVTbmFwc2hvdENhbGxiYWNrKQorICAgICAgICByZXR1cm47 CisKKyAgICBtX2RpZE1vdmVTd2lwZVNuYXBzaG90Q2FsbGJhY2sobV93ZWJQYWdlUHJveHkuYm91 bmRzT2ZMYXllckluTGF5ZXJCYWNrZWRXaW5kb3dDb29yZGluYXRlcyhtX3N3aXBlTGF5ZXIuZ2V0 KCkpKTsKK30KKwogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZFN3aXBlR2VzdHVyZShX ZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0YXJnZXRJdGVtLCBib29sIGNhbmNlbGxlZCkKIHsKICAg ICBBU1NFUlQobV9hY3RpdmVHZXN0dXJlVHlwZSA9PSBWaWV3R2VzdHVyZVR5cGU6OlN3aXBlKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFj Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KaW5k ZXggNjNkNDJjNS4uMWY4ZjJiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9XZWJQYWdlUHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9XZWJQYWdlUHJveHlNYWMubW0KQEAgLTY2Myw2ICs2NjMsMTEgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OnNob3dTZWxlY3Rpb25TZXJ2aWNlTWVudShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIHNl bGVjdGlvbkEKIH0KICNlbmRpZgogCitDR1JlY3QgV2ViUGFnZVByb3h5Ojpib3VuZHNPZkxheWVy SW5MYXllckJhY2tlZFdpbmRvd0Nvb3JkaW5hdGVzKENBTGF5ZXIgKmxheWVyKQoreworICAgIHJl dHVybiBtX3BhZ2VDbGllbnQuYm91bmRzT2ZMYXllckluTGF5ZXJCYWNrZWRXaW5kb3dDb29yZGlu YXRlcyhsYXllcik7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gUExB VEZPUk0oTUFDKQo=