112770 2013-03-19 19:04:37 -0700 Autosize should use documentRect height instead of scrollHeight 2013-04-18 08:16:39 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 113731 1 thorton thorton fsamuel levin mthiesse simon.fraser oldest_to_newest 858978 0 193966 thorton 2013-03-19 19:04:37 -0700 Created attachment 193966 testcase We've found a few cases where autosizing will get the wrong size with overflow. I'll attach one of them here. The solution *seems* to be to use RenderView::documentRect's height, which gets the right height, instead of scrollHeight, which gets the wrong (very short) clipped height. <rdar://problem/13202277> 858986 1 193967 thorton 2013-03-19 19:17:05 -0700 Created attachment 193967 patch 858987 2 thorton 2013-03-19 19:18:42 -0700 Autosizing on Mac doesn't actually resize the view, it waits for the view to be laid-out by autolayout, and this only works for WebKit2 anyway. Making this testable on Mac would be a good chunk of work. I might consider adding a test that works on other platforms but is skipped on Mac, just so others don't regress this. 858996 3 levin 2013-03-19 19:39:22 -0700 You could consider adding drt support like what was done in http://trac.webkit.org/changeset/104398 I only did it for chromium but it was the only port using the feature at the time. 859164 4 levin 2013-03-20 01:39:39 -0700 I was trying to remember why I used that (and I finally tracked it back to the chromium code that had inspired it: https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/render_view_impl.cc&q=scrollHeight%20file:%5C.cc&sq=package:chromium&type=cs&l=3961), so I'll admit to not having a large bias for scrollHeight over documentRect. In fact after some more code investigation, it looks like the content size is set based on documentRect (https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/WebCore/page/FrameView.cpp&sq=package:chromium&type=cs&rcl=1363736896&l=593) and that is how scrollbars are determined so this seems very consistent with what this function is trying to do. Thanks! You may want to consider adding some simple drt support (like what I mentioned below), but I don't think that should block your fix. (Just to help you sleep better at night knowing that folks are much less likely to break you at random, you may want to consider it in the future.) 859583 5 thorton 2013-03-20 11:37:58 -0700 (In reply to comment #4) > I was trying to remember why I used that (and I finally tracked it back to the chromium code that had inspired it: > https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/render_view_impl.cc&q=scrollHeight%20file:%5C.cc&sq=package:chromium&type=cs&l=3961), so I'll admit to not having a large bias for scrollHeight over documentRect. > > > > In fact after some more code investigation, it looks like the content size is set based on documentRect ^^ this is exactly what made me pretty sure that we want this change. Our use of autosizing involves the WKView being sized to the FrameView contentsSize, and that was getting the right number, but we'd only paint a few pixels right at the top :) (https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit/Source/WebCore/page/FrameView.cpp&sq=package:chromium&type=cs&rcl=1363736896&l=593) and that is how scrollbars are determined so this seems very consistent with what this function is trying to do. > > Thanks! > > > You may want to consider adding some simple drt support (like what I mentioned below), but I don't think that should block your fix. (Just to help you sleep better at night knowing that folks are much less likely to break you at random, you may want to consider it in the future.) Agreed, I definitely want to work out how to make testing go. Thanks for the review! 859593 6 thorton 2013-03-20 11:59:51 -0700 http://trac.webkit.org/changeset/146373 867408 7 thorton 2013-04-01 16:27:17 -0700 This broke autosizing entirely, it will now never shrink to be smaller than it was before. David, do you know if it's unreasonable to remove the condition from this call? // If this is the first time we run autosize, start from small height and // allow it to grow. if (!m_didRunAutosize) resize(frameRect().width(), m_minAutoSize.height()); If we shrink the FrameView each time, the documentRect is right. If we don't, the documentRect never gets smaller than it has previously been. 867411 8 thorton 2013-04-01 16:28:57 -0700 (In reply to comment #7) > This broke autosizing entirely, it will now never shrink to be smaller than it was before. David, do you know if it's unreasonable to remove the condition from this call? > > // If this is the first time we run autosize, start from small height and > // allow it to grow. > if (!m_didRunAutosize) > resize(frameRect().width(), m_minAutoSize.height()); > > If we shrink the FrameView each time, the documentRect is right. If we don't, the documentRect never gets smaller than it has previously been. But there are presumably performance implications. 867442 9 196045 thorton 2013-04-01 17:19:26 -0700 Created attachment 196045 better patch! 867445 10 thorton 2013-04-01 17:24:57 -0700 http://trac.webkit.org/changeset/147373 877899 11 mthiesse 2013-04-18 08:16:39 -0700 FYI, this has been reverted in Blink for triggering ASSERTs (https://codereview.chromium.org/14139021/) 193966 2013-03-19 19:04:37 -0700 2013-03-19 19:04:37 -0700 testcase 13202277.html text/html 3398 thorton PGh0bWw+Cjxib2R5PgogIDxkaXYgc3R5bGU9ImJhY2tncm91bmQ6ICNjY2M7IHBvc2l0aW9uOiBh YnNvbHV0ZTsgdG9wOiAwOyBsZWZ0OiAwOyBib3R0b206IDA7IHJpZ2h0OiAwOyI+CkxvcmVtIGlw c3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNjaW5nIGVsaXQuIE51bGxhbSBw aGFyZXRyYSB1cm5hIGV0IG1ldHVzIHB1bHZpbmFyIHZlc3RpYnVsdW0gbHVjdHVzIGlwc3VtIHBl bGxlbnRlc3F1ZS4gVmVzdGlidWx1bSB1bHRyaWNpZXMgbWFnbmEgdmVsIGxhY3VzIG1vbGxpcyBl dCBlbGVpZmVuZCBkdWkgdmFyaXVzLiBGdXNjZSB0ZW1wdXMgYXVndWUgc2l0IGFtZXQgbGliZXJv IG1hbGVzdWFkYSBlZ2V0IGZldWdpYXQgZG9sb3IgY29uc2VjdGV0dXIuIFBoYXNlbGx1cyBhdCBz ZW0gbWV0dXMsIG5vbiB1bHRyaWNlcyB2ZWxpdC4gUGVsbGVudGVzcXVlIGhhYml0YW50IG1vcmJp IHRyaXN0aXF1ZSBzZW5lY3R1cyBldCBuZXR1cyBldCBtYWxlc3VhZGEgZmFtZXMgYWMgdHVycGlz IGVnZXN0YXMuIE51bGxhbSBydXRydW0sIGxpZ3VsYSBpZCBibGFuZGl0IHBoYXJldHJhLCBlbGl0 IHRlbGx1cyBjb25zZWN0ZXR1ciBuaXNsLCBhdCBpYWN1bGlzIG5lcXVlIG51bmMgaW4gZWxpdC4g TWFlY2VuYXMgbm9uIGNvbnNlY3RldHVyIGVzdC4gUGhhc2VsbHVzIG1vbGxpcyBkaWFtIGVnZXQg bGVjdHVzIHBvcnR0aXRvciBhIHBvcnRhIHRlbGx1cyB0ZW1wdXMuIEludGVnZXIgcHVydXMganVz dG8sIGZyaW5naWxsYSBub24gcGhhcmV0cmEgdmVsLCB0aW5jaWR1bnQgdmVoaWN1bGEgbWkuIE51 bmMgcXVhbSBwdXJ1cywgdGVtcG9yIHZpdGFlIGF1Y3RvciBhdCwgc3VzY2lwaXQgdml0YWUgc2Fw aWVuLiBNb3JiaSBhY2N1bXNhbiBjb252YWxsaXMgZXN0LCBldSBwaGFyZXRyYSB0ZWxsdXMgcGxh Y2VyYXQgcGxhY2VyYXQuIE51bGxhIHR1cnBpcyBzZW0sIG1vbGxpcyB2aXRhZSBjb25zZWN0ZXR1 ciBhdCwgcG9zdWVyZSBxdWlzIGFyY3UuIFNlZCB0dXJwaXMgbmlzbCwgZnJpbmdpbGxhIGV1IGVn ZXN0YXMgdmVsLCBlbGVpZmVuZCBjdXJzdXMgZG9sb3IuIE51bGxhIHNpdCBhbWV0IG1hdXJpcyB2 ZWwgbGlndWxhIHBvcnR0aXRvciBwb3J0dGl0b3Igdml0YWUgcXVpcyBkaWFtLiBRdWlzcXVlIHZp dmVycmEgbGFvcmVldCBwZWxsZW50ZXNxdWUuCgpTZWQgdHVycGlzIGVyb3MsIGFkaXBpc2Npbmcg dml0YWUgZmVybWVudHVtIG5vbiwgcmhvbmN1cyB2ZWwgbGVjdHVzLiBOdWxsYW0gY29uZGltZW50 dW0gc2FnaXR0aXMgbnVuYywgc2VkIGFkaXBpc2NpbmcgbGlndWxhIGNvbnNlcXVhdCBldS4gUGVs bGVudGVzcXVlIHV0IHF1YW0gdXQgbGliZXJvIGZyaW5naWxsYSB0aW5jaWR1bnQgcXVpcyBzZWQg YXJjdS4gTnVsbGEgZXVpc21vZCBzZW0gbmVjIGFudGUgYXVjdG9yIGF1Y3Rvci4gTWFlY2VuYXMg cXVpcyBmZWxpcyBpbnRlcmR1bSBsZWN0dXMgcGhhcmV0cmEgbGFjaW5pYSBub24gc2VkIGVyYXQu IE1hZWNlbmFzIHZhcml1cyBhZGlwaXNjaW5nIGV1aXNtb2QuIFZlc3RpYnVsdW0gYW50ZSBpcHN1 bSBwcmltaXMgaW4gZmF1Y2lidXMgb3JjaSBsdWN0dXMgZXQgdWx0cmljZXMgcG9zdWVyZSBjdWJp bGlhIEN1cmFlOyBBbGlxdWFtIGVyYXQgdm9sdXRwYXQuCgpJbnRlZ2VyIGV0IG9kaW8gdmVzdGli dWx1bSBhbnRlIG1vbGVzdGllIGZyaW5naWxsYSBpbiB1dCBudW5jLiBWZXN0aWJ1bHVtIGdyYXZp ZGEgYmliZW5kdW0gc2VtcGVyLiBOYW0gdGluY2lkdW50IGxlbyBzaXQgYW1ldCBtYWduYSBwb3J0 YSB2ZWwgc29sbGljaXR1ZGluIG1ldHVzIHBvcnRhLiBRdWlzcXVlIG5pYmggbWFzc2EsIHBvcnR0 aXRvciB2aXRhZSByaG9uY3VzIHNpdCBhbWV0LCBmcmluZ2lsbGEgYSB2ZWxpdC4gRG9uZWMgc2Fn aXR0aXMgZGljdHVtIGR1aSwgbm9uIHBlbGxlbnRlc3F1ZSBvZGlvIGx1Y3R1cyB1dC4gRnVzY2Ug aW4gYXVjdG9yIGF1Z3VlLiBWZXN0aWJ1bHVtIHB1bHZpbmFyIHNhcGllbiBpZCBuaWJoIHBoYXJl dHJhIGRpY3R1bS4gTnVsbGEgYWMgZG9sb3IgcXVpcyBuaXNpIHNlbXBlciB0aW5jaWR1bnQuIE51 bGxhIGZhY2lsaXNpLiBJbiBldCBtaSB2ZWwgZHVpIGNvbmRpbWVudHVtIHByZXRpdW0gZWdldCBl Z2V0IG1hc3NhLiBDdXJhYml0dXIgZWxlaWZlbmQgZXJvcyBzZWQgcHVydXMgZWxlaWZlbmQgZmF1 Y2lidXMuCgpWZXN0aWJ1bHVtIGFudGUgaXBzdW0gcHJpbWlzIGluIGZhdWNpYnVzIG9yY2kgbHVj dHVzIGV0IHVsdHJpY2VzIHBvc3VlcmUgY3ViaWxpYSBDdXJhZTsgUHJhZXNlbnQgbGliZXJvIGVy YXQsIHNvbGxpY2l0dWRpbiBub24gdGluY2lkdW50IHZpdGFlLCBzb2RhbGVzIHByZXRpdW0gb3Jj aS4gRnVzY2UgZXVpc21vZCBtb2xlc3RpZSBudW5jIGlkIHRpbmNpZHVudC4gTWFlY2VuYXMgYSBw b3N1ZXJlIGZlbGlzLiBEb25lYyBwcmV0aXVtIHBvcnR0aXRvciBzb2RhbGVzLiBBZW5lYW4gcG9z dWVyZSBsZW8gZXQgbGFjdXMgdmFyaXVzIHRlbXBvci4gUXVpc3F1ZSBzYXBpZW4gbWksIGVnZXN0 YXMgbm9uIGNvbW1vZG8gZWdldCwgY29uZGltZW50dW0gaWQgcXVhbS4gQWxpcXVhbSBxdWlzIGR1 aSBuaWJoLCBzaXQgYW1ldCBlZ2VzdGFzIGxvcmVtLiBWaXZhbXVzIGFyY3UgZXJvcywgc3VzY2lw aXQgbm9uIGlhY3VsaXMgc2VkLCB2dWxwdXRhdGUgcXVpcyBtYWduYS4gQ3VyYWJpdHVyIHBsYWNl cmF0IG9ybmFyZSBhbnRlLCBpbiB1bHRyaWNpZXMgZXJhdCB2b2x1dHBhdCBhZGlwaXNjaW5nLiBN YXVyaXMgdmVoaWN1bGEgc3VzY2lwaXQgc2FwaWVuIHF1aXMgdmVuZW5hdGlzLiBDcmFzIGF0IGVs aXQgdmVsIG1hdXJpcyB0cmlzdGlxdWUgZmV1Z2lhdC4gUHJvaW4gYXQgbWkgYXQgbWFnbmEgaW1w ZXJkaWV0IHNjZWxlcmlzcXVlIGV1IGFjIG5pc2wuIEV0aWFtIHNlZCB1cm5hIGluIGxlbyBwbGFj ZXJhdCBjb25zZWN0ZXR1ci4gRG9uZWMgdGluY2lkdW50IGNvbmd1ZSBtYWduYSBuZWMgc2FnaXR0 aXMuCgpEdWlzIGxpZ3VsYSBlbmltLCBjb21tb2RvIGVnZXQgYWRpcGlzY2luZyBldCwgcHJldGl1 bSBldCBsaWJlcm8uIFByYWVzZW50IGlkIGVyYXQgZXJhdC4gTmFtIGxlbyBlbmltLCB1bGxhbWNv cnBlciBub24gdmVzdGlidWx1bSBhYywgcmhvbmN1cyBpbiBudWxsYS4gVml2YW11cyBncmF2aWRh LCBsYWN1cyBpZCBoZW5kcmVyaXQgdWxsYW1jb3JwZXIsIG5pc2wgbnVsbGEgc29sbGljaXR1ZGlu IHZlbGl0LCB1dCBwb3J0YSBmZWxpcyBtaSBhYyBvZGlvLiBQcmFlc2VudCByaG9uY3VzIGltcGVy ZGlldCBhcmN1LCBncmF2aWRhIGxhY2luaWEgcmlzdXMgdHJpc3RpcXVlIGV0LiBJbiBoYWMgaGFi aXRhc3NlIHBsYXRlYSBkaWN0dW1zdC4gVXQgc2VkIG9yY2kganVzdG8sIGV1IHBlbGxlbnRlc3F1 ZSB0ZWxsdXMuCiAgPC9kaXY+CjwvYm9keT4KPC9odG1sPgo= 193967 2013-03-19 19:17:05 -0700 2013-04-01 17:19:26 -0700 patch autosizing.diff text/plain 1881 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1YjRkNmRkLi42ZDFkZmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTMtMDMtMTkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQXV0b3NpemUgc2hvdWxkIHVzZSBkb2N1bWVudFJlY3QgaGVpZ2h0IGluc3RlYWQg b2Ygc2Nyb2xsSGVpZ2h0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTI3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBdXRvc2l6aW5nIGZhaWxzIHRvIGNvbXB1dGUgdGhlIGNvcnJlY3QgaGVpZ2h0IGlm IHRoZSByb290IGVsZW1lbnQgaXMgdmVyeQorICAgICAgICBzbWFsbCBidXQgdGhlIGRvY3VtZW50 IGhhcyBzaWduaWZpY2FudCBvdmVyZmxvdy4KKworICAgICAgICBObyBuZXcgdGVzdHM7IGF1dG9z aXppbmcgaXMgbm90IGN1cnJlbnRseSBleHBvc2VkIGluIGEgdGVzdGFibGUgd2F5IG9uIE1hYy4K KworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6YXV0b1NpemVJZkVuYWJsZWQpOgorCiAyMDEzLTAzLTE5ICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGFmdGVyIHIx NDYyMjAuIEFkZCB0aGUgbWlzc2luZyBdJ3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5k ZXggMDQxZTRlMy4uOTIxZDJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMjcy MywxMCArMjcyMyw2IEBAIHZvaWQgRnJhbWVWaWV3OjphdXRvU2l6ZUlmRW5hYmxlZCgpCiAgICAg aWYgKCFkb2N1bWVudFZpZXcgfHwgIWRvY3VtZW50RWxlbWVudCkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgUmVuZGVyQm94KiBkb2N1bWVudFJlbmRlckJveCA9IGRvY3VtZW50RWxlbWVudC0+cmVu ZGVyQm94KCk7Ci0gICAgaWYgKCFkb2N1bWVudFJlbmRlckJveCkKLSAgICAgICAgcmV0dXJuOwot CiAgICAgLy8gSWYgdGhpcyBpcyB0aGUgZmlyc3QgdGltZSB3ZSBydW4gYXV0b3NpemUsIHN0YXJ0 IGZyb20gc21hbGwgaGVpZ2h0IGFuZAogICAgIC8vIGFsbG93IGl0IHRvIGdyb3cuCiAgICAgaWYg KCFtX2RpZFJ1bkF1dG9zaXplKQpAQCAtMjc0MCw3ICsyNzM2LDcgQEAgdm9pZCBGcmFtZVZpZXc6 OmF1dG9TaXplSWZFbmFibGVkKCkKICAgICAgICAgLy8gVXBkYXRlIHZhcmlvdXMgc2l6ZXMgaW5j bHVkaW5nIGNvbnRlbnRzU2l6ZSwgc2Nyb2xsSGVpZ2h0LCBldGMuCiAgICAgICAgIGRvY3VtZW50 LT51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVldHMoKTsKICAgICAgICAgaW50IHdp ZHRoID0gZG9jdW1lbnRWaWV3LT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKLSAgICAgICAg aW50IGhlaWdodCA9IGRvY3VtZW50UmVuZGVyQm94LT5zY3JvbGxIZWlnaHQoKTsKKyAgICAgICAg aW50IGhlaWdodCA9IGRvY3VtZW50Vmlldy0+ZG9jdW1lbnRSZWN0KCkuaGVpZ2h0KCk7CiAgICAg ICAgIEludFNpemUgbmV3U2l6ZSh3aWR0aCwgaGVpZ2h0KTsKIAogICAgICAgICAvLyBDaGVjayB0 byBzZWUgaWYgYSBzY3JvbGxiYXIgaXMgbmVlZGVkIGZvciBhIGdpdmVuIGRpbWVuc2lvbiBhbmQK 196045 2013-04-01 17:19:26 -0700 2013-04-01 17:22:43 -0700 better patch! autosizing.diff text/plain 2248 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4N2Q4MmRhLi4wZDUxNmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDQtMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQXV0b3NpemUgc2hvdWxkIHVzZSBkb2N1bWVudFJlY3QgaGVpZ2h0IGluc3RlYWQg b2Ygc2Nyb2xsSGVpZ2h0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTI3NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBdXRvc2l6aW5nIGZhaWxzIHRvIGNvbXB1dGUgdGhlIGNvcnJlY3QgaGVpZ2h0IGlm IHRoZSByb290IGVsZW1lbnQgaXMgdmVyeQorICAgICAgICBzbWFsbCBidXQgdGhlIGRvY3VtZW50 IGhhcyBzaWduaWZpY2FudCBvdmVyZmxvdy4KKworICAgICAgICBBbHNvLCB1bmNvbmRpdGlvbmFs bHkgc3RhcnQgbGF5aW5nIG91dCBmcm9tIHRoZSBtaW5pbXVtIGhlaWdodCwgc28gdGhhdCB0aGUK KyAgICAgICAgZG9jdW1lbnRSZWN0IGNhbiBzaHJpbmsgYmVsb3cgaXRzIHByZXZpb3VzIGhlaWdo dCBpZiBuZWVkZWQuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzOyBhdXRvc2l6aW5nIGlzIG5vdCBj dXJyZW50bHkgZXhwb3NlZCBpbiBhIHRlc3RhYmxlIHdheSBvbiBNYWMuCisKKyAgICAgICAgKiBw YWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmF1dG9TaXpl SWZFbmFibGVkKToKKwogMjAxMy0wNC0wMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJv dEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE0NjM3My4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAwYjJmYWExLi5mYjQxZjEzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0yNzc4LDE0ICsyNzc4LDggQEAgdm9pZCBGcmFtZVZp ZXc6OmF1dG9TaXplSWZFbmFibGVkKCkKICAgICBpZiAoIWRvY3VtZW50VmlldyB8fCAhZG9jdW1l bnRFbGVtZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBSZW5kZXJCb3gqIGRvY3VtZW50UmVu ZGVyQm94ID0gZG9jdW1lbnRFbGVtZW50LT5yZW5kZXJCb3goKTsKLSAgICBpZiAoIWRvY3VtZW50 UmVuZGVyQm94KQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBJZiB0aGlzIGlzIHRoZSBmaXJz dCB0aW1lIHdlIHJ1biBhdXRvc2l6ZSwgc3RhcnQgZnJvbSBzbWFsbCBoZWlnaHQgYW5kCi0gICAg Ly8gYWxsb3cgaXQgdG8gZ3Jvdy4KLSAgICBpZiAoIW1fZGlkUnVuQXV0b3NpemUpCi0gICAgICAg IHJlc2l6ZShmcmFtZVJlY3QoKS53aWR0aCgpLCBtX21pbkF1dG9TaXplLmhlaWdodCgpKTsKKyAg ICAvLyBTdGFydCBmcm9tIHRoZSBtaW5pbXVtIGhlaWdodCBhbmQgYWxsb3cgaXQgdG8gZ3Jvdy4K KyAgICByZXNpemUoZnJhbWVSZWN0KCkud2lkdGgoKSwgbV9taW5BdXRvU2l6ZS5oZWlnaHQoKSk7 CiAKICAgICBJbnRTaXplIHNpemUgPSBmcmFtZVJlY3QoKS5zaXplKCk7CiAKQEAgLTI3OTUsNyAr Mjc4OSw3IEBAIHZvaWQgRnJhbWVWaWV3OjphdXRvU2l6ZUlmRW5hYmxlZCgpCiAgICAgICAgIC8v IFVwZGF0ZSB2YXJpb3VzIHNpemVzIGluY2x1ZGluZyBjb250ZW50c1NpemUsIHNjcm9sbEhlaWdo dCwgZXRjLgogICAgICAgICBkb2N1bWVudC0+dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxl c2hlZXRzKCk7CiAgICAgICAgIGludCB3aWR0aCA9IGRvY3VtZW50Vmlldy0+bWluUHJlZmVycmVk TG9naWNhbFdpZHRoKCk7Ci0gICAgICAgIGludCBoZWlnaHQgPSBkb2N1bWVudFJlbmRlckJveC0+ c2Nyb2xsSGVpZ2h0KCk7CisgICAgICAgIGludCBoZWlnaHQgPSBkb2N1bWVudFZpZXctPmRvY3Vt ZW50UmVjdCgpLmhlaWdodCgpOwogICAgICAgICBJbnRTaXplIG5ld1NpemUod2lkdGgsIGhlaWdo dCk7CiAKICAgICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIGEgc2Nyb2xsYmFyIGlzIG5lZWRlZCBm b3IgYSBnaXZlbiBkaW1lbnNpb24gYW5kCg==