26908 2009-07-01 15:38:56 -0700 <canvas> without CSS width/height is unaffected by full page zoom 2009-08-21 09:07:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED http://cufon.shoqolate.com/tests/webkit-zoom/ P2 Normal --- 1 sorccu webkit-unassigned eric gwright krit oliver oldest_to_newest 129397 0 sorccu 2009-07-01 15:38:56 -0700 Canvas, if defined as follows, does not respect full page zoom: <canvas width="100" height="100"></canvas> But the following does: <canvas width="100" height="100" style="width: 100px; height: 100px"></canvas> You'd expect both cases to behave the same. Gecko and Presto respect the zoom level (i.e. it's pretty much identical to <img>). 138991 1 34567 gwright 2009-08-11 09:37:31 -0700 Created attachment 34567 Fix <canvas> zooming This patch makes the canvas element parser add CSS properties for the width and height in the same manner as the image element parser does, thus allowing the canvas to scale properly. It also removes a superfluous zoomedSize declaration which is never used. 139002 2 34567 hyatt 2009-08-11 09:52:59 -0700 Comment on attachment 34567 Fix <canvas> zooming I think it's better to patch the initial intrinsic size on the rendering side. I don't think you have to touch the DOM element. This patch is flawed since it doesn't zoom omitted attributes (that should default to 300 and 150 but then be zoomed). Need a test case also obviously. 139150 3 34609 gwright 2009-08-11 16:02:00 -0700 Created attachment 34609 Canvas zooming fix using intrinsic coordinates New patch which updates the intrinsic coordinates instead of adding to the CSS properties. This also fixes the intrinsic coordinates not being updated for an initial style setting to a renderer. 139153 4 34609 hyatt 2009-08-11 16:05:42 -0700 Comment on attachment 34609 Canvas zooming fix using intrinsic coordinates Everything looks fine to me except for the if (!parent()) check in RenderReplaced::layout(). It's not clear to me why you would need that...are you sure you didn't just need to patch the intrinsicSizeChanged method for other replaced elements in a fashion similar to what you did in RenderHTMLCanvas? 139174 5 34618 gwright 2009-08-11 17:20:28 -0700 Created attachment 34618 Removed unnecessary null pointer check You're right - that null pointer check was an artifact left over from testing. It works fine without it. I have also added the new test which I forgot to put in my last patch. 139333 6 34618 hyatt 2009-08-12 08:46:37 -0700 Comment on attachment 34618 Removed unnecessary null pointer check You are sure that other types of replaced elements aren't going to crash without a parent null check somewhere? I'd recommend browsing in a zoomed window for a bit to make sure. 139338 7 gwright 2009-08-12 08:57:24 -0700 (In reply to comment #6) > (From update of attachment 34618 [details]) > You are sure that other types of replaced elements aren't going to crash > without a parent null check somewhere? I'd recommend browsing in a zoomed > window for a bit to make sure. Seems fine here. I tested it with images and media (from http://webkit.org/blog/140/html5-media-support/) and it didn't crash when zoomed. 139547 8 34618 hyatt 2009-08-12 14:23:05 -0700 Comment on attachment 34618 Removed unnecessary null pointer check r=me 139693 9 34618 eric 2009-08-12 18:07:54 -0700 Comment on attachment 34618 Removed unnecessary null pointer check Clearing flags on attachment: 34618 Committing to http://svn.webkit.org/repository/webkit/trunk ... M LayoutTests/ChangeLog A LayoutTests/fast/canvas/canvas-zoom.html M WebCore/ChangeLog M WebCore/rendering/RenderHTMLCanvas.cpp M WebCore/rendering/RenderReplaced.cpp Committed r47172 M WebCore/ChangeLog M WebCore/rendering/RenderHTMLCanvas.cpp M WebCore/rendering/RenderReplaced.cpp M LayoutTests/ChangeLog A LayoutTests/fast/canvas/canvas-zoom.html r47172 = 02e5f59486ffcc081f9d82d6bc99a675c2fbe394 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/47172 139694 10 eric 2009-08-12 18:07:58 -0700 All reviewed patches have been landed. Closing bug. 139823 11 mrowe 2009-08-13 06:06:27 -0700 This change caused tables/mozilla/bugs/bug2479-4.html to start failing on the Tiger buildbot. Is that expected? See <http://build.webkit.org/results/Tiger%20Intel%20Release/r47194%20(3443)/tables/mozilla/bugs/bug2479-4-pretty-diff.html> for the diff. 139859 12 eric 2009-08-13 08:57:42 -0700 Given the number of troubles we've had with this bug, I must have run "bugzilla-tool land-diff --no-build" manually for some reason. I would not have expected the commit-queue to land a patch with missing results or failing tests. I'm happy to roll out this patch given the troubles we've seen with it. (Email from Darin Adler to authors, missing test results which I've checked in, and now a failing test.) 139863 13 gwright 2009-08-13 09:09:26 -0700 (In reply to comment #12) > Given the number of troubles we've had with this bug, I must have run > "bugzilla-tool land-diff --no-build" manually for some reason. I would not > have expected the commit-queue to land a patch with missing results or failing > tests. I'm happy to roll out this patch given the troubles we've seen with it. > (Email from Darin Adler to authors, missing test results which I've checked > in, and now a failing test.) I think the email from Darin was a misunderstanding (see my email). The patch that was landed was the one that David Hyatt r+d. We're still looking into the problem with the layout test on Intel. I'm not convinced this patch is the outright cause as it has not broken that test on every platform, which suggests it may have uncovered another bug somewhere. 140009 14 eric 2009-08-13 13:49:34 -0700 We still have one failing layout test from this change on Tiger. Unless we have a fix in the pipeline, I recommend we roll out this change to make the Tiger bot green. 140010 15 eric 2009-08-13 13:50:10 -0700 Reopening since there was a regression on the bots: http://build.webkit.org/builders/Tiger%20Intel%20Release/builds/3425 140235 16 gwright 2009-08-14 08:16:54 -0700 (In reply to comment #15) > Reopening since there was a regression on the bots: > http://build.webkit.org/builders/Tiger%20Intel%20Release/builds/3425 It seems to be working again; did you roll out the patch or not? I can't see in the logs that you did. 140242 17 eric 2009-08-14 08:58:40 -0700 http://trac.webkit.org/changeset/47191 was added to fix the qt bot. I did not roll your change out. I'm not sure why the bot results changed. I have not investigated. 141846 18 krit 2009-08-21 01:33:50 -0700 The build-bots are green. If no one rolled out the patch, can we close the bug now? 34567 2009-08-11 09:37:31 -0700 2009-08-11 16:02:00 -0700 Fix <canvas> zooming canvas-zoom.patch text/plain 2114 gwright ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Mjc5MzFlYy4uNzg0MjRiZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0wOC0xMSAgR2VvcmdlIFdyaWdo dCAgPGdlb3JnZS53cmlnaHRAdG9yY2htb2JpbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBDU1MgbGVuZ3RoIHByb3BlcnRpZXMgZm9y IHdpZHRoIGFuZCBoZWlnaHQgZGVmaW5pdGlvbnMgaW4KKyAgICAgICAgdGhlIDxjYW52YXM+IGVs ZW1lbnQgYXMgcGVyIHRoZSA8aW1hZ2U+IHRhZydzIGJlaGF2aW91ci4gVGhpcworICAgICAgICBm aXhlcyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY5MDgKKworICAg ICAgICAqIGh0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TENhbnZhc0VsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVySFRNTENhbnZhcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJIVE1MQ2Fu dmFzOjpjYW52YXNTaXplQ2hhbmdlZCk6CisKIDIwMDktMDgtMDYgIFNpbW9uIEhhdXNtYW5uICA8 c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4 LCBhZGQgI2lmZGVmIGd1YXJkcyBhcm91bmQKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1M Q2FudmFzRWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCmlu ZGV4IDNiN2U3NGYuLmU5NTk1YzYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFz RWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcApAQCAt MTAxLDggKzEwMSwxNCBAQCBpbnQgSFRNTENhbnZhc0VsZW1lbnQ6OnRhZ1ByaW9yaXR5KCkgY29u c3QKIHZvaWQgSFRNTENhbnZhc0VsZW1lbnQ6OnBhcnNlTWFwcGVkQXR0cmlidXRlKE1hcHBlZEF0 dHJpYnV0ZSogYXR0cikKIHsKICAgICBjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSA9IGF0 dHItPm5hbWUoKTsKLSAgICBpZiAoYXR0ck5hbWUgPT0gd2lkdGhBdHRyIHx8IGF0dHJOYW1lID09 IGhlaWdodEF0dHIpCisgICAgaWYgKGF0dHJOYW1lID09IHdpZHRoQXR0cikgeworICAgICAgICBh ZGRDU1NMZW5ndGgoYXR0ciwgQ1NTUHJvcGVydHlXaWR0aCwgYXR0ci0+dmFsdWUoKSk7CiAgICAg ICAgIHJlc2V0KCk7CisgICAgfSBlbHNlIGlmIChhdHRyTmFtZSA9PSBoZWlnaHRBdHRyKSB7Cisg ICAgICAgIGFkZENTU0xlbmd0aChhdHRyLCBDU1NQcm9wZXJ0eUhlaWdodCwgYXR0ci0+dmFsdWUo KSk7CisgICAgICAgIHJlc2V0KCk7CisgICAgfQorCiAgICAgSFRNTEVsZW1lbnQ6OnBhcnNlTWFw cGVkQXR0cmlidXRlKGF0dHIpOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJIVE1MQ2FudmFzLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckhUTUxDYW52YXMu Y3BwCmluZGV4IDFmYzA3ZjAuLjkyMzFlNmIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckhUTUxDYW52YXMuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckhUTUxD YW52YXMuY3BwCkBAIC01Myw3ICs1Myw2IEBAIHZvaWQgUmVuZGVySFRNTENhbnZhczo6cGFpbnRS ZXBsYWNlZChQYWludEluZm8mIHBhaW50SW5mbywgaW50IHR4LCBpbnQgdHkpCiB2b2lkIFJlbmRl ckhUTUxDYW52YXM6OmNhbnZhc1NpemVDaGFuZ2VkKCkKIHsKICAgICBJbnRTaXplIGNhbnZhc1Np emUgPSBzdGF0aWNfY2FzdDxIVE1MQ2FudmFzRWxlbWVudCo+KG5vZGUoKSktPnNpemUoKTsKLSAg ICBJbnRTaXplIHpvb21lZFNpemUoY2FudmFzU2l6ZS53aWR0aCgpICogc3R5bGUoKS0+ZWZmZWN0 aXZlWm9vbSgpLCBjYW52YXNTaXplLmhlaWdodCgpICogc3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgp KTsKIAogICAgIGlmIChjYW52YXNTaXplID09IGludHJpbnNpY1NpemUoKSkKICAgICAgICAgcmV0 dXJuOwo= 34609 2009-08-11 16:02:00 -0700 2009-08-11 17:20:28 -0700 Canvas zooming fix using intrinsic coordinates canvas-zoom.patch text/plain 3037 gwright ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjZjQ0ZjczLi5kZTI4NjMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDgt MTEgIEdlb3JnZSBXcmlnaHQgIDxnZW9yZ2Uud3JpZ2h0QHRvcmNobW9iaWxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IHRoZSBmb3Vy IGNhc2VzIG9mIHdpZHRoIGFuZCBoZWlnaHQgYmVpbmcgZGVjbGFyZWQgb3Igbm90IGZvciBhCisg ICAgICAgIGNhbnZhcyBlbGVtZW50IHdpdGggQ1NTIHpvb21pbmcgZW5hYmxlZC4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY5MDgKKworICAgICAg ICAqIGZhc3QvY2FudmFzL2NhbnZhcy16b29tLmh0bWw6IEFkZGVkLgorCiAyMDA5LTA4LTExICBC cmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSdWJiZXItc3RhbXBl ZCBieSBNYXJrIFJvd2UuCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IDEwNjQ5N2YuLjY0OTFkZmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMDgt MTEgIEdlb3JnZSBXcmlnaHQgIDxnZW9yZ2Uud3JpZ2h0QHRvcmNobW9iaWxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGhlIGNh bnZhcyByZW5kZXJlcidzIGludHJpbnNpYyBzaXplIHdpdGggdGhlIHpvb21lZAorICAgICAgICBs ZW5ndGhzIGFuZCBlbnN1cmUgdGhlIGludHJpbnNpYyBzaXplIGlzIGNvcnJlY3Qgd2hlbiBzZXR0 aW5nCisgICAgICAgIGFuIGluaXRpYWwgc3R5bGUuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2OTA4CisKKyAgICAgICAgVGVzdDogZmFzdC9jYW52 YXMvY2FudmFzLXpvb20uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckhUTUxDYW52 YXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySFRNTENhbnZhczo6Y2FudmFzU2l6ZUNo YW5nZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6c3R5bGVEaWRDaGFuZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyUmVwbGFjZWQ6OmxheW91dCk6CisKIDIwMDktMDgtMTEgIE5pa29sYXMgWmlt bWVybWFubiAgPG5pa29sYXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgR2VvcmdlIFN0YWlrb3MuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJIVE1MQ2FudmFzLmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckhUTUxDYW52 YXMuY3BwCmluZGV4IDFmYzA3ZjAuLjNhNzc2YmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckhUTUxDYW52YXMuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckhU TUxDYW52YXMuY3BwCkBAIC01NSwxMCArNTUsMTMgQEAgdm9pZCBSZW5kZXJIVE1MQ2FudmFzOjpj YW52YXNTaXplQ2hhbmdlZCgpCiAgICAgSW50U2l6ZSBjYW52YXNTaXplID0gc3RhdGljX2Nhc3Q8 SFRNTENhbnZhc0VsZW1lbnQqPihub2RlKCkpLT5zaXplKCk7CiAgICAgSW50U2l6ZSB6b29tZWRT aXplKGNhbnZhc1NpemUud2lkdGgoKSAqIHN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKSwgY2FudmFz U2l6ZS5oZWlnaHQoKSAqIHN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKSk7CiAKLSAgICBpZiAoY2Fu dmFzU2l6ZSA9PSBpbnRyaW5zaWNTaXplKCkpCisgICAgaWYgKHpvb21lZFNpemUgPT0gaW50cmlu c2ljU2l6ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBzZXRJbnRyaW5zaWNTaXplKGNhbnZh c1NpemUpOworICAgIHNldEludHJpbnNpY1NpemUoem9vbWVkU2l6ZSk7CisKKyAgICBpZiAoIXBh cmVudCgpKQorICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIXByZWZXaWR0aHNEaXJ0eSgpKQog ICAgICAgICBzZXRQcmVmV2lkdGhzRGlydHkodHJ1ZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBs YWNlZC5jcHAKaW5kZXggNjkyYTY2ZS4uMTNhYTlhYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJl cGxhY2VkLmNwcApAQCAtNjYsNyArNjYsNyBAQCB2b2lkIFJlbmRlclJlcGxhY2VkOjpzdHlsZURp ZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZAogCiAg ICAgYm9vbCBoYWRTdHlsZSA9IChvbGRTdHlsZSAhPSAwKTsKICAgICBmbG9hdCBvbGRab29tID0g aGFkU3R5bGUgPyBvbGRTdHlsZS0+ZWZmZWN0aXZlWm9vbSgpIDogUmVuZGVyU3R5bGU6OmluaXRp YWxab29tKCk7Ci0gICAgaWYgKGhhZFN0eWxlICYmIHN0eWxlKCkgJiYgc3R5bGUoKS0+ZWZmZWN0 aXZlWm9vbSgpICE9IG9sZFpvb20pCisgICAgaWYgKHN0eWxlKCkgJiYgc3R5bGUoKS0+ZWZmZWN0 aXZlWm9vbSgpICE9IG9sZFpvb20pCiAgICAgICAgIGludHJpbnNpY1NpemVDaGFuZ2VkKCk7CiB9 CiAKQEAgLTc0LDYgKzc0LDkgQEAgdm9pZCBSZW5kZXJSZXBsYWNlZDo6bGF5b3V0KCkKIHsKICAg ICBBU1NFUlQobmVlZHNMYXlvdXQoKSk7CiAgICAgCisgICAgaWYgKCFwYXJlbnQoKSkKKyAgICAg ICAgcmV0dXJuOworCiAgICAgTGF5b3V0UmVwYWludGVyIHJlcGFpbnRlcigqdGhpcywgY2hlY2tG b3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpOwogICAgIAogICAgIHNldEhlaWdodChtaW5pbXVtUmVw bGFjZWRIZWlnaHQoKSk7Cg== 34618 2009-08-11 17:20:28 -0700 2009-08-12 18:07:54 -0700 Removed unnecessary null pointer check canvaszoom.patch text/plain 3396 gwright ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjZjQ0ZjczLi5kZTI4NjMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDgt MTEgIEdlb3JnZSBXcmlnaHQgIDxnZW9yZ2Uud3JpZ2h0QHRvcmNobW9iaWxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IHRoZSBmb3Vy IGNhc2VzIG9mIHdpZHRoIGFuZCBoZWlnaHQgYmVpbmcgZGVjbGFyZWQgb3Igbm90IGZvciBhCisg ICAgICAgIGNhbnZhcyBlbGVtZW50IHdpdGggQ1NTIHpvb21pbmcgZW5hYmxlZC4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY5MDgKKworICAgICAg ICAqIGZhc3QvY2FudmFzL2NhbnZhcy16b29tLmh0bWw6IEFkZGVkLgorCiAyMDA5LTA4LTExICBC cmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSdWJiZXItc3RhbXBl ZCBieSBNYXJrIFJvd2UuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy9jYW52 YXMtem9vbS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLXpvb20uaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40ZGFiY2UxCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvY2FudmFzLXpvb20uaHRtbApAQCAtMCwwICsx LDE1IEBACis8c3R5bGU+CisgICAgY2FudmFzIHsgYm9yZGVyOiBzb2xpZCBncmVlbjsKKyAgICAg ICAgICAgICB6b29tOiAyOyB9Cis8L3N0eWxlPgorPHA+CisgICAgVGhlc2Ugc2hvdWxkIGJlIGZv dXIgZ3JlZW4gaG9sbG93IGJveGVzIHdpdGggZGltZW5zaW9ucyA2MDB4MzAwLCAxMDB4MzAwLCA2 MDB4MTAwLCAxMDB4MTAwLgorPC9wPgorPCEtLSAzMDB4MTUwIC0tPgorPGNhbnZhcyBpZD0iY2Fu dmFzIj48L2NhbnZhcz4KKzwhLS0gNTB4MTUwIC0tPgorPGNhbnZhcyBpZD0iY2FudmFzIiB3aWR0 aD0iNTAiPjwvY2FudmFzPgorPCEtLSAzMDB4NTAgLS0+Cis8Y2FudmFzIGlkPSJjYW52YXMiIGhl aWdodD0iNTAiPjwvY2FudmFzPgorPCEtLSA1MHg1MCAtLT4KKzxjYW52YXMgaWQ9ImNhbnZhcyIg d2lkdGg9IjUwIiBoZWlnaHQ9IjUwIj48L2NhbnZhcz4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hh bmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTA2NDk3Zi4uODhlNzA4NiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMCBAQAorMjAwOS0wOC0xMSAgR2VvcmdlIFdyaWdodCAgPGdlb3JnZS53cmlnaHRAdG9yY2ht b2JpbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFVwZGF0ZSB0aGUgY2FudmFzIHJlbmRlcmVyJ3MgaW50cmluc2ljIHNpemUgd2l0aCB0aGUg em9vbWVkCisgICAgICAgIGxlbmd0aHMgYW5kIGVuc3VyZSB0aGUgaW50cmluc2ljIHNpemUgaXMg Y29ycmVjdCB3aGVuIHNldHRpbmcKKyAgICAgICAgYW4gaW5pdGlhbCBzdHlsZS4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjY5MDgKKworICAgICAg ICBUZXN0OiBmYXN0L2NhbnZhcy9jYW52YXMtem9vbS5odG1sCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVySFRNTENhbnZhcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJIVE1MQ2Fu dmFzOjpjYW52YXNTaXplQ2hhbmdlZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlcGxh Y2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpzdHlsZURpZENoYW5n ZSk6CisKIDIwMDktMDgtMTEgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMuemltbWVybWFu bkB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvcmdlIFN0YWlrb3Mu CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJIVE1MQ2FudmFzLmNwcCBiL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckhUTUxDYW52YXMuY3BwCmluZGV4IDFmYzA3ZjAuLjNhNzc2 YmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckhUTUxDYW52YXMuY3BwCisr KyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckhUTUxDYW52YXMuY3BwCkBAIC01NSwxMCArNTUs MTMgQEAgdm9pZCBSZW5kZXJIVE1MQ2FudmFzOjpjYW52YXNTaXplQ2hhbmdlZCgpCiAgICAgSW50 U2l6ZSBjYW52YXNTaXplID0gc3RhdGljX2Nhc3Q8SFRNTENhbnZhc0VsZW1lbnQqPihub2RlKCkp LT5zaXplKCk7CiAgICAgSW50U2l6ZSB6b29tZWRTaXplKGNhbnZhc1NpemUud2lkdGgoKSAqIHN0 eWxlKCktPmVmZmVjdGl2ZVpvb20oKSwgY2FudmFzU2l6ZS5oZWlnaHQoKSAqIHN0eWxlKCktPmVm ZmVjdGl2ZVpvb20oKSk7CiAKLSAgICBpZiAoY2FudmFzU2l6ZSA9PSBpbnRyaW5zaWNTaXplKCkp CisgICAgaWYgKHpvb21lZFNpemUgPT0gaW50cmluc2ljU2l6ZSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBzZXRJbnRyaW5zaWNTaXplKGNhbnZhc1NpemUpOworICAgIHNldEludHJpbnNpY1Np emUoem9vbWVkU2l6ZSk7CisKKyAgICBpZiAoIXBhcmVudCgpKQorICAgICAgICByZXR1cm47CiAK ICAgICBpZiAoIXByZWZXaWR0aHNEaXJ0eSgpKQogICAgICAgICBzZXRQcmVmV2lkdGhzRGlydHko dHJ1ZSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAg Yi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKaW5kZXggNjkyYTY2ZS4uMGFi MTFiNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisr KyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNjYsNyArNjYsNyBA QCB2b2lkIFJlbmRlclJlcGxhY2VkOjpzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlm ZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZAogCiAgICAgYm9vbCBoYWRTdHlsZSA9IChvbGRTdHls ZSAhPSAwKTsKICAgICBmbG9hdCBvbGRab29tID0gaGFkU3R5bGUgPyBvbGRTdHlsZS0+ZWZmZWN0 aXZlWm9vbSgpIDogUmVuZGVyU3R5bGU6OmluaXRpYWxab29tKCk7Ci0gICAgaWYgKGhhZFN0eWxl ICYmIHN0eWxlKCkgJiYgc3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpICE9IG9sZFpvb20pCisgICAg aWYgKHN0eWxlKCkgJiYgc3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpICE9IG9sZFpvb20pCiAgICAg ICAgIGludHJpbnNpY1NpemVDaGFuZ2VkKCk7CiB9CiAK