47325 2010-10-06 21:46:31 -0700 [Qt] API: ViewportConfiguration => ViewportArguments 2010-10-12 07:42:47 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling webkit-qt-unassigned ademar commit-queue kamaji kenneth oldest_to_newest 290790 0 kling 2010-10-06 21:46:31 -0700 Following the rename in WebCore, QWebPage::ViewportConfiguration should be renamed to QWebPage::ViewportArguments, and QWebPage::viewportConfigurationForSize() should be renamed to QWebPage::viewportAttributesForSize() 290798 1 70035 kling 2010-10-06 22:13:28 -0700 Created attachment 70035 Proposed patch 291188 2 70035 commit-queue 2010-10-07 12:41:53 -0700 Comment on attachment 70035 Proposed patch Clearing flags on attachment: 70035 Committed r69331: <http://trac.webkit.org/changeset/69331> 291189 3 commit-queue 2010-10-07 12:41:58 -0700 All reviewed patches have been landed. Closing bug. 291531 4 ademar 2010-10-08 02:59:34 -0700 Shouldn't WebKit2 API be changed as well (on trunk)? 291561 5 kenneth 2010-10-08 04:37:01 -0700 (In reply to comment #4) > Shouldn't WebKit2 API be changed as well (on trunk)? The WebKit2 API will change as soon as we have the WebKit2 C API approved and integrated. This doesn't depend on our public release. 291566 6 ademar 2010-10-08 04:43:17 -0700 Revision r69331 cherry-picked into qtwebkit-2.1 with commit 15761d2 <http://gitorious.org/webkit/qtwebkit/commit/15761d2> 292948 7 kamaji 2010-10-12 07:42:47 -0700 This breaks Symbian, as the .def files are now again, out of sync, and need to be re-frozen. 70035 2010-10-06 22:13:28 -0700 2010-10-07 12:41:53 -0700 Proposed patch bug-47325.diff text/plain 9627 kling ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAKaW5kZXggYTA4OTM2Mi4uMWY4YjE5ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTE1 NzIsMTUgKzE1NzIsMTUgQEAgcXVpbnQxNiBRV2ViUGFnZVByaXZhdGU6Omluc3BlY3RvclNlcnZl clBvcnQoKQogCiAKIC8qIQotICAgIFxjbGFzcyBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0 aW9uCisgICAgXGNsYXNzIFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXMKICAgICBcc2luY2Ug NC43Ci0gICAgXGJyaWVmIFRoZSBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uIGNsYXNz IGRlc2NyaWJlcyBoaW50cyB0aGF0IGNhbiBiZSBhcHBsaWVkIHRvIGEgdmlld3BvcnQuCisgICAg XGJyaWVmIFRoZSBRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzIGNsYXNzIGRlc2NyaWJlcyBo aW50cyB0aGF0IGNhbiBiZSBhcHBsaWVkIHRvIGEgdmlld3BvcnQuCiAKLSAgICBRV2ViUGFnZTo6 Vmlld3BvcnRDb25maWd1cmF0aW9uIHByb3ZpZGVzIGEgZGVzY3JpcHRpb24gb2YgYSB2aWV3cG9y dCwgc3VjaCBhcyB2aWV3cG9ydCBnZW9tZXRyeSwKKyAgICBRV2ViUGFnZTo6Vmlld3BvcnRBdHRy aWJ1dGVzIHByb3ZpZGVzIGEgZGVzY3JpcHRpb24gb2YgYSB2aWV3cG9ydCwgc3VjaCBhcyB2aWV3 cG9ydCBnZW9tZXRyeSwKICAgICBpbml0aWFsIHNjYWxlIGZhY3RvciB3aXRoIGxpbWl0cywgcGx1 cyBpbmZvcm1hdGlvbiBhYm91dCB3aGV0aGVyIGEgdXNlciBzaG91bGQgYmUgYWJsZQogICAgIHRv IHNjYWxlIHRoZSBjb250ZW50cyBpbiB0aGUgdmlld3BvcnQgb3Igbm90LCBpZS4gYnkgem9vbWlu Zy4KIAotICAgIFZpZXdwb3J0Q29uZmlndXJhdGlvbiBjYW4gYmUgc2V0IGJ5IGEgd2ViIGF1dGhv ciB1c2luZyB0aGUgdmlld3BvcnQgbWV0YSB0YWcgZXh0ZW5zaW9uLCBkb2N1bWVudGVkCisgICAg Vmlld3BvcnRBdHRyaWJ1dGVzIGNhbiBiZSBzZXQgYnkgYSB3ZWIgYXV0aG9yIHVzaW5nIHRoZSB2 aWV3cG9ydCBtZXRhIHRhZyBleHRlbnNpb24sIGRvY3VtZW50ZWQKICAgICBhdCBcbHtodHRwOi8v ZGV2ZWxvcGVyLmFwcGxlLmNvbS9zYWZhcmkvbGlicmFyeS9kb2N1bWVudGF0aW9uL2FwcGxlYXBw bGljYXRpb25zL3JlZmVyZW5jZS9zYWZhcml3ZWJjb250ZW50L3VzaW5ndGhldmlld3BvcnQvdXNp bmd0aGV2aWV3cG9ydC5odG1sfXtTYWZhcmkgUmVmZXJlbmNlIExpYnJhcnk6IFVzaW5nIHRoZSBW aWV3cG9ydCBNZXRhIFRhZ30uCiAKICAgICBBbGwgdmFsdWVzIG1pZ2h0IG5vdCBiZSBzZXQsIGFz IHN1Y2ggd2hlbiBkZWFsaW5nIHdpdGggdGhlIGhpbnRzLCB0aGUgZGV2ZWxvcGVyIG5lZWRzIHRv CkBAIC0xNTkwLDkgKzE1OTAsOSBAQCBxdWludDE2IFFXZWJQYWdlUHJpdmF0ZTo6aW5zcGVjdG9y U2VydmVyUG9ydCgpCiAqLwogCiAvKiEKLSAgICBDb25zdHJ1Y3RzIGFuIGVtcHR5IFFXZWJQYWdl OjpWaWV3cG9ydENvbmZpZ3VyYXRpb24uCisgICAgQ29uc3RydWN0cyBhbiBlbXB0eSBRV2ViUGFn ZTo6Vmlld3BvcnRBdHRyaWJ1dGVzLgogKi8KLVFXZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRp b246OlZpZXdwb3J0Q29uZmlndXJhdGlvbigpCitRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVz OjpWaWV3cG9ydEF0dHJpYnV0ZXMoKQogICAgIDogZCgwKQogICAgICwgbV9pbml0aWFsU2NhbGVG YWN0b3IoLTEuMCkKICAgICAsIG1fbWluaW11bVNjYWxlRmFjdG9yKC0xLjApCkBAIC0xNjA1LDkg KzE2MDUsOSBAQCBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjpWaWV3cG9ydENvbmZp Z3VyYXRpb24oKQogfQogCiAvKiEKLSAgICBDb25zdHJ1Y3RzIGEgUVdlYlBhZ2U6OlZpZXdwb3J0 Q29uZmlndXJhdGlvbiB3aGljaCBpcyBhIGNvcHkgZnJvbSBcYSBvdGhlciAuCisgICAgQ29uc3Ry dWN0cyBhIFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXMgd2hpY2ggaXMgYSBjb3B5IGZyb20g XGEgb3RoZXIgLgogKi8KLVFXZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OlZpZXdwb3J0 Q29uZmlndXJhdGlvbihjb25zdCBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uJiBvdGhl cikKK1FXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXM6OlZpZXdwb3J0QXR0cmlidXRlcyhjb25z dCBRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzJiBvdGhlcikKICAgICA6IGQob3RoZXIuZCkK ICAgICAsIG1faW5pdGlhbFNjYWxlRmFjdG9yKG90aGVyLm1faW5pdGlhbFNjYWxlRmFjdG9yKQog ICAgICwgbV9taW5pbXVtU2NhbGVGYWN0b3Iob3RoZXIubV9taW5pbXVtU2NhbGVGYWN0b3IpCkBA IC0xNjIxLDE4ICsxNjIxLDE4IEBAIFFXZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246OlZp ZXdwb3J0Q29uZmlndXJhdGlvbihjb25zdCBRV2ViUGFnZTo6Vmlld3BvcnRDCiB9CiAKIC8qIQot ICAgIERlc3Ryb3lzIHRoZSBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uLgorICAgIERl c3Ryb3lzIHRoZSBRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzLgogKi8KLVFXZWJQYWdlOjpW aWV3cG9ydENvbmZpZ3VyYXRpb246On5WaWV3cG9ydENvbmZpZ3VyYXRpb24oKQorUVdlYlBhZ2U6 OlZpZXdwb3J0QXR0cmlidXRlczo6flZpZXdwb3J0QXR0cmlidXRlcygpCiB7CiAKIH0KIAogLyoh Ci0gICAgQXNzaWducyB0aGUgZ2l2ZW4gUVdlYlBhZ2U6OlZpZXdwb3J0Q29uZmlndXJhdGlvbiB0 byB0aGlzIHZpZXdwb3J0IGhpbnRzIGFuZCByZXR1cm5zIGEKKyAgICBBc3NpZ25zIHRoZSBnaXZl biBRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzIHRvIHRoaXMgdmlld3BvcnQgaGludHMgYW5k IHJldHVybnMgYQogICAgIHJlZmVyZW5jZSB0byB0aGlzLgogKi8KLVFXZWJQYWdlOjpWaWV3cG9y dENvbmZpZ3VyYXRpb24mIFFXZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246Om9wZXJhdG9y PShjb25zdCBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uJiBvdGhlcikKK1FXZWJQYWdl OjpWaWV3cG9ydEF0dHJpYnV0ZXMmIFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXM6Om9wZXJh dG9yPShjb25zdCBRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzJiBvdGhlcikKIHsKICAgICBp ZiAodGhpcyAhPSAmb3RoZXIpIHsKICAgICAgICAgZCA9IG90aGVyLmQ7CkBAIC0xNjQ3LDMwICsx NjQ3LDMwIEBAIFFXZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb24mIFFXZWJQYWdlOjpWaWV3 cG9ydENvbmZpZ3VyYXRpb246Om9wZXJhdG9yPShjb25zCiAgICAgcmV0dXJuICp0aGlzOwogfQog Ci0vKiEgXGZuIGlubGluZSBib29sIFFXZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246Omlz VmFsaWQoKSBjb25zdAotICAgIFJldHVybnMgd2hldGhlciB0aGlzIGlzIGEgdmFsaWQgVmlld3Bv cnRDb25maWd1cmF0aW9uIG9yIG5vdC4KKy8qISBcZm4gaW5saW5lIGJvb2wgUVdlYlBhZ2U6OlZp ZXdwb3J0QXR0cmlidXRlczo6aXNWYWxpZCgpIGNvbnN0CisgICAgUmV0dXJucyB3aGV0aGVyIHRo aXMgaXMgYSB2YWxpZCBWaWV3cG9ydEF0dHJpYnV0ZXMgb3Igbm90LgogCi0gICAgQW4gaW52YWxp ZCBWaWV3cG9ydENvbmZpZ3VyYXRpb24gd2lsbCBoYXZlIGFuIGVtcHR5IFFTaXplLCBuZWdhdGl2 ZSB2YWx1ZXMgZm9yIHNjYWxlIGZhY3RvcnMgYW5kCisgICAgQW4gaW52YWxpZCBWaWV3cG9ydEF0 dHJpYnV0ZXMgd2lsbCBoYXZlIGFuIGVtcHR5IFFTaXplLCBuZWdhdGl2ZSB2YWx1ZXMgZm9yIHNj YWxlIGZhY3RvcnMgYW5kCiAgICAgdHJ1ZSBmb3IgdGhlIGJvb2xlYW4gaXNVc2VyU2NhbGFibGUu CiAqLwogCi0vKiEgXGZuIGlubGluZSBRU2l6ZSBRV2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0 aW9uOjpzaXplKCkgY29uc3QKKy8qISBcZm4gaW5saW5lIFFTaXplIFFXZWJQYWdlOjpWaWV3cG9y dEF0dHJpYnV0ZXM6OnNpemUoKSBjb25zdAogICAgIFJldHVybnMgdGhlIHNpemUgb2YgdGhlIHZp ZXdwb3J0LgogKi8KIAotLyohIFxmbiBpbmxpbmUgcXJlYWwgUVdlYlBhZ2U6OlZpZXdwb3J0Q29u ZmlndXJhdGlvbjo6aW5pdGlhbFNjYWxlRmFjdG9yKCkgY29uc3QKKy8qISBcZm4gaW5saW5lIHFy ZWFsIFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXM6OmluaXRpYWxTY2FsZUZhY3RvcigpIGNv bnN0CiAgICAgUmV0dXJucyB0aGUgaW5pdGlhbCBzY2FsZSBvZiB0aGUgdmlld3BvcnQgYXMgYSBt dWx0aXBsaWVyLgogKi8KIAotLyohIFxmbiBpbmxpbmUgcXJlYWwgUVdlYlBhZ2U6OlZpZXdwb3J0 Q29uZmlndXJhdGlvbjo6bWluaW11bVNjYWxlRmFjdG9yKCkgY29uc3QKKy8qISBcZm4gaW5saW5l IHFyZWFsIFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXM6Om1pbmltdW1TY2FsZUZhY3Rvcigp IGNvbnN0CiAgICAgUmV0dXJucyB0aGUgbWluaW11bSBzY2FsZSB2YWx1ZSBvZiB0aGUgdmlld3Bv cnQgYXMgYSBtdWx0aXBsaWVyLgogKi8KIAotLyohIFxmbiBpbmxpbmUgcXJlYWwgUVdlYlBhZ2U6 OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bWF4aW11bVNjYWxlRmFjdG9yKCkgY29uc3QKKy8qISBc Zm4gaW5saW5lIHFyZWFsIFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXM6Om1heGltdW1TY2Fs ZUZhY3RvcigpIGNvbnN0CiAgICAgUmV0dXJucyB0aGUgbWF4aW11bSBzY2FsZSB2YWx1ZSBvZiB0 aGUgdmlld3BvcnQgYXMgYSBtdWx0aXBsaWVyLgogKi8KIAotLyohIFxmbiBpbmxpbmUgYm9vbCBR V2ViUGFnZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjppc1VzZXJTY2FsYWJsZSgpIGNvbnN0Cisv KiEgXGZuIGlubGluZSBib29sIFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXM6OmlzVXNlclNj YWxhYmxlKCkgY29uc3QKICAgICBEZXRlcm1pbmVzIHdoZXRoZXIgb3Igbm90IHRoZSBzY2FsZSBj YW4gYmUgbW9kaWZpZWQgYnkgdGhlIHVzZXIuCiAqLwogCkBAIC0yMjMzLDEyICsyMjMzLDEyIEBA IHN0YXRpYyBRU2l6ZSBxdWVyeURldmljZVNpemVGb3JTY3JlZW5Db250YWluaW5nV2lkZ2V0KGNv bnN0IFFXaWRnZXQqIHdpZGdldCkKICAgICBib3RoIG5lZWRzIHRvIGJlIHNldC4KICovCiAKLVFX ZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb24gUVdlYlBhZ2U6OnZpZXdwb3J0Q29uZmlndXJh dGlvbkZvclNpemUoY29uc3QgUVNpemUmIGF2YWlsYWJsZVNpemUpIGNvbnN0CitRV2ViUGFnZTo6 Vmlld3BvcnRBdHRyaWJ1dGVzIFFXZWJQYWdlOjp2aWV3cG9ydEF0dHJpYnV0ZXNGb3JTaXplKGNv bnN0IFFTaXplJiBhdmFpbGFibGVTaXplKSBjb25zdAogewogICAgIHN0YXRpYyBpbnQgZGVza3Rv cFdpZHRoID0gOTgwOwogICAgIHN0YXRpYyBpbnQgZGV2aWNlRFBJID0gMTYwOwogCi0gICAgVmll d3BvcnRDb25maWd1cmF0aW9uIHJlc3VsdDsKKyAgICBWaWV3cG9ydEF0dHJpYnV0ZXMgcmVzdWx0 OwogCiAgICAgaW50IGRldmljZVdpZHRoID0gZ2V0aW50ZW52KCJRVFdFQktJVF9ERVZJQ0VfV0lE VEgiKTsKICAgICBpbnQgZGV2aWNlSGVpZ2h0ID0gZ2V0aW50ZW52KCJRVFdFQktJVF9ERVZJQ0Vf SEVJR0hUIik7CkBAIC0zNjQ2LDcgKzM2NDYsNyBAQCBxdWludDY0IFFXZWJQYWdlOjpieXRlc1Jl Y2VpdmVkKCkgY29uc3QKICAgICBQYWdlIGF1dGhvcnMgY2FuIHByb3ZpZGUgdGhlIHN1cHBsaWVk IHZhbHVlcyBieSB1c2luZyB0aGUgdmlld3BvcnQgbWV0YSB0YWcuIE1vcmUgaW5mb3JtYXRpb24K ICAgICBhYm91dCB0aGlzIGNhbiBiZSBmb3VuZCBhdCBcbHtodHRwOi8vZGV2ZWxvcGVyLmFwcGxl LmNvbS9zYWZhcmkvbGlicmFyeS9kb2N1bWVudGF0aW9uL2FwcGxlYXBwbGljYXRpb25zL3JlZmVy ZW5jZS9zYWZhcml3ZWJjb250ZW50L3VzaW5ndGhldmlld3BvcnQvdXNpbmd0aGV2aWV3cG9ydC5o dG1sfXtTYWZhcmkgUmVmZXJlbmNlIExpYnJhcnk6IFVzaW5nIHRoZSBWaWV3cG9ydCBNZXRhIFRh Z30uCiAKLSAgICBcc2EgUVdlYlBhZ2U6OlZpZXdwb3J0Q29uZmlndXJhdGlvbiwgc2V0UHJlZmVy cmVkQ29udGVudHNTaXplKCksIFFHcmFwaGljc1dlYlZpZXc6OnNldFNjYWxlKCkKKyAgICBcc2Eg UVdlYlBhZ2U6OlZpZXdwb3J0QXR0cmlidXRlcywgc2V0UHJlZmVycmVkQ29udGVudHNTaXplKCks IFFHcmFwaGljc1dlYlZpZXc6OnNldFNjYWxlKCkKICovCiAKIC8qIQpkaWZmIC0tZ2l0IGEvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5oIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5oCmluZGV4IGU3 MWUzZGEuLjQxMGM2ODkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuaAorKysg Yi9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmgKQEAgLTQ4LDcgKzQ4LDcgQEAgY2xhc3MgUVdlYkhp dFRlc3RSZXN1bHQ7CiBjbGFzcyBRV2ViTmV0d29ya0ludGVyZmFjZTsKIGNsYXNzIFFXZWJQYWdl UHJpdmF0ZTsKIGNsYXNzIFFXZWJQbHVnaW5GYWN0b3J5OwotY2xhc3MgUXRWaWV3cG9ydENvbmZp Z3VyYXRpb25Qcml2YXRlOworY2xhc3MgUXRWaWV3cG9ydEF0dHJpYnV0ZXNQcml2YXRlOwogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgQ2hyb21lQ2xpZW50UXQ7CkBAIC0yMDgsMTQg KzIwOCwxNCBAQCBwdWJsaWM6CiAgICAgICAgIEdlb2xvY2F0aW9uUGVybWlzc2lvbkRvbWFpbgog ICAgIH07CiAKLSAgICBjbGFzcyBWaWV3cG9ydENvbmZpZ3VyYXRpb24geworICAgIGNsYXNzIFZp ZXdwb3J0QXR0cmlidXRlcyB7CiAgICAgcHVibGljOgotICAgICAgICBWaWV3cG9ydENvbmZpZ3Vy YXRpb24oKTsKLSAgICAgICAgVmlld3BvcnRDb25maWd1cmF0aW9uKGNvbnN0IFFXZWJQYWdlOjpW aWV3cG9ydENvbmZpZ3VyYXRpb24mIG90aGVyKTsKKyAgICAgICAgVmlld3BvcnRBdHRyaWJ1dGVz KCk7CisgICAgICAgIFZpZXdwb3J0QXR0cmlidXRlcyhjb25zdCBRV2ViUGFnZTo6Vmlld3BvcnRB dHRyaWJ1dGVzJiBvdGhlcik7CiAKLSAgICAgICAgflZpZXdwb3J0Q29uZmlndXJhdGlvbigpOwor ICAgICAgICB+Vmlld3BvcnRBdHRyaWJ1dGVzKCk7CiAKLSAgICAgICAgUVdlYlBhZ2U6OlZpZXdw b3J0Q29uZmlndXJhdGlvbiYgb3BlcmF0b3I9KGNvbnN0IFFXZWJQYWdlOjpWaWV3cG9ydENvbmZp Z3VyYXRpb24mIG90aGVyKTsKKyAgICAgICAgUVdlYlBhZ2U6OlZpZXdwb3J0QXR0cmlidXRlcyYg b3BlcmF0b3I9KGNvbnN0IFFXZWJQYWdlOjpWaWV3cG9ydEF0dHJpYnV0ZXMmIG90aGVyKTsKIAog ICAgICAgICBpbmxpbmUgcXJlYWwgaW5pdGlhbFNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1cm4g bV9pbml0aWFsU2NhbGVGYWN0b3I7IH0KICAgICAgICAgaW5saW5lIHFyZWFsIG1pbmltdW1TY2Fs ZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fbWluaW11bVNjYWxlRmFjdG9yOyB9CkBAIC0yMjYs NyArMjI2LDcgQEAgcHVibGljOgogICAgICAgICBpbmxpbmUgUVNpemUgc2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1fc2l6ZTsgfQogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgUVNoYXJlZERhdGFQb2lu dGVyPFF0Vmlld3BvcnRDb25maWd1cmF0aW9uUHJpdmF0ZT4gZDsKKyAgICAgICAgUVNoYXJlZERh dGFQb2ludGVyPFF0Vmlld3BvcnRBdHRyaWJ1dGVzUHJpdmF0ZT4gZDsKICAgICAgICAgcXJlYWwg bV9pbml0aWFsU2NhbGVGYWN0b3I7CiAgICAgICAgIHFyZWFsIG1fbWluaW11bVNjYWxlRmFjdG9y OwogICAgICAgICBxcmVhbCBtX21heGltdW1TY2FsZUZhY3RvcjsKQEAgLTI3Niw3ICsyNzYsNyBA QCBwdWJsaWM6CiAKICAgICBRU2l6ZSB2aWV3cG9ydFNpemUoKSBjb25zdDsKICAgICB2b2lkIHNl dFZpZXdwb3J0U2l6ZShjb25zdCBRU2l6ZSAmc2l6ZSkgY29uc3Q7Ci0gICAgVmlld3BvcnRDb25m aWd1cmF0aW9uIHZpZXdwb3J0Q29uZmlndXJhdGlvbkZvclNpemUoY29uc3QgUVNpemUmIGF2YWls YWJsZVNpemUpIGNvbnN0OworICAgIFZpZXdwb3J0QXR0cmlidXRlcyB2aWV3cG9ydEF0dHJpYnV0 ZXNGb3JTaXplKGNvbnN0IFFTaXplJiBhdmFpbGFibGVTaXplKSBjb25zdDsKIAogICAgIFFTaXpl IHByZWZlcnJlZENvbnRlbnRzU2l6ZSgpIGNvbnN0OwogICAgIHZvaWQgc2V0UHJlZmVycmVkQ29u dGVudHNTaXplKGNvbnN0IFFTaXplICZzaXplKSBjb25zdDsKZGlmZiAtLWdpdCBhL1dlYktpdC9x dC9BcGkvcXdlYnBhZ2VfcC5oIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZV9wLmgKaW5kZXggZDJh NzFkMi4uMWY3MDI5MyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZV9wLmgKKysr IGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZV9wLmgKQEAgLTYwLDEzICs2MCwxMyBAQCBRVF9FTkRf TkFNRVNQQUNFCiBjbGFzcyBRV2ViSW5zcGVjdG9yOwogY2xhc3MgUVdlYlBhZ2VDbGllbnQ7CiAK LWNsYXNzIFF0Vmlld3BvcnRDb25maWd1cmF0aW9uUHJpdmF0ZSA6IHB1YmxpYyBRU2hhcmVkRGF0 YSB7CitjbGFzcyBRdFZpZXdwb3J0QXR0cmlidXRlc1ByaXZhdGUgOiBwdWJsaWMgUVNoYXJlZERh dGEgewogcHVibGljOgotICAgIFF0Vmlld3BvcnRDb25maWd1cmF0aW9uUHJpdmF0ZShRV2ViUGFn ZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uKiBxcSkKKyAgICBRdFZpZXdwb3J0QXR0cmlidXRlc1By aXZhdGUoUVdlYlBhZ2U6OlZpZXdwb3J0QXR0cmlidXRlcyogcXEpCiAgICAgICAgIDogcShxcSkK ICAgICB7IH0KIAotICAgIFFXZWJQYWdlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb24qIHE7CisgICAg UVdlYlBhZ2U6OlZpZXdwb3J0QXR0cmlidXRlcyogcTsKIH07CiAKIGNsYXNzIFFXZWJQYWdlUHJp dmF0ZSB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5n ZUxvZwppbmRleCA3MWMwMmFlLi5kZjJiNjFmIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0xMC0w NiAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBBUEk6IFZpZXdwb3J0Q29uZmlndXJh dGlvbiA9PiBWaWV3cG9ydEFyZ3VtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDczMjUKKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6Cisg ICAgICAgIChRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzOjpWaWV3cG9ydEF0dHJpYnV0ZXMp OgorICAgICAgICAoUVdlYlBhZ2U6OlZpZXdwb3J0QXR0cmlidXRlczo6flZpZXdwb3J0QXR0cmli dXRlcyk6CisgICAgICAgIChRV2ViUGFnZTo6Vmlld3BvcnRBdHRyaWJ1dGVzOjpvcGVyYXRvcj0p OgorICAgICAgICAoUVdlYlBhZ2U6OnZpZXdwb3J0QXR0cmlidXRlc0ZvclNpemUpOgorICAgICAg ICAqIEFwaS9xd2VicGFnZS5oOgorICAgICAgICAqIEFwaS9xd2VicGFnZV9wLmg6CisgICAgICAg IChRdFZpZXdwb3J0QXR0cmlidXRlc1ByaXZhdGU6OlF0Vmlld3BvcnRBdHRyaWJ1dGVzUHJpdmF0 ZSk6CisKIDIwMTAtMTAtMDYgIFJhZ25lciBNYWdhbGhhZXMgIDxyYWduZXIubWFnYWxoYWVzQG9w ZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW50b25pbyBHb21lcy4K