134999 2014-07-16 18:08:07 -0700 Provide a mechanism to grab the back-forward list for gesture navigation purposes from another WKWebView 2014-07-21 17:24:28 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton benjamin mitz simon.fraser yongjun_zhang oldest_to_newest 1022894 0 thorton 2014-07-16 18:08:07 -0700 <rdar://problem/17238025> 1022898 1 235041 thorton 2014-07-16 18:12:05 -0700 Created attachment 235041 patch 1023826 2 thorton 2014-07-21 17:24:28 -0700 http://trac.webkit.org/changeset/171219 235041 2014-07-16 18:12:05 -0700 2014-07-17 15:51:11 -0700 patch customswipe.diff text/plain 13696 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0YjExOTJlLi5jODY3MGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDgg QEAKKzIwMTQtMDctMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW1dLMl0gUHJvdmlkZSBhIG1lY2hhbmlzbSB0byBncmFiIHRoZSBiYWNrLWZvcndh cmQgbGlzdCBmb3IgZ2VzdHVyZSBuYXZpZ2F0aW9uIHB1cnBvc2VzIGZyb20gYW5vdGhlciBXS1dl YlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEz NDk5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTcyMzgwMjU+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gc29tZSBjYXNlcywgY2xpZW50cyBt YXkgbmVlZCB0byB0aHJvdyBhIFdLV2ViVmlldyB3aXRoIG5vIGJhY2stZm9yd2FyZCBsaXN0IG92 ZXIKKyAgICAgICAgYW5vdGhlciBXS1dlYlZpZXcsIGFuZCB3YW50IHRvIHBhcnRpY2lwYXRlIGlu IGdlc3R1cmUgc3dpcGUgYXMgaWYgdGhleSB3ZXJlIGFjdHVhbGx5CisgICAgICAgIHRoZSBwYWdl IGJlaW5nIG92ZXJsYWlkLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBzZXRBbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRp b25HZXN0dXJlczpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0Nv bmZpZ3VyYXRpb24ubW06CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gY29weVdp dGhab25lOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF9hbHRlcm5hdGVX ZWJWaWV3Rm9yTmF2aWdhdGlvbkdlc3R1cmVzXSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZp Z3VyYXRpb24gX3NldEFsdGVybmF0ZVdlYlZpZXdGb3JOYXZpZ2F0aW9uR2VzdHVyZXM6XSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJpdmF0 ZS5oOgorICAgICAgICBLZWVwIGFuICJhbHRlcm5hdGUiIFdLV2ViVmlldyAiZm9yIG5hdmlnYXRp b24gZ2VzdHVyZXMiLCB3aGljaCBWaWV3R2VzdHVyZUNvbnRyb2xsZXIKKyAgICAgICAgd2lsbCB1 c2UgYXMgdGhlIHJlYWwgc291cmNlIG9mIGJhY2stZm9yd2FyZCBpdGVtcywgYW5kIHRoZSBkZXN0 aW5hdGlvbiBvZiB0aGUgc3dpcGUgbmF2aWdhdGlvbi4KKyAgICAgICAgQWxsIHN3aXBlIGRlbGVn YXRlIGNhbGxiYWNrcyB3aWxsIGFsc28gZmlyZSBmcm9tIHRoZSBhbHRlcm5hdGUgdmlldywgYmVj YXVzZSBpdCBvd25zIHRoZSBpdGVtcworICAgICAgICBhbmQgd2lsbCBiZSBkb2luZyB0aGUgbmF2 aWdhdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvVmlld0dlc3R1cmVDb250cm9sbGVy SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnNldEFsdGVy bmF0ZUJhY2tGb3J3YXJkTGlzdFNvdXJjZVZpZXcpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2Vz dHVyZUNvbnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0dXJlKToKKyAgICAgICAgU2VuZCBuYXZpZ2F0 aW9uR2VzdHVyZURpZEJlZ2luIHZpYSB0aGUgYWx0ZXJuYXRlIHZpZXcncyBXZWJQYWdlUHJveHkg aWYgaXQgZXhpc3RzLgorICAgICAgICBSZWNvcmQgYSBuZXcgc25hcHNob3Qgb24gdGhlIGN1cnJl bnQgcGFnZSwgYnV0IGNvcHkgaXQgdG8gdGhlIGFsdGVybmF0ZSB2aWV3IGlmIG5lY2Vzc2FyeSwK KyAgICAgICAgc28gdGhhdCB3aGVuIHN3aXBpbmcgZm9yd2FyZCBmcm9tIHRoZSBhbHRlcm5hdGUg dmlldywgaXQgd2lsbCBoYXZlIHRoZSAicmlnaHQiIHNuYXBzaG90LgorICAgICAgICBHZXQgdGhl IHRhcmdldCBiYWNrIGZvcndhcmQgaXRlbSBmcm9tIHRoZSBhbHRlcm5hdGUgdmlldy4KKyAgICAg ICAgU2VuZCBuYXZpZ2F0aW9uR2VzdHVyZVdpbGxFbmQgdmlhIHRoZSBhbHRlcm5hdGUgdmlldydz IFdlYlBhZ2VQcm94eSBpZiBpdCBleGlzdHMuCisKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1 cmVDb250cm9sbGVyOjpjYW5Td2lwZUluRGlyZWN0aW9uKToKKyAgICAgICAgRGV0ZXJtaW5lIGlm IHdlIGNhbiBzd2lwZSBpbiBhIGRpcmVjdGlvbiBieSBsb29raW5nIGF0IHRoZSBhbHRlcm5hdGUg dmlldydzIGJhY2stZm9yd2FyZCBsaXN0IGlmIG5lY2Vzc2FyeS4KKworICAgICAgICAoV2ViS2l0 OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZFN3aXBlR2VzdHVyZSk6CisgICAgICAgIFNlbmQg bmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQgdmlhIHRoZSBhbHRlcm5hdGUgdmlldydzIFdlYlBhZ2VQ cm94eSBpZiBpdCBleGlzdHMuCisgICAgICAgIFBlcmZvcm0gdGhlIG5hdmlnYXRpb24gb24gdGhl IGFsdGVybmF0ZSB2aWV3IGlmIG5lY2Vzc2FyeS4KKworICAgICAgICAoV2ViS2l0OjpWaWV3R2Vz dHVyZUNvbnRyb2xsZXI6OnJlbW92ZVN3aXBlU25hcHNob3QpOgorICAgICAgICBTZW5kIG5hdmln YXRpb25HZXN0dXJlU25hcHNob3RXYXNSZW1vdmVkIHZpYSB0aGUgYWx0ZXJuYXRlIHZpZXcncyBX ZWJQYWdlUHJveHkgaWYgaXQgZXhpc3RzLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXIuaDoKKwogMjAxNC0wNy0xNSAgVGltb3RoeSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzcGF0Y2ggdG9wIGNvbnRlbnQgaW5z ZXQgY2hhbmdlcyBpbW1lZGlhdGVseSBpZiBzeW5jaHJvbm91c2x5IHdhaXRpbmcgZm9yIHZpZXcg c3RhdGUgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbQppbmRleCAyM2NiZWQ3Li4xNGMxZmJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMTQ0NCw2ICsxNDQ0LDcgQEAg LSAodm9pZClzZXRBbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJlczooQk9PTClhbGxv d3NCYWNrRm9yd2FyZE5hdmlnYXRpb24KICAgICAgICAgaWYgKCFfZ2VzdHVyZUNvbnRyb2xsZXIp IHsKICAgICAgICAgICAgIF9nZXN0dXJlQ29udHJvbGxlciA9IHN0ZDo6bWFrZV91bmlxdWU8V2Vi S2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI+KCpfcGFnZSk7CiAgICAgICAgICAgICBfZ2VzdHVy ZUNvbnRyb2xsZXItPmluc3RhbGxTd2lwZUhhbmRsZXIoc2VsZiwgW3NlbGYgc2Nyb2xsVmlld10p OworICAgICAgICAgICAgX2dlc3R1cmVDb250cm9sbGVyLT5zZXRBbHRlcm5hdGVCYWNrRm9yd2Fy ZExpc3RTb3VyY2VWaWV3KFtfY29uZmlndXJhdGlvbiBfYWx0ZXJuYXRlV2ViVmlld0Zvck5hdmln YXRpb25HZXN0dXJlc10pOwogICAgICAgICB9CiAgICAgfSBlbHNlCiAgICAgICAgIF9nZXN0dXJl Q29udHJvbGxlciA9IG51bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb24ubW0KaW5kZXggMGU1NDhl Mi4uMzA0YTQ4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdDb25maWd1cmF0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQpAQCAtNzMsNiArNzMsNyBAQCBA aW1wbGVtZW50YXRpb24gV0tXZWJWaWV3Q29uZmlndXJhdGlvbiB7CiAgICAgTGF6eUluaXRpYWxp emVkPF9XS1Zpc2l0ZWRMaW5rUHJvdmlkZXI+IF92aXNpdGVkTGlua1Byb3ZpZGVyOwogICAgIExh enlJbml0aWFsaXplZDxfV0tXZWJzaXRlRGF0YVN0b3JlPiBfd2Vic2l0ZURhdGFTdG9yZTsKICAg ICBXZWJLaXQ6OldlYWtPYmpDUHRyPFdLV2ViVmlldz4gX3JlbGF0ZWRXZWJWaWV3OworICAgIFdl YktpdDo6V2Vha09iakNQdHI8V0tXZWJWaWV3PiBfYWx0ZXJuYXRlV2ViVmlld0Zvck5hdmlnYXRp b25HZXN0dXJlczsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9ncm91cElkZW50aWZpZXI7CiAj aWYgUExBVEZPUk0oSU9TKQogICAgIExhenlJbml0aWFsaXplZDxXS1dlYlZpZXdDb250ZW50UHJv dmlkZXJSZWdpc3RyeT4gX2NvbnRlbnRQcm92aWRlclJlZ2lzdHJ5OwpAQCAtMTA3LDYgKzEwOCw3 IEBAIC0gKGlkKWNvcHlXaXRoWm9uZTooTlNab25lICopem9uZQogICAgIGNvbmZpZ3VyYXRpb24u X3Zpc2l0ZWRMaW5rUHJvdmlkZXIgPSBzZWxmLl92aXNpdGVkTGlua1Byb3ZpZGVyOwogICAgIGNv bmZpZ3VyYXRpb24uX3dlYnNpdGVEYXRhU3RvcmUgPSBzZWxmLl93ZWJzaXRlRGF0YVN0b3JlOwog ICAgIGNvbmZpZ3VyYXRpb24uX3JlbGF0ZWRXZWJWaWV3ID0gX3JlbGF0ZWRXZWJWaWV3LmdldCgp LmdldCgpOworICAgIGNvbmZpZ3VyYXRpb24uX2FsdGVybmF0ZVdlYlZpZXdGb3JOYXZpZ2F0aW9u R2VzdHVyZXMgPSBfYWx0ZXJuYXRlV2ViVmlld0Zvck5hdmlnYXRpb25HZXN0dXJlcy5nZXQoKS5n ZXQoKTsKICNpZiBQTEFURk9STShJT1MpCiAgICAgY29uZmlndXJhdGlvbi5fY29udGVudFByb3Zp ZGVyUmVnaXN0cnkgPSBzZWxmLl9jb250ZW50UHJvdmlkZXJSZWdpc3RyeTsKICNlbmRpZgpAQCAt MjIxLDYgKzIyMywxNiBAQCAtICh2b2lkKV9zZXRSZWxhdGVkV2ViVmlldzooV0tXZWJWaWV3ICop cmVsYXRlZFdlYlZpZXcKICAgICBfcmVsYXRlZFdlYlZpZXcgPSByZWxhdGVkV2ViVmlldzsKIH0K IAorLSAoV0tXZWJWaWV3ICopX2FsdGVybmF0ZVdlYlZpZXdGb3JOYXZpZ2F0aW9uR2VzdHVyZXMK K3sKKyAgICByZXR1cm4gX2FsdGVybmF0ZVdlYlZpZXdGb3JOYXZpZ2F0aW9uR2VzdHVyZXMuZ2V0 QXV0b3JlbGVhc2VkKCk7Cit9CisKKy0gKHZvaWQpX3NldEFsdGVybmF0ZVdlYlZpZXdGb3JOYXZp Z2F0aW9uR2VzdHVyZXM6KFdLV2ViVmlldyAqKWFsdGVybmF0ZVZpZXcKK3sKKyAgICBfYWx0ZXJu YXRlV2ViVmlld0Zvck5hdmlnYXRpb25HZXN0dXJlcyA9IGFsdGVybmF0ZVZpZXc7Cit9CisKIC0g KE5TU3RyaW5nICopX2dyb3VwSWRlbnRpZmllcgogewogICAgIHJldHVybiBfZ3JvdXBJZGVudGlm aWVyLmdldCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJpdmF0ZS5oCmluZGV4IDYyNGY3 NjAuLjQ3NGY2OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvblByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0NvbmZpZ3VyYXRpb25Qcml2YXRlLmgKQEAgLTQw LDYgKzQwLDggQEAKIAogQHByb3BlcnR5IChub25hdG9taWMsIHN0cm9uZywgc2V0dGVyPV9zZXRX ZWJzaXRlRGF0YVN0b3JlOikgX1dLV2Vic2l0ZURhdGFTdG9yZSAqX3dlYnNpdGVEYXRhU3RvcmU7 CiAKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCB3ZWFrLCBzZXR0ZXI9X3NldEFsdGVybmF0ZVdlYlZp ZXdGb3JOYXZpZ2F0aW9uR2VzdHVyZXM6KSBXS1dlYlZpZXcgKl9hbHRlcm5hdGVXZWJWaWV3Rm9y TmF2aWdhdGlvbkdlc3R1cmVzOworCiBAZW5kCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXJJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbQppbmRl eCBmNTcwYzcyLi41ZjZhZGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1ZpZXdHZXN0dXJlQ29udHJvbGxlcklPUy5tbQpAQCAtMzEsNiArMzEsOCBAQAog I2ltcG9ydCAiVmlld0dlc3R1cmVDb250cm9sbGVyTWVzc2FnZXMuaCIKICNpbXBvcnQgIlZpZXdH ZXN0dXJlR2VvbWV0cnlDb2xsZWN0b3JNZXNzYWdlcy5oIgogI2ltcG9ydCAiVmlld1NuYXBzaG90 U3RvcmUuaCIKKyNpbXBvcnQgIldLQmFja0ZvcndhcmRMaXN0SXRlbUludGVybmFsLmgiCisjaW1w b3J0ICJXS1dlYlZpZXdJbnRlcm5hbC5oIgogI2ltcG9ydCAiV2ViQmFja0ZvcndhcmRMaXN0Lmgi CiAjaW1wb3J0ICJXZWJQYWdlR3JvdXAuaCIKICNpbXBvcnQgIldlYlBhZ2VNZXNzYWdlcy5oIgpA QCAtMTQ2LDYgKzE0OCwxMSBAQCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6On5WaWV3R2VzdHVyZUNv bnRyb2xsZXIoKQogICAgIHZpZXdHZXN0dXJlQ29udHJvbGxlcnNGb3JBbGxQYWdlcygpLnJlbW92 ZShtX3dlYlBhZ2VQcm94eS5wYWdlSUQoKSk7CiB9CiAKK3ZvaWQgVmlld0dlc3R1cmVDb250cm9s bGVyOjpzZXRBbHRlcm5hdGVCYWNrRm9yd2FyZExpc3RTb3VyY2VWaWV3KFdLV2ViVmlldyAqdmll dykKK3sKKyAgICBtX2FsdGVybmF0ZUJhY2tGb3J3YXJkTGlzdFNvdXJjZVZpZXcgPSB2aWV3Owor fQorCiB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6aW5zdGFsbFN3aXBlSGFuZGxlcihVSVZp ZXcgKmdlc3R1cmVSZWNvZ25pemVyVmlldywgVUlWaWV3ICpzd2lwaW5nVmlldykKIHsKICAgICBB U1NFUlQoIW1fc3dpcGVJbnRlcmFjdGl2ZVRyYW5zaXRpb25EZWxlZ2F0ZSk7CkBAIC0xNTgsMTEg KzE2NSwyMCBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6YmVnaW5Td2lwZUdlc3R1cmUo X1VJTmF2aWdhdGlvbkludGVyYWN0aXZlVHJhbnNpdGlvbgogICAgIGlmIChtX2FjdGl2ZUdlc3R1 cmVUeXBlICE9IFZpZXdHZXN0dXJlVHlwZTo6Tm9uZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg bV93ZWJQYWdlUHJveHkubmF2aWdhdGlvbkdlc3R1cmVEaWRCZWdpbigpOworICAgIG1fd2ViUGFn ZVByb3h5Rm9yQmFja0ZvcndhcmRMaXN0Rm9yQ3VycmVudFN3aXBlID0gbV9hbHRlcm5hdGVCYWNr Rm9yd2FyZExpc3RTb3VyY2VWaWV3LmdldCgpID8gbV9hbHRlcm5hdGVCYWNrRm9yd2FyZExpc3RT b3VyY2VWaWV3LmdldCgpLT5fcGFnZSA6ICZtX3dlYlBhZ2VQcm94eTsKKworICAgIG1fd2ViUGFn ZVByb3h5Rm9yQmFja0ZvcndhcmRMaXN0Rm9yQ3VycmVudFN3aXBlLT5uYXZpZ2F0aW9uR2VzdHVy ZURpZEJlZ2luKCk7CisKKyAgICBtX3dlYlBhZ2VQcm94eS5yZWNvcmROYXZpZ2F0aW9uU25hcHNo b3QoKTsKIAotICAgIFZpZXdTbmFwc2hvdFN0b3JlOjpzaGFyZWQoKS5yZWNvcmRTbmFwc2hvdCht X3dlYlBhZ2VQcm94eSk7CisgICAgYXV0byBiYWNrRm9yd2FyZExpc3QgPSBtX3dlYlBhZ2VQcm94 eUZvckJhY2tGb3J3YXJkTGlzdEZvckN1cnJlbnRTd2lwZS0+YmFja0ZvcndhcmRMaXN0KCk7CiAK LSAgICBXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0gPSBkaXJlY3Rp b24gPT0gU3dpcGVEaXJlY3Rpb246OkxlZnQgPyBtX3dlYlBhZ2VQcm94eS5iYWNrRm9yd2FyZExp c3QoKS5iYWNrSXRlbSgpIDogbV93ZWJQYWdlUHJveHkuYmFja0ZvcndhcmRMaXN0KCkuZm9yd2Fy ZEl0ZW0oKTsKKyAgICAvLyBDb3B5IHRoZSBzbmFwc2hvdCBmcm9tIHRoaXMgdmlldyB0byB0aGUg b25lIHRoYXQgb3ducyB0aGUgYmFjayBmb3J3YXJkIGxpc3QsIHNvIHRoYXQKKyAgICAvLyBzd2lw aW5nIGZvcndhcmQgd2lsbCBoYXZlIHRoZSBjb3JyZWN0IHNuYXBzaG90LgorICAgIGlmIChtX3dl YlBhZ2VQcm94eUZvckJhY2tGb3J3YXJkTGlzdEZvckN1cnJlbnRTd2lwZSAhPSAmbV93ZWJQYWdl UHJveHkpCisgICAgICAgIGJhY2tGb3J3YXJkTGlzdC5jdXJyZW50SXRlbSgpLT5zZXRTbmFwc2hv dChtX3dlYlBhZ2VQcm94eS5iYWNrRm9yd2FyZExpc3QoKS5jdXJyZW50SXRlbSgpLT5zbmFwc2hv dCgpKTsKKworICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0gPSBkaXJlY3Rp b24gPT0gU3dpcGVEaXJlY3Rpb246OkxlZnQgPyBiYWNrRm9yd2FyZExpc3QuYmFja0l0ZW0oKSA6 IGJhY2tGb3J3YXJkTGlzdC5mb3J3YXJkSXRlbSgpOwogCiAgICAgQ0dSZWN0IGxpdmVTd2lwZVZp ZXdGcmFtZSA9IFttX2xpdmVTd2lwZVZpZXcgZnJhbWVdOwogCkBAIC0yMTMsNyArMjI5LDcgQEAg dm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0dXJlKF9VSU5hdmlnYXRp b25JbnRlcmFjdGl2ZVRyYW5zaXRpb24KICAgICBbdHJhbnNpdGlvbkNvbnRleHQgX3NldFRyYW5z aXRpb25Jc0luRmxpZ2h0OllFU107CiAgICAgW3RyYW5zaXRpb25Db250ZXh0IF9zZXRJbnRlcmFj dGl2ZVVwZGF0ZUhhbmRsZXI6XihCT09MIGZpbmlzaCwgQ0dGbG9hdCBwZXJjZW50LCBCT09MIHRy YW5zaXRpb25Db21wbGV0ZWQsIF9VSVZpZXdDb250cm9sbGVyVHJhbnNpdGlvbkNvbnRleHQgKikg ewogICAgICAgICBpZiAoZmluaXNoKQotICAgICAgICAgICAgbV93ZWJQYWdlUHJveHkubmF2aWdh dGlvbkdlc3R1cmVXaWxsRW5kKHRyYW5zaXRpb25Db21wbGV0ZWQsICp0YXJnZXRJdGVtKTsKKyAg ICAgICAgICAgIG1fd2ViUGFnZVByb3h5Rm9yQmFja0ZvcndhcmRMaXN0Rm9yQ3VycmVudFN3aXBl LT5uYXZpZ2F0aW9uR2VzdHVyZVdpbGxFbmQodHJhbnNpdGlvbkNvbXBsZXRlZCwgKnRhcmdldEl0 ZW0pOwogICAgIH1dOwogICAgIFt0cmFuc2l0aW9uQ29udGV4dCBfc2V0Q29tcGxldGlvbkhhbmRs ZXI6XihfVUlWaWV3Q29udHJvbGxlclRyYW5zaXRpb25Db250ZXh0ICpjb250ZXh0LCBCT09MIGRp ZENvbXBsZXRlKSB7IGVuZFN3aXBlR2VzdHVyZSh0YXJnZXRJdGVtLCBjb250ZXh0LCAhZGlkQ29t cGxldGUpOyB9XTsKICAgICBbdHJhbnNpdGlvbkNvbnRleHQgX3NldEludGVyYWN0aXZlVXBkYXRl SGFuZGxlcjpeKEJPT0wsIENHRmxvYXQsIEJPT0wsIF9VSVZpZXdDb250cm9sbGVyVHJhbnNpdGlv bkNvbnRleHQgKikgeyB9XTsKQEAgLTIyNiw5ICsyNDIsMTAgQEAgdm9pZCBWaWV3R2VzdHVyZUNv bnRyb2xsZXI6OmJlZ2luU3dpcGVHZXN0dXJlKF9VSU5hdmlnYXRpb25JbnRlcmFjdGl2ZVRyYW5z aXRpb24KIAogYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmNhblN3aXBlSW5EaXJlY3Rpb24o U3dpcGVEaXJlY3Rpb24gZGlyZWN0aW9uKQogeworICAgIGF1dG8gYmFja0ZvcndhcmRMaXN0ID0g bV9hbHRlcm5hdGVCYWNrRm9yd2FyZExpc3RTb3VyY2VWaWV3LmdldCgpID8gbV9hbHRlcm5hdGVC YWNrRm9yd2FyZExpc3RTb3VyY2VWaWV3LmdldCgpLT5fcGFnZS0+YmFja0ZvcndhcmRMaXN0KCkg OiBtX3dlYlBhZ2VQcm94eS5iYWNrRm9yd2FyZExpc3QoKTsKICAgICBpZiAoZGlyZWN0aW9uID09 IFN3aXBlRGlyZWN0aW9uOjpMZWZ0KQotICAgICAgICByZXR1cm4gISFtX3dlYlBhZ2VQcm94eS5i YWNrRm9yd2FyZExpc3QoKS5iYWNrSXRlbSgpOwotICAgIHJldHVybiAhIW1fd2ViUGFnZVByb3h5 LmJhY2tGb3J3YXJkTGlzdCgpLmZvcndhcmRJdGVtKCk7CisgICAgICAgIHJldHVybiAhIWJhY2tG b3J3YXJkTGlzdC5iYWNrSXRlbSgpOworICAgIHJldHVybiAhIWJhY2tGb3J3YXJkTGlzdC5mb3J3 YXJkSXRlbSgpOwogfQogCiB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0 dXJlKFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0sIF9VSVZpZXdDb250cm9sbGVy VHJhbnNpdGlvbkNvbnRleHQgKmNvbnRleHQsIGJvb2wgY2FuY2VsbGVkKQpAQCAtMjQzLDEwICsy NjAsMTIgQEAgdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmVuZFN3aXBlR2VzdHVyZShXZWJC YWNrRm9yd2FyZExpc3RJdGVtKiB0YXJnZXRJdGVtLAogICAgIG1fbGl2ZVN3aXBlVmlld0NsaXBw aW5nVmlldyA9IG51bGxwdHI7CiAgICAgW21fdHJhbnNpdGlvbkNvbnRhaW5lclZpZXcgcmVtb3Zl RnJvbVN1cGVydmlld107CiAgICAgbV90cmFuc2l0aW9uQ29udGFpbmVyVmlldyA9IG51bGxwdHI7 Ci0gICAgCisKICAgICBpZiAoY2FuY2VsbGVkKSB7CisgICAgICAgIC8vIHJlbW92ZVN3aXBlU25h cHNob3Qgd2lsbCBjbGVhciBtX3dlYlBhZ2VQcm94eUZvckJhY2tGb3J3YXJkTGlzdEZvckN1cnJl bnRTd2lwZSwgc28gaG9sZCBvbiB0byBpdCBoZXJlLgorICAgICAgICBSZWZQdHI8V2ViUGFnZVBy b3h5PiB3ZWJQYWdlUHJveHlGb3JCYWNrRm9yd2FyZExpc3RGb3JDdXJyZW50U3dpcGUgPSBtX3dl YlBhZ2VQcm94eUZvckJhY2tGb3J3YXJkTGlzdEZvckN1cnJlbnRTd2lwZTsKICAgICAgICAgcmVt b3ZlU3dpcGVTbmFwc2hvdCgpOwotICAgICAgICBtX3dlYlBhZ2VQcm94eS5uYXZpZ2F0aW9uR2Vz dHVyZURpZEVuZChmYWxzZSwgKnRhcmdldEl0ZW0pOworICAgICAgICB3ZWJQYWdlUHJveHlGb3JC YWNrRm9yd2FyZExpc3RGb3JDdXJyZW50U3dpcGUtPm5hdmlnYXRpb25HZXN0dXJlRGlkRW5kKGZh bHNlLCAqdGFyZ2V0SXRlbSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI1OSw4ICsy NzgsOSBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6ZW5kU3dpcGVHZXN0dXJlKFdlYkJh Y2tGb3J3YXJkTGlzdEl0ZW0qIHRhcmdldEl0ZW0sCiAgICAgLy8gZGlzcGxheWluZyB0aGUgZGVz dGluYXRpb24gaXRlbSdzIHNuYXBzaG90LgogICAgIFZpZXdTbmFwc2hvdFN0b3JlOjpzaGFyZWQo KS5kaXNhYmxlU25hcHNob3R0aW5nKCk7CiAKLSAgICBtX3dlYlBhZ2VQcm94eS5uYXZpZ2F0aW9u R2VzdHVyZURpZEVuZCh0cnVlLCAqdGFyZ2V0SXRlbSk7Ci0gICAgbV93ZWJQYWdlUHJveHkuZ29U b0JhY2tGb3J3YXJkSXRlbSh0YXJnZXRJdGVtKTsKKyAgICBtX3dlYlBhZ2VQcm94eUZvckJhY2tG b3J3YXJkTGlzdEZvckN1cnJlbnRTd2lwZS0+bmF2aWdhdGlvbkdlc3R1cmVEaWRFbmQodHJ1ZSwg KnRhcmdldEl0ZW0pOworICAgIG1fd2ViUGFnZVByb3h5Rm9yQmFja0ZvcndhcmRMaXN0Rm9yQ3Vy cmVudFN3aXBlLT5nb1RvQmFja0ZvcndhcmRJdGVtKHRhcmdldEl0ZW0pOworCiAgICAgVmlld1Nu YXBzaG90U3RvcmU6OnNoYXJlZCgpLmVuYWJsZVNuYXBzaG90dGluZygpOwogCiAgICAgdWludDY0 X3QgcGFnZUlEID0gbV93ZWJQYWdlUHJveHkucGFnZUlEKCk7CkBAIC0zMjQsNyArMzQ0LDggQEAg dm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OnJlbW92ZVN3aXBlU25hcHNob3QoKQogICAgIG1f c25hcHNob3RSZW1vdmFsVGFyZ2V0UmVuZGVyVHJlZVNpemUgPSAwOwogICAgIG1fYWN0aXZlR2Vz dHVyZVR5cGUgPSBWaWV3R2VzdHVyZVR5cGU6Ok5vbmU7CiAKLSAgICBtX3dlYlBhZ2VQcm94eS5u YXZpZ2F0aW9uR2VzdHVyZVNuYXBzaG90V2FzUmVtb3ZlZCgpOworICAgIG1fd2ViUGFnZVByb3h5 Rm9yQmFja0ZvcndhcmRMaXN0Rm9yQ3VycmVudFN3aXBlLT5uYXZpZ2F0aW9uR2VzdHVyZVNuYXBz aG90V2FzUmVtb3ZlZCgpOworICAgIG1fd2ViUGFnZVByb3h5Rm9yQmFja0ZvcndhcmRMaXN0Rm9y Q3VycmVudFN3aXBlID0gbnVsbHB0cjsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxl ci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIu aAppbmRleCA4ZTEyZDEyLi5hODg1N2E0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmgKQEAgLTI3LDYgKzI3LDcgQEAKICNk ZWZpbmUgVmlld0dlc3R1cmVDb250cm9sbGVyX2gKIAogI2luY2x1ZGUgIk1lc3NhZ2VSZWNlaXZl ci5oIgorI2luY2x1ZGUgIldlYWtPYmpDUHRyLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9GbG9hdFJl Y3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1RpbWVyLmg+CiAjaW5jbHVkZSA8d3RmL1JldGFpblB0 ci5oPgpAQCAtMzYsNiArMzcsNyBAQCBPQkpDX0NMQVNTIENBTGF5ZXI7CiAjaWYgUExBVEZPUk0o SU9TKQogT0JKQ19DTEFTUyBVSVZpZXc7CiBPQkpDX0NMQVNTIFdLU3dpcGVUcmFuc2l0aW9uQ29u dHJvbGxlcjsKK09CSkNfQ0xBU1MgV0tXZWJWaWV3OwogT0JKQ19DTEFTUyBfVUlWaWV3Q29udHJv bGxlclRyYW5zaXRpb25Db250ZXh0OwogT0JKQ19DTEFTUyBfVUlOYXZpZ2F0aW9uSW50ZXJhY3Rp dmVUcmFuc2l0aW9uQmFzZTsKICNlbHNlCkBAIC0xMDQsNiArMTA2LDcgQEAgcHVibGljOgogICAg IHZvaWQgc2V0U2hvdWxkSWdub3JlUGlubmVkU3RhdGUoYm9vbCBpZ25vcmUpIHsgbV9zaG91bGRJ Z25vcmVQaW5uZWRTdGF0ZSA9IGlnbm9yZTsgfQogI2Vsc2UKICAgICB2b2lkIGluc3RhbGxTd2lw ZUhhbmRsZXIoVUlWaWV3ICpnZXN0dXJlUmVjb2duaXplclZpZXcsIFVJVmlldyAqc3dpcGluZ1Zp ZXcpOworICAgIHZvaWQgc2V0QWx0ZXJuYXRlQmFja0ZvcndhcmRMaXN0U291cmNlVmlldyhXS1dl YlZpZXcgKik7CiAgICAgYm9vbCBjYW5Td2lwZUluRGlyZWN0aW9uKFN3aXBlRGlyZWN0aW9uKTsK ICAgICB2b2lkIGJlZ2luU3dpcGVHZXN0dXJlKF9VSU5hdmlnYXRpb25JbnRlcmFjdGl2ZVRyYW5z aXRpb25CYXNlICosIFN3aXBlRGlyZWN0aW9uKTsKICAgICB2b2lkIGVuZFN3aXBlR2VzdHVyZShX ZWJCYWNrRm9yd2FyZExpc3RJdGVtKiB0YXJnZXRJdGVtLCBfVUlWaWV3Q29udHJvbGxlclRyYW5z aXRpb25Db250ZXh0ICosIGJvb2wgY2FuY2VsbGVkKTsKQEAgLTEzOSw3ICsxNDIsNyBAQCBwcml2 YXRlOgogICAgIENBTGF5ZXIgKmRldGVybWluZUxheWVyQWRqYWNlbnRUb1NuYXBzaG90Rm9yUGFy ZW50KFN3aXBlRGlyZWN0aW9uLCBDQUxheWVyICpzbmFwc2hvdExheWVyUGFyZW50KSBjb25zdDsK ICAgICB2b2lkIGFwcGx5RGVidWdnaW5nUHJvcGVydGllc1RvU3dpcGVWaWV3cygpOwogI2VuZGlm Ci0gICAgCisKICAgICBXZWJQYWdlUHJveHkmIG1fd2ViUGFnZVByb3h5OwogICAgIFZpZXdHZXN0 dXJlVHlwZSBtX2FjdGl2ZUdlc3R1cmVUeXBlOwogICAgIApAQCAtMTg2LDYgKzE4OSw4IEBAIHBy aXZhdGU6CiAgICAgUmV0YWluUHRyPFdLU3dpcGVUcmFuc2l0aW9uQ29udHJvbGxlcj4gbV9zd2lw ZUludGVyYWN0aXZlVHJhbnNpdGlvbkRlbGVnYXRlOwogICAgIHVpbnQ2NF90IG1fc25hcHNob3RS ZW1vdmFsVGFyZ2V0UmVuZGVyVHJlZVNpemU7CiAgICAgYm9vbCBtX3Nob3VsZFJlbW92ZVNuYXBz aG90V2hlblRhcmdldFJlbmRlclRyZWVTaXplSGl0OworICAgIFdlYWtPYmpDUHRyPFdLV2ViVmll dz4gbV9hbHRlcm5hdGVCYWNrRm9yd2FyZExpc3RTb3VyY2VWaWV3OworICAgIFJlZlB0cjxXZWJQ YWdlUHJveHk+IG1fd2ViUGFnZVByb3h5Rm9yQmFja0ZvcndhcmRMaXN0Rm9yQ3VycmVudFN3aXBl OwogI2VuZGlmCiB9OwogCg==