77629 2012-02-02 05:07:43 -0800 [Qt] Rename content* to contents* in QQuickWebPage. 2012-02-03 06:44:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte kenneth menard webkit.review.bot zoltan oldest_to_newest 547800 0 jturcotte 2012-02-02 05:07:43 -0800 [Qt] Rename content* to contents* in QQuickWebPage. 547803 1 125118 jturcotte 2012-02-02 05:09:55 -0800 Created attachment 125118 Patch 548676 2 jturcotte 2012-02-03 06:44:58 -0800 Committed r106656: <http://trac.webkit.org/changeset/106656> 125118 2012-02-02 05:09:55 -0800 2012-02-02 05:41:38 -0800 Patch bug-77629-20120202140539.patch text/plain 14033 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTJkN2YxM2U3OWZlZDRk YmQwNmQyMzJlZTU1MzcxY2RjY2FiOWEyZC4uZWQ3MWFlMDBkZmRlNzQ5ZjY0ZGJjMGEyNWE2ZTZh Y2MyYzlmZGZhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAyLTAyICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0 XSBSZW5hbWUgY29udGVudCogdG8gY29udGVudHMqIGluIFFRdWlja1dlYlBhZ2UuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzYyOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlBhZ2VQcml2YXRlOjpRUXVp Y2tXZWJQYWdlUHJpdmF0ZSk6CisgICAgICAgIChRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6cGFpbnRU b0N1cnJlbnRHTENvbnRleHQpOgorICAgICAgICAoUVF1aWNrV2ViUGFnZTo6c2V0Q29udGVudHNT aXplKToKKyAgICAgICAgKFFRdWlja1dlYlBhZ2U6OmNvbnRlbnRzU2l6ZSk6CisgICAgICAgIChR UXVpY2tXZWJQYWdlOjpzZXRDb250ZW50c1NjYWxlKToKKyAgICAgICAgKFFRdWlja1dlYlBhZ2U6 OmNvbnRlbnRzU2NhbGUpOgorICAgICAgICAoUVF1aWNrV2ViUGFnZTo6dHJhbnNmb3JtVG9JdGVt KToKKyAgICAgICAgKFFRdWlja1dlYlBhZ2VQcml2YXRlOjp1cGRhdGVTaXplKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2VfcC5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrd2VicGFnZV9wX3AuaDoKKyAgICAgICAgKFFRdWlja1dlYlBhZ2VQcml2 YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAg ICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZSk6CisgICAg ICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0QW5kU2Nh bGUpOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OlBvc3RUcmFuc2l0aW9uU3RhdGU6 OmFwcGx5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJ2aWV3cG9ydGluZm8uY3Bw OgorICAgICAgICAoUVdlYlZpZXdwb3J0SW5mbzo6Y29udGVudHNTaXplKToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FxdWlja3dlYnZpZXcvdHN0X3FxdWlja3dlYnZpZXcuY3Bw OgorICAgICAgICAodHN0X1FRdWlja1dlYlZpZXc6OnNjcm9sbFJlcXVlc3QpOgorICAgICAgICAq IFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAgICAgICAo V2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldEl0ZW1SZWN0VmlzaWJsZSk6 CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6ZXZlbnQpOgor ICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OndoZWVsRXZlbnQp OgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhZ2VQb3Np dGlvblJlcXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25Fbmdp bmU6OmNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxlKToKKyAgICAgICAgKFdlYktpdDo6UXRW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjphcHBseUNvbnN0cmFpbnRzKToKKyAgICAgICAgKFdl YktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpjdXJyZW50Q1NTU2NhbGUpOgorICAg ICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZVN0 YXJ0ZWQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNj YWxlQ29udGVudCk6CisKIDIwMTItMDEtMzAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1 cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIERpc2Nvbm5lY3QgdGhlIExheWVyVHJl ZUhvc3QgZnJvbSBsYXllcnMgd2hlbiB0aGV5IGdldCByZW1vdmVkIGZyb20gdGhlaXIgcGFyZW50 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJw YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5j cHAKaW5kZXggNjk3NmY4NzhjNjA2OTY2MTI3YmVkOTgzMTZkZTgxM2RkZWE5ZGQzNi4uZDEwMWQ4 MmQ4ODQxYzRiNTk5MjBjZDgyYjRhYTA4MzdiNDU2NTkzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwCkBAIC02OSw3ICs2OSw3IEBA IFFRdWlja1dlYlBhZ2VQcml2YXRlOjpRUXVpY2tXZWJQYWdlUHJpdmF0ZShRUXVpY2tXZWJQYWdl KiBxLCBRUXVpY2tXZWJWaWV3KiB2aWV3CiAgICAgLCBzZ1VwZGF0ZVF1ZXVlKHEpCiAgICAgLCBw YWludGluZ0lzSW5pdGlhbGl6ZWQoZmFsc2UpCiAgICAgLCBtX3BhaW50Tm9kZSgwKQotICAgICwg Y29udGVudFNjYWxlKDEpCisgICAgLCBjb250ZW50c1NjYWxlKDEpCiAgICAgLCB1c2VUcmFkaXRp b25hbERlc2t0b3BCZWhhdmlvdXIoZmFsc2UpCiB7CiB9CkBAIC0xMTIsNyArMTEyLDcgQEAgdm9p ZCBRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6cGFpbnRUb0N1cnJlbnRHTENvbnRleHQoKQogICAgICAg ICByZXR1cm47CiAKICAgICBRVHJhbnNmb3JtIHRyYW5zZm9ybSA9IHEtPml0ZW1UcmFuc2Zvcm0o MCwgMCk7Ci0gICAgdHJhbnNmb3JtLnNjYWxlKGNvbnRlbnRTY2FsZSwgY29udGVudFNjYWxlKTsK KyAgICB0cmFuc2Zvcm0uc2NhbGUoY29udGVudHNTY2FsZSwgY29udGVudHNTY2FsZSk7CiAKICAg ICBmbG9hdCBvcGFjaXR5ID0gY29tcHV0ZUVmZmVjdGl2ZU9wYWNpdHkocSk7CiAgICAgUVJlY3RG IGNsaXBSZWN0ID0gcS0+cGFyZW50SXRlbSgpLT5tYXBSZWN0VG9TY2VuZShxLT5wYXJlbnRJdGVt KCktPmJvdW5kaW5nUmVjdCgpKTsKQEAgLTI1MSwzMiArMjUxLDMyIEBAIFF0V2ViUGFnZUV2ZW50 SGFuZGxlciogUVF1aWNrV2ViUGFnZTo6ZXZlbnRIYW5kbGVyKCkgY29uc3QKICAgICByZXR1cm4g ZC0+ZXZlbnRIYW5kbGVyLmRhdGEoKTsKIH0KIAotdm9pZCBRUXVpY2tXZWJQYWdlOjpzZXRDb250 ZW50U2l6ZShjb25zdCBRU2l6ZUYmIHNpemUpCit2b2lkIFFRdWlja1dlYlBhZ2U6OnNldENvbnRl bnRzU2l6ZShjb25zdCBRU2l6ZUYmIHNpemUpCiB7Ci0gICAgaWYgKHNpemUuaXNFbXB0eSgpIHx8 IGQtPmNvbnRlbnRTaXplID09IHNpemUpCisgICAgaWYgKHNpemUuaXNFbXB0eSgpIHx8IGQtPmNv bnRlbnRzU2l6ZSA9PSBzaXplKQogICAgICAgICByZXR1cm47CiAKLSAgICBkLT5jb250ZW50U2l6 ZSA9IHNpemU7CisgICAgZC0+Y29udGVudHNTaXplID0gc2l6ZTsKICAgICBkLT51cGRhdGVTaXpl KCk7Ci0gICAgZC0+c2V0RHJhd2luZ0FyZWFTaXplKGQtPmNvbnRlbnRTaXplLnRvU2l6ZSgpKTsK KyAgICBkLT5zZXREcmF3aW5nQXJlYVNpemUoZC0+Y29udGVudHNTaXplLnRvU2l6ZSgpKTsKIH0K IAotY29uc3QgUVNpemVGJiBRUXVpY2tXZWJQYWdlOjpjb250ZW50U2l6ZSgpIGNvbnN0Citjb25z dCBRU2l6ZUYmIFFRdWlja1dlYlBhZ2U6OmNvbnRlbnRzU2l6ZSgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIGQtPmNvbnRlbnRTaXplOworICAgIHJldHVybiBkLT5jb250ZW50c1NpemU7CiB9CiAKLXZv aWQgUVF1aWNrV2ViUGFnZTo6c2V0Q29udGVudFNjYWxlKHFyZWFsIHNjYWxlKQordm9pZCBRUXVp Y2tXZWJQYWdlOjpzZXRDb250ZW50c1NjYWxlKHFyZWFsIHNjYWxlKQogewogICAgIEFTU0VSVChz Y2FsZSA+IDApOwotICAgIGQtPmNvbnRlbnRTY2FsZSA9IHNjYWxlOworICAgIGQtPmNvbnRlbnRz U2NhbGUgPSBzY2FsZTsKICAgICBkLT51cGRhdGVTaXplKCk7CiB9CiAKLXFyZWFsIFFRdWlja1dl YlBhZ2U6OmNvbnRlbnRTY2FsZSgpIGNvbnN0CitxcmVhbCBRUXVpY2tXZWJQYWdlOjpjb250ZW50 c1NjYWxlKCkgY29uc3QKIHsKLSAgICBBU1NFUlQoZC0+Y29udGVudFNjYWxlID4gMCk7Ci0gICAg cmV0dXJuIGQtPmNvbnRlbnRTY2FsZTsKKyAgICBBU1NFUlQoZC0+Y29udGVudHNTY2FsZSA+IDAp OworICAgIHJldHVybiBkLT5jb250ZW50c1NjYWxlOwogfQogCiBRVHJhbnNmb3JtIFFRdWlja1dl YlBhZ2U6OnRyYW5zZm9ybUZyb21JdGVtKCkgY29uc3QKQEAgLTI4NiwxMiArMjg2LDEyIEBAIFFU cmFuc2Zvcm0gUVF1aWNrV2ViUGFnZTo6dHJhbnNmb3JtRnJvbUl0ZW0oKSBjb25zdAogCiBRVHJh bnNmb3JtIFFRdWlja1dlYlBhZ2U6OnRyYW5zZm9ybVRvSXRlbSgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIFFUcmFuc2Zvcm0oZC0+Y29udGVudFNjYWxlLCAwLCAwLCAwLCBkLT5jb250ZW50U2NhbGUs IDAsIHgoKSwgeSgpLCAxKTsKKyAgICByZXR1cm4gUVRyYW5zZm9ybShkLT5jb250ZW50c1NjYWxl LCAwLCAwLCAwLCBkLT5jb250ZW50c1NjYWxlLCAwLCB4KCksIHkoKSwgMSk7CiB9CiAKIHZvaWQg UVF1aWNrV2ViUGFnZVByaXZhdGU6OnVwZGF0ZVNpemUoKQogewotICAgIFFTaXplRiBzY2FsZWRT aXplID0gY29udGVudFNpemUgKiBjb250ZW50U2NhbGU7CisgICAgUVNpemVGIHNjYWxlZFNpemUg PSBjb250ZW50c1NpemUgKiBjb250ZW50c1NjYWxlOwogICAgIHEtPnNldFNpemUoc2NhbGVkU2l6 ZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2VicGFnZV9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnBhZ2VfcC5oCmluZGV4IGJmNDRiOWRjN2UyNTBlY2MyYmJmZjRjYmNiM2IwZWE5ZTA1OTJiMTgu LjdjODZlZjM3YTQ0NjMzYWJjMDZiYTEyNGE0NGFlYTFjMWU4MzdkMzYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZV9wLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlX3AuaApAQCAtNDEsMTAg KzQxLDEwIEBAIHB1YmxpYzoKICAgICBRUXVpY2tXZWJQYWdlKFFRdWlja1dlYlZpZXcqIHZpZXcg PSAwKTsKICAgICB2aXJ0dWFsIH5RUXVpY2tXZWJQYWdlKCk7CiAKLSAgICB2b2lkIHNldENvbnRl bnRTaXplKGNvbnN0IFFTaXplRiYgc2l6ZSk7Ci0gICAgY29uc3QgUVNpemVGJiBjb250ZW50U2l6 ZSgpIGNvbnN0OwotICAgIHZvaWQgc2V0Q29udGVudFNjYWxlKHFyZWFsKTsKLSAgICBxcmVhbCBj b250ZW50U2NhbGUoKSBjb25zdDsKKyAgICB2b2lkIHNldENvbnRlbnRzU2l6ZShjb25zdCBRU2l6 ZUYmIHNpemUpOworICAgIGNvbnN0IFFTaXplRiYgY29udGVudHNTaXplKCkgY29uc3Q7CisgICAg dm9pZCBzZXRDb250ZW50c1NjYWxlKHFyZWFsKTsKKyAgICBxcmVhbCBjb250ZW50c1NjYWxlKCkg Y29uc3Q7CiAKICAgICBRVHJhbnNmb3JtIHRyYW5zZm9ybUZyb21JdGVtKCkgY29uc3Q7CiAgICAg UVRyYW5zZm9ybSB0cmFuc2Zvcm1Ub0l0ZW0oKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZV9wX3AuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZV9wX3AuaAppbmRleCAwYzE3YWE1YjVh M2FjZjFmYTg2OThkOGNjNjM0YWE4OWI0NzhhNzkwLi41NzliMmRkMDhhOWVjZTViN2Q4NWE3NGEy ZDIxMjAxMzE0YmQ2M2U1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnBhZ2VfcF9wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJwYWdlX3BfcC5oCkBAIC01NCw4ICs1NCw4IEBAIHB1YmxpYzoKICAgICBi b29sIHBhaW50aW5nSXNJbml0aWFsaXplZDsKICAgICBRU0dOb2RlKiBtX3BhaW50Tm9kZTsKIAot ICAgIFFTaXplRiBjb250ZW50U2l6ZTsKLSAgICBxcmVhbCBjb250ZW50U2NhbGU7CisgICAgUVNp emVGIGNvbnRlbnRzU2l6ZTsKKyAgICBxcmVhbCBjb250ZW50c1NjYWxlOwogICAgIGJvb2wgdXNl VHJhZGl0aW9uYWxEZXNrdG9wQmVoYXZpb3VyOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggOTM1ZGU5MjcyODY2Yzk2 YWQ4ZjUzYWU5ZDZiNGY5YjFkZDdkZTk0Mi4uNjQ4NWJmNjkyODgzZTQ4NTExOTZiYTMyYjI5MjIx MDVjODAyMmU2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnZpZXcuY3BwCkBAIC0yMjksNyArMjI5LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFFTaXplJiBuZXdTaXplKQogICAgICAg ICByZXR1cm47CiAgICAgfQogCi0gICAgcGFnZVZpZXctPnNldENvbnRlbnRTaXplKG5ld1NpemUp OworICAgIHBhZ2VWaWV3LT5zZXRDb250ZW50c1NpemUobmV3U2l6ZSk7CiAgICAgcS0+bV9leHBl cmltZW50YWwtPnZpZXdwb3J0SW5mbygpLT5kaWRVcGRhdGVDb250ZW50c1NpemUoKTsKIH0KIApA QCAtMzA2LDcgKzMwNiw3IEBAIHZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6OnVwZGF0ZVZpc2li bGVDb250ZW50UmVjdEFuZFNjYWxlKCkKIAogICAgIFFfUShRUXVpY2tXZWJWaWV3KTsKICAgICBj b25zdCBRUmVjdEYgdmlzaWJsZVJlY3RJbkNTU0Nvb3JkaW5hdGVzID0gcS0+bWFwUmVjdFRvV2Vi Q29udGVudChxLT5ib3VuZGluZ1JlY3QoKSkuaW50ZXJzZWN0ZWQocGFnZVZpZXctPmJvdW5kaW5n UmVjdCgpKTsKLSAgICBmbG9hdCBzY2FsZSA9IHBhZ2VWaWV3LT5jb250ZW50U2NhbGUoKTsKKyAg ICBmbG9hdCBzY2FsZSA9IHBhZ2VWaWV3LT5jb250ZW50c1NjYWxlKCk7CiAKICAgICBRUmVjdCBh bGlnbmVkVmlzaWJsZUNvbnRlbnRSZWN0ID0gdmlzaWJsZVJlY3RJbkNTU0Nvb3JkaW5hdGVzLnRv QWxpZ25lZFJlY3QoKTsKICAgICBkcmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdEFu ZFNjYWxlKGFsaWduZWRWaXNpYmxlQ29udGVudFJlY3QsIHNjYWxlKTsKQEAgLTM3NSw3ICszNzUs NyBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpQb3N0VHJhbnNpdGlvblN0YXRlOjphcHBs eSgpCiAgICAgcC0+aW50ZXJhY3Rpb25FbmdpbmUtPnBhZ2VQb3NpdGlvblJlcXVlc3QocG9zaXRp b24pOwogCiAgICAgaWYgKGNvbnRlbnRzU2l6ZS5pc1ZhbGlkKCkpIHsKLSAgICAgICAgcC0+cGFn ZVZpZXctPnNldENvbnRlbnRTaXplKGNvbnRlbnRzU2l6ZSk7CisgICAgICAgIHAtPnBhZ2VWaWV3 LT5zZXRDb250ZW50c1NpemUoY29udGVudHNTaXplKTsKICAgICAgICAgcC0+cV9wdHItPmV4cGVy aW1lbnRhbCgpLT52aWV3cG9ydEluZm8oKS0+ZGlkVXBkYXRlQ29udGVudHNTaXplKCk7CiAgICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJ2aWV3 cG9ydGluZm8uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Vidmlld3Bv cnRpbmZvLmNwcAppbmRleCA3MzUxOTZmODYyNWQ4YzQ3NWU1MjZlMTNkYzFhNWY3Mzc5OTM0YTEw Li4wYWUyYjFkYmU0OTViNmY3NTI0NDZjNzgyNzVmM2YyZTY1ZWUwNzNjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJ2aWV3cG9ydGluZm8uY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnZpZXdwb3J0aW5mby5jcHAKQEAg LTM4LDcgKzM4LDcgQEAgUVdlYlZpZXdwb3J0SW5mbzo6flFXZWJWaWV3cG9ydEluZm8oKQogCiBR U2l6ZSBRV2ViVmlld3BvcnRJbmZvOjpjb250ZW50c1NpemUoKSBjb25zdAogewotICAgIHJldHVy biBRU2l6ZShtX3dlYlZpZXdQcml2YXRlLT5wYWdlVmlldy0+Y29udGVudFNpemUoKS50b1NpemUo KSk7CisgICAgcmV0dXJuIFFTaXplKG1fd2ViVmlld1ByaXZhdGUtPnBhZ2VWaWV3LT5jb250ZW50 c1NpemUoKS50b1NpemUoKSk7CiB9CiAKIFFWYXJpYW50IFFXZWJWaWV3cG9ydEluZm86OmN1cnJl bnRTY2FsZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3Rlc3RzL3FxdWlja3dlYnZpZXcvdHN0X3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xcXVpY2t3ZWJ2aWV3L3RzdF9xcXVpY2t3ZWJ2 aWV3LmNwcAppbmRleCAxZDE0ZDE4NDRhMWM5ZDQ4ODljZDZjMGZmYTIzN2Q1MjUyMjhlOGJiLi4x Nzc5NzZiYzljOWM4MGNkN2IxMjEwOWQ3ZDczMmUwMzNhN2EyYTJlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FxdWlja3dlYnZpZXcvdHN0X3FxdWlj a3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMv cXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHAKQEAgLTMyOCw3ICszMjgsNyBAQCB2 b2lkIHRzdF9RUXVpY2tXZWJWaWV3OjpzY3JvbGxSZXF1ZXN0KCkKICAgICAvLyBDT01QQVJFIHdp dGggdGhlIHBvc2l0aW9uIHJlcXVlc3RlZCBpbiB0aGUgaHRtbAogICAgIC8vIFVzZSBxUm91bmQg YXMgdGhhdCBpcyBhbHNvIHVzZWQgd2hlbiBjYWxjdWxhdGluZyB0aGUgcG9zaXRpb24KICAgICAv LyBpbiBXZWJLaXQuCi0gICAgaW50IHkgPSAtcVJvdW5kKDUwICogd2ViVmlldygpLT5wYWdlKCkt PmNvbnRlbnRTY2FsZSgpKTsKKyAgICBpbnQgeSA9IC1xUm91bmQoNTAgKiB3ZWJWaWV3KCktPnBh Z2UoKS0+Y29udGVudHNTY2FsZSgpKTsKICAgICBRVkVSSUZZKHdlYlZpZXcoKS0+cGFnZSgpLT5w b3MoKS55KCkgPT0geSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggODdjYjlkYjZk MGQzMmJmNzZlY2NmMzk4ODBiYTQ4YzUyNjgzMWUzYi4uOWIzMWQ5ZjgxNjE3ZmU0YzJlMmQ4Y2Y4 NzZiNjJjYzgyYzU1YjMzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTE4MCw3ICsxODAs NyBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2V0SXRlbVJlY3RWaXNpYmxl KGNvbnN0IFFSZWN0RiYgaXRlbVJlY3QpCiAKICAgICBxcmVhbCBpdGVtU2NhbGUgPSBtX3ZpZXdw b3J0LT53aWR0aCgpIC8gaXRlbVJlY3Qud2lkdGgoKTsKIAotICAgIG1fY29udGVudC0+c2V0Q29u dGVudFNjYWxlKGl0ZW1TY2FsZSk7CisgICAgbV9jb250ZW50LT5zZXRDb250ZW50c1NjYWxlKGl0 ZW1TY2FsZSk7CiAKICAgICAvLyBXZSBuZWVkIHRvIGFuaW1hdGUgdGhlIGNvbnRlbnQgYnV0IHRo ZSBwb3NpdGlvbiByZXByZXNlbnRzIHRoZSB2aWV3cG9ydCBoZW5jZSB3ZSBuZWVkIHRvIGludmVy dCB0aGUgcG9zaXRpb24gaGVyZS4KICAgICAvLyBUbyBhbmltYXRlIHRoZSBwb3NpdGlvbiB0b2dl dGhlciB3aXRoIHRoZSBzY2FsZSB3ZSBtdWx0aXBseSB0aGUgcG9zaXRpb24gd2l0aCB0aGUgY3Vy cmVudCBzY2FsZTsKQEAgLTI0NCw3ICsyNDQsNyBAQCBib29sIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6ZXZlbnQoUUV2ZW50KiBldmVudCkKICAgICAgICAgUVNjcm9sbFByZXBhcmVFdmVu dCogcHJlcGFyZUV2ZW50ID0gc3RhdGljX2Nhc3Q8UVNjcm9sbFByZXBhcmVFdmVudCo+KGV2ZW50 KTsKICAgICAgICAgY29uc3QgUVJlY3RGIHZpZXdwb3J0UmVjdCA9IG1fdmlld3BvcnQtPmJvdW5k aW5nUmVjdCgpOwogICAgICAgICBjb25zdCBRUmVjdEYgY29udGVudFJlY3QgPSBtX3ZpZXdwb3J0 LT5tYXBSZWN0RnJvbUl0ZW0obV9jb250ZW50LCBtX2NvbnRlbnQtPmJvdW5kaW5nUmVjdCgpKTsK LSAgICAgICAgY29uc3QgUVJlY3RGIHBvc1JhbmdlID0gY29tcHV0ZVBvc1JhbmdlRm9ySXRlbUF0 U2NhbGUobV9jb250ZW50LT5jb250ZW50U2NhbGUoKSk7CisgICAgICAgIGNvbnN0IFFSZWN0RiBw b3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5nZUZvckl0ZW1BdFNjYWxlKG1fY29udGVudC0+Y29udGVu dHNTY2FsZSgpKTsKICAgICAgICAgcHJlcGFyZUV2ZW50LT5zZXRDb250ZW50UG9zUmFuZ2UocG9z UmFuZ2UpOwogICAgICAgICBwcmVwYXJlRXZlbnQtPnNldFZpZXdwb3J0U2l6ZSh2aWV3cG9ydFJl Y3Quc2l6ZSgpKTsKIApAQCAtMzAzLDcgKzMwMyw3IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0 aW9uRW5naW5lOjp3aGVlbEV2ZW50KFFXaGVlbEV2ZW50KiBldikKICAgICBlbHNlCiAgICAgICAg IG5ld1Bvcy5yeSgpICs9IGRlbHRhOwogCi0gICAgUVJlY3RGIGVuZFBvc1JhbmdlID0gY29tcHV0 ZVBvc1JhbmdlRm9ySXRlbUF0U2NhbGUobV9jb250ZW50LT5jb250ZW50U2NhbGUoKSk7CisgICAg UVJlY3RGIGVuZFBvc1JhbmdlID0gY29tcHV0ZVBvc1JhbmdlRm9ySXRlbUF0U2NhbGUobV9jb250 ZW50LT5jb250ZW50c1NjYWxlKCkpOwogICAgIG1fY29udGVudC0+c2V0UG9zKC1ib3VuZFBvc2l0 aW9uKGVuZFBvc1JhbmdlLnRvcExlZnQoKSwgbmV3UG9zLCBlbmRQb3NSYW5nZS5ib3R0b21SaWdo dCgpKSk7CiB9CiAKQEAgLTMxMyw3ICszMTMsNyBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlv bkVuZ2luZTo6cGFnZVBvc2l0aW9uUmVxdWVzdChjb25zdCBRUG9pbnQmIHBhZ2VQb3NpdGlvbgog ICAgIGlmIChtX3N1c3BlbmRDb3VudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgcXJlYWwgZW5k SXRlbVNjYWxlID0gbV9jb250ZW50LT5jb250ZW50U2NhbGUoKTsgLy8gU3RheSBhdCBzYW1lIHNj YWxlLgorICAgIHFyZWFsIGVuZEl0ZW1TY2FsZSA9IG1fY29udGVudC0+Y29udGVudHNTY2FsZSgp OyAvLyBTdGF5IGF0IHNhbWUgc2NhbGUuCiAKICAgICBRUmVjdEYgZW5kUG9zUmFuZ2UgPSBjb21w dXRlUG9zUmFuZ2VGb3JJdGVtQXRTY2FsZShlbmRJdGVtU2NhbGUpOwogICAgIFFQb2ludEYgZW5k UG9zaXRpb24gPSBib3VuZFBvc2l0aW9uKGVuZFBvc1JhbmdlLnRvcExlZnQoKSwgcGFnZVBvc2l0 aW9uICogZW5kSXRlbVNjYWxlLCBlbmRQb3NSYW5nZS5ib3R0b21SaWdodCgpKTsKQEAgLTMyNSw3 ICszMjUsNyBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGFnZVBvc2l0aW9u UmVxdWVzdChjb25zdCBRUG9pbnQmIHBhZ2VQb3NpdGlvbgogCiBRUmVjdEYgUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjpjb21wdXRlUG9zUmFuZ2VGb3JJdGVtQXRTY2FsZShxcmVhbCBpdGVt U2NhbGUpIGNvbnN0CiB7Ci0gICAgY29uc3QgUVNpemVGIGNvbnRlbnRJdGVtU2l6ZSA9IG1fY29u dGVudC0+Y29udGVudFNpemUoKSAqIGl0ZW1TY2FsZTsKKyAgICBjb25zdCBRU2l6ZUYgY29udGVu dEl0ZW1TaXplID0gbV9jb250ZW50LT5jb250ZW50c1NpemUoKSAqIGl0ZW1TY2FsZTsKICAgICBj b25zdCBRU2l6ZUYgdmlld3BvcnRJdGVtU2l6ZSA9IG1fdmlld3BvcnQtPmJvdW5kaW5nUmVjdCgp LnNpemUoKTsKIAogICAgIGNvbnN0IHFyZWFsIGhvcml6b250YWxSYW5nZSA9IGNvbnRlbnRJdGVt U2l6ZS53aWR0aCgpIC0gdmlld3BvcnRJdGVtU2l6ZS53aWR0aCgpOwpAQCAtNDQ3LDcgKzQ0Nyw3 IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjphcHBseUNvbnN0cmFpbnRzKGNv bnN0IENvbnN0cmFpbnRzJiBjb25zdHJhaW50CiAKICAgICBpZiAoIW1faGFkVXNlckludGVyYWN0 aW9uKSB7CiAgICAgICAgIHFyZWFsIGluaXRpYWxTY2FsZSA9IGlubmVyQm91bmRlZENTU1NjYWxl KG1fY29uc3RyYWludHMuaW5pdGlhbFNjYWxlKTsKLSAgICAgICAgbV9jb250ZW50LT5zZXRDb250 ZW50U2NhbGUoaXRlbVNjYWxlRnJvbUNTUyhpbml0aWFsU2NhbGUpKTsKKyAgICAgICAgbV9jb250 ZW50LT5zZXRDb250ZW50c1NjYWxlKGl0ZW1TY2FsZUZyb21DU1MoaW5pdGlhbFNjYWxlKSk7CiAg ICAgfQogCiAgICAgLy8gSWYgdGhlIHdlYiBhcHAgY2hhbmdlcyBzdWNjZXNzaXZlbHkgY2hhbmdl cyB0aGUgdmlld3BvcnQgb24gcHVycG9zZQpAQCAtNDU3LDcgKzQ1Nyw3IEBAIHZvaWQgUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjphcHBseUNvbnN0cmFpbnRzKGNvbnN0IENvbnN0cmFpbnRz JiBjb25zdHJhaW50CiAKIHFyZWFsIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y3VycmVu dENTU1NjYWxlKCkKIHsKLSAgICByZXR1cm4gY3NzU2NhbGVGcm9tSXRlbShtX2NvbnRlbnQtPmNv bnRlbnRTY2FsZSgpKTsKKyAgICByZXR1cm4gY3NzU2NhbGVGcm9tSXRlbShtX2NvbnRlbnQtPmNv bnRlbnRzU2NhbGUoKSk7CiB9CiAKIGJvb2wgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpz Y3JvbGxBbmltYXRpb25BY3RpdmUoKSBjb25zdApAQCAtNTMwLDcgKzUzMCw3IEBAIHZvaWQgUXRW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVTdGFydGVkKGNvbnN0IFFQb2lu dEYmIHBpbmNoQ2VudGVyCiAgICAgbV9zY2FsZVVwZGF0ZURlZmVycmVyID0gYWRvcHRQdHIobmV3 IFZpZXdwb3J0VXBkYXRlRGVmZXJyZXIodGhpcykpOwogCiAgICAgbV9sYXN0UGluY2hDZW50ZXJJ blZpZXdwb3J0Q29vcmRpbmF0ZXMgPSBwaW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlczsK LSAgICBtX3BpbmNoU3RhcnRTY2FsZSA9IG1fY29udGVudC0+Y29udGVudFNjYWxlKCk7CisgICAg bV9waW5jaFN0YXJ0U2NhbGUgPSBtX2NvbnRlbnQtPmNvbnRlbnRzU2NhbGUoKTsKIAogICAgIC8v IFJlc2V0IHRoZSB0aWxpbmcgbG9vay1haGVhZCB2ZWN0b3Igc28gdGhhdCB0aWxlcyBhbGwgYXJv dW5kIHRoZSB2aWV3cG9ydCB3aWxsIGJlIHJlcXVlc3RlZCBvbiBwaW5jaC1lbmQuCiAgICAgZW1p dCB2aWV3cG9ydFRyYWplY3RvcnlWZWN0b3JDaGFuZ2VkKFFQb2ludEYoKSk7CkBAIC01ODQsNyAr NTg0LDcgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6Oml0ZW1TaXplQ2hhbmdl ZCgpCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6c2NhbGVDb250ZW50KGNvbnN0 IFFQb2ludEYmIGNlbnRlckluQ1NTQ29vcmRpbmF0ZXMsIHFyZWFsIGNzc1NjYWxlKQogewogICAg IFFQb2ludEYgb2xkUGluY2hDZW50ZXJPblZpZXdwb3J0ID0gbV92aWV3cG9ydC0+bWFwRnJvbVdl YkNvbnRlbnQoY2VudGVySW5DU1NDb29yZGluYXRlcyk7Ci0gICAgbV9jb250ZW50LT5zZXRDb250 ZW50U2NhbGUoaXRlbVNjYWxlRnJvbUNTUyhjc3NTY2FsZSkpOworICAgIG1fY29udGVudC0+c2V0 Q29udGVudHNTY2FsZShpdGVtU2NhbGVGcm9tQ1NTKGNzc1NjYWxlKSk7CiAgICAgUVBvaW50RiBu ZXdQaW5jaENlbnRlck9uVmlld3BvcnQgPSBtX3ZpZXdwb3J0LT5tYXBGcm9tV2ViQ29udGVudChj ZW50ZXJJbkNTU0Nvb3JkaW5hdGVzKTsKICAgICBtX2NvbnRlbnQtPnNldFBvcyhtX2NvbnRlbnQt PnBvcygpIC0gKG5ld1BpbmNoQ2VudGVyT25WaWV3cG9ydCAtIG9sZFBpbmNoQ2VudGVyT25WaWV3 cG9ydCkpOwogfQo=