74442 2011-12-13 13:11:35 -0800 [Qt] [WK2] Move QWebNavigationHistory to QQuickWebView 2011-12-14 05:57:22 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72943 1 cmarcelo cmarcelo hausmann kenneth menard webkit.review.bot zoltan oldest_to_newest 520319 0 cmarcelo 2011-12-13 13:11:35 -0800 [Qt] [WK2] Move QWebNavigationHistory to QQuickWebView 520323 1 119074 cmarcelo 2011-12-13 13:14:00 -0800 Created attachment 119074 Patch 520889 2 cmarcelo 2011-12-14 05:57:22 -0800 Committed r102771: <http://trac.webkit.org/changeset/102771> 119074 2011-12-13 13:14:00 -0800 2011-12-14 00:28:45 -0800 Patch bug-74442-20111213181458.patch text/plain 14681 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmZiMDM2MGM4NjNjMGQz YTkyNzVhZGViZDE2MzU2YmVlOTY1Y2RkOS4uOWY3OWQyNThhYjQ0YTNiN2UyMDU0MmUyMGNlMzUz NzIxNGM3NzAxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDExLTEyLTEzICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CiAKKyAgICAgICAgW1F0XSBbV0syXSBNb3ZlIFFXZWJOYXZpZ2F0aW9uSGlzdG9yeSB0byBRUXVp Y2tXZWJWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD03NDQ0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFFXZWJOYXZpZ2F0aW9uSGlzdG9yeSB1c2VkIFF0V2ViUGFnZVByb3h5IHRvIGJlIFFPYmplY3Qg cGFyZW50IG9mIHRoZSBpbm5lciBtb2RlbHMsCisgICAgICAgIHRoaXMgcGF0Y2ggY2hhbmdlIHRo YXQgdG8gdXNlIE93blB0ciBpbnN0ZWFkLiBXaGVuIGNyZWF0aW5nIHRoZSBoaXN0b3J5IG9iamVj dCB3ZSBwYXNzCisgICAgICAgIG9ubHkgdGhlIFdLUGFnZVJlZiBhbmQgbGV0IGl0IGdldCB0aGUg YmFja0ZvcndhcmRMaXN0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjppbml0aWFsaXplKToKKyAg ICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjpkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QpOgor ICAgICAgICAoUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6bmF2aWdhdGlvbkhpc3RvcnkpOgor ICAgICAgICAoUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6Z29Gb3J3YXJkVG8pOgorICAgICAg ICAoUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6Z29CYWNrVG8pOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L3F0L3F3ZWJuYXZpZ2F0aW9uaGlzdG9yeS5jcHA6CisgICAgICAgIChRV2ViTmF2aWdhdGlvbkxp c3RNb2RlbFByaXZhdGU6OmNyZWF0ZVdlYk5hdmlnYXRpb25Nb2RlbCk6CisgICAgICAgIChRV2Vi TmF2aWdhdGlvbkhpc3RvcnlQcml2YXRlOjpRV2ViTmF2aWdhdGlvbkhpc3RvcnlQcml2YXRlKToK KyAgICAgICAgKFFXZWJOYXZpZ2F0aW9uSGlzdG9yeVByaXZhdGU6OmNyZWF0ZUhpc3RvcnkpOgor ICAgICAgICAoUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0ZTo6Z29CYWNrVG8pOgorICAgICAg ICAoUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0ZTo6Z29Gb3J3YXJkVG8pOgorICAgICAgICAo UVdlYk5hdmlnYXRpb25MaXN0TW9kZWw6OlFXZWJOYXZpZ2F0aW9uTGlzdE1vZGVsKToKKyAgICAg ICAgKFFXZWJOYXZpZ2F0aW9uSGlzdG9yeTo6YmFja0l0ZW1zKToKKyAgICAgICAgKFFXZWJOYXZp Z2F0aW9uSGlzdG9yeTo6Zm9yd2FyZEl0ZW1zKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0 L3F3ZWJuYXZpZ2F0aW9uaGlzdG9yeV9wLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbmhpc3RvcnlfcF9wLmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5OjpRdFdlYlBhZ2VQcm94eSk6 CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5Lmg6CisKKzIwMTEtMTItMTMg IENhaW8gTWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3Nh Lm9yZz4KKwogICAgICAgICBbUXRdW1dLMl0gTWFrZSBRdFBhZ2VDbGllbnQgZGlzcGF0Y2ggZGly ZWN0bHkgdG8gV2ViVmlldyB3aGVuIHBvc3NpYmxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDQwNwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCBiYmMxODgzNjU1OTUzNjdlNDY4 ODQ4OGZjMjQ4NjRiOWQ3OGFiMjM5Li42NjcyNGM5NjdiYjRmZTE2OThjNWYwOGEzMzFmZmMzNDE0 ODhlOTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAKQEAgLTcxLDYgKzcxLDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6 aW5pdGlhbGl6ZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGEKICAg ICBwYWdlUG9saWN5Q2xpZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VQb2xpY3lDbGllbnQocGFnZVBy b3h5LT5wYWdlUmVmKCksIHFfcHRyKSk7CiAgICAgcGFnZVVJQ2xpZW50LnJlc2V0KG5ldyBRdFdl YlBhZ2VVSUNsaWVudChwYWdlUHJveHktPnBhZ2VSZWYoKSwgcV9wdHIpKTsKICAgICBldmVudEhh bmRsZXIucmVzZXQobmV3IFF0V2ViUGFnZUV2ZW50SGFuZGxlcihwYWdlUHJveHktPnBhZ2VSZWYo KSwgcV9wdHIpKTsKKyAgICBuYXZpZ2F0aW9uSGlzdG9yeSA9IGFkb3B0UHRyKFFXZWJOYXZpZ2F0 aW9uSGlzdG9yeVByaXZhdGU6OmNyZWF0ZUhpc3RvcnkocGFnZVByb3h5LT5wYWdlUmVmKCkpKTsK IAogICAgIC8vIEFueSBwYWdlIHNldHRpbmcgc2hvdWxkIHByZWZlcnJhYmxlIGJlIHNldCBiZWZv cmUgY3JlYXRpbmcgdGhlIHBhZ2UsIHNvIHNldCB0aGVtIGhlcmU6CiAgICAgc2V0VXNlVHJhZGl0 aW9uYWxEZXNrdG9wQmVoYXZpb3VyKGZhbHNlKTsKQEAgLTE5NSw3ICsxOTYsNyBAQCB2b2lkIFFR dWlja1dlYlZpZXdQcml2YXRlOjpkaWRDaGFuZ2VWaWV3cG9ydFByb3BlcnRpZXMoY29uc3QgV2Vi Q29yZTo6Vmlld3BvcnRBcgogCiB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpkaWRDaGFuZ2VC YWNrRm9yd2FyZExpc3QoKQogewotICAgIHBhZ2VQcm94eS0+bmF2aWdhdGlvbkhpc3RvcnkoKS0+ ZC0+cmVzZXQoKTsKKyAgICBuYXZpZ2F0aW9uSGlzdG9yeS0+ZC0+cmVzZXQoKTsKIH0KIAogdm9p ZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6cGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgUVBvaW50 JiBwb3MpCkBAIC01MzAsNyArNTMxLDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFs OjpzZXRDb25maXJtRGlhbG9nKFFEZWNsYXJhdGl2ZUNvbXBvbmVudCogY29uZmlybUQKIAogUVdl Yk5hdmlnYXRpb25IaXN0b3J5KiBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpuYXZpZ2F0aW9u SGlzdG9yeSgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGRfcHRyLT5wYWdlUHJveHktPm5hdmlnYXRp b25IaXN0b3J5KCk7CisgICAgcmV0dXJuIGRfcHRyLT5uYXZpZ2F0aW9uSGlzdG9yeS5nZXQoKTsK IH0KIAogUURlY2xhcmF0aXZlQ29tcG9uZW50KiBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpw cm9tcHREaWFsb2coKSBjb25zdApAQCAtNTcxLDEyICs1NzIsMTIgQEAgYm9vbCBRUXVpY2tXZWJW aWV3RXhwZXJpbWVudGFsOjp1c2VUcmFkaXRpb25hbERlc2t0b3BCZWhhdmlvdXIoKSBjb25zdAog CiB2b2lkIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OmdvRm9yd2FyZFRvKGludCBpbmRleCkK IHsKLSAgICBkX3B0ci0+cGFnZVByb3h5LT5nb0ZvcndhcmRUbyhpbmRleCk7CisgICAgZF9wdHIt Pm5hdmlnYXRpb25IaXN0b3J5LT5kLT5nb0ZvcndhcmRUbyhpbmRleCk7CiB9CiAKIHZvaWQgUVF1 aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6Z29CYWNrVG8oaW50IGluZGV4KQogewotICAgIGRfcHRy LT5wYWdlUHJveHktPmdvQmFja1RvKGluZGV4KTsKKyAgICBkX3B0ci0+bmF2aWdhdGlvbkhpc3Rv cnktPmQtPmdvQmFja1RvKGluZGV4KTsKIH0KIAogUVF1aWNrV2ViVmlldzo6UVF1aWNrV2ViVmll dyhRUXVpY2tJdGVtKiBwYXJlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKaW5kZXggYTE5Nzg1ZDg4NmNlOWFkNjgwMDA4NWU4 NzQ5Mzg5YjM5NWNhMGNjYS4uYmRjZDg4MTY1ZmIxODAwMTI5NWJmMGYzMzc3ZDU1MjE0Y2M3NDEw MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3X3BfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlld19wX3AuaApAQCAtNDEsNiArNDEsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdl YlBhZ2VQcm94eTsKIH0KIGNsYXNzIFF0V2ViUGFnZVByb3h5OworY2xhc3MgUVdlYk5hdmlnYXRp b25IaXN0b3J5OwogCiBRVF9CRUdJTl9OQU1FU1BBQ0UKIGNsYXNzIFFEZWNsYXJhdGl2ZUNvbXBv bmVudDsKQEAgLTEzNCw2ICsxMzUsNyBAQCBwcml2YXRlOgogCiAgICAgUXRQYWdlQ2xpZW50IHBh Z2VDbGllbnQ7CiAgICAgUXRXZWJVbmRvQ29udHJvbGxlciB1bmRvQ29udHJvbGxlcjsKKyAgICBP d25QdHI8UVdlYk5hdmlnYXRpb25IaXN0b3J5PiBuYXZpZ2F0aW9uSGlzdG9yeTsKIAogICAgIFFT Y29wZWRQb2ludGVyPFF0V2ViUGFnZUV2ZW50SGFuZGxlcj4gZXZlbnRIYW5kbGVyOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9uaGlz dG9yeS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJuYXZpZ2F0aW9u aGlzdG9yeS5jcHAKaW5kZXggOWI3Njc4ZWQyNmM2ODRlNDJkMzJhMTU1ZGFhOGJjYTQ3NmQ5NzE4 YS4uZmY3N2RhZTZiMTEwM2Y0NDZmYWUzOTRmNDk1MDZkOTM5MzI0YjcwMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmhpc3RvcnkuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25oaXN0 b3J5LmNwcApAQCAtMjYsNyArMjYsNiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUg InF3ZWJuYXZpZ2F0aW9uaGlzdG9yeV9wLmgiCiAKLSNpbmNsdWRlICJRdFdlYlBhZ2VQcm94eS5o IgogI2luY2x1ZGUgIldLQmFja0ZvcndhcmRMaXN0LmgiCiAjaW5jbHVkZSAiV0tTdHJpbmdRdC5o IgogI2luY2x1ZGUgIldLVVJMLmgiCkBAIC01MCwxOSArNDksMTkgQEAgUVdlYk5hdmlnYXRpb25M aXN0TW9kZWxQcml2YXRlOjpRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbFByaXZhdGUoV0tCYWNrRm9y d2FyZExpc3QKIHsKIH0KIAotUVdlYk5hdmlnYXRpb25MaXN0TW9kZWwqIFFXZWJOYXZpZ2F0aW9u TGlzdE1vZGVsUHJpdmF0ZTo6Y3JlYXRlV2ViTmF2aWdhdGlvbk1vZGVsKFFPYmplY3QqIHBhcmVu dCwgV0tCYWNrRm9yd2FyZExpc3RSZWYgbGlzdCkKK1FXZWJOYXZpZ2F0aW9uTGlzdE1vZGVsKiBR V2ViTmF2aWdhdGlvbkxpc3RNb2RlbFByaXZhdGU6OmNyZWF0ZVdlYk5hdmlnYXRpb25Nb2RlbChX S0JhY2tGb3J3YXJkTGlzdFJlZiBsaXN0KQogewotICAgIFFXZWJOYXZpZ2F0aW9uTGlzdE1vZGVs KiBtb2RlbCA9IG5ldyBRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbChwYXJlbnQpOworICAgIFFXZWJO YXZpZ2F0aW9uTGlzdE1vZGVsKiBtb2RlbCA9IG5ldyBRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbCgp OwogICAgIG1vZGVsLT5kID0gbmV3IFFXZWJOYXZpZ2F0aW9uTGlzdE1vZGVsUHJpdmF0ZShsaXN0 KTsKICAgICByZXR1cm4gbW9kZWw7CiB9CiAKIAotUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0 ZTo6UVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0ZShRdFdlYlBhZ2VQcm94eSogcGFnZSwgV0tC YWNrRm9yd2FyZExpc3RSZWYgbGlzdCkKK1FXZWJOYXZpZ2F0aW9uSGlzdG9yeVByaXZhdGU6OlFX ZWJOYXZpZ2F0aW9uSGlzdG9yeVByaXZhdGUoV0tQYWdlUmVmIHBhZ2UpCiAgICAgOiBtX3BhZ2Uo cGFnZSkKLSAgICAsIG1fYmFja0ZvcndhcmRMaXN0KGxpc3QpCi0gICAgLCBtX2JhY2tOYXZpZ2F0 aW9uTW9kZWwoUVdlYk5hdmlnYXRpb25MaXN0TW9kZWxQcml2YXRlOjpjcmVhdGVXZWJOYXZpZ2F0 aW9uTW9kZWwocGFnZSwgbGlzdCkpCi0gICAgLCBtX2ZvcndhcmROYXZpZ2F0aW9uTW9kZWwoUVdl Yk5hdmlnYXRpb25MaXN0TW9kZWxQcml2YXRlOjpjcmVhdGVXZWJOYXZpZ2F0aW9uTW9kZWwocGFn ZSwgbGlzdCkpCisgICAgLCBtX2JhY2tGb3J3YXJkTGlzdChXS1BhZ2VHZXRCYWNrRm9yd2FyZExp c3QocGFnZSkpCisgICAgLCBtX2JhY2tOYXZpZ2F0aW9uTW9kZWwoYWRvcHRQdHIoUVdlYk5hdmln YXRpb25MaXN0TW9kZWxQcml2YXRlOjpjcmVhdGVXZWJOYXZpZ2F0aW9uTW9kZWwobV9iYWNrRm9y d2FyZExpc3QuZ2V0KCkpKSkKKyAgICAsIG1fZm9yd2FyZE5hdmlnYXRpb25Nb2RlbChhZG9wdFB0 cihRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbFByaXZhdGU6OmNyZWF0ZVdlYk5hdmlnYXRpb25Nb2Rl bChtX2JhY2tGb3J3YXJkTGlzdC5nZXQoKSkpKQogewogICAgIG1fYmFja05hdmlnYXRpb25Nb2Rl bC0+ZC0+Y291bnQgPSAmV0tCYWNrRm9yd2FyZExpc3RHZXRCYWNrTGlzdENvdW50OwogICAgIG1f YmFja05hdmlnYXRpb25Nb2RlbC0+ZC0+aW5kZXhTaWduID0gLTE7CkBAIC03MCwxMCArNjksMTAg QEAgUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0ZTo6UVdlYk5hdmlnYXRpb25IaXN0b3J5UHJp dmF0ZShRdFdlYlBhZ2VQcm94eSogcGFnZSwKICAgICBtX2ZvcndhcmROYXZpZ2F0aW9uTW9kZWwt PmQtPmluZGV4U2lnbiA9IDE7CiB9CiAKLVFXZWJOYXZpZ2F0aW9uSGlzdG9yeSogUVdlYk5hdmln YXRpb25IaXN0b3J5UHJpdmF0ZTo6Y3JlYXRlSGlzdG9yeShRdFdlYlBhZ2VQcm94eSogcGFnZSwg V0tCYWNrRm9yd2FyZExpc3RSZWYgbGlzdCkKK1FXZWJOYXZpZ2F0aW9uSGlzdG9yeSogUVdlYk5h dmlnYXRpb25IaXN0b3J5UHJpdmF0ZTo6Y3JlYXRlSGlzdG9yeShXS1BhZ2VSZWYgcGFnZSkKIHsK ICAgICBRV2ViTmF2aWdhdGlvbkhpc3RvcnkqIGhpc3RvcnkgPSBuZXcgUVdlYk5hdmlnYXRpb25I aXN0b3J5KCk7Ci0gICAgaGlzdG9yeS0+ZCA9IG5ldyBRV2ViTmF2aWdhdGlvbkhpc3RvcnlQcml2 YXRlKHBhZ2UsIGxpc3QpOworICAgIGhpc3RvcnktPmQgPSBuZXcgUVdlYk5hdmlnYXRpb25IaXN0 b3J5UHJpdmF0ZShwYWdlKTsKICAgICByZXR1cm4gaGlzdG9yeTsKIH0KIApAQCAtODcsMTggKzg2 LDE4IEBAIHZvaWQgUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0ZTo6Z29CYWNrVG8oaW50IGlu ZGV4KQogewogICAgIFdLUmV0YWluUHRyPFdLQmFja0ZvcndhcmRMaXN0SXRlbVJlZj4gaXRlbVJl ZiA9IFdLQmFja0ZvcndhcmRMaXN0R2V0SXRlbUF0SW5kZXgobV9iYWNrRm9yd2FyZExpc3QuZ2V0 KCksIC0oaW5kZXggKyAxKSk7CiAgICAgaWYgKGl0ZW1SZWYgJiYgbV9wYWdlKQotICAgICAgICBX S1BhZ2VHb1RvQmFja0ZvcndhcmRMaXN0SXRlbShtX3BhZ2UtPnBhZ2VSZWYoKSwgaXRlbVJlZi5n ZXQoKSk7CisgICAgICAgIFdLUGFnZUdvVG9CYWNrRm9yd2FyZExpc3RJdGVtKG1fcGFnZS5nZXQo KSwgaXRlbVJlZi5nZXQoKSk7CiB9CiAKIHZvaWQgUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0 ZTo6Z29Gb3J3YXJkVG8oaW50IGluZGV4KQogewogICAgIFdLUmV0YWluUHRyPFdLQmFja0Zvcndh cmRMaXN0SXRlbVJlZj4gaXRlbVJlZiA9IFdLQmFja0ZvcndhcmRMaXN0R2V0SXRlbUF0SW5kZXgo bV9iYWNrRm9yd2FyZExpc3QuZ2V0KCksIGluZGV4ICsgMSk7CiAgICAgaWYgKGl0ZW1SZWYgJiYg bV9wYWdlKQotICAgICAgICBXS1BhZ2VHb1RvQmFja0ZvcndhcmRMaXN0SXRlbShtX3BhZ2UtPnBh Z2VSZWYoKSwgaXRlbVJlZi5nZXQoKSk7CisgICAgICAgIFdLUGFnZUdvVG9CYWNrRm9yd2FyZExp c3RJdGVtKG1fcGFnZS5nZXQoKSwgaXRlbVJlZi5nZXQoKSk7CiB9CiAKLVFXZWJOYXZpZ2F0aW9u TGlzdE1vZGVsOjpRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbChRT2JqZWN0KiBwYXJlbnQpCi0gICAg OiBRQWJzdHJhY3RMaXN0TW9kZWwocGFyZW50KQorUVdlYk5hdmlnYXRpb25MaXN0TW9kZWw6OlFX ZWJOYXZpZ2F0aW9uTGlzdE1vZGVsKCkKKyAgICA6IFFBYnN0cmFjdExpc3RNb2RlbCgpCiB7CiAg ICAgUUhhc2g8aW50LCBRQnl0ZUFycmF5PiByb2xlczsKICAgICByb2xlc1tRV2ViTmF2aWdhdGlv bkhpc3Rvcnk6OlVybFJvbGVdID0gInVybCI7CkBAIC0xNTAsMTIgKzE0OSwxMiBAQCBRV2ViTmF2 aWdhdGlvbkhpc3Rvcnk6On5RV2ViTmF2aWdhdGlvbkhpc3RvcnkoKQogCiBRV2ViTmF2aWdhdGlv bkxpc3RNb2RlbCogUVdlYk5hdmlnYXRpb25IaXN0b3J5OjpiYWNrSXRlbXMoKSBjb25zdAogewot ICAgIHJldHVybiBkLT5tX2JhY2tOYXZpZ2F0aW9uTW9kZWw7CisgICAgcmV0dXJuIGQtPm1fYmFj a05hdmlnYXRpb25Nb2RlbC5nZXQoKTsKIH0KIAogUVdlYk5hdmlnYXRpb25MaXN0TW9kZWwqIFFX ZWJOYXZpZ2F0aW9uSGlzdG9yeTo6Zm9yd2FyZEl0ZW1zKCkgY29uc3QKIHsKLSAgICByZXR1cm4g ZC0+bV9mb3J3YXJkTmF2aWdhdGlvbk1vZGVsOworICAgIHJldHVybiBkLT5tX2ZvcndhcmROYXZp Z2F0aW9uTW9kZWwuZ2V0KCk7CiB9CiAKICNpbmNsdWRlICJtb2NfcXdlYm5hdmlnYXRpb25oaXN0 b3J5X3AuY3BwIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VibmF2aWdhdGlvbmhpc3RvcnlfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xd2VibmF2aWdhdGlvbmhpc3RvcnlfcC5oCmluZGV4IGFlYTUyMDdiMTBmNzBjMTFlODYyNzQ4 Y2NlNjRlNzAwMDJiNTU2ZTguLjkyOTExNDQ3MmE4NWMxZWIyZTQxNjY0ZmNjZWU2ZThjN2IyNDQ3 N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmln YXRpb25oaXN0b3J5X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJuYXZpZ2F0aW9uaGlzdG9yeV9wLmgKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogICAgIFFW YXJpYW50IGRhdGEoY29uc3QgUU1vZGVsSW5kZXgmIGluZGV4LCBpbnQgcm9sZSkgY29uc3Q7CiAK IHByaXZhdGU6Ci0gICAgUVdlYk5hdmlnYXRpb25MaXN0TW9kZWwoUU9iamVjdCogcGFyZW50KTsK KyAgICBRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbCgpOwogICAgIFFXZWJOYXZpZ2F0aW9uTGlzdE1v ZGVsUHJpdmF0ZSogZDsKICAgICBmcmllbmQgY2xhc3MgUVdlYk5hdmlnYXRpb25MaXN0TW9kZWxQ cml2YXRlOwogICAgIGZyaWVuZCBjbGFzcyBRV2ViTmF2aWdhdGlvbkhpc3Rvcnk7CkBAIC03Nyw4 ICs3Nyw4IEBAIHByaXZhdGU6CiAKICAgICBRV2ViTmF2aWdhdGlvbkhpc3RvcnlQcml2YXRlKiBk OwogICAgIGZyaWVuZCBjbGFzcyBRV2ViTmF2aWdhdGlvbkhpc3RvcnlQcml2YXRlOwotICAgIGZy aWVuZCBjbGFzcyBRdFdlYlBhZ2VQcm94eTsKICAgICBmcmllbmQgY2xhc3MgUVF1aWNrV2ViVmll d1ByaXZhdGU7CisgICAgZnJpZW5kIGNsYXNzIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw7CiB9 OwogCiBRTUxfREVDTEFSRV9UWVBFKFFXZWJOYXZpZ2F0aW9uSGlzdG9yeSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYm5hdmlnYXRpb25oaXN0b3J5X3Bf cC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmhpc3Rv cnlfcF9wLmgKaW5kZXggOTg4MTBkNDI0Njg5Y2U4Yjk0YjlhZjAxOTlkZjUzOWI4NWFiNWZhNi4u MjliNzE1OTQ4MTEwYTA4NTYyMjJjYTM1ZGJlN2ZkOTYyZmZkYzFlYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmhpc3RvcnlfcF9wLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VibmF2aWdhdGlvbmhpc3Rv cnlfcF9wLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlIDxRT2JqZWN0PgogI2luY2x1ZGUg PFdlYktpdDIvV0tCYXNlLmg+CiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1JldGFpblB0ci5oPgorI2lu Y2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogCiBuYW1l c3BhY2UgV2ViS2l0IHsKQEAgLTQ1LDcgKzQ2LDcgQEAgY2xhc3MgUVdlYk5hdmlnYXRpb25MaXN0 TW9kZWxQcml2YXRlIHsKIHB1YmxpYzoKICAgICBRV2ViTmF2aWdhdGlvbkxpc3RNb2RlbFByaXZh dGUoV0tCYWNrRm9yd2FyZExpc3RSZWYpOwogCi0gICAgc3RhdGljIFFXZWJOYXZpZ2F0aW9uTGlz dE1vZGVsKiBjcmVhdGVXZWJOYXZpZ2F0aW9uTW9kZWwoUU9iamVjdCosIFdLQmFja0ZvcndhcmRM aXN0UmVmKTsKKyAgICBzdGF0aWMgUVdlYk5hdmlnYXRpb25MaXN0TW9kZWwqIGNyZWF0ZVdlYk5h dmlnYXRpb25Nb2RlbChXS0JhY2tGb3J3YXJkTGlzdFJlZik7CiAKICAgICB1bnNpZ25lZCAoKmNv dW50KShXS0JhY2tGb3J3YXJkTGlzdFJlZik7CiAgICAgV0tSZXRhaW5QdHI8V0tCYWNrRm9yd2Fy ZExpc3RSZWY+IG1fYmFja0ZvcndhcmRMaXN0OwpAQCAtNTQsMTcgKzU1LDE3IEBAIHB1YmxpYzoK IAogY2xhc3MgUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0ZSB7CiBwdWJsaWM6Ci0gICAgc3Rh dGljIFFXZWJOYXZpZ2F0aW9uSGlzdG9yeSogY3JlYXRlSGlzdG9yeShRdFdlYlBhZ2VQcm94eSos IFdLQmFja0ZvcndhcmRMaXN0UmVmKTsKKyAgICBzdGF0aWMgUVdlYk5hdmlnYXRpb25IaXN0b3J5 KiBjcmVhdGVIaXN0b3J5KFdLUGFnZVJlZik7CiAKLSAgICBRV2ViTmF2aWdhdGlvbkhpc3RvcnlQ cml2YXRlKFF0V2ViUGFnZVByb3h5KiwgV0tCYWNrRm9yd2FyZExpc3RSZWYpOworICAgIFFXZWJO YXZpZ2F0aW9uSGlzdG9yeVByaXZhdGUoV0tQYWdlUmVmKTsKICAgICB2b2lkIHJlc2V0KCk7CiAg ICAgdm9pZCBnb0JhY2tUbyhpbnQgaW5kZXgpOwogICAgIHZvaWQgZ29Gb3J3YXJkVG8oaW50IGlu ZGV4KTsKIAotICAgIFF0V2ViUGFnZVByb3h5KiBtX3BhZ2U7CisgICAgV0tSZXRhaW5QdHI8V0tQ YWdlUmVmPiBtX3BhZ2U7CiAgICAgV0tSZXRhaW5QdHI8V0tCYWNrRm9yd2FyZExpc3RSZWY+IG1f YmFja0ZvcndhcmRMaXN0OwotICAgIFFXZWJOYXZpZ2F0aW9uTGlzdE1vZGVsKiBtX2JhY2tOYXZp Z2F0aW9uTW9kZWw7Ci0gICAgUVdlYk5hdmlnYXRpb25MaXN0TW9kZWwqIG1fZm9yd2FyZE5hdmln YXRpb25Nb2RlbDsKKyAgICBPd25QdHI8UVdlYk5hdmlnYXRpb25MaXN0TW9kZWw+IG1fYmFja05h dmlnYXRpb25Nb2RlbDsKKyAgICBPd25QdHI8UVdlYk5hdmlnYXRpb25MaXN0TW9kZWw+IG1fZm9y d2FyZE5hdmlnYXRpb25Nb2RlbDsKIH07CiAKICNlbmRpZiAvKiBxd2VibmF2aWdhdGlvbmhpc3Rv cnlfcF9wX2ggKi8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdl YlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJv eHkuY3BwCmluZGV4IDhkZjRkNDc2MjRlYjAzZGQzOGU2ODJjYTQwZDRhYmQ4NWU2MTI3YzguLmFh YzEwODhhMzRiMjc5MGNjNmFhNDU0ZDUyNmU3Mjk5M2YyMzdiOTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcApAQCAtMjcsOCArMjcsNiBAQAog I2luY2x1ZGUgInFxdWlja3dlYnZpZXdfcF9wLmgiCiAjaW5jbHVkZSAicXdlYmRvd25sb2FkaXRl bV9wLmgiCiAjaW5jbHVkZSAicXdlYmRvd25sb2FkaXRlbV9wX3AuaCIKLSNpbmNsdWRlICJxd2Vi bmF2aWdhdGlvbmhpc3RvcnlfcC5oIgotI2luY2x1ZGUgInF3ZWJuYXZpZ2F0aW9uaGlzdG9yeV9w X3AuaCIKICNpbmNsdWRlICJxd2VicHJlZmVyZW5jZXNfcC5oIgogI2luY2x1ZGUgInF3ZWJwcmVm ZXJlbmNlc19wX3AuaCIKIApAQCAtNTQsNyArNTIsNiBAQCBRdFdlYlBhZ2VQcm94eTo6UXRXZWJQ YWdlUHJveHkoUVF1aWNrV2ViVmlldyogcW1sV2ViVmlldywgUXRQYWdlQ2xpZW50ICpwYWdlQ2xp ZQogICAgICwgbV9uYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoZmFsc2UpCiB7CiAgICAgbV93ZWJQ YWdlUHJveHkgPSBtX2NvbnRleHQtPmNyZWF0ZVdlYlBhZ2UocGFnZUNsaWVudCwgdG9JbXBsKHBh Z2VHcm91cFJlZikpOwotICAgIG1fbmF2aWdhdGlvbkhpc3RvcnkgPSBhZG9wdFB0cihRV2ViTmF2 aWdhdGlvbkhpc3RvcnlQcml2YXRlOjpjcmVhdGVIaXN0b3J5KHRoaXMsIHRvQVBJKG1fd2ViUGFn ZVByb3h5LT5iYWNrRm9yd2FyZExpc3QoKSkpKTsKIH0KIAogdm9pZCBRdFdlYlBhZ2VQcm94eTo6 aW5pdChRdFdlYlBhZ2VFdmVudEhhbmRsZXIqIGV2ZW50SGFuZGxlcikKQEAgLTEwNSwxNiArMTAy LDYgQEAgV0tQYWdlUmVmIFF0V2ViUGFnZVByb3h5OjpwYWdlUmVmKCkgY29uc3QKICAgICByZXR1 cm4gdG9BUEkobV93ZWJQYWdlUHJveHkuZ2V0KCkpOzsKIH0KIAotdm9pZCBRdFdlYlBhZ2VQcm94 eTo6Z29CYWNrVG8oaW50IGluZGV4KQotewotICAgIG1fbmF2aWdhdGlvbkhpc3RvcnktPmQtPmdv QmFja1RvKGluZGV4KTsKLX0KLQotdm9pZCBRdFdlYlBhZ2VQcm94eTo6Z29Gb3J3YXJkVG8oaW50 IGluZGV4KQotewotICAgIG1fbmF2aWdhdGlvbkhpc3RvcnktPmQtPmdvRm9yd2FyZFRvKGluZGV4 KTsKLX0KLQogUVdlYlByZWZlcmVuY2VzKiBRdFdlYlBhZ2VQcm94eTo6cHJlZmVyZW5jZXMoKSBj b25zdAogewogICAgIGlmICghbV9wcmVmZXJlbmNlcykKQEAgLTE3OSwxMSArMTY2LDYgQEAgdm9p ZCBRdFdlYlBhZ2VQcm94eTo6c2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhxcmVhbCBwYWdlWm9v bUZhY3RvciwgcXJlYWwgdGV4dFoKICAgICBXS1BhZ2VTZXRQYWdlQW5kVGV4dFpvb21GYWN0b3Jz KHBhZ2VSZWYoKSwgcGFnZVpvb21GYWN0b3IsIHRleHRab29tRmFjdG9yKTsKIH0KIAotUVdlYk5h dmlnYXRpb25IaXN0b3J5KiBRdFdlYlBhZ2VQcm94eTo6bmF2aWdhdGlvbkhpc3RvcnkoKSBjb25z dAotewotICAgIHJldHVybiBtX25hdmlnYXRpb25IaXN0b3J5LmdldCgpOwotfQotCiB2b2lkIFF0 V2ViUGFnZVByb3h5OjpoYW5kbGVEb3dubG9hZFJlcXVlc3QoRG93bmxvYWRQcm94eSogZG93bmxv YWQpCiB7CiAgICAgLy8gVGhpcyBmdW5jdGlvbiBpcyByZXNwb25zaWJsZSBmb3IgaG9va2luZyB1 cCBhIERvd25sb2FkUHJveHkgdG8gb3VyIEFQSSBsYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAppbmRleCAyZmQ3Y2MwNzJmNWQwYmI4NDYxODQ0YWQw NGY1NjAzOTMzZWRkOTczLi44OTVmYWJiNDVlNTIxMGM0ZDA1MjZiZGIxZmE0YTBlYzQ3NTM0NzRj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHku aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaApAQCAt MzMsNyArMzMsNiBAQCBjbGFzcyBRUXVpY2tXZWJQYWdlOwogY2xhc3MgUVF1aWNrV2ViVmlldzsK IGNsYXNzIFF0V2ViUGFnZUV2ZW50SGFuZGxlcjsKIGNsYXNzIFFXZWJEb3dubG9hZEl0ZW07Ci1j bGFzcyBRV2ViTmF2aWdhdGlvbkhpc3Rvcnk7CiBjbGFzcyBRV2ViUHJlZmVyZW5jZXM7CiAKIG5h bWVzcGFjZSBXZWJLaXQgewpAQCAtNTIsOSArNTEsNiBAQCBwdWJsaWM6CiAKICAgICBQYXNzT3du UHRyPERyYXdpbmdBcmVhUHJveHk+IGNyZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKIAotICAgIHZv aWQgZ29CYWNrVG8oaW50IGluZGV4KTsKLSAgICB2b2lkIGdvRm9yd2FyZFRvKGludCBpbmRleCk7 Ci0KICAgICBXS1BhZ2VSZWYgcGFnZVJlZigpIGNvbnN0OwogCiAgICAgdm9pZCBzZXREcmF3aW5n QXJlYVNpemUoY29uc3QgUVNpemUmKTsKQEAgLTgwLDggKzc2LDYgQEAgcHVibGljOgogICAgIHZv aWQgcmVuZGVyVG9DdXJyZW50R0xDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9u TWF0cml4JiwgZmxvYXQpOwogICAgIHZvaWQgcHVyZ2VHTFJlc291cmNlcygpOwogCi0gICAgUVdl Yk5hdmlnYXRpb25IaXN0b3J5KiBuYXZpZ2F0aW9uSGlzdG9yeSgpIGNvbnN0OwotCiAgICAgdm9p ZCBjb250ZXh0TWVudUl0ZW1TZWxlY3RlZChjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1EYXRhJiBk YXRhKQogICAgIHsKICAgICAgICAgbV93ZWJQYWdlUHJveHktPmNvbnRleHRNZW51SXRlbVNlbGVj dGVkKGRhdGEpOwpAQCAtMTA3LDcgKzEwMSw2IEBAIHByb3RlY3RlZDoKIAogcHJpdmF0ZToKICAg ICBSZWZQdHI8UXRXZWJDb250ZXh0PiBtX2NvbnRleHQ7Ci0gICAgT3duUHRyPFFXZWJOYXZpZ2F0 aW9uSGlzdG9yeT4gbV9uYXZpZ2F0aW9uSGlzdG9yeTsKIAogICAgIG11dGFibGUgT3duUHRyPFFX ZWJQcmVmZXJlbmNlcz4gbV9wcmVmZXJlbmNlczsKIAo=