86085 2012-05-10 04:08:38 -0700 [Qt] Implement fit-to-width behaviour 2012-05-10 06:01:46 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth abecsi hausmann menard webkit.review.bot zalan zoltan oldest_to_newest 620450 0 kenneth 2012-05-10 04:08:38 -0700 SSIA 620455 1 141141 kenneth 2012-05-10 04:11:34 -0700 Created attachment 141141 Patch 620458 2 141141 kenneth 2012-05-10 04:17:48 -0700 Comment on attachment 141141 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141141&action=review > Source/WebCore/ChangeLog:9 > + fully. 9 without showing any chrome background. 620469 3 zalan 2012-05-10 04:41:23 -0700 discussed over irc. While I had some reservations about the QWebViewportInfo changes, it can't really be done cleaner at this time. 620473 4 141145 kenneth 2012-05-10 04:57:22 -0700 Created attachment 141145 Patch 620480 5 abecsi 2012-05-10 05:09:10 -0700 (In reply to comment #4) > Created an attachment (id=141145) [details] > Patch I have a pending two-liner fix for Flickable to address the float comparison issue which prevents Flickable from automatically locking the content if it fits into the visual viewport but the content width is larger than the viewport by a fraction of a pixel. This bug tries to fix a problem which is the result of the same rounding issue. I'm not sure if copying and slightly modifying the restrictMinimumScaleFactorToViewportSize function from ViewportArguments.cpp is the correct solution here, since this is a rounding issue and computeViewportAttributes in ViewportArguments.cpp should already calculate the initial scale that fits into view. 620482 6 kenneth 2012-05-10 05:12:13 -0700 (In reply to comment #5) > (In reply to comment #4) > > Created an attachment (id=141145) [details] [details] > > Patch > > I have a pending two-liner fix for Flickable to address the float comparison issue which prevents Flickable from automatically locking the content if it fits into the visual viewport but the content width is larger than the viewport by a fraction of a pixel. > > This bug tries to fix a problem which is the result of the same rounding issue. No it does not :-) This bug is fixing the minimum bound which has nothing directly to do with the axis locking. > I'm not sure if copying and slightly modifying the restrictMinimumScaleFactorToViewportSize function from ViewportArguments.cpp is the correct solution here, since this is a rounding issue and computeViewportAttributes in ViewportArguments.cpp should already calculate the initial scale that fits into view. That does consider that the size might be bigger than the actual layout viewport. 620486 7 kenneth 2012-05-10 05:19:19 -0700 Landed in r116632 620504 8 abecsi 2012-05-10 05:45:43 -0700 (In reply to comment #6) > (In reply to comment #5) > > (In reply to comment #4) > > > Created an attachment (id=141145) [details] [details] [details] > > > Patch > > > > I have a pending two-liner fix for Flickable to address the float comparison issue which prevents Flickable from automatically locking the content if it fits into the visual viewport but the content width is larger than the viewport by a fraction of a pixel. > > > > This bug tries to fix a problem which is the result of the same rounding issue. > > No it does not :-) This bug is fixing the minimum bound which has nothing directly to do with the axis locking. The minimum scale (which should fit into view) should have the result that Flickable disables horizontal content movement, so this patch has an impact on axis locking, and it actually fixes some cases where Flickable did not lock :) > > > I'm not sure if copying and slightly modifying the restrictMinimumScaleFactorToViewportSize function from ViewportArguments.cpp is the correct solution here, since this is a rounding issue and computeViewportAttributes in ViewportArguments.cpp should already calculate the initial scale that fits into view. > > That does consider that the size might be bigger than the actual layout viewport. I see. What I do not understand is why we needed to duplicate the computeMinimumScaleFactorForContentContained function here if we could use the exact same one in ViewportArguments.cpp (WebCore::computeMinimumScaleFactorForContentContained) as we did with the restrictMinimumScaleFactorToViewportSize? 620506 9 kenneth 2012-05-10 05:51:27 -0700 > What I do not understand is why we needed to duplicate the computeMinimumScaleFactorForContentContained function here if we could use the exact same one in ViewportArguments.cpp (WebCore::computeMinimumScaleFactorForContentContained) as we did with the restrictMinimumScaleFactorToViewportSize? I am using the one from ViewportArguments.cpp, there is no duplication here. The restrict* method is still there for those not implementing proper fit-to-view behavior like us now and Chromium. It is also used for teh testing system. 620511 10 abecsi 2012-05-10 06:01:46 -0700 (In reply to comment #9) > > What I do not understand is why we needed to duplicate the computeMinimumScaleFactorForContentContained function here if we could use the exact same one in ViewportArguments.cpp (WebCore::computeMinimumScaleFactorForContentContained) as we did with the restrictMinimumScaleFactorToViewportSize? > > I am using the one from ViewportArguments.cpp, there is no duplication here. The restrict* method is still there for those not implementing proper fit-to-view behavior like us now and Chromium. It is also used for teh testing system. Right, my bad, I looked at the wrong working copy :) 141141 2012-05-10 04:11:34 -0700 2012-05-10 04:57:15 -0700 Patch bug-86085-20120510130015.patch text/plain 7639 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJjYWVkYTAzNDE5ZTli MzFkNGFhNmZjZDdhYWEyNWRmMjQ4OWI1ZS4uYTRjMTFiNTc5ZjFiYWRiNjg0OWJkNjdjOTJiMWY4 ZjczNWU2NTRhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTEwICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIEltcGxlbWVudCBmaXQtdG8td2lkdGggYmVoYXZpb3VyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjA4NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG1ldGhvZCB0byBnZXQgdGhlIG1pbmlt dW0gc2NhbGUgZmFjdG9yIHRoYXQgY29udGFpbnMgdGhlIGNvbnRlbnQKKyAgICAgICAgZnVsbHku CisKKyAgICAgICAgKiBkb20vVmlld3BvcnRBcmd1bWVudHMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y29tcHV0ZU1pbmltdW1TY2FsZUZhY3RvckZvckNvbnRlbnRDb250YWluZWQpOgorICAgICAg ICAoV2ViQ29yZSk6CisgICAgICAgICogZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmg6CisgICAgICAg IChXZWJDb3JlKToKKwogMjAxMi0wNS0xMCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEF1dG9jb21wbGV0ZSBmb3IgQ1NT IHByb3BlcnR5IHZhbHVlcyBpbiB0aGUgU3R5bGVzIHBhbmUgYmVoYXZpbmcgaW5jb3JyZWN0bHkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0MmFjMDQyYWM5ODYxYmEwMzdkZjhiNDgyZGJjMzcwMjllMGM2ZDI5Li4y MjdlNDU0Y2FiMjc3M2E2YWQ2NjYyOTE5MmI0Mjg4MjU4ZTAzZjBiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjIgQEAKKzIwMTItMDUtMTAgIEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2Vu bmV0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF0gSW1wbGVtZW50IGZpdC10by13aWR0aCBi ZWhhdmlvdXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg2MDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V2UgZG9uJ3QgcmVzdHJpY3QgdGhlIG1pbmltdW0gc2NhbGUgdG8gdGhlIGxheW91dCB2aWV3cG9y dCBhbnltb3JlLAorICAgICAgICBidXQgaW5zdGVhZCB1cGRhdGUgdGhlIG1pbmltdW0gc2NhbGUg d2hlbiB0aGUgY29udGVudCBzaXplIGNoYW5nZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2ViVmlld0ZsaWNrYWJsZVBy aXZhdGU6OmRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGllcyk6CisgICAgICAgIChRUXVpY2tXZWJW aWV3RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL3F0L3F3ZWJ2aWV3cG9ydGluZm8uY3BwOgorICAgICAgICAoUVdlYlZpZXdw b3J0SW5mbzo6bWluaW11bVNjYWxlKToKKyAgICAgICAgKFFXZWJWaWV3cG9ydEluZm86Om1heGlt dW1TY2FsZSk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZS5oOgorICAgICAgICAoUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKToKKwogMjAxMi0w NS0wOSAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAg IE1vdmUgc3VzcGVuZEFuaW1hdGlvbnMgdG8gdXNlIEludGVybmFscyBpbnRlcmZhY2UuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVudHMuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNwcAppbmRleCAwZjMyOWFjMzE2ZjM0NDQz MjZkMGFmMjg2M2VhZThjOTZhMjdlY2EwLi4xNGU1OGVmMzBiNzQ3ZWU5ZDE2MWM4MTQxNmNiZTUz OWM2MjU1YjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1bWVu dHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKQEAg LTE4NSw2ICsxODUsMTkgQEAgVmlld3BvcnRBdHRyaWJ1dGVzIGNvbXB1dGVWaWV3cG9ydEF0dHJp YnV0ZXMoVmlld3BvcnRBcmd1bWVudHMgYXJncywgaW50IGRlc2t0b3AKICAgICByZXR1cm4gcmVz dWx0OwogfQogCitmbG9hdCBjb21wdXRlTWluaW11bVNjYWxlRmFjdG9yRm9yQ29udGVudENvbnRh aW5lZChjb25zdCBWaWV3cG9ydEF0dHJpYnV0ZXMmIHJlc3VsdCwgY29uc3QgSW50U2l6ZSYgdmll d3BvcnRTaXplLCBjb25zdCBJbnRTaXplJiBjb250ZW50c1NpemUpCit7CisgICAgZmxvYXQgYXZh aWxhYmxlV2lkdGggPSB2aWV3cG9ydFNpemUud2lkdGgoKTsKKyAgICBmbG9hdCBhdmFpbGFibGVI ZWlnaHQgPSB2aWV3cG9ydFNpemUuaGVpZ2h0KCk7CisKKyAgICBpZiAocmVzdWx0LmRldmljZVBp eGVsUmF0aW8gIT0gMS4wKSB7CisgICAgICAgIGF2YWlsYWJsZVdpZHRoIC89IHJlc3VsdC5kZXZp Y2VQaXhlbFJhdGlvOworICAgICAgICBhdmFpbGFibGVIZWlnaHQgLz0gcmVzdWx0LmRldmljZVBp eGVsUmF0aW87CisgICAgfQorCisgICAgcmV0dXJuIG1heDxmbG9hdD4ocmVzdWx0Lm1pbmltdW1T Y2FsZSwgbWF4KGF2YWlsYWJsZVdpZHRoIC8gY29udGVudHNTaXplLndpZHRoKCksIGF2YWlsYWJs ZUhlaWdodCAvIGNvbnRlbnRzU2l6ZS5oZWlnaHQoKSkpOworfQorCiB2b2lkIHJlc3RyaWN0TWlu aW11bVNjYWxlRmFjdG9yVG9WaWV3cG9ydFNpemUoVmlld3BvcnRBdHRyaWJ1dGVzJiByZXN1bHQs IEludFNpemUgdmlzaWJsZVZpZXdwb3J0KQogewogICAgIGZsb2F0IGF2YWlsYWJsZVdpZHRoID0g dmlzaWJsZVZpZXdwb3J0LndpZHRoKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v Vmlld3BvcnRBcmd1bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50 cy5oCmluZGV4IDc5NjUxZDI1YjIzMjNmOWJmYjhlYjljODBjMTc4MjJjMjQ4ODViMjguLjkyZTMx NzJmYTNmOGQzYzU4Yjc0ZTBmYWU0NTUwZjljOWIxNjZiODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9W aWV3cG9ydEFyZ3VtZW50cy5oCkBAIC0xMDksNiArMTA5LDcgQEAgc3RydWN0IFZpZXdwb3J0QXJn dW1lbnRzIHsKIFZpZXdwb3J0QXR0cmlidXRlcyBjb21wdXRlVmlld3BvcnRBdHRyaWJ1dGVzKFZp ZXdwb3J0QXJndW1lbnRzIGFyZ3MsIGludCBkZXNrdG9wV2lkdGgsIGludCBkZXZpY2VXaWR0aCwg aW50IGRldmljZUhlaWdodCwgaW50IGRldmljZURQSSwgSW50U2l6ZSB2aXNpYmxlVmlld3BvcnQp Owogdm9pZCByZXN0cmljdE1pbmltdW1TY2FsZUZhY3RvclRvVmlld3BvcnRTaXplKFZpZXdwb3J0 QXR0cmlidXRlcyYgcmVzdWx0LCBJbnRTaXplIHZpc2libGVWaWV3cG9ydCk7CiB2b2lkIHJlc3Ry aWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKFZpZXdwb3J0QXR0 cmlidXRlcyYgcmVzdWx0KTsKK2Zsb2F0IGNvbXB1dGVNaW5pbXVtU2NhbGVGYWN0b3JGb3JDb250 ZW50Q29udGFpbmVkKGNvbnN0IFZpZXdwb3J0QXR0cmlidXRlcyYgcmVzdWx0LCBjb25zdCBJbnRT aXplJiB2aWV3cG9ydFNpemUsIGNvbnN0IEludFNpemUmIGNvbnRlbnRTaXplKTsKIAogdm9pZCBz ZXRWaWV3cG9ydEZlYXR1cmUoY29uc3QgU3RyaW5nJiBrZXlTdHJpbmcsIGNvbnN0IFN0cmluZyYg dmFsdWVTdHJpbmcsIERvY3VtZW50Kiwgdm9pZCogZGF0YSk7CiB2b2lkIHJlcG9ydFZpZXdwb3J0 V2FybmluZyhEb2N1bWVudCosIFZpZXdwb3J0RXJyb3JDb2RlLCBjb25zdCBTdHJpbmcmIHJlcGxh Y2VtZW50MSwgY29uc3QgU3RyaW5nJiByZXBsYWNlbWVudDIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggNjcyMzU1ODIyOThl OTJlZDQ1ZjFmOWQ2YjhlMDZiYWFkNWRiNjNiNS4uYjcyNjM2MTJjMmFkOTY4Y2UwMmFhMWI4Y2Nl YTgyMmIxYWMzYTlmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnZpZXcuY3BwCkBAIC04NTcsMTEgKzg1Nyw4IEBAIHZvaWQgUVF1aWNrV2ViVmll d0ZsaWNrYWJsZVByaXZhdGU6OmRpZENoYW5nZVZpZXdwb3J0UHJvcGVydGllcyhjb25zdCBXZWJD b3JlOjpWCiB7CiAgICAgUV9RKFFRdWlja1dlYlZpZXcpOwogCi0gICAgUVNpemUgdmlld3BvcnRT aXplID0gcS0+Ym91bmRpbmdSZWN0KCkuc2l6ZSgpLnRvU2l6ZSgpOwotCiAgICAgLy8gRklYTUU6 IFJldmlzZSB0aGVzZSB3aGVuIGltcGxlbWVudGluZyBmaXQtdG8td2lkdGguCiAgICAgV2ViQ29y ZTo6Vmlld3BvcnRBdHRyaWJ1dGVzIGF0dHIgPSBuZXdBdHRyaWJ1dGVzOwotICAgIFdlYkNvcmU6 OnJlc3RyaWN0TWluaW11bVNjYWxlRmFjdG9yVG9WaWV3cG9ydFNpemUoYXR0ciwgdmlld3BvcnRT aXplKTsKICAgICBXZWJDb3JlOjpyZXN0cmljdFNjYWxlRmFjdG9yVG9Jbml0aWFsU2NhbGVJZk5v dFVzZXJTY2FsYWJsZShhdHRyKTsKIAogICAgIC8vIEZJWE1FOiBSZXNldHRpbmcgaGVyZSBjYW4g cmVzZXQgbW9yZSB0aGFuIG5lZWRlZC4gRm9yIGluc3RhbmNlIGl0IHdpbGwgZW5kIGRlZmVycmVy cy4KQEAgLTk0OSw4ICs5NDYsMjAgQEAgdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0 ZTo6cGFnZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgUVBvaW50JiBwb3MpCiB2b2lkIFFRdWlja1dl YlZpZXdGbGlja2FibGVQcml2YXRlOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgUVNpemUm IG5ld1NpemUpCiB7CiAgICAgUV9RKFFRdWlja1dlYlZpZXcpOworICAgIFFTaXplIHZpZXdwb3J0 U2l6ZSA9IHEtPmJvdW5kaW5nUmVjdCgpLnNpemUoKS50b1NpemUoKTsKKwogICAgIHBhZ2VWaWV3 LT5zZXRDb250ZW50c1NpemUobmV3U2l6ZSk7CiAgICAgcS0+ZXhwZXJpbWVudGFsKCktPnZpZXdw b3J0SW5mbygpLT5kaWRVcGRhdGVDb250ZW50c1NpemUoKTsKKworICAgIGZsb2F0IG1pbmltdW1T Y2FsZSA9IFdlYkNvcmU6OmNvbXB1dGVNaW5pbXVtU2NhbGVGYWN0b3JGb3JDb250ZW50Q29udGFp bmVkKGF0dHJpYnV0ZXMsIHZpZXdwb3J0U2l6ZSwgbmV3U2l6ZSk7CisKKyAgICBpZiAobWluaW11 bVNjYWxlICE9IGF0dHJpYnV0ZXMubWluaW11bVNjYWxlKSB7CisgICAgICAgIGludGVyYWN0aW9u RW5naW5lLT5zZXRDU1NTY2FsZUJvdW5kcyhtaW5pbXVtU2NhbGUsIGF0dHJpYnV0ZXMubWF4aW11 bVNjYWxlKTsKKyAgICAgICAgcS0+ZXhwZXJpbWVudGFsKCktPnZpZXdwb3J0SW5mbygpLT5kaWRV cGRhdGVWaWV3cG9ydENvbnN0cmFpbnRzKCk7CisKKyAgICAgICAgaWYgKCFpbnRlcmFjdGlvbkVu Z2luZS0+aGFkVXNlckludGVyYWN0aW9uKCkgJiYgIXBhZ2VJc1N1c3BlbmRlZCkKKyAgICAgICAg ICAgIGludGVyYWN0aW9uRW5naW5lLT5zZXRDU1NTY2FsZShtaW5pbXVtU2NhbGUpOworICAgIH0K IH0KIAogLyohCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJ2aWV3cG9ydGluZm8uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Vi dmlld3BvcnRpbmZvLmNwcAppbmRleCAxNzA2MDRkMWRmYzUwMGQxYzRjZmJjMzVlOWY5OTVmYzM3 MTNhOWNhLi5lYTE2NzMyZjVkMGNiN2MwZjNiYjRhZTkzYjcxZmQ4MTEzNzU3MGFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJ2aWV3cG9ydGluZm8uY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnZpZXdwb3J0aW5mby5j cHAKQEAgLTYyLDExICs2MiwxNyBAQCBRVmFyaWFudCBRV2ViVmlld3BvcnRJbmZvOjppbml0aWFs U2NhbGUoKSBjb25zdAogCiBRVmFyaWFudCBRV2ViVmlld3BvcnRJbmZvOjptaW5pbXVtU2NhbGUo KSBjb25zdAogeworICAgIGlmIChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUqIGludGVyYWN0 aW9uRW5naW5lID0gbV93ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSgp KQorICAgICAgICByZXR1cm4gaW50ZXJhY3Rpb25FbmdpbmUtPm1fbWluaW11bVNjYWxlOworCiAg ICAgcmV0dXJuIG1fd2ViVmlld1ByaXZhdGUtPmF0dHJpYnV0ZXMubWluaW11bVNjYWxlOwogfQog CiBRVmFyaWFudCBRV2ViVmlld3BvcnRJbmZvOjptYXhpbXVtU2NhbGUoKSBjb25zdAogeworICAg IGlmIChRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUqIGludGVyYWN0aW9uRW5naW5lID0gbV93 ZWJWaWV3UHJpdmF0ZS0+dmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSgpKQorICAgICAgICByZXR1 cm4gaW50ZXJhY3Rpb25FbmdpbmUtPm1fbWF4aW11bVNjYWxlOworCiAgICAgcmV0dXJuIG1fd2Vi Vmlld1ByaXZhdGUtPmF0dHJpYnV0ZXMubWF4aW11bVNjYWxlOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l LmgKaW5kZXggNDg2ZDg0MTdjNWM1MzRiZDQ2NzIxYzA3OGVjZmMxYzcwYTJlMzgxOC4uOGE3MjBm MzRiOTcyNTMyYjRhZjQ3MmNhMmUyZmJlZTZiNTA2MjAwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaApA QCAtMzUsNiArMzUsOCBAQCBjbGFzcyBRUXVpY2tXZWJWaWV3OwogY2xhc3MgUVdoZWVsRXZlbnQ7 CiBRVF9FTkRfTkFNRVNQQUNFCiAKK2NsYXNzIFFXZWJWaWV3cG9ydEluZm87CisKIG5hbWVzcGFj ZSBXZWJLaXQgewogCiBjbGFzcyBWaWV3cG9ydFVwZGF0ZURlZmVycmVyOwpAQCAtMTE0LDcgKzEx Niw3IEBAIHByaXZhdGUgUV9TTE9UUzoKIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgVmll d3BvcnRVcGRhdGVEZWZlcnJlcjsKLSAgICBmcmllbmQgY2xhc3MgUVdlYlZpZXdwb3J0SW5mbzsK KyAgICBmcmllbmQgY2xhc3MgOjpRV2ViVmlld3BvcnRJbmZvOwogCiAgICAgUVF1aWNrV2ViVmll dyogY29uc3QgbV92aWV3cG9ydDsKICAgICBRUXVpY2tXZWJQYWdlKiBjb25zdCBtX2NvbnRlbnQ7 Cg== 141145 2012-05-10 04:57:22 -0700 2012-05-10 05:00:09 -0700 Patch bug-86085-20120510134602.patch text/plain 7685 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2NjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJjYWVkYTAzNDE5ZTli MzFkNGFhNmZjZDdhYWEyNWRmMjQ4OWI1ZS4uMzlhZjBiOWZhNTIyYWUyOGFiY2UzN2RiZmRjZjBj YTE1Y2RiMDdlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTEwICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb UXRdIEltcGxlbWVudCBmaXQtdG8td2lkdGggYmVoYXZpb3VyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjA4NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG1ldGhvZCB0byBnZXQgdGhlIG1pbmlt dW0gc2NhbGUgZmFjdG9yIHRoYXQgY29udGFpbnMgdGhlIGNvbnRlbnQKKyAgICAgICAgd2l0aG91 dCBzaG93aW5nIGFueSBjaHJvbWUgYmFja2dyb3VuZC4KKworICAgICAgICAqIGRvbS9WaWV3cG9y dEFyZ3VtZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTWluaW11bVNjYWxlRmFj dG9yRm9yQ29udGVudENvbnRhaW5lZCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBk b20vVmlld3BvcnRBcmd1bWVudHMuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA1LTEw ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogQXV0b2NvbXBsZXRlIGZvciBDU1MgcHJvcGVydHkgdmFsdWVzIGluIHRoZSBT dHlsZXMgcGFuZSBiZWhhdmluZyBpbmNvcnJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDQyYWMwNDJhYzk4 NjFiYTAzN2RmOGI0ODJkYmMzNzAyOWUwYzZkMjkuLjIyN2U0NTRjYWIyNzczYTZhZDY2NjI5MTky YjQyODgyNThlMDNmMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMi0wNS0xMCAg S2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgW1F0XSBJbXBsZW1lbnQgZml0LXRvLXdpZHRoIGJlaGF2aW91cgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODYwODUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBkb24ndCByZXN0cmljdCB0aGUgbWlu aW11bSBzY2FsZSB0byB0aGUgbGF5b3V0IHZpZXdwb3J0IGFueW1vcmUsCisgICAgICAgIGJ1dCBp bnN0ZWFkIHVwZGF0ZSB0aGUgbWluaW11bSBzY2FsZSB3aGVuIHRoZSBjb250ZW50IHNpemUgY2hh bmdlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6Cisg ICAgICAgIChRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hhbmdlVmlld3BvcnRQ cm9wZXJ0aWVzKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpkaWRD aGFuZ2VDb250ZW50c1NpemUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYnZpZXdw b3J0aW5mby5jcHA6CisgICAgICAgIChRV2ViVmlld3BvcnRJbmZvOjptaW5pbXVtU2NhbGUpOgor ICAgICAgICAoUVdlYlZpZXdwb3J0SW5mbzo6bWF4aW11bVNjYWxlKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmg6CisgICAgICAgIChRdFZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorCiAyMDEyLTA1LTA5ICBHeXV5b3VuZyBLaW0gIDxneXV5 b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgTW92ZSBzdXNwZW5kQW5pbWF0aW9ucyB0 byB1c2UgSW50ZXJuYWxzIGludGVyZmFjZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vVmlld3BvcnRBcmd1 bWVudHMuY3BwCmluZGV4IDBmMzI5YWMzMTZmMzQ0NDMyNmQwYWYyODYzZWFlOGM5NmEyN2VjYTAu LjE0ZTU4ZWYzMGI3NDdlZTlkMTYxYzgxNDE2Y2JlNTM5YzYyNTViMDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmNwcApAQCAtMTg1LDYgKzE4NSwxOSBAQCBWaWV3cG9y dEF0dHJpYnV0ZXMgY29tcHV0ZVZpZXdwb3J0QXR0cmlidXRlcyhWaWV3cG9ydEFyZ3VtZW50cyBh cmdzLCBpbnQgZGVza3RvcAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK2Zsb2F0IGNvbXB1dGVN aW5pbXVtU2NhbGVGYWN0b3JGb3JDb250ZW50Q29udGFpbmVkKGNvbnN0IFZpZXdwb3J0QXR0cmli dXRlcyYgcmVzdWx0LCBjb25zdCBJbnRTaXplJiB2aWV3cG9ydFNpemUsIGNvbnN0IEludFNpemUm IGNvbnRlbnRzU2l6ZSkKK3sKKyAgICBmbG9hdCBhdmFpbGFibGVXaWR0aCA9IHZpZXdwb3J0U2l6 ZS53aWR0aCgpOworICAgIGZsb2F0IGF2YWlsYWJsZUhlaWdodCA9IHZpZXdwb3J0U2l6ZS5oZWln aHQoKTsKKworICAgIGlmIChyZXN1bHQuZGV2aWNlUGl4ZWxSYXRpbyAhPSAxLjApIHsKKyAgICAg ICAgYXZhaWxhYmxlV2lkdGggLz0gcmVzdWx0LmRldmljZVBpeGVsUmF0aW87CisgICAgICAgIGF2 YWlsYWJsZUhlaWdodCAvPSByZXN1bHQuZGV2aWNlUGl4ZWxSYXRpbzsKKyAgICB9CisKKyAgICBy ZXR1cm4gbWF4PGZsb2F0PihyZXN1bHQubWluaW11bVNjYWxlLCBtYXgoYXZhaWxhYmxlV2lkdGgg LyBjb250ZW50c1NpemUud2lkdGgoKSwgYXZhaWxhYmxlSGVpZ2h0IC8gY29udGVudHNTaXplLmhl aWdodCgpKSk7Cit9CisKIHZvaWQgcmVzdHJpY3RNaW5pbXVtU2NhbGVGYWN0b3JUb1ZpZXdwb3J0 U2l6ZShWaWV3cG9ydEF0dHJpYnV0ZXMmIHJlc3VsdCwgSW50U2l6ZSB2aXNpYmxlVmlld3BvcnQp CiB7CiAgICAgZmxvYXQgYXZhaWxhYmxlV2lkdGggPSB2aXNpYmxlVmlld3BvcnQud2lkdGgoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9WaWV3cG9ydEFyZ3VtZW50cy5oIGIvU291 cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmgKaW5kZXggNzk2NTFkMjViMjMyM2Y5 YmZiOGViOWM4MGMxNzgyMmMyNDg4NWIyOC4uOTJlMzE3MmZhM2Y4ZDNjNThiNzRlMGZhZTQ1NTBm OWM5YjE2NmI4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1l bnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1ZpZXdwb3J0QXJndW1lbnRzLmgKQEAgLTEw OSw2ICsxMDksNyBAQCBzdHJ1Y3QgVmlld3BvcnRBcmd1bWVudHMgewogVmlld3BvcnRBdHRyaWJ1 dGVzIGNvbXB1dGVWaWV3cG9ydEF0dHJpYnV0ZXMoVmlld3BvcnRBcmd1bWVudHMgYXJncywgaW50 IGRlc2t0b3BXaWR0aCwgaW50IGRldmljZVdpZHRoLCBpbnQgZGV2aWNlSGVpZ2h0LCBpbnQgZGV2 aWNlRFBJLCBJbnRTaXplIHZpc2libGVWaWV3cG9ydCk7CiB2b2lkIHJlc3RyaWN0TWluaW11bVNj YWxlRmFjdG9yVG9WaWV3cG9ydFNpemUoVmlld3BvcnRBdHRyaWJ1dGVzJiByZXN1bHQsIEludFNp emUgdmlzaWJsZVZpZXdwb3J0KTsKIHZvaWQgcmVzdHJpY3RTY2FsZUZhY3RvclRvSW5pdGlhbFNj YWxlSWZOb3RVc2VyU2NhbGFibGUoVmlld3BvcnRBdHRyaWJ1dGVzJiByZXN1bHQpOworZmxvYXQg Y29tcHV0ZU1pbmltdW1TY2FsZUZhY3RvckZvckNvbnRlbnRDb250YWluZWQoY29uc3QgVmlld3Bv cnRBdHRyaWJ1dGVzJiByZXN1bHQsIGNvbnN0IEludFNpemUmIHZpZXdwb3J0U2l6ZSwgY29uc3Qg SW50U2l6ZSYgY29udGVudFNpemUpOwogCiB2b2lkIHNldFZpZXdwb3J0RmVhdHVyZShjb25zdCBT dHJpbmcmIGtleVN0cmluZywgY29uc3QgU3RyaW5nJiB2YWx1ZVN0cmluZywgRG9jdW1lbnQqLCB2 b2lkKiBkYXRhKTsKIHZvaWQgcmVwb3J0Vmlld3BvcnRXYXJuaW5nKERvY3VtZW50KiwgVmlld3Bv cnRFcnJvckNvZGUsIGNvbnN0IFN0cmluZyYgcmVwbGFjZW1lbnQxLCBjb25zdCBTdHJpbmcmIHJl cGxhY2VtZW50Mik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVp Y2t3ZWJ2aWV3LmNwcAppbmRleCA2NzIzNTU4MjI5OGU5MmVkNDVmMWY5ZDZiOGUwNmJhYWQ1ZGI2 M2I1Li45YWVlNDI4NTFmNzI1ZDVkM2I2MWU2OTUyMzhkZjNjMzEyMzU2ZGZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKQEAgLTg1 NywxMSArODU3LDggQEAgdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6ZGlkQ2hh bmdlVmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlYKIHsKICAgICBRX1EoUVF1aWNr V2ViVmlldyk7CiAKLSAgICBRU2l6ZSB2aWV3cG9ydFNpemUgPSBxLT5ib3VuZGluZ1JlY3QoKS5z aXplKCkudG9TaXplKCk7Ci0KICAgICAvLyBGSVhNRTogUmV2aXNlIHRoZXNlIHdoZW4gaW1wbGVt ZW50aW5nIGZpdC10by13aWR0aC4KICAgICBXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMgYXR0 ciA9IG5ld0F0dHJpYnV0ZXM7Ci0gICAgV2ViQ29yZTo6cmVzdHJpY3RNaW5pbXVtU2NhbGVGYWN0 b3JUb1ZpZXdwb3J0U2l6ZShhdHRyLCB2aWV3cG9ydFNpemUpOwogICAgIFdlYkNvcmU6OnJlc3Ry aWN0U2NhbGVGYWN0b3JUb0luaXRpYWxTY2FsZUlmTm90VXNlclNjYWxhYmxlKGF0dHIpOwogCiAg ICAgLy8gRklYTUU6IFJlc2V0dGluZyBoZXJlIGNhbiByZXNldCBtb3JlIHRoYW4gbmVlZGVkLiBG b3IgaW5zdGFuY2UgaXQgd2lsbCBlbmQgZGVmZXJyZXJzLgpAQCAtOTQ5LDggKzk0NiwyMCBAQCB2 b2lkIFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpwYWdlRGlkUmVxdWVzdFNjcm9sbChj b25zdCBRUG9pbnQmIHBvcykKIHZvaWQgUVF1aWNrV2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6OmRp ZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBRU2l6ZSYgbmV3U2l6ZSkKIHsKICAgICBRX1EoUVF1 aWNrV2ViVmlldyk7CisgICAgUVNpemUgdmlld3BvcnRTaXplID0gcS0+Ym91bmRpbmdSZWN0KCku c2l6ZSgpLnRvU2l6ZSgpOworCiAgICAgcGFnZVZpZXctPnNldENvbnRlbnRzU2l6ZShuZXdTaXpl KTsKICAgICBxLT5leHBlcmltZW50YWwoKS0+dmlld3BvcnRJbmZvKCktPmRpZFVwZGF0ZUNvbnRl bnRzU2l6ZSgpOworCisgICAgZmxvYXQgbWluaW11bVNjYWxlID0gV2ViQ29yZTo6Y29tcHV0ZU1p bmltdW1TY2FsZUZhY3RvckZvckNvbnRlbnRDb250YWluZWQoYXR0cmlidXRlcywgdmlld3BvcnRT aXplLCBuZXdTaXplKTsKKworICAgIGlmICghcUZ1enp5Q29tcGFyZShtaW5pbXVtU2NhbGUsIGF0 dHJpYnV0ZXMubWluaW11bVNjYWxlKSkgeworICAgICAgICBpbnRlcmFjdGlvbkVuZ2luZS0+c2V0 Q1NTU2NhbGVCb3VuZHMobWluaW11bVNjYWxlLCBhdHRyaWJ1dGVzLm1heGltdW1TY2FsZSk7Cisg ICAgICAgIHEtPmV4cGVyaW1lbnRhbCgpLT52aWV3cG9ydEluZm8oKS0+ZGlkVXBkYXRlVmlld3Bv cnRDb25zdHJhaW50cygpOworCisgICAgICAgIGlmICghaW50ZXJhY3Rpb25FbmdpbmUtPmhhZFVz ZXJJbnRlcmFjdGlvbigpICYmICFwYWdlSXNTdXNwZW5kZWQpCisgICAgICAgICAgICBpbnRlcmFj dGlvbkVuZ2luZS0+c2V0Q1NTU2NhbGUobWluaW11bVNjYWxlKTsKKyAgICB9CiB9CiAKIC8qIQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Vidmlld3BvcnRp bmZvLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnZpZXdwb3J0aW5m by5jcHAKaW5kZXggMTcwNjA0ZDFkZmM1MDBkMWM0Y2ZiYzM1ZTlmOTk1ZmMzNzEzYTljYS4uZWEx NjczMmY1ZDBjYjdjMGYzYmI0YWU5M2I3MWZkODExMzc1NzBhZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2Vidmlld3BvcnRpbmZvLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJ2aWV3cG9ydGluZm8uY3BwCkBAIC02Miwx MSArNjIsMTcgQEAgUVZhcmlhbnQgUVdlYlZpZXdwb3J0SW5mbzo6aW5pdGlhbFNjYWxlKCkgY29u c3QKIAogUVZhcmlhbnQgUVdlYlZpZXdwb3J0SW5mbzo6bWluaW11bVNjYWxlKCkgY29uc3QKIHsK KyAgICBpZiAoUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKiBpbnRlcmFjdGlvbkVuZ2luZSA9 IG1fd2ViVmlld1ByaXZhdGUtPnZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUoKSkKKyAgICAgICAg cmV0dXJuIGludGVyYWN0aW9uRW5naW5lLT5tX21pbmltdW1TY2FsZTsKKwogICAgIHJldHVybiBt X3dlYlZpZXdQcml2YXRlLT5hdHRyaWJ1dGVzLm1pbmltdW1TY2FsZTsKIH0KIAogUVZhcmlhbnQg UVdlYlZpZXdwb3J0SW5mbzo6bWF4aW11bVNjYWxlKCkgY29uc3QKIHsKKyAgICBpZiAoUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lKiBpbnRlcmFjdGlvbkVuZ2luZSA9IG1fd2ViVmlld1ByaXZh dGUtPnZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUoKSkKKyAgICAgICAgcmV0dXJuIGludGVyYWN0 aW9uRW5naW5lLT5tX21heGltdW1TY2FsZTsKKwogICAgIHJldHVybiBtX3dlYlZpZXdQcml2YXRl LT5hdHRyaWJ1dGVzLm1heGltdW1TY2FsZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCmluZGV4IDQ4 NmQ4NDE3YzVjNTM0YmQ0NjcyMWMwNzhlY2ZjMWM3MGEyZTM4MTguLjhhNzIwZjM0Yjk3MjUzMmI0 YWY0NzJjYTJlMmZiZWU2YjUwNjIwMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKQEAgLTM1LDYgKzM1 LDggQEAgY2xhc3MgUVF1aWNrV2ViVmlldzsKIGNsYXNzIFFXaGVlbEV2ZW50OwogUVRfRU5EX05B TUVTUEFDRQogCitjbGFzcyBRV2ViVmlld3BvcnRJbmZvOworCiBuYW1lc3BhY2UgV2ViS2l0IHsK IAogY2xhc3MgVmlld3BvcnRVcGRhdGVEZWZlcnJlcjsKQEAgLTExNCw3ICsxMTYsNyBAQCBwcml2 YXRlIFFfU0xPVFM6CiAKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFZpZXdwb3J0VXBkYXRl RGVmZXJyZXI7Ci0gICAgZnJpZW5kIGNsYXNzIFFXZWJWaWV3cG9ydEluZm87CisgICAgZnJpZW5k IGNsYXNzIDo6UVdlYlZpZXdwb3J0SW5mbzsKIAogICAgIFFRdWlja1dlYlZpZXcqIGNvbnN0IG1f dmlld3BvcnQ7CiAgICAgUVF1aWNrV2ViUGFnZSogY29uc3QgbV9jb250ZW50Owo=