87061 2012-05-21 17:38:43 -0700 WKPageGetScaleFactor can return 0.0 after a session is restored 2012-05-21 19:04:16 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson webkit.review.bot oldest_to_newest 629767 0 beidson 2012-05-21 17:38:43 -0700 WKPageGetScaleFactor can return 0.0 after a session is restored This is because http://trac.webkit.org/changeset/116617 made "0.0" the new default scale factor to indicate that the scale factor has never actually been set. When restoring sessions in WK2 we propagate that 0.0 up to the UIProcess as the "actual" scale factor which then confuses clients. Patch and API test coming. In radar as <rdar://problem/11460336> 629771 1 143150 beidson 2012-05-21 17:43:10 -0700 Created attachment 143150 Patch v1 - Fix + API test 629775 2 webkit.review.bot 2012-05-21 17:46:19 -0700 Attachment 143150 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp:76: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1133: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 629778 3 143150 sullivan 2012-05-21 17:47:55 -0700 Comment on attachment 143150 Patch v1 - Fix + API test View in context: https://bugs.webkit.org/attachment.cgi?id=143150&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1135 > m_frame->page()->send(Messages::WebPageProxy::PageScaleFactorDidChange(scaleFactor)); It seems cleaner to bail out without calling PageScaleFactorDidChange() at all if we're just trying to use "no particular value". Would that approach not work for some reason? It doesn't seem right to set the scaleFactor to 1 if we have no information about the actual scaleFactor. 629795 4 beidson 2012-05-21 18:00:23 -0700 (In reply to comment #3) > (From update of attachment 143150 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=143150&action=review > > > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1135 > > m_frame->page()->send(Messages::WebPageProxy::PageScaleFactorDidChange(scaleFactor)); > > It seems cleaner to bail out without calling PageScaleFactorDidChange() at all if we're just trying to use "no particular value". Would that approach not work for some reason? It doesn't seem right to set the scaleFactor to 1 if we have no information about the actual scaleFactor. Previous behavior was to notify the UI process of the scale factor always, even if it was the default value of 1.0 This is important - for example - if the page already had content in it and the scale factor had been set to a non-default value. Restoring a session in to that page with the default scale factor needs to also update the UI process's copy of the scale factor. 629811 5 143150 bdakin 2012-05-21 18:18:48 -0700 Comment on attachment 143150 Patch v1 - Fix + API test You should fix the style errors, but r=me 629849 6 beidson 2012-05-21 19:00:39 -0700 (In reply to comment #5) > (From update of attachment 143150 [details]) > You should fix the style errors, but r=me Yah, misguided attempt to be more precise with floating points than with other numbers, based on "== 0.0" being scattered throughout WebCore. Will fix. Thanks for the review! 629852 7 beidson 2012-05-21 19:04:16 -0700 http://trac.webkit.org/changeset/117870 143150 2012-05-21 17:43:10 -0700 2012-05-21 18:18:48 -0700 Patch v1 - Fix + API test patch.txt text/plain 10312 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhOTI4Yzc4Li5hOTFlYTFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTItMDUtMjEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8xMTQ2MDMzNj4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NzA2MQorICAgICAgICBXS1BhZ2VHZXRTY2FsZUZhY3RvciBjYW4g cmV0dXJuIDAuMCBhZnRlciBhIHNlc3Npb24gaXMgcmVzdG9yZWQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBUEkgdGVzdCBXS1BhZ2VHZXRTY2FsZUZh Y3Rvck5vdFplcm8gYWRkZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OnJlc3RvcmVWaWV3U3RhdGUpOiBUZWxsIHRoZSBVSSBQcm9jZXNzIHRoZSBzY2Fs ZSBmYWN0b3IKKyAgICAgICAgICBpcyAxLjAgaWYgaXQgaGFzIG5ldmVyIGJlZW4gbWFudWFsbHkg c2V0LgorCiAyMDEyLTA1LTIxICBIdWdvIFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9z c2Eub3JnPgogCiAgICAgICAgIFtRdF1bV0syXSBmYXN0L2Zvcm1zL3N1Ym1pdC10by1ibGFuay1t dWx0aXBsZS10aW1lcy5odG1sIGZhaWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw CmluZGV4IGQzM2M0ZjAuLjZmNWE3ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu Y3BwCkBAIC0xMTI4LDYgKzExMjgsMTAgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVz dG9yZVZpZXdTdGF0ZSgpCiB7CiAgICAgLy8gSW5mb3JtIHRoZSBVSSBwcm9jZXNzIG9mIHRoZSBz Y2FsZSBmYWN0b3IuCiAgICAgZG91YmxlIHNjYWxlRmFjdG9yID0gbV9mcmFtZS0+Y29yZUZyYW1l KCktPmxvYWRlcigpLT5oaXN0b3J5KCktPmN1cnJlbnRJdGVtKCktPnBhZ2VTY2FsZUZhY3Rvcigp OworCisgICAgLy8gQSBzY2FsZSBmYWN0b3Igb2YgMC4wIG1lYW5zIHRoZSBoaXN0b3J5IGl0ZW0g YWN0dWFsbHkgaGFzIHRoZSAiZGVmYXVsdCBzY2FsZSBmYWN0b3IiIG9mIDEuMC4KKyAgICBpZiAo c2NhbGVGYWN0b3IgPT0gMC4wKQorICAgICAgICBzY2FsZUZhY3RvciA9IDEuMDsKICAgICBtX2Zy YW1lLT5wYWdlKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UGFnZVNjYWxlRmFjdG9y RGlkQ2hhbmdlKHNjYWxlRmFjdG9yKSk7CiAKICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgbm90 IGJlIG5lY2Vzc2FyeS4gV2ViQ29yZSBzaG91bGQgYmUgY29ycmVjdGx5IGludmFsaWRhdGluZwpk aWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDY0NDJh ZmUuLmU5NWVjMGMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxMi0wNS0yMSAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExNDYwMzM2PiBhbmQgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDYxCisgICAgICAgIFdLUGFn ZUdldFNjYWxlRmFjdG9yIGNhbiByZXR1cm4gMC4wIGFmdGVyIGEgc2Vzc2lvbiBpcyByZXN0b3Jl ZAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExvYWRz IGEgc2ltcGxlIHBhZ2UsIGNyZWF0ZXMgYSBzZXNzaW9uIGZyb20gaXQsIHJlc3RvcmVzIHRoYXQg c2Vzc2lvbiwgdGhlbgorICAgICAgICBxdWVyaWVzIHRoZSBwYWdlIHNjYWxlIGZhY3RvciBmb3Ig dGhlIGFwcHJvcHJpYXRlIHZhbHVlIG9mIDEuMC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9XS1BhZ2VHZXRTY2FsZUZhY3Rvck5vdFplcm8uY3BwOiBB ZGRlZC4KKyAgICAgICAgKFRlc3RXZWJLaXRBUEkpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 ZGlkRmluaXNoTG9hZEZvckZyYW1lKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OnNldFBhZ2VM b2FkZXJDbGllbnQpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6Y3JlYXRlU2Vzc2lvblN0YXRl KToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCisyMDEyLTA1LTIxICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTE0 NjAzMzY+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcwNjEK KyAgICAgICAgV0tQYWdlR2V0U2NhbGVGYWN0b3IgY2FuIHJldHVybiAwLjAgYWZ0ZXIgYSBzZXNz aW9uIGlzIHJlc3RvcmVkCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvajoKKwogMjAxMi0wNS0yMSAgSHVnbyBQYXJlbnRlIExpbWEgIDxodWdvLmxpbWFAb3Bl bmJvc3NhLm9yZz4KIAogICAgICAgICBbV0syXSBSZW1vdmUgYSB1c2VsZXNzICNpZiBvbiBUb29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agppbmRleCA5OTBmNzNmLi5jNTE5YzAyIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtNDQs NiArNDQsNyBAQAogCQk1MTQyQjI3MzE1MTdDOEM4MDBDMzJCMTkgLyogQ29udGV4dE1lbnVDYW5D b3B5VVJMLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNTE0MkIyNzIxNTE3Qzg5MTAwQzMyQjE5IC8qIENvbnRleHRNZW51Q2FuQ29weVVS TC5odG1sICovOyB9OwogCQk1MTdFN0RGQzE1MTEwRUE2MDBEMEIwMDggLyogTWVtb3J5Q2FjaGVQ cnVuZVdpdGhpblJlc291cmNlTG9hZERlbGVnYXRlLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTE3RTdERkIxNTExMEVBNjAwRDBCMDA4IC8qIE1lbW9y eUNhY2hlUHJ1bmVXaXRoaW5SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbSAqLzsgfTsKIAkJNTE3RTdF MDQxNTExMTlDMTAwRDBCMDA4IC8qIE1lbW9yeUNhY2hlUHJ1bmVXaXRoaW5SZXNvdXJjZUxvYWRE ZWxlZ2F0ZS5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDUxN0U3RTAzMTUxMTE4NzUwMEQwQjAwOCAvKiBNZW1vcnlDYWNoZVBydW5lV2l0 aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRtbCAqLzsgfTsKKwkJNTFFOTMwMTcxNTZCMTNFMTAw NEM5OURGIC8qIFdLUGFnZUdldFNjYWxlRmFjdG9yTm90WmVyby5jcHAgaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUU5MzAxNjE1NkIxM0UxMDA0Qzk5REYg LyogV0tQYWdlR2V0U2NhbGVGYWN0b3JOb3RaZXJvLmNwcCAqLzsgfTsKIAkJNTFGQkJCNEQxNTEz RDRFOTAwODIyNzM4IC8qIFdlYlZpZXdDYW5QYXN0ZVVSTC5tbSBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxRkJCQjRDMTUxM0Q0RTkwMDgyMjczOCAvKiBX ZWJWaWV3Q2FuUGFzdGVVUkwubW0gKi87IH07CiAJCTUxRkNGNzlBMTUzNEFDNkQwMDEwNDQ5MSAv KiBTaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MUZDRjc5ODE1MzRBQzZEMDAxMDQ0OTEgLyogU2hv dWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwICovOyB9OwogCQk1MUZDRjdBMTE1MzRCMkEw MDAxMDQ0OTEgLyogU2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW1fQnVuZGxlLmNwcCBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDUxRkNGNzk3MTUzNEFD NkQwMDEwNDQ5MSAvKiBTaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0SXRlbV9CdW5kbGUuY3BwICov OyB9OwpAQCAtMjQ3LDYgKzI0OCw3IEBACiAJCTUxNDJCMjcyMTUxN0M4OTEwMEMzMkIxOSAvKiBD b250ZXh0TWVudUNhbkNvcHlVUkwuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9IENv bnRleHRNZW51Q2FuQ29weVVSTC5odG1sOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1 MTdFN0RGQjE1MTEwRUE2MDBEMEIwMDggLyogTWVtb3J5Q2FjaGVQcnVuZVdpdGhpblJlc291cmNl TG9hZERlbGVnYXRlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0g TWVtb3J5Q2FjaGVQcnVuZVdpdGhpblJlc291cmNlTG9hZERlbGVnYXRlLm1tOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQk1MTdFN0UwMzE1MTExODc1MDBEMEIwMDggLyogTWVtb3J5Q2Fj aGVQcnVuZVdpdGhpblJlc291cmNlTG9hZERlbGVnYXRlLmh0bWwgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0Lmh0 bWw7IHBhdGggPSBNZW1vcnlDYWNoZVBydW5lV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUuaHRt bDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNTFFOTMwMTYxNTZCMTNFMTAwNEM5OURG IC8qIFdLUGFnZUdldFNjYWxlRmFjdG9yTm90WmVyby5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBXS1BhZ2VHZXRTY2FsZUZhY3Rvck5vdFplcm8uY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk1MUZCQkI0QzE1MTNENEU5MDA4MjI3MzggLyogV2ViVmll d0NhblBhc3RlVVJMLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0g V2ViVmlld0NhblBhc3RlVVJMLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MUZD Rjc5NzE1MzRBQzZEMDAxMDQ0OTEgLyogU2hvdWxkR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW1fQnVu ZGxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNob3VsZEdvVG9C YWNrRm9yd2FyZExpc3RJdGVtX0J1bmRsZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTUxRkNGNzk4MTUzNEFDNkQwMDEwNDQ5MSAvKiBTaG91bGRHb1RvQmFja0ZvcndhcmRMaXN0 SXRlbS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBTaG91bGRHb1Rv QmFja0ZvcndhcmRMaXN0SXRlbS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC01 NTgsNiArNTYwLDcgQEAKIAkJCQk3NkUxODJEQzE1NDc1NjkxMDBGMUZBREQgLyogV2lsbFNlbmRT dWJtaXRFdmVudF9CdW5kbGUuY3BwICovLAogCQkJCUJDOTAxRTIyMTQ5MkFEQ0UwMDc0QTY2NyAv KiBXS0Nvbm5lY3Rpb24uY3BwICovLAogCQkJCUJDOTAxRTMxMTQ5MkFGMzkwMDc0QTY2NyAvKiBX S0Nvbm5lY3Rpb25fQnVuZGxlLmNwcCAqLywKKwkJCQk1MUU5MzAxNjE1NkIxM0UxMDA0Qzk5REYg LyogV0tQYWdlR2V0U2NhbGVGYWN0b3JOb3RaZXJvLmNwcCAqLywKIAkJCQlCQzdCNjE5QTEyOTlG RTlFMDBEMTc0QTQgLyogV0tQcmVmZXJlbmNlcy5jcHAgKi8sCiAJCQkJQkM5MDk5NUQxMjU2N0JD MTAwMDgzNzU2IC8qIFdLU3RyaW5nLmNwcCAqLywKIAkJCQlCQzkwOTk5MzEyNTZBQ0YxMDAwODM3 NTYgLyogV0tTdHJpbmdKU1N0cmluZy5jcHAgKi8sCkBAIC04NzksNiArODgyLDcgQEAKIAkJCQk3 NkUxODJEQTE1NDc1NTAxMDBGMUZBREQgLyogV2lsbFNlbmRTdWJtaXRFdmVudC5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQlFMTIyMERBMDE1NUIyNTQ4MDAxM0UyRkMgLyogTWVtb3J5Q2FjaGVEaXNh YmxlV2l0aGluUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0gaW4gU291cmNlcyAqLywKIAkJCQlGNkY0 OUM2OTE1NTQ1QzhFMDAwN0YzOUQgLyogRE9NV2luZG93RXh0ZW5zaW9uTm9DYWNoZS5jcHAgaW4g U291cmNlcyAqLywKKwkJCQk1MUU5MzAxNzE1NkIxM0UxMDA0Qzk5REYgLyogV0tQYWdlR2V0U2Nh bGVGYWN0b3JOb3RaZXJvLmNwcCBpbiBTb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JE ZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1dLUGFnZUdldFNjYWxlRmFjdG9yTm90WmVyby5jcHAg Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvV0tQYWdlR2V0U2NhbGVGYWN0b3JO b3RaZXJvLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yMzc2YTAxCi0t LSAvZGV2L251bGwKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL1dLUGFn ZUdldFNjYWxlRmFjdG9yTm90WmVyby5jcHAKQEAgLTAsMCArMSw3OSBAQAorLyoKKyAqIENvcHly aWdodCAoQykgMjAxMiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVk aXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3 aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUg Zm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy LgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24g YW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisg KgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09O VFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisg KiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9S IElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICog QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisK KyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVV0aWxpdGllcy5oIgorI2lu Y2x1ZGUgIlBsYXRmb3JtV2ViVmlldy5oIgorI2luY2x1ZGUgIlRlc3QuaCIKKworbmFtZXNwYWNl IFRlc3RXZWJLaXRBUEkgeworCitzdGF0aWMgYm9vbCBkaWRGaW5pc2hMb2FkOworCitzdGF0aWMg dm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1R5cGVS ZWYsIGNvbnN0IHZvaWQqKQoreworICAgIGRpZEZpbmlzaExvYWQgPSB0cnVlOworfQorCitzdGF0 aWMgdm9pZCBzZXRQYWdlTG9hZGVyQ2xpZW50KFdLUGFnZVJlZiBwYWdlKQoreworICAgIFdLUGFn ZUxvYWRlckNsaWVudCBsb2FkZXJDbGllbnQ7CisgICAgbWVtc2V0KCZsb2FkZXJDbGllbnQsIDAs IHNpemVvZihsb2FkZXJDbGllbnQpKTsKKyAgICBsb2FkZXJDbGllbnQudmVyc2lvbiA9IDA7Cisg ICAgbG9hZGVyQ2xpZW50LmRpZEZpbmlzaExvYWRGb3JGcmFtZSA9IGRpZEZpbmlzaExvYWRGb3JG cmFtZTsKKworICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQocGFnZSwgJmxvYWRlckNsaWVu dCk7Cit9CisKK3N0YXRpYyBXS1JldGFpblB0cjxXS0RhdGFSZWY+IGNyZWF0ZVNlc3Npb25TdGF0 ZShXS0NvbnRleHRSZWYgY29udGV4dCkKK3sKKyAgICBQbGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhj b250ZXh0KTsKKyAgICBzZXRQYWdlTG9hZGVyQ2xpZW50KHdlYlZpZXcucGFnZSgpKTsKKworICAg IFdLUGFnZUxvYWRVUkwod2ViVmlldy5wYWdlKCksIGFkb3B0V0soVXRpbDo6Y3JlYXRlVVJMRm9y UmVzb3VyY2UoInNpbXBsZSIsICJodG1sIikpLmdldCgpKTsKKyAgICBVdGlsOjpydW4oJmRpZEZp bmlzaExvYWQpOworICAgIGRpZEZpbmlzaExvYWQgPSBmYWxzZTsKKworICAgIHJldHVybiBhZG9w dFdLKFdLUGFnZUNvcHlTZXNzaW9uU3RhdGUod2ViVmlldy5wYWdlKCksIDAsIDApKTsKK30KKwor VEVTVChXZWJLaXQyLCBXS1BhZ2VHZXRTY2FsZUZhY3Rvck5vdFplcm8pCit7CisgICAgV0tSZXRh aW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFkb3B0V0ssIFdLQ29udGV4dENyZWF0ZSgpKTsK KworICAgIFBsYXRmb3JtV2ViVmlldyB3ZWJWaWV3KGNvbnRleHQuZ2V0KCkpOworICAgIHNldFBh Z2VMb2FkZXJDbGllbnQod2ViVmlldy5wYWdlKCkpOworCisgICAgV0tSZXRhaW5QdHI8V0tEYXRh UmVmPiBkYXRhID0gY3JlYXRlU2Vzc2lvblN0YXRlKGNvbnRleHQuZ2V0KCkpOworICAgIEVYUEVD VF9OT1RfTlVMTChkYXRhKTsKKworICAgIFdLUGFnZVJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKHdl YlZpZXcucGFnZSgpLCBkYXRhLmdldCgpKTsKKyAgICBVdGlsOjpydW4oJmRpZEZpbmlzaExvYWQp OworCisgICAgRVhQRUNUX1RSVUUoV0tQYWdlR2V0U2NhbGVGYWN0b3Iod2ViVmlldy5wYWdlKCkp ID09IDEuMCk7CisgICAgRVhQRUNUX0ZBTFNFKFdLUGFnZUdldFNjYWxlRmFjdG9yKHdlYlZpZXcu cGFnZSgpKSA9PSAwLjApOworfQorCit9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg==