109735 2013-02-13 12:41:46 -0800 [chromium] No triggering autofill on unfocus 2013-02-14 15:43:50 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 dtrainor webkit-unassigned abarth aurimas dglazkov fishd isherman jamesr tkent+wkapi webkit.review.bot oldest_to_newest 832214 0 dtrainor 2013-02-13 12:41:46 -0800 No triggering autofill on unfocus 832219 1 188153 dtrainor 2013-02-13 12:45:00 -0800 Created attachment 188153 Patch 832228 2 dtrainor 2013-02-13 12:56:12 -0800 To fix showing the autofill popup when trying to defocus a field and therefore committing the text composition. ptal! 832245 3 webkit.review.bot 2013-02-13 13:15:12 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 832246 4 webkit.review.bot 2013-02-13 13:15:29 -0800 Attachment 188153 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Source/WebKit/chromium/public/WebAutofillClient.h', u'Source/WebKit/chromium/src/WebViewImpl.cpp']" exit_code: 1 Source/WebKit/chromium/src/WebViewImpl.cpp:2147: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Source/WebKit/chromium/src/WebViewImpl.cpp:2152: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 832249 5 188153 jamesr 2013-02-13 13:16:52 -0800 Comment on attachment 188153 Patch Where's the test? 832417 6 188198 dtrainor 2013-02-13 15:35:53 -0800 Created attachment 188198 Patch 832523 7 188198 webkit.review.bot 2013-02-13 16:46:54 -0800 Comment on attachment 188198 Patch Attachment 188198 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16536348 832528 8 188198 webkit.review.bot 2013-02-13 16:51:34 -0800 Comment on attachment 188198 Patch Attachment 188198 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16581023 832590 9 188234 dtrainor 2013-02-13 17:32:09 -0800 Created attachment 188234 Patch 833139 10 dtrainor 2013-02-14 09:20:50 -0800 Okay tests added and style checks fixed. 833226 11 jamesr 2013-02-14 10:44:55 -0800 Happy to review the API bits once someone familiar with autofill looks at this. 833230 12 dtrainor 2013-02-14 10:47:12 -0800 isherman@ took a look at the corresponding Chromium change that implements these methods. Ilya, do you think you could take a look? If you're not the right person to ask do you know who should review this? Thanks! 833298 13 188234 isherman 2013-02-14 12:03:23 -0800 Comment on attachment 188234 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188234&action=review Unofficial r+ for Autofill > Source/WebKit/chromium/src/WebViewImpl.cpp:-2144 > - nit: Unrelated change? 833344 14 188234 jamesr 2013-02-14 13:12:01 -0800 Comment on attachment 188234 Patch R=me. Please remove the spurious whitespace change before landing 833376 15 188417 dtrainor 2013-02-14 13:47:09 -0800 Created attachment 188417 Patch 833383 16 dtrainor 2013-02-14 13:53:07 -0800 Removed whitespace change. 833460 17 dtrainor 2013-02-14 14:53:27 -0800 James sorry can I get one more review? Removed whitespace but needs that review before I can land the patch :(. 833469 18 188417 webkit.review.bot 2013-02-14 14:59:10 -0800 Comment on attachment 188417 Patch Rejecting attachment 188417 from review queue. isherman@chromium.org does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 833475 19 188417 jamesr 2013-02-14 15:04:12 -0800 Comment on attachment 188417 Patch Gonna toggle cq bit to make sure it gets picked up 833490 20 188417 webkit.review.bot 2013-02-14 15:43:45 -0800 Comment on attachment 188417 Patch Clearing flags on attachment: 188417 Committed r142927: <http://trac.webkit.org/changeset/142927> 833491 21 webkit.review.bot 2013-02-14 15:43:50 -0800 All reviewed patches have been landed. Closing bug. 188153 2013-02-13 12:45:00 -0800 2013-02-13 15:35:50 -0800 Patch bug-109735-20130213124129.patch text/plain 2995 dtrainor U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRkYzAxMTAzM2NkNWVmNDY5ZWNlMzgwM2JlNDI4MjAxZjMzYzQyYTMuLjYyMGMyOWE0MmQ3MDIx OTI1ZWQ4ODNjMzI3OWQwOTY4YTM0ZGQwODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTMtMDItMTMgIERhdmlkIFRyYWlub3IgIDxkdHJhaW5vckBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgTm8gdHJpZ2dlcmluZyBhdXRvZmlsbCBvbiB1bmZvY3VzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDk3MzUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIG5v dGlmeSB0aGUgYXV0b2ZpbGwgY2xpZW50IHRvIG5vdCBwcm9jZXNzIHRleHQgY2hhbmdlcyB3aGVu IHdlJ3JlIHNldHRpbmcKKyAgICAgICAgZm9jdXMgdG8gZmFsc2UgYW5kIGFyZSB0cnlpbmcgdG8g Y29tbWl0IGEgY29tcG9zaXRpb24uCisKKyAgICAgICAgKiBwdWJsaWMvV2ViQXV0b2ZpbGxDbGll bnQuaDoKKyAgICAgICAgKFdlYkF1dG9maWxsQ2xpZW50KToKKyAgICAgICAgKFdlYktpdDo6V2Vi QXV0b2ZpbGxDbGllbnQ6OnNldElnbm9yZVRleHRDaGFuZ2VzKToKKyAgICAgICAgKFdlYktpdDo6 V2ViQXV0b2ZpbGxDbGllbnQ6On5XZWJBdXRvZmlsbENsaWVudCk6CisgICAgICAgICogc3JjL1dl YlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldEZvY3VzKToK KwogMjAxMy0wMi0xMSAgRmxvcmluIE1hbGl0YSAgPGZtYWxpdGFAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFVucmV2aWV3ZWQuICBSb2xsZWQgQ2hyb21pdW0gREVQUyB0byByMTgxNzcwLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQXV0b2ZpbGxDbGllbnQu aCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkF1dG9maWxsQ2xpZW50LmgKaW5k ZXggNzQyNGMzZmVjZGJhOWZmYTcyODZlMWI3ZWVmM2RmOGM5NjBiZmQ1ZC4uYWE0ZDBhM2RhZWRi MWM3ZWNiZjY5ZDRjYzQyNjAyMjZjZDA2MzhmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViQXV0b2ZpbGxDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJBdXRvZmlsbENsaWVudC5oCkBAIC05MCw4ICs5MCwxMSBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCB2b2lkIHRleHRGaWVsZERpZENoYW5nZShjb25zdCBXZWJJbnB1dEVs ZW1lbnQmKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgdGV4dEZpZWxkRGlkUmVjZWl2ZUtleURvd24o Y29uc3QgV2ViSW5wdXRFbGVtZW50JiwgY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpIHsgfQogCisg ICAgLy8gSW5mb3JtcyB0aGUgY2xpZW50IHdoZXRoZXIgb3Igbm90IGFueSBzdWJzZXF1ZW50IHRl eHQgY2hhbmdlcyBzaG91bGQgYmUgaWdub3JlZC4KKyAgICB2aXJ0dWFsIHZvaWQgc2V0SWdub3Jl VGV4dENoYW5nZXMoYm9vbCBpZ25vcmUpIHsgfQorCiBwcm90ZWN0ZWQ6Ci0gICAgfldlYkF1dG9m aWxsQ2xpZW50KCkgeyB9CisgICAgdmlydHVhbCB+V2ViQXV0b2ZpbGxDbGllbnQoKSB7IH0KIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCmluZGV4IDc0NDk1OTcxNjEzYWI4MThmMzY2ZTc2MmU3NGNhYTcxOGFlNzg1 NTUuLmQ2MjE3OGY1ODZjOTMyZjVlYTFhZTk5ODE1MmQwNjM3YjhmOTllZWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTIxNDEsNyArMjE0MSw2IEBA IHZvaWQgV2ViVmlld0ltcGw6OnNldEZvY3VzKGJvb2wgZW5hYmxlKQogICAgICAgICBtX2ltZUFj Y2VwdEV2ZW50cyA9IHRydWU7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaGlkZVBvcHVwcygpOwot CiAgICAgICAgIC8vIENsZWFyIGZvY3VzIG9uIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBmcmFtZSBp ZiBhbnkuCiAgICAgICAgIGlmICghbV9wYWdlKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjE1 NCw4ICsyMTUzLDE1IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldEZvY3VzKGJvb2wgZW5hYmxlKQog ICAgICAgICBpZiAoZm9jdXNlZEZyYW1lKSB7CiAgICAgICAgICAgICAvLyBGaW5pc2ggYW4gb25n b2luZyBjb21wb3NpdGlvbiB0byBkZWxldGUgdGhlIGNvbXBvc2l0aW9uIG5vZGUuCiAgICAgICAg ICAgICBFZGl0b3IqIGVkaXRvciA9IGZvY3VzZWRGcmFtZS0+ZWRpdG9yKCk7Ci0gICAgICAgICAg ICBpZiAoZWRpdG9yICYmIGVkaXRvci0+aGFzQ29tcG9zaXRpb24oKSkKKyAgICAgICAgICAgIGlm IChlZGl0b3IgJiYgZWRpdG9yLT5oYXNDb21wb3NpdGlvbigpKSB7CisgICAgICAgICAgICAgICAg aWYgKG1fYXV0b2ZpbGxDbGllbnQpCisgICAgICAgICAgICAgICAgICBtX2F1dG9maWxsQ2xpZW50 LT5zZXRJZ25vcmVUZXh0Q2hhbmdlcyh0cnVlKTsKKwogICAgICAgICAgICAgICAgIGVkaXRvci0+ Y29uZmlybUNvbXBvc2l0aW9uKCk7CisKKyAgICAgICAgICAgICAgICBpZiAobV9hdXRvZmlsbENs aWVudCkKKyAgICAgICAgICAgICAgICAgIG1fYXV0b2ZpbGxDbGllbnQtPnNldElnbm9yZVRleHRD aGFuZ2VzKGZhbHNlKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIG1faW1lQWNjZXB0RXZl bnRzID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9Cg== 188198 2013-02-13 15:35:53 -0800 2013-02-13 17:32:06 -0800 Patch bug-109735-20130213153222.patch text/plain 7138 dtrainor U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRkYzAxMTAzM2NkNWVmNDY5ZWNlMzgwM2JlNDI4MjAxZjMzYzQyYTMuLjcyMjAyOTYwMTRjZjE0 YzJhMWRjMGIzY2JjM2I1YTdmNWQ1ZGY0MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTMtMDItMTMgIERhdmlkIFRyYWlub3IgIDxkdHJhaW5vckBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBObyB0cmlnZ2VyaW5nIGF1dG9maWxsIG9u IHVuZm9jdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwOTczNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5lZWQgdG8gbm90aWZ5IHRoZSBhdXRvZmlsbCBjbGllbnQgdG8gbm90IHByb2Nlc3MgdGV4dCBj aGFuZ2VzIHdoZW4gd2UncmUgc2V0dGluZworICAgICAgICBmb2N1cyB0byBmYWxzZSBhbmQgYXJl IHRyeWluZyB0byBjb21taXQgYSBjb21wb3NpdGlvbi4KKworICAgICAgICAqIHB1YmxpYy9XZWJB dXRvZmlsbENsaWVudC5oOgorICAgICAgICAoV2ViQXV0b2ZpbGxDbGllbnQpOgorICAgICAgICAo V2ViS2l0OjpXZWJBdXRvZmlsbENsaWVudDo6c2V0SWdub3JlVGV4dENoYW5nZXMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJBdXRvZmlsbENsaWVudDo6fldlYkF1dG9maWxsQ2xpZW50KToKKyAgICAg ICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 c2V0Rm9jdXMpOgorICAgICAgICAqIHRlc3RzL1dlYlZpZXdUZXN0LmNwcDoKKwogMjAxMy0wMi0x MSAgRmxvcmluIE1hbGl0YSAgPGZtYWxpdGFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQuICBSb2xsZWQgQ2hyb21pdW0gREVQUyB0byByMTgxNzcwLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQXV0b2ZpbGxDbGllbnQuaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkF1dG9maWxsQ2xpZW50LmgKaW5kZXggNzQyNGMzZmVj ZGJhOWZmYTcyODZlMWI3ZWVmM2RmOGM5NjBiZmQ1ZC4uYWE0ZDBhM2RhZWRiMWM3ZWNiZjY5ZDRj YzQyNjAyMjZjZDA2MzhmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQXV0b2ZpbGxDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJBdXRvZmlsbENsaWVudC5oCkBAIC05MCw4ICs5MCwxMSBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIHRleHRGaWVsZERpZENoYW5nZShjb25zdCBXZWJJbnB1dEVsZW1lbnQmKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgdGV4dEZpZWxkRGlkUmVjZWl2ZUtleURvd24oY29uc3QgV2ViSW5w dXRFbGVtZW50JiwgY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpIHsgfQogCisgICAgLy8gSW5mb3Jt cyB0aGUgY2xpZW50IHdoZXRoZXIgb3Igbm90IGFueSBzdWJzZXF1ZW50IHRleHQgY2hhbmdlcyBz aG91bGQgYmUgaWdub3JlZC4KKyAgICB2aXJ0dWFsIHZvaWQgc2V0SWdub3JlVGV4dENoYW5nZXMo Ym9vbCBpZ25vcmUpIHsgfQorCiBwcm90ZWN0ZWQ6Ci0gICAgfldlYkF1dG9maWxsQ2xpZW50KCkg eyB9CisgICAgdmlydHVhbCB+V2ViQXV0b2ZpbGxDbGllbnQoKSB7IH0KIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CmluZGV4IDc0NDk1OTcxNjEzYWI4MThmMzY2ZTc2MmU3NGNhYTcxOGFlNzg1NTUuLjM0MmU1MzA1 NzJhYjc5MmY0NjY5NDI3MjgzMzk4ZTAxZjkxNjliZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTIxNDEsNyArMjE0MSw2IEBAIHZvaWQgV2ViVmll d0ltcGw6OnNldEZvY3VzKGJvb2wgZW5hYmxlKQogICAgICAgICBtX2ltZUFjY2VwdEV2ZW50cyA9 IHRydWU7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaGlkZVBvcHVwcygpOwotCiAgICAgICAgIC8v IENsZWFyIGZvY3VzIG9uIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBmcmFtZSBpZiBhbnkuCiAgICAg ICAgIGlmICghbV9wYWdlKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjE1NCw4ICsyMTUzLDE1 IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldEZvY3VzKGJvb2wgZW5hYmxlKQogICAgICAgICBpZiAo Zm9jdXNlZEZyYW1lKSB7CiAgICAgICAgICAgICAvLyBGaW5pc2ggYW4gb25nb2luZyBjb21wb3Np dGlvbiB0byBkZWxldGUgdGhlIGNvbXBvc2l0aW9uIG5vZGUuCiAgICAgICAgICAgICBFZGl0b3Iq IGVkaXRvciA9IGZvY3VzZWRGcmFtZS0+ZWRpdG9yKCk7Ci0gICAgICAgICAgICBpZiAoZWRpdG9y ICYmIGVkaXRvci0+aGFzQ29tcG9zaXRpb24oKSkKKyAgICAgICAgICAgIGlmIChlZGl0b3IgJiYg ZWRpdG9yLT5oYXNDb21wb3NpdGlvbigpKSB7CisgICAgICAgICAgICAgICAgaWYgKG1fYXV0b2Zp bGxDbGllbnQpCisgICAgICAgICAgICAgICAgICAgIG1fYXV0b2ZpbGxDbGllbnQtPnNldElnbm9y ZVRleHRDaGFuZ2VzKHRydWUpOworCiAgICAgICAgICAgICAgICAgZWRpdG9yLT5jb25maXJtQ29t cG9zaXRpb24oKTsKKworICAgICAgICAgICAgICAgIGlmIChtX2F1dG9maWxsQ2xpZW50KQorICAg ICAgICAgICAgICAgICAgICBtX2F1dG9maWxsQ2xpZW50LT5zZXRJZ25vcmVUZXh0Q2hhbmdlcyhm YWxzZSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBtX2ltZUFjY2VwdEV2ZW50cyA9IGZh bHNlOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dl YlZpZXdUZXN0LmNwcAppbmRleCAyNGZlY2Y1NTdmNDM4YWQ0OTM3MWYzZjJjZmU2ZGE1ZmJkNjRm ZmYyLi4yMDkyNmYyN2Y1MGIxNDhmNjg3MDk5MDJlY2VjN2UzNzRjZTdmZmU2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcApAQCAtMzcsNiArMzcsNyBA QAogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudC5oIgogI2lu Y2x1ZGUgIlVSTFRlc3RIZWxwZXJzLmgiCisjaW5jbHVkZSAiV2ViQXV0b2ZpbGxDbGllbnQuaCIK ICNpbmNsdWRlICJXZWJDb250ZW50RGV0ZWN0aW9uUmVzdWx0LmgiCiAjaW5jbHVkZSAiV2ViRG9j dW1lbnQuaCIKICNpbmNsdWRlICJXZWJFbGVtZW50LmgiCkBAIC03MjAsNCArNzIxLDk2IEBAIFRF U1RfRihXZWJWaWV3VGVzdCwgU2VsZWN0aW9uT25SZWFkT25seUlucHV0KQogICAgIHdlYlZpZXct PmNsb3NlKCk7CiB9CiAKK2NsYXNzIE1vY2tBdXRvZmlsbENsaWVudCA6IHB1YmxpYyBXZWJBdXRv ZmlsbENsaWVudCB7CitwdWJsaWM6CisgICAgTW9ja0F1dG9maWxsQ2xpZW50KCkKKyAgICAgICAg OiBtX2lnbm9yZVRleHRDaGFuZ2VzKGZhbHNlKQorICAgICAgICAsIG1fdGV4dENoYW5nZXNXaGls ZUlnbm9yZWQoMCkKKyAgICAgICAgLCBtX3RleHRDaGFuZ2VzV2hpbGVOb3RJZ25vcmVkKDApIHsg fQorCisgICAgdmlydHVhbCB+TW9ja0F1dG9maWxsQ2xpZW50KCkgeyB9CisKKyAgICB2aXJ0dWFs IHZvaWQgc2V0SWdub3JlVGV4dENoYW5nZXMoYm9vbCBpZ25vcmUpIE9WRVJSSURFIHsgbV9pZ25v cmVUZXh0Q2hhbmdlcyA9IGlnbm9yZTsgfQorICAgIHZpcnR1YWwgdm9pZCB0ZXh0RmllbGREaWRD aGFuZ2UoY29uc3QgV2ViSW5wdXRFbGVtZW50JikgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIGlm IChtX2lnbm9yZVRleHRDaGFuZ2VzKQorICAgICAgICAgICAgKyttX3RleHRDaGFuZ2VzV2hpbGVJ Z25vcmVkOworICAgICAgICBlbHNlCisgICAgICAgICAgICArK21fdGV4dENoYW5nZXNXaGlsZU5v dElnbm9yZWQ7CisgICAgfQorCisgICAgdm9pZCBjbGVhckNoYW5nZUNvdW50cygpCisgICAgewor ICAgICAgICBtX3RleHRDaGFuZ2VzV2hpbGVJZ25vcmVkID0gMDsKKyAgICAgICAgbV90ZXh0Q2hh bmdlc1doaWxlTm90SWdub3JlZCA9IDA7CisgICAgfQorCisgICAgaW50IHRleHRDaGFuZ2VzV2hp bGVJZ25vcmVkKCkgeyByZXR1cm4gbV90ZXh0Q2hhbmdlc1doaWxlSWdub3JlZDsgfQorICAgIGlu dCB0ZXh0Q2hhbmdlc1doaWxlTm90SWdub3JlZCgpIHsgcmV0dXJuIG1fdGV4dENoYW5nZXNXaGls ZU5vdElnbm9yZWQ7IH0KKworcHJpdmF0ZToKKyAgICBib29sIG1faWdub3JlVGV4dENoYW5nZXM7 CisgICAgaW50IG1fdGV4dENoYW5nZXNXaGlsZUlnbm9yZWQ7CisgICAgaW50IG1fdGV4dENoYW5n ZXNXaGlsZU5vdElnbm9yZWQ7Cit9OworCisKK1RFU1RfRihXZWJWaWV3VGVzdCwgTG9zaW5nRm9j dXNEb2VzTm90VHJpZ2dlckF1dG9maWxsVGV4dENoYW5nZSkKK3sKKyAgICBVUkxUZXN0SGVscGVy czo6cmVnaXN0ZXJNb2NrZWRVUkxGcm9tQmFzZVVSTChXZWJTdHJpbmc6OmZyb21VVEY4KG1fYmFz ZVVSTC5jX3N0cigpKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgiaW5wdXRfZmllbGRfcG9wdWxhdGVk Lmh0bWwiKSk7CisgICAgTW9ja0F1dG9maWxsQ2xpZW50IGNsaWVudDsKKyAgICBXZWJWaWV3KiB3 ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJM ICsgImlucHV0X2ZpZWxkX3BvcHVsYXRlZC5odG1sIik7CisgICAgd2ViVmlldy0+c2V0QXV0b2Zp bGxDbGllbnQoJmNsaWVudCk7CisgICAgd2ViVmlldy0+c2V0SW5pdGlhbEZvY3VzKGZhbHNlKTsK KworICAgIC8vIFNldCB1cCBhIGNvbXBvc2l0aW9uIHRoYXQgbmVlZHMgdG8gYmUgY29tbWl0dGVk LgorICAgIFdlYlZlY3RvcjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4gZW1wdHlVbmRlcmxpbmVz OworICAgIHdlYlZpZXctPnNldEVkaXRhYmxlU2VsZWN0aW9uT2Zmc2V0cyg0LCAxMCk7CisgICAg d2ViVmlldy0+c2V0Q29tcG9zaXRpb25Gcm9tRXhpc3RpbmdUZXh0KDgsIDEyLCBlbXB0eVVuZGVy bGluZXMpOworICAgIFdlYlRleHRJbnB1dEluZm8gaW5mbyA9IHdlYlZpZXctPnRleHRJbnB1dElu Zm8oKTsKKyAgICBFWFBFQ1RfRVEoNCwgaW5mby5zZWxlY3Rpb25TdGFydCk7CisgICAgRVhQRUNU X0VRKDEwLCBpbmZvLnNlbGVjdGlvbkVuZCk7CisgICAgRVhQRUNUX0VRKDgsIGluZm8uY29tcG9z aXRpb25TdGFydCk7CisgICAgRVhQRUNUX0VRKDEyLCBpbmZvLmNvbXBvc2l0aW9uRW5kKTsKKwor ICAgIC8vIENsZWFyIHRoZSBmb2N1cyBhbmQgdHJhY2sgdGhhdCB0aGUgc3Vic2VxdWVudCBjb21w b3NpdGlvbiBjb21taXQgZG9lcyBub3QgdHJpZ2dlciBhCisgICAgLy8gdGV4dCBjaGFuZ2VkIG5v dGlmaWNhdGlvbiBmb3IgYXV0b2ZpbGwuCisgICAgY2xpZW50LmNsZWFyQ2hhbmdlQ291bnRzKCk7 CisgICAgd2ViVmlldy0+c2V0Rm9jdXMoZmFsc2UpOworICAgIEVYUEVDVF9FUSgxLCBjbGllbnQu dGV4dENoYW5nZXNXaGlsZUlnbm9yZWQoKSk7CisgICAgRVhQRUNUX0VRKDAsIGNsaWVudC50ZXh0 Q2hhbmdlc1doaWxlTm90SWdub3JlZCgpKTsKKworICAgIHdlYlZpZXctPnNldEF1dG9maWxsQ2xp ZW50KDApOworICAgIHdlYlZpZXctPmNsb3NlKCk7Cit9CisKK1RFU1RfRihXZWJWaWV3VGVzdCwg Q29uZmlybUNvbXBvc2l0aW9uVHJpZ2dlcnNBdXRvZmlsbFRleHRDaGFuZ2UpCit7CisgICAgVVJM VGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMRnJvbUJhc2VVUkwoV2ViU3RyaW5nOjpmcm9t VVRGOChtX2Jhc2VVUkwuY19zdHIoKSksIFdlYlN0cmluZzo6ZnJvbVVURjgoImlucHV0X2ZpZWxk X3BvcHVsYXRlZC5odG1sIikpOworICAgIE1vY2tBdXRvZmlsbENsaWVudCBjbGllbnQ7CisgICAg V2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2Fk KG1fYmFzZVVSTCArICJpbnB1dF9maWVsZF9wb3B1bGF0ZWQuaHRtbCIpOworICAgIHdlYlZpZXct PnNldEF1dG9maWxsQ2xpZW50KCZjbGllbnQpOworICAgIHdlYlZpZXctPnNldEluaXRpYWxGb2N1 cyhmYWxzZSk7CisKKyAgICAvLyBTZXQgdXAgYSBjb21wb3NpdGlvbiB0aGF0IG5lZWRzIHRvIGJl IGNvbW1pdHRlZC4KKyAgICBzdGQ6OnN0cmluZyBjb21wb3NpdGlvblRleHQoInRlc3Rpbmd0ZXh0 Iik7CisKKyAgICBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+IGVtcHR5VW5kZXJs aW5lczsKKyAgICB3ZWJWaWV3LT5zZXRDb21wb3NpdGlvbihXZWJTdHJpbmc6OmZyb21VVEY4KGNv bXBvc2l0aW9uVGV4dC5jX3N0cigpKSwgZW1wdHlVbmRlcmxpbmVzLCAwLCBjb21wb3NpdGlvblRl eHQubGVuZ3RoKCkpOworCisgICAgV2ViVGV4dElucHV0SW5mbyBpbmZvID0gd2ViVmlldy0+dGV4 dElucHV0SW5mbygpOworICAgIEVYUEVDVF9FUSgwLCBpbmZvLnNlbGVjdGlvblN0YXJ0KTsKKyAg ICBFWFBFQ1RfRVEoY29tcG9zaXRpb25UZXh0Lmxlbmd0aCgpLCBpbmZvLnNlbGVjdGlvbkVuZCk7 CisgICAgRVhQRUNUX0VRKDAsIGluZm8uY29tcG9zaXRpb25TdGFydCk7CisgICAgRVhQRUNUX0VR KGNvbXBvc2l0aW9uVGV4dC5sZW5ndGgoKSwgaW5mby5jb21wb3NpdGlvbkVuZCk7CisKKyAgICBj bGllbnQuY2xlYXJDaGFuZ2VDb3VudHMoKTsKKyAgICB3ZWJWaWV3LT5jb25maXJtQ29tcG9zaXRp b24oKTsKKyAgICBFWFBFQ1RfRVEoMCwgY2xpZW50LnRleHRDaGFuZ2VzV2hpbGVJZ25vcmVkKCkp OworICAgIEVYUEVDVF9FUSgxLCBjbGllbnQudGV4dENoYW5nZXNXaGlsZU5vdElnbm9yZWQoKSk7 CisKKyAgICB3ZWJWaWV3LT5zZXRBdXRvZmlsbENsaWVudCgwKTsKKyAgICB3ZWJWaWV3LT5jbG9z ZSgpOworfQorCiB9Cg== 188234 2013-02-13 17:32:09 -0800 2013-02-14 13:47:06 -0800 Patch bug-109735-20130213172837.patch text/plain 7150 dtrainor U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRkYzAxMTAzM2NkNWVmNDY5ZWNlMzgwM2JlNDI4MjAxZjMzYzQyYTMuLjcyMjAyOTYwMTRjZjE0 YzJhMWRjMGIzY2JjM2I1YTdmNWQ1ZGY0MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTMtMDItMTMgIERhdmlkIFRyYWlub3IgIDxkdHJhaW5vckBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBObyB0cmlnZ2VyaW5nIGF1dG9maWxsIG9u IHVuZm9jdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwOTczNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5lZWQgdG8gbm90aWZ5IHRoZSBhdXRvZmlsbCBjbGllbnQgdG8gbm90IHByb2Nlc3MgdGV4dCBj aGFuZ2VzIHdoZW4gd2UncmUgc2V0dGluZworICAgICAgICBmb2N1cyB0byBmYWxzZSBhbmQgYXJl IHRyeWluZyB0byBjb21taXQgYSBjb21wb3NpdGlvbi4KKworICAgICAgICAqIHB1YmxpYy9XZWJB dXRvZmlsbENsaWVudC5oOgorICAgICAgICAoV2ViQXV0b2ZpbGxDbGllbnQpOgorICAgICAgICAo V2ViS2l0OjpXZWJBdXRvZmlsbENsaWVudDo6c2V0SWdub3JlVGV4dENoYW5nZXMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJBdXRvZmlsbENsaWVudDo6fldlYkF1dG9maWxsQ2xpZW50KToKKyAgICAg ICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 c2V0Rm9jdXMpOgorICAgICAgICAqIHRlc3RzL1dlYlZpZXdUZXN0LmNwcDoKKwogMjAxMy0wMi0x MSAgRmxvcmluIE1hbGl0YSAgPGZtYWxpdGFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQuICBSb2xsZWQgQ2hyb21pdW0gREVQUyB0byByMTgxNzcwLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQXV0b2ZpbGxDbGllbnQuaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkF1dG9maWxsQ2xpZW50LmgKaW5kZXggNzQyNGMzZmVj ZGJhOWZmYTcyODZlMWI3ZWVmM2RmOGM5NjBiZmQ1ZC4uYWE0ZDBhM2RhZWRiMWM3ZWNiZjY5ZDRj YzQyNjAyMjZjZDA2MzhmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQXV0b2ZpbGxDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJBdXRvZmlsbENsaWVudC5oCkBAIC05MCw4ICs5MCwxMSBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIHRleHRGaWVsZERpZENoYW5nZShjb25zdCBXZWJJbnB1dEVsZW1lbnQmKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgdGV4dEZpZWxkRGlkUmVjZWl2ZUtleURvd24oY29uc3QgV2ViSW5w dXRFbGVtZW50JiwgY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpIHsgfQogCisgICAgLy8gSW5mb3Jt cyB0aGUgY2xpZW50IHdoZXRoZXIgb3Igbm90IGFueSBzdWJzZXF1ZW50IHRleHQgY2hhbmdlcyBz aG91bGQgYmUgaWdub3JlZC4KKyAgICB2aXJ0dWFsIHZvaWQgc2V0SWdub3JlVGV4dENoYW5nZXMo Ym9vbCBpZ25vcmUpIHsgfQorCiBwcm90ZWN0ZWQ6Ci0gICAgfldlYkF1dG9maWxsQ2xpZW50KCkg eyB9CisgICAgdmlydHVhbCB+V2ViQXV0b2ZpbGxDbGllbnQoKSB7IH0KIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CmluZGV4IDc0NDk1OTcxNjEzYWI4MThmMzY2ZTc2MmU3NGNhYTcxOGFlNzg1NTUuLjM0MmU1MzA1 NzJhYjc5MmY0NjY5NDI3MjgzMzk4ZTAxZjkxNjliZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTIxNDEsNyArMjE0MSw2IEBAIHZvaWQgV2ViVmll d0ltcGw6OnNldEZvY3VzKGJvb2wgZW5hYmxlKQogICAgICAgICBtX2ltZUFjY2VwdEV2ZW50cyA9 IHRydWU7CiAgICAgfSBlbHNlIHsKICAgICAgICAgaGlkZVBvcHVwcygpOwotCiAgICAgICAgIC8v IENsZWFyIGZvY3VzIG9uIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBmcmFtZSBpZiBhbnkuCiAgICAg ICAgIGlmICghbV9wYWdlKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjE1NCw4ICsyMTUzLDE1 IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNldEZvY3VzKGJvb2wgZW5hYmxlKQogICAgICAgICBpZiAo Zm9jdXNlZEZyYW1lKSB7CiAgICAgICAgICAgICAvLyBGaW5pc2ggYW4gb25nb2luZyBjb21wb3Np dGlvbiB0byBkZWxldGUgdGhlIGNvbXBvc2l0aW9uIG5vZGUuCiAgICAgICAgICAgICBFZGl0b3Iq IGVkaXRvciA9IGZvY3VzZWRGcmFtZS0+ZWRpdG9yKCk7Ci0gICAgICAgICAgICBpZiAoZWRpdG9y ICYmIGVkaXRvci0+aGFzQ29tcG9zaXRpb24oKSkKKyAgICAgICAgICAgIGlmIChlZGl0b3IgJiYg ZWRpdG9yLT5oYXNDb21wb3NpdGlvbigpKSB7CisgICAgICAgICAgICAgICAgaWYgKG1fYXV0b2Zp bGxDbGllbnQpCisgICAgICAgICAgICAgICAgICAgIG1fYXV0b2ZpbGxDbGllbnQtPnNldElnbm9y ZVRleHRDaGFuZ2VzKHRydWUpOworCiAgICAgICAgICAgICAgICAgZWRpdG9yLT5jb25maXJtQ29t cG9zaXRpb24oKTsKKworICAgICAgICAgICAgICAgIGlmIChtX2F1dG9maWxsQ2xpZW50KQorICAg ICAgICAgICAgICAgICAgICBtX2F1dG9maWxsQ2xpZW50LT5zZXRJZ25vcmVUZXh0Q2hhbmdlcyhm YWxzZSk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBtX2ltZUFjY2VwdEV2ZW50cyA9IGZh bHNlOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dl YlZpZXdUZXN0LmNwcAppbmRleCAyNGZlY2Y1NTdmNDM4YWQ0OTM3MWYzZjJjZmU2ZGE1ZmJkNjRm ZmYyLi40NjA4OGU2NmIyOTVhM2Y5MGEwZjkzOWNhODVlZTJiOTQ3ZDg3MDc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcApAQCAtMzcsNiArMzcsNyBA QAogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1ZGUgIkhUTUxEb2N1bWVudC5oIgogI2lu Y2x1ZGUgIlVSTFRlc3RIZWxwZXJzLmgiCisjaW5jbHVkZSAiV2ViQXV0b2ZpbGxDbGllbnQuaCIK ICNpbmNsdWRlICJXZWJDb250ZW50RGV0ZWN0aW9uUmVzdWx0LmgiCiAjaW5jbHVkZSAiV2ViRG9j dW1lbnQuaCIKICNpbmNsdWRlICJXZWJFbGVtZW50LmgiCkBAIC03MjAsNCArNzIxLDk2IEBAIFRF U1RfRihXZWJWaWV3VGVzdCwgU2VsZWN0aW9uT25SZWFkT25seUlucHV0KQogICAgIHdlYlZpZXct PmNsb3NlKCk7CiB9CiAKK2NsYXNzIE1vY2tBdXRvZmlsbENsaWVudCA6IHB1YmxpYyBXZWJBdXRv ZmlsbENsaWVudCB7CitwdWJsaWM6CisgICAgTW9ja0F1dG9maWxsQ2xpZW50KCkKKyAgICAgICAg OiBtX2lnbm9yZVRleHRDaGFuZ2VzKGZhbHNlKQorICAgICAgICAsIG1fdGV4dENoYW5nZXNXaGls ZUlnbm9yZWQoMCkKKyAgICAgICAgLCBtX3RleHRDaGFuZ2VzV2hpbGVOb3RJZ25vcmVkKDApIHsg fQorCisgICAgdmlydHVhbCB+TW9ja0F1dG9maWxsQ2xpZW50KCkgeyB9CisKKyAgICB2aXJ0dWFs IHZvaWQgc2V0SWdub3JlVGV4dENoYW5nZXMoYm9vbCBpZ25vcmUpIE9WRVJSSURFIHsgbV9pZ25v cmVUZXh0Q2hhbmdlcyA9IGlnbm9yZTsgfQorICAgIHZpcnR1YWwgdm9pZCB0ZXh0RmllbGREaWRD aGFuZ2UoY29uc3QgV2ViSW5wdXRFbGVtZW50JikgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIGlm IChtX2lnbm9yZVRleHRDaGFuZ2VzKQorICAgICAgICAgICAgKyttX3RleHRDaGFuZ2VzV2hpbGVJ Z25vcmVkOworICAgICAgICBlbHNlCisgICAgICAgICAgICArK21fdGV4dENoYW5nZXNXaGlsZU5v dElnbm9yZWQ7CisgICAgfQorCisgICAgdm9pZCBjbGVhckNoYW5nZUNvdW50cygpCisgICAgewor ICAgICAgICBtX3RleHRDaGFuZ2VzV2hpbGVJZ25vcmVkID0gMDsKKyAgICAgICAgbV90ZXh0Q2hh bmdlc1doaWxlTm90SWdub3JlZCA9IDA7CisgICAgfQorCisgICAgaW50IHRleHRDaGFuZ2VzV2hp bGVJZ25vcmVkKCkgeyByZXR1cm4gbV90ZXh0Q2hhbmdlc1doaWxlSWdub3JlZDsgfQorICAgIGlu dCB0ZXh0Q2hhbmdlc1doaWxlTm90SWdub3JlZCgpIHsgcmV0dXJuIG1fdGV4dENoYW5nZXNXaGls ZU5vdElnbm9yZWQ7IH0KKworcHJpdmF0ZToKKyAgICBib29sIG1faWdub3JlVGV4dENoYW5nZXM7 CisgICAgaW50IG1fdGV4dENoYW5nZXNXaGlsZUlnbm9yZWQ7CisgICAgaW50IG1fdGV4dENoYW5n ZXNXaGlsZU5vdElnbm9yZWQ7Cit9OworCisKK1RFU1RfRihXZWJWaWV3VGVzdCwgTG9zaW5nRm9j dXNEb2VzTm90VHJpZ2dlckF1dG9maWxsVGV4dENoYW5nZSkKK3sKKyAgICBVUkxUZXN0SGVscGVy czo6cmVnaXN0ZXJNb2NrZWRVUkxGcm9tQmFzZVVSTChXZWJTdHJpbmc6OmZyb21VVEY4KG1fYmFz ZVVSTC5jX3N0cigpKSwgV2ViU3RyaW5nOjpmcm9tVVRGOCgiaW5wdXRfZmllbGRfcG9wdWxhdGVk Lmh0bWwiKSk7CisgICAgTW9ja0F1dG9maWxsQ2xpZW50IGNsaWVudDsKKyAgICBXZWJWaWV3KiB3 ZWJWaWV3ID0gRnJhbWVUZXN0SGVscGVyczo6Y3JlYXRlV2ViVmlld0FuZExvYWQobV9iYXNlVVJM ICsgImlucHV0X2ZpZWxkX3BvcHVsYXRlZC5odG1sIik7CisgICAgd2ViVmlldy0+c2V0QXV0b2Zp bGxDbGllbnQoJmNsaWVudCk7CisgICAgd2ViVmlldy0+c2V0SW5pdGlhbEZvY3VzKGZhbHNlKTsK KworICAgIC8vIFNldCB1cCBhIGNvbXBvc2l0aW9uIHRoYXQgbmVlZHMgdG8gYmUgY29tbWl0dGVk LgorICAgIFdlYlZlY3RvcjxXZWJDb21wb3NpdGlvblVuZGVybGluZT4gZW1wdHlVbmRlcmxpbmVz OworICAgIHdlYlZpZXctPnNldEVkaXRhYmxlU2VsZWN0aW9uT2Zmc2V0cyg0LCAxMCk7CisgICAg d2ViVmlldy0+c2V0Q29tcG9zaXRpb25Gcm9tRXhpc3RpbmdUZXh0KDgsIDEyLCBlbXB0eVVuZGVy bGluZXMpOworICAgIFdlYlRleHRJbnB1dEluZm8gaW5mbyA9IHdlYlZpZXctPnRleHRJbnB1dElu Zm8oKTsKKyAgICBFWFBFQ1RfRVEoNCwgaW5mby5zZWxlY3Rpb25TdGFydCk7CisgICAgRVhQRUNU X0VRKDEwLCBpbmZvLnNlbGVjdGlvbkVuZCk7CisgICAgRVhQRUNUX0VRKDgsIGluZm8uY29tcG9z aXRpb25TdGFydCk7CisgICAgRVhQRUNUX0VRKDEyLCBpbmZvLmNvbXBvc2l0aW9uRW5kKTsKKwor ICAgIC8vIENsZWFyIHRoZSBmb2N1cyBhbmQgdHJhY2sgdGhhdCB0aGUgc3Vic2VxdWVudCBjb21w b3NpdGlvbiBjb21taXQgZG9lcyBub3QgdHJpZ2dlciBhCisgICAgLy8gdGV4dCBjaGFuZ2VkIG5v dGlmaWNhdGlvbiBmb3IgYXV0b2ZpbGwuCisgICAgY2xpZW50LmNsZWFyQ2hhbmdlQ291bnRzKCk7 CisgICAgd2ViVmlldy0+c2V0Rm9jdXMoZmFsc2UpOworICAgIEVYUEVDVF9FUSgxLCBjbGllbnQu dGV4dENoYW5nZXNXaGlsZUlnbm9yZWQoKSk7CisgICAgRVhQRUNUX0VRKDAsIGNsaWVudC50ZXh0 Q2hhbmdlc1doaWxlTm90SWdub3JlZCgpKTsKKworICAgIHdlYlZpZXctPnNldEF1dG9maWxsQ2xp ZW50KDApOworICAgIHdlYlZpZXctPmNsb3NlKCk7Cit9CisKK1RFU1RfRihXZWJWaWV3VGVzdCwg Q29uZmlybUNvbXBvc2l0aW9uVHJpZ2dlcnNBdXRvZmlsbFRleHRDaGFuZ2UpCit7CisgICAgVVJM VGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9ja2VkVVJMRnJvbUJhc2VVUkwoV2ViU3RyaW5nOjpmcm9t VVRGOChtX2Jhc2VVUkwuY19zdHIoKSksIFdlYlN0cmluZzo6ZnJvbVVURjgoImlucHV0X2ZpZWxk X3BvcHVsYXRlZC5odG1sIikpOworICAgIE1vY2tBdXRvZmlsbENsaWVudCBjbGllbnQ7CisgICAg V2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2Fk KG1fYmFzZVVSTCArICJpbnB1dF9maWVsZF9wb3B1bGF0ZWQuaHRtbCIpOworICAgIHdlYlZpZXct PnNldEF1dG9maWxsQ2xpZW50KCZjbGllbnQpOworICAgIHdlYlZpZXctPnNldEluaXRpYWxGb2N1 cyhmYWxzZSk7CisKKyAgICAvLyBTZXQgdXAgYSBjb21wb3NpdGlvbiB0aGF0IG5lZWRzIHRvIGJl IGNvbW1pdHRlZC4KKyAgICBzdGQ6OnN0cmluZyBjb21wb3NpdGlvblRleHQoInRlc3Rpbmd0ZXh0 Iik7CisKKyAgICBXZWJWZWN0b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+IGVtcHR5VW5kZXJs aW5lczsKKyAgICB3ZWJWaWV3LT5zZXRDb21wb3NpdGlvbihXZWJTdHJpbmc6OmZyb21VVEY4KGNv bXBvc2l0aW9uVGV4dC5jX3N0cigpKSwgZW1wdHlVbmRlcmxpbmVzLCAwLCBjb21wb3NpdGlvblRl eHQubGVuZ3RoKCkpOworCisgICAgV2ViVGV4dElucHV0SW5mbyBpbmZvID0gd2ViVmlldy0+dGV4 dElucHV0SW5mbygpOworICAgIEVYUEVDVF9FUSgwLCBpbmZvLnNlbGVjdGlvblN0YXJ0KTsKKyAg ICBFWFBFQ1RfRVEoKGludCkgY29tcG9zaXRpb25UZXh0Lmxlbmd0aCgpLCBpbmZvLnNlbGVjdGlv bkVuZCk7CisgICAgRVhQRUNUX0VRKDAsIGluZm8uY29tcG9zaXRpb25TdGFydCk7CisgICAgRVhQ RUNUX0VRKChpbnQpIGNvbXBvc2l0aW9uVGV4dC5sZW5ndGgoKSwgaW5mby5jb21wb3NpdGlvbkVu ZCk7CisKKyAgICBjbGllbnQuY2xlYXJDaGFuZ2VDb3VudHMoKTsKKyAgICB3ZWJWaWV3LT5jb25m aXJtQ29tcG9zaXRpb24oKTsKKyAgICBFWFBFQ1RfRVEoMCwgY2xpZW50LnRleHRDaGFuZ2VzV2hp bGVJZ25vcmVkKCkpOworICAgIEVYUEVDVF9FUSgxLCBjbGllbnQudGV4dENoYW5nZXNXaGlsZU5v dElnbm9yZWQoKSk7CisKKyAgICB3ZWJWaWV3LT5zZXRBdXRvZmlsbENsaWVudCgwKTsKKyAgICB3 ZWJWaWV3LT5jbG9zZSgpOworfQorCiB9Cg== 188417 2013-02-14 13:47:09 -0800 2013-02-14 15:43:45 -0800 Patch bug-109735-20130214134336.patch text/plain 6908 dtrainor U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRkYzAxMTAzM2NkNWVmNDY5ZWNlMzgwM2JlNDI4MjAxZjMzYzQyYTMuLjJmYzBmMDY4ZmIwODg2 ZWM4NDIzYTdhZWZiMTNmNjUyOWU1MzljZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTMtMDItMTQgIERhdmlkIFRyYWlub3IgIDxkdHJhaW5vckBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBObyB0cmlnZ2VyaW5nIGF1dG9maWxsIG9u IHVuZm9jdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwOTczNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5lZWQgdG8gbm90aWZ5IHRoZSBhdXRvZmlsbCBjbGllbnQgdG8gbm90IHByb2Nlc3MgdGV4dCBj aGFuZ2VzIHdoZW4gd2UncmUgc2V0dGluZworICAgICAgICBmb2N1cyB0byBmYWxzZSBhbmQgYXJl IHRyeWluZyB0byBjb21taXQgYSBjb21wb3NpdGlvbi4KKworICAgICAgICAqIHB1YmxpYy9XZWJB dXRvZmlsbENsaWVudC5oOgorICAgICAgICAoV2ViQXV0b2ZpbGxDbGllbnQpOgorICAgICAgICAo V2ViS2l0OjpXZWJBdXRvZmlsbENsaWVudDo6c2V0SWdub3JlVGV4dENoYW5nZXMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJBdXRvZmlsbENsaWVudDo6fldlYkF1dG9maWxsQ2xpZW50KToKKyAgICAg ICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 c2V0Rm9jdXMpOgorICAgICAgICAqIHRlc3RzL1dlYlZpZXdUZXN0LmNwcDoKKwogMjAxMy0wMi0x MSAgRmxvcmluIE1hbGl0YSAgPGZtYWxpdGFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQuICBSb2xsZWQgQ2hyb21pdW0gREVQUyB0byByMTgxNzcwLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQXV0b2ZpbGxDbGllbnQuaCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkF1dG9maWxsQ2xpZW50LmgKaW5kZXggNzQyNGMzZmVj ZGJhOWZmYTcyODZlMWI3ZWVmM2RmOGM5NjBiZmQ1ZC4uYWE0ZDBhM2RhZWRiMWM3ZWNiZjY5ZDRj YzQyNjAyMjZjZDA2MzhmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViQXV0b2ZpbGxDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJBdXRvZmlsbENsaWVudC5oCkBAIC05MCw4ICs5MCwxMSBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIHRleHRGaWVsZERpZENoYW5nZShjb25zdCBXZWJJbnB1dEVsZW1lbnQmKSB7IH0K ICAgICB2aXJ0dWFsIHZvaWQgdGV4dEZpZWxkRGlkUmVjZWl2ZUtleURvd24oY29uc3QgV2ViSW5w dXRFbGVtZW50JiwgY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpIHsgfQogCisgICAgLy8gSW5mb3Jt cyB0aGUgY2xpZW50IHdoZXRoZXIgb3Igbm90IGFueSBzdWJzZXF1ZW50IHRleHQgY2hhbmdlcyBz aG91bGQgYmUgaWdub3JlZC4KKyAgICB2aXJ0dWFsIHZvaWQgc2V0SWdub3JlVGV4dENoYW5nZXMo Ym9vbCBpZ25vcmUpIHsgfQorCiBwcm90ZWN0ZWQ6Ci0gICAgfldlYkF1dG9maWxsQ2xpZW50KCkg eyB9CisgICAgdmlydHVhbCB+V2ViQXV0b2ZpbGxDbGllbnQoKSB7IH0KIH07CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CmluZGV4IDc0NDk1OTcxNjEzYWI4MThmMzY2ZTc2MmU3NGNhYTcxOGFlNzg1NTUuLjhkZGM4NTll YzFmMzE0MzVjM2ExZmI0MDU2ZWZlMDljMGQ0YTI4Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTIxNTQsOCArMjE1NCwxNSBAQCB2b2lkIFdlYlZp ZXdJbXBsOjpzZXRGb2N1cyhib29sIGVuYWJsZSkKICAgICAgICAgaWYgKGZvY3VzZWRGcmFtZSkg ewogICAgICAgICAgICAgLy8gRmluaXNoIGFuIG9uZ29pbmcgY29tcG9zaXRpb24gdG8gZGVsZXRl IHRoZSBjb21wb3NpdGlvbiBub2RlLgogICAgICAgICAgICAgRWRpdG9yKiBlZGl0b3IgPSBmb2N1 c2VkRnJhbWUtPmVkaXRvcigpOwotICAgICAgICAgICAgaWYgKGVkaXRvciAmJiBlZGl0b3ItPmhh c0NvbXBvc2l0aW9uKCkpCisgICAgICAgICAgICBpZiAoZWRpdG9yICYmIGVkaXRvci0+aGFzQ29t cG9zaXRpb24oKSkgeworICAgICAgICAgICAgICAgIGlmIChtX2F1dG9maWxsQ2xpZW50KQorICAg ICAgICAgICAgICAgICAgICBtX2F1dG9maWxsQ2xpZW50LT5zZXRJZ25vcmVUZXh0Q2hhbmdlcyh0 cnVlKTsKKwogICAgICAgICAgICAgICAgIGVkaXRvci0+Y29uZmlybUNvbXBvc2l0aW9uKCk7CisK KyAgICAgICAgICAgICAgICBpZiAobV9hdXRvZmlsbENsaWVudCkKKyAgICAgICAgICAgICAgICAg ICAgbV9hdXRvZmlsbENsaWVudC0+c2V0SWdub3JlVGV4dENoYW5nZXMoZmFsc2UpOworICAgICAg ICAgICAgfQogICAgICAgICAgICAgbV9pbWVBY2NlcHRFdmVudHMgPSBmYWxzZTsKICAgICAgICAg fQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViVmll d1Rlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAK aW5kZXggMjRmZWNmNTU3ZjQzOGFkNDkzNzFmM2YyY2ZlNmRhNWZiZDY0ZmZmMi4uNDYwODhlNjZi Mjk1YTNmOTBhMGY5MzljYTg1ZWUyYjk0N2Q4NzA3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKQEAgLTM3LDYgKzM3LDcgQEAKICNpbmNsdWRlICJG cmFtZVZpZXcuaCIKICNpbmNsdWRlICJIVE1MRG9jdW1lbnQuaCIKICNpbmNsdWRlICJVUkxUZXN0 SGVscGVycy5oIgorI2luY2x1ZGUgIldlYkF1dG9maWxsQ2xpZW50LmgiCiAjaW5jbHVkZSAiV2Vi Q29udGVudERldGVjdGlvblJlc3VsdC5oIgogI2luY2x1ZGUgIldlYkRvY3VtZW50LmgiCiAjaW5j bHVkZSAiV2ViRWxlbWVudC5oIgpAQCAtNzIwLDQgKzcyMSw5NiBAQCBURVNUX0YoV2ViVmlld1Rl c3QsIFNlbGVjdGlvbk9uUmVhZE9ubHlJbnB1dCkKICAgICB3ZWJWaWV3LT5jbG9zZSgpOwogfQog CitjbGFzcyBNb2NrQXV0b2ZpbGxDbGllbnQgOiBwdWJsaWMgV2ViQXV0b2ZpbGxDbGllbnQgewor cHVibGljOgorICAgIE1vY2tBdXRvZmlsbENsaWVudCgpCisgICAgICAgIDogbV9pZ25vcmVUZXh0 Q2hhbmdlcyhmYWxzZSkKKyAgICAgICAgLCBtX3RleHRDaGFuZ2VzV2hpbGVJZ25vcmVkKDApCisg ICAgICAgICwgbV90ZXh0Q2hhbmdlc1doaWxlTm90SWdub3JlZCgwKSB7IH0KKworICAgIHZpcnR1 YWwgfk1vY2tBdXRvZmlsbENsaWVudCgpIHsgfQorCisgICAgdmlydHVhbCB2b2lkIHNldElnbm9y ZVRleHRDaGFuZ2VzKGJvb2wgaWdub3JlKSBPVkVSUklERSB7IG1faWdub3JlVGV4dENoYW5nZXMg PSBpZ25vcmU7IH0KKyAgICB2aXJ0dWFsIHZvaWQgdGV4dEZpZWxkRGlkQ2hhbmdlKGNvbnN0IFdl YklucHV0RWxlbWVudCYpIE9WRVJSSURFCisgICAgeworICAgICAgICBpZiAobV9pZ25vcmVUZXh0 Q2hhbmdlcykKKyAgICAgICAgICAgICsrbV90ZXh0Q2hhbmdlc1doaWxlSWdub3JlZDsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgKyttX3RleHRDaGFuZ2VzV2hpbGVOb3RJZ25vcmVkOworICAg IH0KKworICAgIHZvaWQgY2xlYXJDaGFuZ2VDb3VudHMoKQorICAgIHsKKyAgICAgICAgbV90ZXh0 Q2hhbmdlc1doaWxlSWdub3JlZCA9IDA7CisgICAgICAgIG1fdGV4dENoYW5nZXNXaGlsZU5vdEln bm9yZWQgPSAwOworICAgIH0KKworICAgIGludCB0ZXh0Q2hhbmdlc1doaWxlSWdub3JlZCgpIHsg cmV0dXJuIG1fdGV4dENoYW5nZXNXaGlsZUlnbm9yZWQ7IH0KKyAgICBpbnQgdGV4dENoYW5nZXNX aGlsZU5vdElnbm9yZWQoKSB7IHJldHVybiBtX3RleHRDaGFuZ2VzV2hpbGVOb3RJZ25vcmVkOyB9 CisKK3ByaXZhdGU6CisgICAgYm9vbCBtX2lnbm9yZVRleHRDaGFuZ2VzOworICAgIGludCBtX3Rl eHRDaGFuZ2VzV2hpbGVJZ25vcmVkOworICAgIGludCBtX3RleHRDaGFuZ2VzV2hpbGVOb3RJZ25v cmVkOworfTsKKworCitURVNUX0YoV2ViVmlld1Rlc3QsIExvc2luZ0ZvY3VzRG9lc05vdFRyaWdn ZXJBdXRvZmlsbFRleHRDaGFuZ2UpCit7CisgICAgVVJMVGVzdEhlbHBlcnM6OnJlZ2lzdGVyTW9j a2VkVVJMRnJvbUJhc2VVUkwoV2ViU3RyaW5nOjpmcm9tVVRGOChtX2Jhc2VVUkwuY19zdHIoKSks IFdlYlN0cmluZzo6ZnJvbVVURjgoImlucHV0X2ZpZWxkX3BvcHVsYXRlZC5odG1sIikpOworICAg IE1vY2tBdXRvZmlsbENsaWVudCBjbGllbnQ7CisgICAgV2ViVmlldyogd2ViVmlldyA9IEZyYW1l VGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKG1fYmFzZVVSTCArICJpbnB1dF9maWVs ZF9wb3B1bGF0ZWQuaHRtbCIpOworICAgIHdlYlZpZXctPnNldEF1dG9maWxsQ2xpZW50KCZjbGll bnQpOworICAgIHdlYlZpZXctPnNldEluaXRpYWxGb2N1cyhmYWxzZSk7CisKKyAgICAvLyBTZXQg dXAgYSBjb21wb3NpdGlvbiB0aGF0IG5lZWRzIHRvIGJlIGNvbW1pdHRlZC4KKyAgICBXZWJWZWN0 b3I8V2ViQ29tcG9zaXRpb25VbmRlcmxpbmU+IGVtcHR5VW5kZXJsaW5lczsKKyAgICB3ZWJWaWV3 LT5zZXRFZGl0YWJsZVNlbGVjdGlvbk9mZnNldHMoNCwgMTApOworICAgIHdlYlZpZXctPnNldENv bXBvc2l0aW9uRnJvbUV4aXN0aW5nVGV4dCg4LCAxMiwgZW1wdHlVbmRlcmxpbmVzKTsKKyAgICBX ZWJUZXh0SW5wdXRJbmZvIGluZm8gPSB3ZWJWaWV3LT50ZXh0SW5wdXRJbmZvKCk7CisgICAgRVhQ RUNUX0VRKDQsIGluZm8uc2VsZWN0aW9uU3RhcnQpOworICAgIEVYUEVDVF9FUSgxMCwgaW5mby5z ZWxlY3Rpb25FbmQpOworICAgIEVYUEVDVF9FUSg4LCBpbmZvLmNvbXBvc2l0aW9uU3RhcnQpOwor ICAgIEVYUEVDVF9FUSgxMiwgaW5mby5jb21wb3NpdGlvbkVuZCk7CisKKyAgICAvLyBDbGVhciB0 aGUgZm9jdXMgYW5kIHRyYWNrIHRoYXQgdGhlIHN1YnNlcXVlbnQgY29tcG9zaXRpb24gY29tbWl0 IGRvZXMgbm90IHRyaWdnZXIgYQorICAgIC8vIHRleHQgY2hhbmdlZCBub3RpZmljYXRpb24gZm9y IGF1dG9maWxsLgorICAgIGNsaWVudC5jbGVhckNoYW5nZUNvdW50cygpOworICAgIHdlYlZpZXct PnNldEZvY3VzKGZhbHNlKTsKKyAgICBFWFBFQ1RfRVEoMSwgY2xpZW50LnRleHRDaGFuZ2VzV2hp bGVJZ25vcmVkKCkpOworICAgIEVYUEVDVF9FUSgwLCBjbGllbnQudGV4dENoYW5nZXNXaGlsZU5v dElnbm9yZWQoKSk7CisKKyAgICB3ZWJWaWV3LT5zZXRBdXRvZmlsbENsaWVudCgwKTsKKyAgICB3 ZWJWaWV3LT5jbG9zZSgpOworfQorCitURVNUX0YoV2ViVmlld1Rlc3QsIENvbmZpcm1Db21wb3Np dGlvblRyaWdnZXJzQXV0b2ZpbGxUZXh0Q2hhbmdlKQoreworICAgIFVSTFRlc3RIZWxwZXJzOjpy ZWdpc3Rlck1vY2tlZFVSTEZyb21CYXNlVVJMKFdlYlN0cmluZzo6ZnJvbVVURjgobV9iYXNlVVJM LmNfc3RyKCkpLCBXZWJTdHJpbmc6OmZyb21VVEY4KCJpbnB1dF9maWVsZF9wb3B1bGF0ZWQuaHRt bCIpKTsKKyAgICBNb2NrQXV0b2ZpbGxDbGllbnQgY2xpZW50OworICAgIFdlYlZpZXcqIHdlYlZp ZXcgPSBGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jhc2VVUkwgKyAi aW5wdXRfZmllbGRfcG9wdWxhdGVkLmh0bWwiKTsKKyAgICB3ZWJWaWV3LT5zZXRBdXRvZmlsbENs aWVudCgmY2xpZW50KTsKKyAgICB3ZWJWaWV3LT5zZXRJbml0aWFsRm9jdXMoZmFsc2UpOworCisg ICAgLy8gU2V0IHVwIGEgY29tcG9zaXRpb24gdGhhdCBuZWVkcyB0byBiZSBjb21taXR0ZWQuCisg ICAgc3RkOjpzdHJpbmcgY29tcG9zaXRpb25UZXh0KCJ0ZXN0aW5ndGV4dCIpOworCisgICAgV2Vi VmVjdG9yPFdlYkNvbXBvc2l0aW9uVW5kZXJsaW5lPiBlbXB0eVVuZGVybGluZXM7CisgICAgd2Vi Vmlldy0+c2V0Q29tcG9zaXRpb24oV2ViU3RyaW5nOjpmcm9tVVRGOChjb21wb3NpdGlvblRleHQu Y19zdHIoKSksIGVtcHR5VW5kZXJsaW5lcywgMCwgY29tcG9zaXRpb25UZXh0Lmxlbmd0aCgpKTsK KworICAgIFdlYlRleHRJbnB1dEluZm8gaW5mbyA9IHdlYlZpZXctPnRleHRJbnB1dEluZm8oKTsK KyAgICBFWFBFQ1RfRVEoMCwgaW5mby5zZWxlY3Rpb25TdGFydCk7CisgICAgRVhQRUNUX0VRKChp bnQpIGNvbXBvc2l0aW9uVGV4dC5sZW5ndGgoKSwgaW5mby5zZWxlY3Rpb25FbmQpOworICAgIEVY UEVDVF9FUSgwLCBpbmZvLmNvbXBvc2l0aW9uU3RhcnQpOworICAgIEVYUEVDVF9FUSgoaW50KSBj b21wb3NpdGlvblRleHQubGVuZ3RoKCksIGluZm8uY29tcG9zaXRpb25FbmQpOworCisgICAgY2xp ZW50LmNsZWFyQ2hhbmdlQ291bnRzKCk7CisgICAgd2ViVmlldy0+Y29uZmlybUNvbXBvc2l0aW9u KCk7CisgICAgRVhQRUNUX0VRKDAsIGNsaWVudC50ZXh0Q2hhbmdlc1doaWxlSWdub3JlZCgpKTsK KyAgICBFWFBFQ1RfRVEoMSwgY2xpZW50LnRleHRDaGFuZ2VzV2hpbGVOb3RJZ25vcmVkKCkpOwor CisgICAgd2ViVmlldy0+c2V0QXV0b2ZpbGxDbGllbnQoMCk7CisgICAgd2ViVmlldy0+Y2xvc2Uo KTsKK30KKwogfQo=