53476 2011-01-31 23:45:42 -0800 Fix some Visual Studio compiler warnings 2011-02-01 12:36:48 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd commit-queue eric oldest_to_newest 343053 0 fishd 2011-01-31 23:45:42 -0800 Chromium builds WebKit without C4244 suppressed, and we trip over that in a number of places. This warning is about converting from one type to a smaller type. I see this a bunch for conversions from "int" to "float". 343054 1 80721 fishd 2011-01-31 23:48:13 -0800 Created attachment 80721 v1 patch 343101 2 80721 eric 2011-02-01 02:42:58 -0800 Comment on attachment 80721 v1 patch View in context: https://bugs.webkit.org/attachment.cgi?id=80721&action=review looks fine. > Source/WebKit/chromium/src/WebFrameImpl.cpp:689 > + for (size_t sourceIndex = 0; j < forms->length(); ++sourceIndex) { I don't understand why renaming i to j here, but OK... > Source/WebKit/chromium/src/WebViewImpl.cpp:1619 > + float zoomFactor = static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel)); Maybe this should have float in its name some where? 343144 3 80721 commit-queue 2011-02-01 04:42:28 -0800 Comment on attachment 80721 v1 patch Clearing flags on attachment: 80721 Committed r77242: <http://trac.webkit.org/changeset/77242> 343145 4 commit-queue 2011-02-01 04:42:32 -0800 All reviewed patches have been landed. Closing bug. 343173 5 commit-queue 2011-02-01 05:36:16 -0800 The commit-queue encountered the following flaky tests while processing attachment 80721: animations/play-state-suspend.html bug 50959 (author: cmarrin@apple.com) The commit-queue is continuing to process your patch. 343236 6 fishd 2011-02-01 08:41:38 -0800 (In reply to comment #2) > (From update of attachment 80721 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=80721&action=review > > looks fine. > > > Source/WebKit/chromium/src/WebFrameImpl.cpp:689 > > + for (size_t sourceIndex = 0; j < forms->length(); ++sourceIndex) { > > I don't understand why renaming i to j here, but OK... Sorry, I forgot to mention this case. It is not the same class of warning. In this case, the compiler is complaining because "i" is re-declared. The compiler (VS2005) sees the "for (size_t i = 0;...)" above, and then it sees us using "i" again outside of the loop. The compiler thinks we want old-style scoping of for-loop initializers, even though "i" is re-declared outside of the for-loop!!! Just changing the variable name seemed like the simplest way to make the compiler happy. > > > Source/WebKit/chromium/src/WebViewImpl.cpp:1619 > > + float zoomFactor = static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel)); > > Maybe this should have float in its name some where? Are you suggesting that zoomFactor be renamed to zoomFactorFloat? I hadn't considered naming the variable like that. Is that conventional in WebKit? 343428 7 eric 2011-02-01 12:36:48 -0800 (In reply to comment #6) > > > Source/WebKit/chromium/src/WebViewImpl.cpp:1619 > > > + float zoomFactor = static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel)); > > > > Maybe this should have float in its name some where? > > Are you suggesting that zoomFactor be renamed to zoomFactorFloat? I hadn't considered naming the variable like that. Is that conventional in WebKit? I don't know whether folks use typeFooBar or fooBarType. But I've seen that done in rendering code or places where we need both types for different functiosn and want to keep them straight. In this case it's slightly strange to have a float local when we have a funtion which returns a double and a m_zoomLevel double. but I udnerstand why you did it. I guess other ports use double? Anyway, I think it's fine as is. :) 80721 2011-01-31 23:48:13 -0800 2011-02-01 04:42:28 -0800 v1 patch warn_1.txt text/plain 8096 fishd SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA3NzIyMCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBA QAorMjAxMS0wMS0zMSAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBzb21lIFZpc3Vh bCBTdHVkaW8gY29tcGlsZXIgd2FybmluZ3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01MzQ3NgorCisgICAgICAgICogd3RmL01hdGhFeHRyYXMuaDoK KyAgICAgICAgKGNsYW1wVG9JbnRlZ2VyKToKKyAgICAgICAgKGNsYW1wVG9Qb3NpdGl2ZUludGVn ZXIpOgorICAgICAgICAqIHd0Zi9UaHJlYWRpbmdXaW4uY3BwOgorICAgICAgICAoV1RGOjphYnNv bHV0ZVRpbWVUb1dhaXRUaW1lb3V0SW50ZXJ2YWwpOgorCiAyMDExLTAxLTMxICBPbGl2ZXIgSHVu dCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4K SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvTWF0aEV4dHJhcy5oDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9NYXRoRXh0cmFzLmgJKHJldmlzaW9uIDc3 MTUwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9NYXRoRXh0cmFzLmgJKHdvcmtpbmcg Y29weSkKQEAgLTIyMiwxNCArMjIyLDE0IEBAIGlubGluZSBpbnQgY2xhbXBUb1Bvc2l0aXZlSW50 ZWdlcihkb3VibGUKIAogaW5saW5lIGludCBjbGFtcFRvSW50ZWdlcihmbG9hdCBkKQogewotICAg IGNvbnN0IGZsb2F0IG1pbkludEFzRmxvYXQgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1p bigpOwotICAgIGNvbnN0IGZsb2F0IG1heEludEFzRmxvYXQgPSBzdGQ6Om51bWVyaWNfbGltaXRz PGludD46Om1heCgpOworICAgIGNvbnN0IGZsb2F0IG1pbkludEFzRmxvYXQgPSBzdGF0aWNfY2Fz dDxmbG9hdD4oc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKSk7CisgICAgY29uc3QgZmxv YXQgbWF4SW50QXNGbG9hdCA9IHN0YXRpY19jYXN0PGZsb2F0PihzdGQ6Om51bWVyaWNfbGltaXRz PGludD46Om1heCgpKTsKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8aW50PihzdGQ6Om1heChzdGQ6 Om1pbihkLCBtYXhJbnRBc0Zsb2F0KSwgbWluSW50QXNGbG9hdCkpOwogfQogCiBpbmxpbmUgaW50 IGNsYW1wVG9Qb3NpdGl2ZUludGVnZXIoZmxvYXQgZCkKIHsKLSAgICBjb25zdCBmbG9hdCBtYXhJ bnRBc0Zsb2F0ID0gc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKTsKKyAgICBjb25zdCBm bG9hdCBtYXhJbnRBc0Zsb2F0ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHN0ZDo6bnVtZXJpY19saW1p dHM8aW50Pjo6bWF4KCkpOwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxpbnQ+KHN0ZDo6bWF4PGZs b2F0PihzdGQ6Om1pbihkLCBtYXhJbnRBc0Zsb2F0KSwgMCkpOwogfQogCkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1dpbi5jcHANCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZ1dpbi5jcHAJKHJldmlzaW9uIDc3MTUwKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmdXaW4uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00OTEsNyArNDkxLDcgQEAgRFdPUkQgYWJzb2x1dGVUaW1lVG9XYWl0VGltZW91dElu dGVydmFsKAogICAgIGlmIChhYnNvbHV0ZVRpbWUgLSBjdXJyZW50VGltZSA+IHN0YXRpY19jYXN0 PGRvdWJsZT4oSU5UX01BWCkgLyAxMDAwLjApCiAgICAgICAgIHJldHVybiBJTkZJTklURTsKIAot ICAgIHJldHVybiAoYWJzb2x1dGVUaW1lIC0gY3VycmVudFRpbWUpICogMTAwMDsKKyAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8RFdPUkQ+KChhYnNvbHV0ZVRpbWUgLSBjdXJyZW50VGltZSkgKiAxMDAw LjApOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXVEYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cJKHJldmlzaW9uIDc3MjIwKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMS0wMS0zMSAgRGFyaW4gRmlz aGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZpeCBzb21lIFZpc3VhbCBTdHVkaW8gY29tcGlsZXIgd2Fybmlu Z3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzQ3 NgorCisgICAgICAgICogc3JjL0dyYXBoaWNzQ29udGV4dDNEQ2hyb21pdW0uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0RJbnRlcm5hbDo6cGFpbnRSZW5kZXJpbmdSZXN1 bHRzVG9DYW52YXMpOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZUltcGw6OmZvcm1zKToKKyAgICAgICAgKiBzcmMvV2ViTWVkaWFQbGF5 ZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJ bXBsOjpyZXBhaW50KToKKyAgICAgICAgKiBzcmMvV2ViU2Nyb2xsYmFySW1wbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlNjcm9sbGJhckltcGw6OnNldFZhbHVlKToKKyAgICAgICAgKiBzcmMv V2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZG9QaXhlbFJl YWRiYWNrVG9DYW52YXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0Wm9vbUxl dmVsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGxTY3JvbGxiYXJQYWludEludGVyZmFj ZTo6cGFpbnQpOgorCiAyMDExLTAxLTMxICBDaHJpcyBSb2dlcnMgIDxjcm9nZXJzQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvR3JhcGhpY3NDb250ZXh0M0RDaHJvbWl1bS5jcHANCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCi0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9HcmFwaGljc0NvbnRleHQzRENocm9t aXVtLmNwcAkocmV2aXNpb24gNzcxNTApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9H cmFwaGljc0NvbnRleHQzRENocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA1LDcgKzIw NSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0M0RJbnRlcm5hbDo6cGFpbnRSZW4KICAgICAgICAg Ly8gV2UgbmVlZCB0byBkcmF3IHRoZSByZXNpemluZyBiaXRtYXAgaW50byB0aGUgY2FudmFzJ3Mg YmFja2luZyBzdG9yZS4KICAgICAgICAgU2tDYW52YXMgY2FudmFzKCpjYW52YXNCaXRtYXApOwog ICAgICAgICBTa1JlY3QgZHN0OwotICAgICAgICBkc3Quc2V0KFNrSW50VG9TY2FsYXIoMCksIFNr SW50VG9TY2FsYXIoMCksIGNhbnZhc0JpdG1hcC0+d2lkdGgoKSwgY2FudmFzQml0bWFwLT5oZWln aHQoKSk7CisgICAgICAgIGRzdC5zZXQoU2tJbnRUb1NjYWxhcigwKSwgU2tJbnRUb1NjYWxhcigw KSwgU2tJbnRUb1NjYWxhcihjYW52YXNCaXRtYXAtPndpZHRoKCkpLCBTa0ludFRvU2NhbGFyKGNh bnZhc0JpdG1hcC0+aGVpZ2h0KCkpKTsKICAgICAgICAgY2FudmFzLmRyYXdCaXRtYXBSZWN0KG1f cmVzaXppbmdCaXRtYXAsIDAsIGRzdCk7CiAgICAgfQogI2VsaWYgUExBVEZPUk0oQ0cpCkluZGV4 OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwDQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2aXNp b24gNzcxNTApCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02ODUsMTQgKzY4NSwxNCBAQCB2b2lkIFdlYkZyYW1lSW1wbDo6 Zm9ybXMoV2ViVmVjdG9yPFdlYkZvCiAgICAgfQogCiAgICAgV2ViVmVjdG9yPFdlYkZvcm1FbGVt ZW50PiB0ZW1wKGZvcm1Db3VudCk7Ci0gICAgdW5zaWduZWQgaSA9IDA7Ci0gICAgZm9yIChzaXpl X3Qgc291cmNlSW5kZXggPSAwOyBpIDwgZm9ybXMtPmxlbmd0aCgpOyArK3NvdXJjZUluZGV4KSB7 CisgICAgc2l6ZV90IGogPSAwOworICAgIGZvciAoc2l6ZV90IHNvdXJjZUluZGV4ID0gMDsgaiA8 IGZvcm1zLT5sZW5ndGgoKTsgKytzb3VyY2VJbmRleCkgewogICAgICAgICBOb2RlKiBub2RlID0g Zm9ybXMtPml0ZW0oc291cmNlSW5kZXgpOwogICAgICAgICAvLyBTdHJhbmdlIGJ1dCB0cnVlLCBz b21ldGltZXMgaXRlbSBjYW4gYmUgMC4KICAgICAgICAgaWYgKG5vZGUgJiYgbm9kZS0+aXNIVE1M RWxlbWVudCgpKQotICAgICAgICAgICAgdGVtcFtpKytdID0gc3RhdGljX2Nhc3Q8SFRNTEZvcm1F bGVtZW50Kj4obm9kZSk7CisgICAgICAgICAgICB0ZW1wW2orK10gPSBzdGF0aWNfY2FzdDxIVE1M Rm9ybUVsZW1lbnQqPihub2RlKTsKICAgICB9Ci0gICAgQVNTRVJUKGkgPT0gZm9ybUNvdW50KTsK KyAgICBBU1NFUlQoaiA9PSBmb3JtQ291bnQpOwogICAgIHJlc3VsdHMuc3dhcCh0ZW1wKTsKIH0K IApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJ bXBsLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1l ZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDc3MTUwKQorKysgU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTQ0LDcgKzE0NCw3IEBAIHZvaWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpyZXBh aW50KCkKICAgICBBU1NFUlQobV9tZWRpYVBsYXllcik7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NP TVBPU0lUSU5HKQogICAgIGlmIChtX3ZpZGVvTGF5ZXIuZ2V0KCkgJiYgc3VwcG9ydHNBY2NlbGVy YXRlZFJlbmRlcmluZygpKQotICAgICAgICBtX3ZpZGVvTGF5ZXItPnNldE5lZWRzRGlzcGxheShG bG9hdFJlY3QoMCwgMCwgbV92aWRlb0xheWVyLT5ib3VuZHMoKS53aWR0aCgpLCBtX3ZpZGVvTGF5 ZXItPmJvdW5kcygpLmhlaWdodCgpKSk7CisgICAgICAgIG1fdmlkZW9MYXllci0+c2V0TmVlZHNE aXNwbGF5KEludFJlY3QoMCwgMCwgbV92aWRlb0xheWVyLT5ib3VuZHMoKS53aWR0aCgpLCBtX3Zp ZGVvTGF5ZXItPmJvdW5kcygpLmhlaWdodCgpKSk7CiAjZW5kaWYKICAgICBtX21lZGlhUGxheWVy LT5yZXBhaW50KCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTY3Jv bGxiYXJJbXBsLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlNjcm9sbGJhckltcGwuY3BwCShyZXZpc2lvbiA3NzE1MCkKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlNjcm9sbGJhckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NSw3 ICs5NSw3IEBAIGludCBXZWJTY3JvbGxiYXJJbXBsOjp2YWx1ZSgpIGNvbnN0CiAKIHZvaWQgV2Vi U2Nyb2xsYmFySW1wbDo6c2V0VmFsdWUoaW50IHBvc2l0aW9uKQogewotICAgIFdlYkNvcmU6OlNj cm9sbGFibGVBcmVhOjpzY3JvbGxUb09mZnNldFdpdGhvdXRBbmltYXRpb24obV9zY3JvbGxiYXIt Pm9yaWVudGF0aW9uKCksIHBvc2l0aW9uKTsKKyAgICBXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6 c2Nyb2xsVG9PZmZzZXRXaXRob3V0QW5pbWF0aW9uKG1fc2Nyb2xsYmFyLT5vcmllbnRhdGlvbigp LCBzdGF0aWNfY2FzdDxmbG9hdD4ocG9zaXRpb24pKTsKIH0KIAogdm9pZCBXZWJTY3JvbGxiYXJJ bXBsOjpzZXREb2N1bWVudFNpemUoaW50IHNpemUpCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlzaW9uIDc3MTUwKQorKysgU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMz LDcgKzEwMzMsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkb1BpeGVsUmVhZGJhY2tUb0NhbnZhCiAg ICAgICAgIG1fbGF5ZXJSZW5kZXJlci0+Z2V0RnJhbWVidWZmZXJQaXhlbHMocGl4ZWxBcnJheS0+ ZGF0YSgpLCBpbnZlcnRSZWN0KTsKICAgICAgICAgaW1hZ2VCdWZmZXItPnB1dFByZW11bHRpcGxp ZWRJbWFnZURhdGEocGl4ZWxBcnJheS5nZXQoKSwgcmVjdC5zaXplKCksIEludFJlY3QoSW50UG9p bnQoKSwgcmVjdC5zaXplKCkpLCBJbnRQb2ludCgpKTsKICAgICAgICAgZ2Muc2F2ZSgpOwotICAg ICAgICBnYy50cmFuc2xhdGUoRmxvYXRTaXplKDAuMGYsIGJpdG1hcEhlaWdodCkpOworICAgICAg ICBnYy50cmFuc2xhdGUoSW50U2l6ZSgwLCBiaXRtYXBIZWlnaHQpKTsKICAgICAgICAgZ2Muc2Nh bGUoRmxvYXRTaXplKDEuMGYsIC0xLjBmKSk7CiAgICAgICAgIC8vIFVzZSBpbnZlcnRSZWN0IGlu IG5leHQgbGluZSwgc28gdGhhdCB0cmFuc2Zvcm0gYWJvdmUgaW52ZXJ0cyBpdCBiYWNrIHRvCiAg ICAgICAgIC8vIGRlc2lyZWQgZGVzdGluYXRpb24gcmVjdC4KQEAgLTE2MTYsNyArMTYxNiw3IEBA IGRvdWJsZSBXZWJWaWV3SW1wbDo6c2V0Wm9vbUxldmVsKGJvb2wgdGUKICAgICBpZiAocGx1Z2lu Q29udGFpbmVyKQogICAgICAgICBwbHVnaW5Db250YWluZXItPnBsdWdpbigpLT5zZXRab29tTGV2 ZWwobV96b29tTGV2ZWwsIHRleHRPbmx5KTsKICAgICBlbHNlIHsKLSAgICAgICAgZG91YmxlIHpv b21GYWN0b3IgPSB6b29tTGV2ZWxUb1pvb21GYWN0b3IobV96b29tTGV2ZWwpOworICAgICAgICBm bG9hdCB6b29tRmFjdG9yID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHpvb21MZXZlbFRvWm9vbUZhY3Rv cihtX3pvb21MZXZlbCkpOwogICAgICAgICBpZiAodGV4dE9ubHkpCiAgICAgICAgICAgICBmcmFt ZS0+c2V0UGFnZUFuZFRleHRab29tRmFjdG9ycygxLCB6b29tRmFjdG9yKTsKICAgICAgICAgZWxz ZQpAQCAtMjM3Myw3ICsyMzczLDcgQEAgcHVibGljOgogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICBGcmFtZVZpZXcqIHZpZXcgPSBwYWdlLT5tYWluRnJhbWUoKS0+dmlldygpOwogCi0gICAg ICAgIGNvbnRleHQudHJhbnNsYXRlKHZpZXctPnNjcm9sbFgoKSwgdmlldy0+c2Nyb2xsWSgpKTsK KyAgICAgICAgY29udGV4dC50cmFuc2xhdGUoc3RhdGljX2Nhc3Q8ZmxvYXQ+KHZpZXctPnNjcm9s bFgoKSksIHN0YXRpY19jYXN0PGZsb2F0Pih2aWV3LT5zY3JvbGxZKCkpKTsKICAgICAgICAgSW50 UmVjdCB3aW5kb3dSZWN0ID0gdmlldy0+Y29udGVudHNUb1dpbmRvdyhjb250ZW50UmVjdCk7CiAg ICAgICAgIHZpZXctPnBhaW50U2Nyb2xsYmFycygmY29udGV4dCwgd2luZG93UmVjdCk7CiAgICAg fQo=