11768 2006-12-06 06:02:45 -0800 Embedded Video within Scrollable DIV / Browser Scrolling 2007-07-31 23:57:32 -0700 1 1 1 Unclassified WebKit New Bugs 419.x Mac (PowerPC) OS X 10.4 RESOLVED FIXED GoogleBug P2 Normal --- 1 ainsoph1c hyatt beidson chezsmithy graeck oldest_to_newest 43101 0 ainsoph1c 2006-12-06 06:02:45 -0800 I have a Scrollable DIV that contains an embedded youtube video and some text beneath. The browsers Safari, OmniWeb, Opera, IE (Firefox being an exception) seem to display the video outside the boundaries of the DIV that it is contained within - regardless. That is, the video ignores the DIV clipping. Here is a link to demonstrate http://mcdxliv.cabspace.com/sample.html 10269 1 graeck 2007-05-11 18:18:10 -0700 I found this too. On this page: http://www.myspace.com/danegardner There's a YouTube video posted in the comments down a bit in the right column. It's too wide for the div and leaks out, even though there is a horizontal scroll bar showing - as if the video were hidden and you "needed" to scroll over to see the right portion of the screen. Also, when you do scroll to the right, the video breaks into sections where the right border of the div is, and leave a copy of part of the video outside the div. Safari exihibited the same behavior. Works fine in Firefox 2.x. Havent' tried other browsers. 8671 2 mitz 2007-05-31 00:12:10 -0700 *** Bug 13948 has been marked as a duplicate of this bug. *** 8669 3 mitz 2007-05-31 00:12:41 -0700 Affects Google Reader and Google Maps Street View 8666 4 mitz 2007-05-31 00:13:18 -0700 *** Bug 13189 has been marked as a duplicate of this bug. *** 8667 5 mitz 2007-05-31 00:14:20 -0700 According to Dave Hyatt, this bug is in Radar (along with some 20 duplicates). 8607 6 14813 hyatt 2007-05-31 16:34:34 -0700 Created attachment 14813 Clip Flash properly. This patch should get Netscape plugins clipping properly. 8592 7 14814 hyatt 2007-05-31 16:39:06 -0700 Created attachment 14814 Fix some typos in comments. 8601 8 14814 oliver 2007-05-31 22:42:28 -0700 Comment on attachment 14814 Fix some typos in comments. r=me, but it would be good if it you can make a layout test (i don't known if such a test if possible within drt) 8604 9 hyatt 2007-05-31 23:08:04 -0700 Fixed. 6638 10 chezsmithy 2007-06-22 23:25:34 -0700 Please bring this fix forward into the version of webkit bundled with Safari 3.0.x... Confirmed that 3.0.2 (522.12) does not include it. 3274 11 chezsmithy 2007-07-31 23:57:32 -0700 Please bring this bug forward into Safari 3. Confirmed 3.0.3 does not contain it. This fix resolves google reader issues related to scrolling and flash completely. 14813 2007-05-31 16:34:34 -0700 2007-05-31 16:39:06 -0700 Clip Flash properly. patch.txt text/plain 6193 hyatt SW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET00ubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9iaW5kaW5ncy9vYmpjL0RPTS5tbQkocmV2aXNpb24gMjE4MTMpCisrKyBXZWJDb3JlL2JpbmRp bmdzL29iamMvRE9NLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw3IEBACiAjaW1wb3J0 ICJGb250RGF0YS5oIgogI2ltcG9ydCAiRm91bmRhdGlvbkV4dHJhcy5oIgogI2ltcG9ydCAiRnJh bWUuaCIKKyNpbXBvcnQgIkZyYW1lVmlldy5oIgogI2ltcG9ydCAiSFRNTERvY3VtZW50LmgiCiAj aW1wb3J0ICJIVE1MTmFtZXMuaCIKICNpbXBvcnQgIkhUTUxQbHVnSW5FbGVtZW50LmgiCkBAIC01 OCw2ICs1OSw3IEBACiAjaW1wb3J0ICJRdWFsaWZpZWROYW1lLmgiCiAjaW1wb3J0ICJSYW5nZS5o IgogI2ltcG9ydCAiUmVuZGVySW1hZ2UuaCIKKyNpbXBvcnQgIlJlbmRlclZpZXcuaCIKICNpbXBv cnQgIlRleHQuaCIKICNpbXBvcnQgIlRyZWVXYWxrZXIuaCIKICNpbXBvcnQgIldlYlNjcmlwdE9i amVjdFByaXZhdGUuaCIKQEAgLTUzMSw2ICs1MzMsMTggQEAgc3RhdGljIE5TQXJyYXkgKmtpdChj b25zdCBWZWN0b3I8SW50UmVjdAogICAgIHJldHVybiBuaWw7CiB9CiAKKy0gKE5TUmVjdClfd2lu ZG93Q2xpcFJlY3QKK3sKKyAgICBXZWJDb3JlOjpSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gW3Nl bGYgX2VsZW1lbnRdLT5yZW5kZXJlcigpOworICAgIGlmIChyZW5kZXJlcikgeworICAgICAgICBX ZWJDb3JlOjpGcmFtZVZpZXcqIGZyYW1lVmlldyA9IHJlbmRlcmVyLT52aWV3KCktPmZyYW1lVmll dygpOworICAgICAgICBpZiAoIWZyYW1lVmlldykKKyAgICAgICAgICAgIHJldHVybiBXZWJDb3Jl OjpJbnRSZWN0KCk7CisgICAgICAgIHJldHVybiBmcmFtZVZpZXctPndpbmRvd0NsaXBSZWN0Rm9y TGF5ZXIocmVuZGVyZXItPmVuY2xvc2luZ0xheWVyKCksIHRydWUpOworICAgIH0KKyAgICByZXR1 cm4gV2ViQ29yZTo6SW50UmVjdCgpOworfQorCiAvLyBGSVhNRTogdGhpcyBzaG91bGQgYmUgaW1w bGVtZW50ZWQgaW4gdGhlIGltcGxlbWVudGF0aW9uCiAtIChOU1VSTCAqKV9nZXRVUkxBdHRyaWJ1 dGU6KE5TU3RyaW5nICopbmFtZQogewpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTVBy aXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NUHJpdmF0ZS5o CShyZXZpc2lvbiAyMTgxMykKKysrIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01Qcml2YXRlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTg1LDYgKzg1LDcgQEAKIC0gKE5TRGF0YSAqKV9pbWFnZVRJRkZS ZXByZXNlbnRhdGlvbjsKIC0gKE5TVVJMICopX2dldFVSTEF0dHJpYnV0ZTooTlNTdHJpbmcgKilu YW1lOwogLSAodm9pZCAqKV9OUE9iamVjdDsgLy8gRm9yIHN1YmNsYXNzZXMgdG8gaW1wbGVtZW50 OyB3ZSBvbmx5IGFsbG93IE5QT2JqZWN0cyB0byBiZSBjcmVhdGVkIGZvciBjZXJ0YWluIGVsZW1l bnQgdHlwZXMKKy0gKE5TUmVjdClfd2luZG93Q2xpcFJlY3Q7IC8vIENsaXAgcmVjdCBpbiBOU1dp bmRvdyBjb29yZHMgKHVzZWQgYnkgcGx1Z2lucykKIC0gKEJPT0wpaXNGb2N1c2VkOwogQGVuZAog CkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMjE4MTMpCisrKyBXZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUxLDcgKzg1MSw4IEBAIEludFJlY3QgRnJh bWVWaWV3Ojp3aW5kb3dDbGlwUmVjdChib29sIGMKICAgICAgICAgY2xpcFJlY3QgPSBlbmNsb3Np bmdJbnRSZWN0KHZpc2libGVDb250ZW50UmVjdCgpKTsKICAgICBlbHNlCiAgICAgICAgIGNsaXBS ZWN0ID0gSW50UmVjdChjb250ZW50c1goKSwgY29udGVudHNZKCksIHdpZHRoKCksIGhlaWdodCgp KTsKLSAgICBjbGlwUmVjdC5zZXRMb2NhdGlvbihjb250ZW50c1RvV2luZG93KGNsaXBSZWN0Lmxv Y2F0aW9uKCkpKTsKKyAgICBjbGlwUmVjdCA9IGNvbnRlbnRzVG9XaW5kb3coY2xpcFJlY3QpOwor CiAgICAgaWYgKCFtX2ZyYW1lIHx8ICFtX2ZyYW1lLT5kb2N1bWVudCgpIHx8ICFtX2ZyYW1lLT5k b2N1bWVudCgpLT5vd25lckVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuIGNsaXBSZWN0OwogCkBA IC04NzQsOCArODc1LDcgQEAgSW50UmVjdCBGcmFtZVZpZXc6OndpbmRvd0NsaXBSZWN0Rm9yTGF5 ZQogICAgICAgICBjbGlwUmVjdCA9IGxheWVyLT5jaGlsZHJlbkNsaXBSZWN0KCk7CiAgICAgZWxz ZQogICAgICAgICBjbGlwUmVjdCA9IGxheWVyLT5zZWxmQ2xpcFJlY3QoKTsKLSAgICBjbGlwUmVj dC5zZXRMb2NhdGlvbihjb250ZW50c1RvV2luZG93KGNsaXBSZWN0LmxvY2F0aW9uKCkpKTsKLSAK KyAgICBjbGlwUmVjdCA9IGNvbnRlbnRzVG9XaW5kb3coY2xpcFJlY3QpOyAKICAgICByZXR1cm4g aW50ZXJzZWN0aW9uKGNsaXBSZWN0LCB3aW5kb3dDbGlwUmVjdCgpKTsKIH0KIApJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxWaWV3LmgJKHJldmlzaW9uIDIxODEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgU2Nyb2xs Vmlld19oCiAjZGVmaW5lIFNjcm9sbFZpZXdfaAogCisjaW5jbHVkZSAiSW50UmVjdC5oIgogI2lu Y2x1ZGUgIlNjcm9sbFR5cGVzLmgiCiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVkZSA8d3Rm L0hhc2hTZXQuaD4KQEAgLTg2LDcgKzg3LDE3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgLy8gb2YgY29udGFpbmluZyB3aW5kb3cgaXMuICAoRm9yIGV4YW1wbGUgb24gTWFjIGl0IGlz IHRoZSBjb250YWluaW5nIE5TV2luZG93LikKICAgICAgICAgSW50UG9pbnQgd2luZG93VG9Db250 ZW50cyhjb25zdCBJbnRQb2ludCYpIGNvbnN0OwogICAgICAgICBJbnRQb2ludCBjb250ZW50c1Rv V2luZG93KGNvbnN0IEludFBvaW50JikgY29uc3Q7Ci0gCisgICAgICAgIAorI2lmIFBMQVRGT1JN KE1BQykKKyAgICAgICAgLy8gT24gTWFjLW9ubHkgYmVjYXVzZSBvZiBmbGlwcGVkIE5TV2luZG93 IHktY29vcmRpbmF0ZXMsIHdlIGhhdmUgdG8gaGF2ZSBhIHNwZWNpYWwgaW1wbGVtZW50YXRpb24u CisgICAgICAgIEludFJlY3Qgd2luZG93VG9Db250ZW50cyhjb25zdCBJbnRSZWN0JikgY29uc3Q7 CisgICAgICAgIEludFJlY3QgY29udGVudHNUb1dpbmRvdyhjb25zdCBJbnRSZWN0JikgY29uc3Q7 CisjZWxzZQorICAgICAgICAvLyBPdGhlciBwbGF0Zm9ybXMgY2FuIGp1c3QgaW1wbGVtZW50IHRo ZXNlIGhlbHBlciBtZXRob2RzIHVzaW5nIHRoZSBjb3JyZXNwb25kaW5nIHBvaW50IGNvbnZlcnNp b24gbWV0aG9kcy4KKyAgICAgICAgSW50UmVjdCBjb250ZW50c1RvV2luZG93KGNvbnN0IEludFJl Y3QmIHJlY3QpIGNvbnN0IHsgcmV0dXJuIEludFJlY3QoY29udGVudHNUb1dpbmRvdyhyZWN0Lmxv Y2F0aW9uKCkpLCByZWN0LnNpemUoKSk7IH0KKyAgICAgICAgSW50UmVjdCB3aW5kb3dUb0NvbnRl bnRzKGNvbnN0IEludFJlY3QmIHJlY3QpIGNvbnN0IHsgcmV0dXJuIEludFJlY3Qod2luZG93VG9D b250ZW50cyhyZWN0LmxvY2F0aW9uKCkpLCByZWN0LnNpemUoKSk7IH0KKyNlbmRpZgorCiAgICAg ICAgIHZvaWQgc2V0U3RhdGljQmFja2dyb3VuZChib29sKTsKIAogICAgICAgICBib29sIGluV2lu ZG93KCkgY29uc3Q7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxWaWV3TWFjLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbFZpZXdNYWMubW0JKHJl dmlzaW9uIDIxODEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsVmlld01hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtNDIyLDYgKzQyMiw0NSBAQCBJbnRQb2ludCBTY3JvbGxWaWV3Ojp3 aW5kb3dUb0NvbnRlbnRzKGNvCiAgICAgcmV0dXJuIEludFBvaW50KCk7CiB9CiAKK0ludFJlY3Qg U2Nyb2xsVmlldzo6Y29udGVudHNUb1dpbmRvdyhjb25zdCBJbnRSZWN0JiBjb250ZW50c1JlY3Qp IGNvbnN0Cit7CisgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOworCisgICAgTlNWaWV3 KiBkb2NWaWV3OworICAgIE5TVmlldyogdmlldyA9IGdldFZpZXcoKTsgICAgCisgICAgIAorICAg IGRvY1ZpZXcgPSBnZXREb2N1bWVudFZpZXcoKTsKKyAgICBpZiAoZG9jVmlldykKKyAgICAgICAg dmlldyA9IGRvY1ZpZXc7CisgICAgCisgICAgTlNSZWN0IG5yID0gW3ZpZXcgY29udmVydFJlY3Q6 Y29udGVudHNSZWN0IHRvVmlldzogbmlsXTsKKyAgICByZXR1cm4gSW50UmVjdChucik7CisKKyAg ICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOworICAgIAorICAgIHJldHVybiBJbnRSZWN0KCk7 Cit9CisKK0ludFJlY3QgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjb25zdCBJbnRSZWN0 JiByZWN0KSBjb25zdAoreworICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKworICAg IE5TVmlldyogZG9jVmlldzsKKyAgICBOU1ZpZXcqIHZpZXcgPSBnZXRWaWV3KCk7ICAgIAorCisg ICAgZG9jVmlldyA9IGdldERvY3VtZW50VmlldygpOworICAgIGlmIChkb2NWaWV3KQorICAgICAg ICB2aWV3ID0gZG9jVmlldzsKKyAgICAKKyAgICBOU1JlY3QgbnIgPSBbdmlldyBjb252ZXJ0UmVj dDpyZWN0IGZyb21WaWV3OiBuaWxdOworCisgICAgcmV0dXJuIEludFJlY3QobnIpOworCisgICAg RU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKworICAgIHJldHVybiBJbnRSZWN0KCk7Cit9CisK IHZvaWQgU2Nyb2xsVmlldzo6c2V0U3RhdGljQmFja2dyb3VuZChib29sIGIpCiB7CiAgICAgTlNT Y3JvbGxWaWV3ICp2aWV3ID0gKE5TU2Nyb2xsVmlldyAqKWdldFZpZXcoKTsKSW5kZXg6IFdlYktp dC9QbHVnaW5zL1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L1BsdWdpbnMvV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldy5tbQkocmV2aXNpb24gMjE4MTMp CisrKyBXZWJLaXQvUGx1Z2lucy9XZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCSh3b3JraW5n IGNvcHkpCkBAIC0zMjYsNiArMzI2LDExIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBnZXROUFJlY3Qo Y29uc3QgTlNSZWMKICAgICBOU1JlY3QgYm91bmRzSW5XaW5kb3cgPSBbc2VsZiBjb252ZXJ0UmVj dDpbc2VsZiBib3VuZHNdIHRvVmlldzpuaWxdOwogICAgIE5TUmVjdCB2aXNpYmxlUmVjdEluV2lu ZG93ID0gW3NlbGYgY29udmVydFJlY3Q6W3NlbGYgdmlzaWJsZVJlY3RdIHRvVmlldzpuaWxdOwog ICAgIAorICAgIC8vIFdlYkNvcmUgbWF5IGltcG9zZSBhbiBhZGRpdGlvbmFsIGNsaXAgKHZpYSBD U1Mgb3ZlcmZsb3cgb2YgY2xpcCBwcm9wZXJ0aWVzKS4gIEZldGNoCisgICAgLy8gdGhhdCBjbGlw IG5vdy4KKyAgICBOU1JlY3Qgd2luZG93Q2xpcFJlY3QgPSBbZWxlbWVudCBfd2luZG93Q2xpcFJl Y3RdOworICAgIHZpc2libGVSZWN0SW5XaW5kb3cgPSBOU0ludGVyc2VjdGlvblJlY3QodmlzaWJs ZVJlY3RJbldpbmRvdywgd2luZG93Q2xpcFJlY3QpOworCiAgICAgLy8gRmxpcCBZIHRvIGNvbnZl cnQgTlNXaW5kb3cgY29vcmRpbmF0ZXMgdG8gdG9wLWxlZnQtYmFzZWQgd2luZG93IGNvb3JkaW5h dGVzLgogICAgIGZsb2F0IGJvcmRlclZpZXdIZWlnaHQgPSBbW3NlbGYgY3VycmVudFdpbmRvd10g ZnJhbWVdLnNpemUuaGVpZ2h0OwogICAgIGJvdW5kc0luV2luZG93Lm9yaWdpbi55ID0gYm9yZGVy Vmlld0hlaWdodCAtIE5TTWF4WShib3VuZHNJbldpbmRvdyk7Cg== 14814 2007-05-31 16:39:06 -0700 2007-05-31 22:42:28 -0700 Fix some typos in comments. patch.txt text/plain 6193 hyatt SW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET00ubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9iaW5kaW5ncy9vYmpjL0RPTS5tbQkocmV2aXNpb24gMjE4MTMpCisrKyBXZWJDb3JlL2JpbmRp bmdzL29iamMvRE9NLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw3IEBACiAjaW1wb3J0 ICJGb250RGF0YS5oIgogI2ltcG9ydCAiRm91bmRhdGlvbkV4dHJhcy5oIgogI2ltcG9ydCAiRnJh bWUuaCIKKyNpbXBvcnQgIkZyYW1lVmlldy5oIgogI2ltcG9ydCAiSFRNTERvY3VtZW50LmgiCiAj aW1wb3J0ICJIVE1MTmFtZXMuaCIKICNpbXBvcnQgIkhUTUxQbHVnSW5FbGVtZW50LmgiCkBAIC01 OCw2ICs1OSw3IEBACiAjaW1wb3J0ICJRdWFsaWZpZWROYW1lLmgiCiAjaW1wb3J0ICJSYW5nZS5o IgogI2ltcG9ydCAiUmVuZGVySW1hZ2UuaCIKKyNpbXBvcnQgIlJlbmRlclZpZXcuaCIKICNpbXBv cnQgIlRleHQuaCIKICNpbXBvcnQgIlRyZWVXYWxrZXIuaCIKICNpbXBvcnQgIldlYlNjcmlwdE9i amVjdFByaXZhdGUuaCIKQEAgLTUzMSw2ICs1MzMsMTggQEAgc3RhdGljIE5TQXJyYXkgKmtpdChj b25zdCBWZWN0b3I8SW50UmVjdAogICAgIHJldHVybiBuaWw7CiB9CiAKKy0gKE5TUmVjdClfd2lu ZG93Q2xpcFJlY3QKK3sKKyAgICBXZWJDb3JlOjpSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gW3Nl bGYgX2VsZW1lbnRdLT5yZW5kZXJlcigpOworICAgIGlmIChyZW5kZXJlcikgeworICAgICAgICBX ZWJDb3JlOjpGcmFtZVZpZXcqIGZyYW1lVmlldyA9IHJlbmRlcmVyLT52aWV3KCktPmZyYW1lVmll dygpOworICAgICAgICBpZiAoIWZyYW1lVmlldykKKyAgICAgICAgICAgIHJldHVybiBXZWJDb3Jl OjpJbnRSZWN0KCk7CisgICAgICAgIHJldHVybiBmcmFtZVZpZXctPndpbmRvd0NsaXBSZWN0Rm9y TGF5ZXIocmVuZGVyZXItPmVuY2xvc2luZ0xheWVyKCksIHRydWUpOworICAgIH0KKyAgICByZXR1 cm4gV2ViQ29yZTo6SW50UmVjdCgpOworfQorCiAvLyBGSVhNRTogdGhpcyBzaG91bGQgYmUgaW1w bGVtZW50ZWQgaW4gdGhlIGltcGxlbWVudGF0aW9uCiAtIChOU1VSTCAqKV9nZXRVUkxBdHRyaWJ1 dGU6KE5TU3RyaW5nICopbmFtZQogewpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTVBy aXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NUHJpdmF0ZS5o CShyZXZpc2lvbiAyMTgxMykKKysrIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01Qcml2YXRlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTg1LDYgKzg1LDcgQEAKIC0gKE5TRGF0YSAqKV9pbWFnZVRJRkZS ZXByZXNlbnRhdGlvbjsKIC0gKE5TVVJMICopX2dldFVSTEF0dHJpYnV0ZTooTlNTdHJpbmcgKilu YW1lOwogLSAodm9pZCAqKV9OUE9iamVjdDsgLy8gRm9yIHN1YmNsYXNzZXMgdG8gaW1wbGVtZW50 OyB3ZSBvbmx5IGFsbG93IE5QT2JqZWN0cyB0byBiZSBjcmVhdGVkIGZvciBjZXJ0YWluIGVsZW1l bnQgdHlwZXMKKy0gKE5TUmVjdClfd2luZG93Q2xpcFJlY3Q7IC8vIENsaXAgcmVjdCBpbiBOU1dp bmRvdyBjb29yZHMgKHVzZWQgYnkgcGx1Z2lucykKIC0gKEJPT0wpaXNGb2N1c2VkOwogQGVuZAog CkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMjE4MTMpCisrKyBXZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUxLDcgKzg1MSw4IEBAIEludFJlY3QgRnJh bWVWaWV3Ojp3aW5kb3dDbGlwUmVjdChib29sIGMKICAgICAgICAgY2xpcFJlY3QgPSBlbmNsb3Np bmdJbnRSZWN0KHZpc2libGVDb250ZW50UmVjdCgpKTsKICAgICBlbHNlCiAgICAgICAgIGNsaXBS ZWN0ID0gSW50UmVjdChjb250ZW50c1goKSwgY29udGVudHNZKCksIHdpZHRoKCksIGhlaWdodCgp KTsKLSAgICBjbGlwUmVjdC5zZXRMb2NhdGlvbihjb250ZW50c1RvV2luZG93KGNsaXBSZWN0Lmxv Y2F0aW9uKCkpKTsKKyAgICBjbGlwUmVjdCA9IGNvbnRlbnRzVG9XaW5kb3coY2xpcFJlY3QpOwor CiAgICAgaWYgKCFtX2ZyYW1lIHx8ICFtX2ZyYW1lLT5kb2N1bWVudCgpIHx8ICFtX2ZyYW1lLT5k b2N1bWVudCgpLT5vd25lckVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuIGNsaXBSZWN0OwogCkBA IC04NzQsOCArODc1LDcgQEAgSW50UmVjdCBGcmFtZVZpZXc6OndpbmRvd0NsaXBSZWN0Rm9yTGF5 ZQogICAgICAgICBjbGlwUmVjdCA9IGxheWVyLT5jaGlsZHJlbkNsaXBSZWN0KCk7CiAgICAgZWxz ZQogICAgICAgICBjbGlwUmVjdCA9IGxheWVyLT5zZWxmQ2xpcFJlY3QoKTsKLSAgICBjbGlwUmVj dC5zZXRMb2NhdGlvbihjb250ZW50c1RvV2luZG93KGNsaXBSZWN0LmxvY2F0aW9uKCkpKTsKLSAK KyAgICBjbGlwUmVjdCA9IGNvbnRlbnRzVG9XaW5kb3coY2xpcFJlY3QpOyAKICAgICByZXR1cm4g aW50ZXJzZWN0aW9uKGNsaXBSZWN0LCB3aW5kb3dDbGlwUmVjdCgpKTsKIH0KIApJbmRleDogV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxWaWV3LmgJKHJldmlzaW9uIDIxODEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgU2Nyb2xs Vmlld19oCiAjZGVmaW5lIFNjcm9sbFZpZXdfaAogCisjaW5jbHVkZSAiSW50UmVjdC5oIgogI2lu Y2x1ZGUgIlNjcm9sbFR5cGVzLmgiCiAjaW5jbHVkZSAiV2lkZ2V0LmgiCiAjaW5jbHVkZSA8d3Rm L0hhc2hTZXQuaD4KQEAgLTg2LDcgKzg3LDE3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgLy8gb2YgY29udGFpbmluZyB3aW5kb3cgaXMuICAoRm9yIGV4YW1wbGUgb24gTWFjIGl0IGlz IHRoZSBjb250YWluaW5nIE5TV2luZG93LikKICAgICAgICAgSW50UG9pbnQgd2luZG93VG9Db250 ZW50cyhjb25zdCBJbnRQb2ludCYpIGNvbnN0OwogICAgICAgICBJbnRQb2ludCBjb250ZW50c1Rv V2luZG93KGNvbnN0IEludFBvaW50JikgY29uc3Q7Ci0gCisgICAgICAgIAorI2lmIFBMQVRGT1JN KE1BQykKKyAgICAgICAgLy8gT24gTWFjIG9ubHkgYmVjYXVzZSBvZiBmbGlwcGVkIE5TV2luZG93 IHktY29vcmRpbmF0ZXMsIHdlIGhhdmUgdG8gaGF2ZSBhIHNwZWNpYWwgaW1wbGVtZW50YXRpb24u CisgICAgICAgIEludFJlY3Qgd2luZG93VG9Db250ZW50cyhjb25zdCBJbnRSZWN0JikgY29uc3Q7 CisgICAgICAgIEludFJlY3QgY29udGVudHNUb1dpbmRvdyhjb25zdCBJbnRSZWN0JikgY29uc3Q7 CisjZWxzZQorICAgICAgICAvLyBPdGhlciBwbGF0Zm9ybXMgY2FuIGp1c3QgaW1wbGVtZW50IHRo ZXNlIGhlbHBlciBtZXRob2RzIHVzaW5nIHRoZSBjb3JyZXNwb25kaW5nIHBvaW50IGNvbnZlcnNp b24gbWV0aG9kcy4KKyAgICAgICAgSW50UmVjdCBjb250ZW50c1RvV2luZG93KGNvbnN0IEludFJl Y3QmIHJlY3QpIGNvbnN0IHsgcmV0dXJuIEludFJlY3QoY29udGVudHNUb1dpbmRvdyhyZWN0Lmxv Y2F0aW9uKCkpLCByZWN0LnNpemUoKSk7IH0KKyAgICAgICAgSW50UmVjdCB3aW5kb3dUb0NvbnRl bnRzKGNvbnN0IEludFJlY3QmIHJlY3QpIGNvbnN0IHsgcmV0dXJuIEludFJlY3Qod2luZG93VG9D b250ZW50cyhyZWN0LmxvY2F0aW9uKCkpLCByZWN0LnNpemUoKSk7IH0KKyNlbmRpZgorCiAgICAg ICAgIHZvaWQgc2V0U3RhdGljQmFja2dyb3VuZChib29sKTsKIAogICAgICAgICBib29sIGluV2lu ZG93KCkgY29uc3Q7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxWaWV3TWFjLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbFZpZXdNYWMubW0JKHJl dmlzaW9uIDIxODEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsVmlld01hYy5tbQko d29ya2luZyBjb3B5KQpAQCAtNDIyLDYgKzQyMiw0NSBAQCBJbnRQb2ludCBTY3JvbGxWaWV3Ojp3 aW5kb3dUb0NvbnRlbnRzKGNvCiAgICAgcmV0dXJuIEludFBvaW50KCk7CiB9CiAKK0ludFJlY3Qg U2Nyb2xsVmlldzo6Y29udGVudHNUb1dpbmRvdyhjb25zdCBJbnRSZWN0JiBjb250ZW50c1JlY3Qp IGNvbnN0Cit7CisgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOworCisgICAgTlNWaWV3 KiBkb2NWaWV3OworICAgIE5TVmlldyogdmlldyA9IGdldFZpZXcoKTsgICAgCisgICAgIAorICAg IGRvY1ZpZXcgPSBnZXREb2N1bWVudFZpZXcoKTsKKyAgICBpZiAoZG9jVmlldykKKyAgICAgICAg dmlldyA9IGRvY1ZpZXc7CisgICAgCisgICAgTlNSZWN0IG5yID0gW3ZpZXcgY29udmVydFJlY3Q6 Y29udGVudHNSZWN0IHRvVmlldzogbmlsXTsKKyAgICByZXR1cm4gSW50UmVjdChucik7CisKKyAg ICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOworICAgIAorICAgIHJldHVybiBJbnRSZWN0KCk7 Cit9CisKK0ludFJlY3QgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjb25zdCBJbnRSZWN0 JiByZWN0KSBjb25zdAoreworICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKworICAg IE5TVmlldyogZG9jVmlldzsKKyAgICBOU1ZpZXcqIHZpZXcgPSBnZXRWaWV3KCk7ICAgIAorCisg ICAgZG9jVmlldyA9IGdldERvY3VtZW50VmlldygpOworICAgIGlmIChkb2NWaWV3KQorICAgICAg ICB2aWV3ID0gZG9jVmlldzsKKyAgICAKKyAgICBOU1JlY3QgbnIgPSBbdmlldyBjb252ZXJ0UmVj dDpyZWN0IGZyb21WaWV3OiBuaWxdOworCisgICAgcmV0dXJuIEludFJlY3QobnIpOworCisgICAg RU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKworICAgIHJldHVybiBJbnRSZWN0KCk7Cit9CisK IHZvaWQgU2Nyb2xsVmlldzo6c2V0U3RhdGljQmFja2dyb3VuZChib29sIGIpCiB7CiAgICAgTlNT Y3JvbGxWaWV3ICp2aWV3ID0gKE5TU2Nyb2xsVmlldyAqKWdldFZpZXcoKTsKSW5kZXg6IFdlYktp dC9QbHVnaW5zL1dlYkJhc2VOZXRzY2FwZVBsdWdpblZpZXcubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L1BsdWdpbnMvV2ViQmFzZU5ldHNjYXBlUGx1Z2luVmlldy5tbQkocmV2aXNpb24gMjE4MTMp CisrKyBXZWJLaXQvUGx1Z2lucy9XZWJCYXNlTmV0c2NhcGVQbHVnaW5WaWV3Lm1tCSh3b3JraW5n IGNvcHkpCkBAIC0zMjYsNiArMzI2LDExIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBnZXROUFJlY3Qo Y29uc3QgTlNSZWMKICAgICBOU1JlY3QgYm91bmRzSW5XaW5kb3cgPSBbc2VsZiBjb252ZXJ0UmVj dDpbc2VsZiBib3VuZHNdIHRvVmlldzpuaWxdOwogICAgIE5TUmVjdCB2aXNpYmxlUmVjdEluV2lu ZG93ID0gW3NlbGYgY29udmVydFJlY3Q6W3NlbGYgdmlzaWJsZVJlY3RdIHRvVmlldzpuaWxdOwog ICAgIAorICAgIC8vIFdlYkNvcmUgbWF5IGltcG9zZSBhbiBhZGRpdGlvbmFsIGNsaXAgKHZpYSBD U1Mgb3ZlcmZsb3cgb3IgY2xpcCBwcm9wZXJ0aWVzKS4gIEZldGNoCisgICAgLy8gdGhhdCBjbGlw IG5vdy4KKyAgICBOU1JlY3Qgd2luZG93Q2xpcFJlY3QgPSBbZWxlbWVudCBfd2luZG93Q2xpcFJl Y3RdOworICAgIHZpc2libGVSZWN0SW5XaW5kb3cgPSBOU0ludGVyc2VjdGlvblJlY3QodmlzaWJs ZVJlY3RJbldpbmRvdywgd2luZG93Q2xpcFJlY3QpOworCiAgICAgLy8gRmxpcCBZIHRvIGNvbnZl cnQgTlNXaW5kb3cgY29vcmRpbmF0ZXMgdG8gdG9wLWxlZnQtYmFzZWQgd2luZG93IGNvb3JkaW5h dGVzLgogICAgIGZsb2F0IGJvcmRlclZpZXdIZWlnaHQgPSBbW3NlbGYgY3VycmVudFdpbmRvd10g ZnJhbWVdLnNpemUuaGVpZ2h0OwogICAgIGJvdW5kc0luV2luZG93Lm9yaWdpbi55ID0gYm9yZGVy Vmlld0hlaWdodCAtIE5TTWF4WShib3VuZHNJbldpbmRvdyk7Cg==