190020 2018-09-26 17:21:59 -0700 Search cancels but also clears highlights 2018-10-03 16:34:36 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zhaque zhaque aestes bdakin commit-queue thorton webkit-bug-importer wenson_hsieh zhaque oldest_to_newest 1463842 0 zhaque 2018-09-26 17:21:59 -0700 Search cancels but also clears highlights 1463843 1 350929 zhaque 2018-09-26 17:24:56 -0700 Created attachment 350929 Patch 1463844 2 zhaque 2018-09-26 17:24:58 -0700 <rdar://problem/39546973> 1464042 3 350929 aestes 2018-09-27 10:40:09 -0700 Comment on attachment 350929 Patch Thanks for the patch, Zamiul! A few questions/comments: 1. How did you test this? 2. You'll notice that the ios and ios-sim EWS bots are red. I think this is because you didn't declare -cancelFindStringWithHighlightsCleared: in PDFKitSPI.h. 3. I think you'll need to still update _findStringCount and call _findCompletion when _findStringMaxCount is exceeded. Otherwise, we'll never inform the client about the find count, never focus the first result, and probably won't handle wrap-around properly. 1464044 4 aestes 2018-09-27 10:46:17 -0700 Also note that we have API tests for PDF find-in page in Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm. Right now those tests are disabled on iOS 12, and rdar://problem/39475542 tracks fixing that. Maybe you can help with that too! 1464046 5 350929 aestes 2018-09-27 10:47:51 -0700 Comment on attachment 350929 Patch r- for now based on my previous comments. 1464265 6 zhaque 2018-09-27 19:29:30 -0700 (In reply to Andy Estes from comment #3) > Comment on attachment 350929 [details] > Patch > > Thanks for the patch, Zamiul! > > A few questions/comments: > > 1. How did you test this? > 2. You'll notice that the ios and ios-sim EWS bots are red. I think this is > because you didn't declare -cancelFindStringWithHighlightsCleared: in > PDFKitSPI.h. > 3. I think you'll need to still update _findStringCount and call > _findCompletion when _findStringMaxCount is exceeded. Otherwise, we'll never > inform the client about the find count, never focus the first result, and > probably won't handle wrap-around properly. 1. I tested it manually by changing _maximumNumberOfMatches in _SFFindOnPageView.m to 4, compiling it to the iOS simulator (iPhone X) and searching a PDF document for a string that occurs zero times, once, 3 times, 4 times and more than 4 times. I also tested the macOS PDF find-in-page feature, just in case something was broken. I was also relying on ews to give me any hints, if something went wrong. 2 & 3. I've changed the code to attend to both of these concerns. Please let me know what you think. I'll attend to making proper test cases for this now. 1464266 7 zhaque 2018-09-27 19:30:57 -0700 (In reply to Andy Estes from comment #4) > Also note that we have API tests for PDF find-in page in > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm. Right now those tests > are disabled on iOS 12, and rdar://problem/39475542 tracks fixing that. > Maybe you can help with that too! Yeah, this looks helpful. I'll look into this and base my test cases for this bug off of it. 1464268 8 350929 wenson_hsieh 2018-09-27 19:37:51 -0700 Comment on attachment 350929 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350929&action=review > Source/WebKit/ChangeLog:5 > + <rdar://problem/39546973> Nit - I think you should leave out this radar, since it only represents PDFKit work blocking this bug (<rdar://problem/39585214>) > Source/WebKit/UIProcess/ios/WKPDFView.mm:398 > + Another very minor nit — extra newline here. 1464272 9 351042 zhaque 2018-09-27 19:53:32 -0700 Created attachment 351042 Patch 1464273 10 zhaque 2018-09-27 19:53:59 -0700 (In reply to Wenson Hsieh from comment #8) > Comment on attachment 350929 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=350929&action=review > > > Source/WebKit/ChangeLog:5 > > + <rdar://problem/39546973> > > Nit - I think you should leave out this radar, since it only represents > PDFKit work blocking this bug (<rdar://problem/39585214>) > > > Source/WebKit/UIProcess/ios/WKPDFView.mm:398 > > + > > Another very minor nit — extra newline here. Done and done! 1464505 11 351042 aestes 2018-09-28 14:29:20 -0700 Comment on attachment 351042 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351042&action=review This looks great Zamiul! r=me, but please address my comments before landing. > Source/WebKit/ChangeLog:3 > + Search cancels but also clears highlights This title doesn't really make sense. The issue isn't that we mistakenly cleared highlights when the maximum count was exceeded, it's that we didn't even cancel the search (because the only cancel API we had at the time also cleared highlights). > Source/WebKit/ChangeLog:10 > + When searching a PDF document on iOS, the maximum number of matching > + terms are limited to 100. Beyond this limit, a PDF document should not Limiting the search to 100 items is what Safari happens to do, but other clients might use a different limit. I'd talk about the search limit in more generic terms and avoid mentioning the policy of a specific client. > Source/WebKit/ChangeLog:17 > + In the process of making tests. Do you plan to add tests directly to this patch? If not, I'd mention that you are planning to test this in a follow-up. I think a follow-up is fine since WKPDFView tests are currently disabled, and re-enabling them on iOS 12 is a task in itself. > Source/WebKit/UIProcess/ios/WKPDFView.mm:395 > + if (numFound > _findStringMaxCount) { It's probably my fault for writing a misleading FIXME comment, but I think you want to stop when numFound is greater than or equal to _findStringMaxCount. > Source/WebKit/UIProcess/ios/WKPDFView.mm:397 > + [controller cancelFindStringWithHighlightsCleared:false]; > + done = true; For BOOL types we use YES and NO, not true and false. > Source/WebKit/UIProcess/ios/WKPDFView.mm:402 > + Unneeded whitespace. 1464555 12 351042 aestes 2018-09-28 15:33:40 -0700 Comment on attachment 351042 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351042&action=review >> Source/WebKit/UIProcess/ios/WKPDFView.mm:395 >> + if (numFound > _findStringMaxCount) { > > It's probably my fault for writing a misleading FIXME comment, but I think you want to stop when numFound is greater than or equal to _findStringMaxCount. One more comment about this: if numFound happens to be greater than or equal to _findStringMaxCount but done is also YES, then we probably don't want to call -cancelFindStringWithHighlightsCleared:. 1466210 13 351557 zhaque 2018-10-03 16:00:07 -0700 Created attachment 351557 Patch 1466212 14 zhaque 2018-10-03 16:01:14 -0700 (In reply to Andy Estes from comment #12) > Comment on attachment 351042 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351042&action=review > > >> Source/WebKit/UIProcess/ios/WKPDFView.mm:395 > >> + if (numFound > _findStringMaxCount) { > > > > It's probably my fault for writing a misleading FIXME comment, but I think you want to stop when numFound is greater than or equal to _findStringMaxCount. > > One more comment about this: if numFound happens to be greater than or equal > to _findStringMaxCount but done is also YES, then we probably don't want to > call -cancelFindStringWithHighlightsCleared:. True, I've included that in the conditional. 1466216 15 zhaque 2018-10-03 16:11:20 -0700 (In reply to Andy Estes from comment #11) > Comment on attachment 351042 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351042&action=review > > This looks great Zamiul! r=me, but please address my comments before landing. > > > Source/WebKit/ChangeLog:3 > > + Search cancels but also clears highlights > > This title doesn't really make sense. The issue isn't that we mistakenly > cleared highlights when the maximum count was exceeded, it's that we didn't > even cancel the search (because the only cancel API we had at the time also > cleared highlights). > > > Source/WebKit/ChangeLog:10 > > + When searching a PDF document on iOS, the maximum number of matching > > + terms are limited to 100. Beyond this limit, a PDF document should not > > Limiting the search to 100 items is what Safari happens to do, but other > clients might use a different limit. I'd talk about the search limit in more > generic terms and avoid mentioning the policy of a specific client. > > > Source/WebKit/ChangeLog:17 > > + In the process of making tests. > > Do you plan to add tests directly to this patch? > > If not, I'd mention that you are planning to test this in a follow-up. I > think a follow-up is fine since WKPDFView tests are currently disabled, and > re-enabling them on iOS 12 is a task in itself. > > > Source/WebKit/UIProcess/ios/WKPDFView.mm:395 > > + if (numFound > _findStringMaxCount) { > > It's probably my fault for writing a misleading FIXME comment, but I think > you want to stop when numFound is greater than or equal to > _findStringMaxCount. > > > Source/WebKit/UIProcess/ios/WKPDFView.mm:397 > > + [controller cancelFindStringWithHighlightsCleared:false]; > > + done = true; > > For BOOL types we use YES and NO, not true and false. > > > Source/WebKit/UIProcess/ios/WKPDFView.mm:402 > > + > > Unneeded whitespace. As per our discussion, we decided to stick with numFound > _findStringMaxCount, rather than use a >=. The latter would finish a bit too early and result in unexpected UI updates. 1466230 16 351557 commit-queue 2018-10-03 16:34:34 -0700 Comment on attachment 351557 Patch Clearing flags on attachment: 351557 Committed r236815: <https://trac.webkit.org/changeset/236815> 1466231 17 commit-queue 2018-10-03 16:34:36 -0700 All reviewed patches have been landed. Closing bug. 350929 2018-09-26 17:24:56 -0700 2018-09-27 19:53:31 -0700 Patch bug-190020-20180926172454.patch text/plain 1783 zhaque U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1OTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxYTA1YjM2ZTA3N2U1MTNl MTM1MWExZGM1ZWJmMGQ1OWUxYjA2NzMuLmE5Y2RiYjMxN2E3NzZhZTYwNThiZjRhYTlkMjgzYTUw ZTRmMmQwZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMDktMjYgIFphbWl1bCBI YXF1ZSAgPHpoYXF1ZUBhcHBsZS5jb20+CisKKyAgICAgICAgU2VhcmNoIGNhbmNlbHMgYnV0IGFs c28gY2xlYXJzIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5MDAyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk1NDY5NzM+Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zOTU4NTIxND4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBwcm9jZXNzIG9mIG1ha2luZyB0ZXN0cyAoYW5k IGV4cGxvcmluZyB2aWFiaWxpdHkgb2YgbWFraW5nIHRlc3RzIGF0IGFsbCkuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbToKKyAgICAgICAgKC1bV0tQREZWaWV3IHBkZkhv c3RWaWV3Q29udHJvbGxlcjpmaW5kU3RyaW5nVXBkYXRlOmRvbmU6XSk6CisKIDIwMTgtMDktMTEg IFBhYmxvIFNhYXZlZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgQWRkIG1p c3NpbmcgI2lmIEVOQUJMRShWSURFTykgV2ViUHJvY2Vzcy9GdWxsU2NyZWVuL1dlYkZ1bGxTY3Jl ZW5NYW5hZ2VyLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL UERGVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KaW5k ZXggZGZmNGM2Y2JmMDAzMmUxNTVjYmNiOTFmMTNhYmZiM2RjMjM0MDFlYS4uNDNiMWM5YTRkMTkx ZTNhMWIwYzRiYTg5MDc0OTcyZjNkMGFiZjI5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tQREZWaWV3Lm1tCkBAIC0zOTIsOCArMzkyLDEyIEBAIC0gKHZvaWQpcGRmSG9zdFZpZXdD b250cm9sbGVyOihQREZIb3N0Vmlld0NvbnRyb2xsZXIgKiljb250cm9sbGVyIGRvY3VtZW50RGlk VW5sCiAKIC0gKHZvaWQpcGRmSG9zdFZpZXdDb250cm9sbGVyOihQREZIb3N0Vmlld0NvbnRyb2xs ZXIgKiljb250cm9sbGVyIGZpbmRTdHJpbmdVcGRhdGU6KE5TVUludGVnZXIpbnVtRm91bmQgZG9u ZTooQk9PTClkb25lCiB7Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBzdG9wIHNlYXJjaGluZyBv bmNlIG51bUZvdW5kIGV4Y2VlZHMgX2ZpbmRTdHJpbmdNYXhDb3VudCwgYnV0IFBERktpdCBkb2Vz bid0Ci0gICAgLy8gYWxsb3cgdXMgdG8gc3RvcCB0aGUgc2VhcmNoIHdpdGhvdXQgYWxzbyBjbGVh cmluZyB0aGUgc2VhcmNoIGhpZ2hsaWdodHMuIFNlZSA8cmRhcjovL3Byb2JsZW0vMzk1NDY5NzM+ LgorICAgIGlmIChudW1Gb3VuZCA+IF9maW5kU3RyaW5nTWF4Q291bnQpIHsKKyAgICAgICAgW2Nv bnRyb2xsZXIgY2FuY2VsRmluZFN0cmluZ1dpdGhIaWdobGlnaHRzQ2xlYXJlZDpmYWxzZV07Cisg ICAgICAgIHJldHVybjsKKyAgICAgICAgCisgICAgfQorICAgIAogICAgIGlmICghZG9uZSkKICAg ICAgICAgcmV0dXJuOwogCg== 351042 2018-09-27 19:53:32 -0700 2018-10-03 16:00:06 -0700 Patch bug-190020-20180927195329.patch text/plain 3147 zhaque U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1OTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUxYTA1YjM2ZTA3N2U1MTNl MTM1MWExZGM1ZWJmMGQ1OWUxYjA2NzMuLmY4NjE1NDU2MzllYmY4Zjk0ZTc0Y2IzZDhmNWZhNjM5 ZDUwMjQzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTgtMDktMjYgIFphbWl1bCBI YXF1ZSAgPHpoYXF1ZUBhcHBsZS5jb20+CisKKyAgICAgICAgU2VhcmNoIGNhbmNlbHMgYnV0IGFs c28gY2xlYXJzIGhpZ2hsaWdodHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5MDAyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzk1ODUyMTQ+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBzZWFy Y2hpbmcgYSBQREYgZG9jdW1lbnQgb24gaU9TLCB0aGUgbWF4aW11bSBudW1iZXIgb2YgbWF0Y2hp bmcKKyAgICAgICAgdGVybXMgYXJlIGxpbWl0ZWQgdG8gMTAwLiBCZXlvbmQgdGhpcyBsaW1pdCwg YSBQREYgZG9jdW1lbnQgc2hvdWxkIG5vdAorICAgICAgICBiZSBzZWFyY2hlZCwgc2luY2UgdGhl IFVJIHdpbGwgbm90IGJlIHVwZGF0ZWQgY29ycmVzcG9uZGluZ2x5LiBUbyB0aGlzIGVmZmVjdCwK KyAgICAgICAgYSBuZXcgU1BJIHdhcyBtYWRlIHRvIGNhbmNlbCBhIHNlYXJjaCB3aGVuIHRoZSBt YXhpbXVtIGxpbWl0IG9mIG1hdGNoaW5nIHRlcm1zCisgICAgICAgIGlzIHJlYWNoZWQuIFRoaXMg aXMgZG9uZSB3aXRob3V0IGNsZWFyaW5nIHRoZSBoaWdobGlnaHRpbmcgZm9yIHRoZSBhbGwgdGhl IHRlcm1zCisgICAgICAgIHRoYXQgd2VyZSBmb3VuZCB1bmRlciB0aGUgbGltaXQuIFRoaXMgYnVn IHdhcyBhIHJlc3VsdCBvZiBub3QgaGF2aW5nIGltcGxlbWVudGVkIAorICAgICAgICB0aGUgbmV3 IFNQSSBpbiBXS1BERlZpZXcuCisKKyAgICAgICAgSW4gdGhlIHByb2Nlc3Mgb2YgbWFraW5nIHRl c3RzLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW06CisgICAgICAgICgt W1dLUERGVmlldyBwZGZIb3N0Vmlld0NvbnRyb2xsZXI6ZmluZFN0cmluZ1VwZGF0ZTpkb25lOl0p OgorCiAyMDE4LTA5LTExICBQYWJsbyBTYWF2ZWRyYSAgPHBzYWF2ZWRyYUBpZ2FsaWEuY29tPgog CiAgICAgICAgIEFkZCBtaXNzaW5nICNpZiBFTkFCTEUoVklERU8pIFdlYlByb2Nlc3MvRnVsbFNj cmVlbi9XZWJGdWxsU2NyZWVuTWFuYWdlci5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv UGxhdGZvcm0vc3BpL2lvcy9QREZLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3Bp L2lvcy9QREZLaXRTUEkuaAppbmRleCA1ODM3MzMzNGRhZTlkMWVjZTdiYTYyMzlkYzA5N2I1NTRi MDEwZThhLi45M2IwMTA1Njg1MDUzZTYyYWYzMmQxN2UyZjBlM2VhMDcxYWExMzI3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvUERGS2l0U1BJLmgKKysrIGIvU291 cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1BERktpdFNQSS5oCkBAIC00NSw2ICs0NSw3IEBA CiAKIC0gKHZvaWQpIGZpbmRTdHJpbmc6KE5TU3RyaW5nKikgc3RyaW5nIHdpdGhPcHRpb25zOihO U1N0cmluZ0NvbXBhcmVPcHRpb25zKSBvcHRpb25zOwogLSAodm9pZCkgY2FuY2VsRmluZFN0cmlu ZzsKKy0gKHZvaWQpIGNhbmNlbEZpbmRTdHJpbmdXaXRoSGlnaGxpZ2h0c0NsZWFyZWQ6KEJPT0wp Y2xlYXJlZDsKIC0gKHZvaWQpIGZvY3VzT25TZWFyY2hSZXN1bHRBdEluZGV4OihOU1VJbnRlZ2Vy KSBzZWFyY2hJbmRleDsKIAogLSAoTlNJbnRlZ2VyKSBjdXJyZW50UGFnZUluZGV4OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KaW5kZXggZGZmNGM2Y2JmMDAzMmUxNTVj YmNiOTFmMTNhYmZiM2RjMjM0MDFlYS4uNDQxOTgyOTFkNGY0NTMxZWU0MTkxZTg5OWNlZDkyOGZh NjQ0ZWVmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLUERGVmll dy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCkBAIC0z OTIsMTQgKzM5MiwxOCBAQCAtICh2b2lkKXBkZkhvc3RWaWV3Q29udHJvbGxlcjooUERGSG9zdFZp ZXdDb250cm9sbGVyICopY29udHJvbGxlciBkb2N1bWVudERpZFVubAogCiAtICh2b2lkKXBkZkhv c3RWaWV3Q29udHJvbGxlcjooUERGSG9zdFZpZXdDb250cm9sbGVyICopY29udHJvbGxlciBmaW5k U3RyaW5nVXBkYXRlOihOU1VJbnRlZ2VyKW51bUZvdW5kIGRvbmU6KEJPT0wpZG9uZQogewotICAg IC8vIEZJWE1FOiBXZSBzaG91bGQgc3RvcCBzZWFyY2hpbmcgb25jZSBudW1Gb3VuZCBleGNlZWRz IF9maW5kU3RyaW5nTWF4Q291bnQsIGJ1dCBQREZLaXQgZG9lc24ndAotICAgIC8vIGFsbG93IHVz IHRvIHN0b3AgdGhlIHNlYXJjaCB3aXRob3V0IGFsc28gY2xlYXJpbmcgdGhlIHNlYXJjaCBoaWdo bGlnaHRzLiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzM5NTQ2OTczPi4KKyAgICBpZiAobnVtRm91bmQg PiBfZmluZFN0cmluZ01heENvdW50KSB7CisgICAgICAgIFtjb250cm9sbGVyIGNhbmNlbEZpbmRT dHJpbmdXaXRoSGlnaGxpZ2h0c0NsZWFyZWQ6ZmFsc2VdOworICAgICAgICBkb25lID0gdHJ1ZTsK KyAgICB9CisgICAgCiAgICAgaWYgKCFkb25lKQogICAgICAgICByZXR1cm47Ci0KLSAgICBfZmlu ZFN0cmluZ0NvdW50ID0gbnVtRm91bmQ7Ci0gICAgaWYgKGF1dG8gZmluZENvbXBsZXRpb24gPSBz dGQ6OmV4Y2hhbmdlKF9maW5kQ29tcGxldGlvbiwgbmlsKSkKKyAgICAKKyAgICBpZiAoYXV0byBm aW5kQ29tcGxldGlvbiA9IHN0ZDo6ZXhjaGFuZ2UoX2ZpbmRDb21wbGV0aW9uLCBuaWwpKSB7Cisg ICAgICAgIF9maW5kU3RyaW5nQ291bnQgPSBudW1Gb3VuZDsKICAgICAgICAgZmluZENvbXBsZXRp b24oKTsKKyAgICB9CiB9CiAKIC0gKE5TVVJMICopX1VSTFdpdGhQYWdlSW5kZXg6KE5TSW50ZWdl cilwYWdlSW5kZXgK 351557 2018-10-03 16:00:07 -0700 2018-10-03 16:34:34 -0700 Patch bug-190020-20181003160007.patch text/plain 3301 zhaque U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2ODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY3ZTI3YWU5YWJkZjQ2ODNk NTBjYjcxNjcxMDM2NDE3MjMyNDllOTEuLjFhZDM5OTI1Y2JjNTdjNWUwOTNjYTUwMTk3NzE0ZTg2 MDcyOGJiMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTgtMTAtMDMgIFphbWl1bCBI YXF1ZSAgPHpoYXF1ZUBhcHBsZS5jb20+CisKKyAgICAgICAgU2VhcmNoIGRvZXMgbm90IGNhbmNl bCBhZnRlciBudW1iZXIgb2YgbWF0Y2hpbmcgdGVybXMgZXhjZWVkIHNldCBtYXggbGltaXQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDAyMAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzk1ODUyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5k eSBFc3Rlcy4KKworICAgICAgICBXaGVuIHNlYXJjaGluZyBhIFBERiBkb2N1bWVudCBvbiBNb2Jp bGVTYWZhcmksIHRoZSBtYXhpbXVtIG51bWJlciBvZiBtYXRjaGluZworICAgICAgICB0ZXJtcyBh cmUgbGltaXRlZCB0byBhIHNldCBjb25zdGFudC4gQmV5b25kIHRoaXMgbGltaXQsIGEgUERGIGRv Y3VtZW50IHNob3VsZCBub3QKKyAgICAgICAgYmUgc2VhcmNoZWQsIHNpbmNlIHRoZSBVSSB3aWxs IG5vdCBiZSB1cGRhdGVkIGNvcnJlc3BvbmRpbmdseS4gVG8gdGhpcyBlZmZlY3QsCisgICAgICAg IGEgbmV3IFNQSSB3YXMgbWFkZSB0byBjYW5jZWwgYSBzZWFyY2ggd2hlbiB0aGUgbWF4aW11bSBs aW1pdCBvZiBtYXRjaGluZyB0ZXJtcworICAgICAgICBpcyByZWFjaGVkLiBUaGlzIGlzIGRvbmUg d2l0aG91dCBjbGVhcmluZyB0aGUgaGlnaGxpZ2h0aW5nIGZvciB0aGUgYWxsIHRoZSB0ZXJtcwor ICAgICAgICB0aGF0IHdlcmUgZm91bmQgdW5kZXIgdGhlIGxpbWl0LiBUaGlzIGJ1ZyB3YXMgYSBy ZXN1bHQgb2Ygbm90IGhhdmluZyBpbXBsZW1lbnRlZCAKKyAgICAgICAgdGhlIG5ldyBTUEkgaW4g V0tQREZWaWV3LgorCisgICAgICAgIFRoaXMgd2lsbCBiZSB0ZXN0ZWQgaW4gYSBmb2xsb3ctdXAg cGF0Y2gsIGFmdGVyIHJlLWVuYWJsaW5nIFdLUERGVmlldyB0ZXN0cworICAgICAgICBvbiBpT1Mg MTIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLUERGVmlldy5tbToKKyAgICAgICAgKC1b V0tQREZWaWV3IHBkZkhvc3RWaWV3Q29udHJvbGxlcjpmaW5kU3RyaW5nVXBkYXRlOmRvbmU6XSk6 CisKIDIwMTgtMTAtMDMgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAg W0NvY29hXSBSRUdSRVNTSU9OOiB3ZWIgY29udGVudCBwcm9jZXNzIHBhdXNlZCBpbiBkZWJ1Z2dl ciBpcyBjb25zaWRlcmVkIHRvIGJlIHVucmVzcG9uc2l2ZSBpZiBXZWJLaXQgY2xpZW50IGlzIHNh bmRib3hlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1BERktp dFNQSS5oIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1BERktpdFNQSS5oCmluZGV4 IDU4MzczMzM0ZGFlOWQxZWNlN2JhNjIzOWRjMDk3YjU1NGIwMTBlOGEuLjkzYjAxMDU2ODUwNTNl NjJhZjMyZDE3ZTJmMGUzZWEwNzFhYTEzMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxh dGZvcm0vc3BpL2lvcy9QREZLaXRTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3Nw aS9pb3MvUERGS2l0U1BJLmgKQEAgLTQ1LDYgKzQ1LDcgQEAKIAogLSAodm9pZCkgZmluZFN0cmlu ZzooTlNTdHJpbmcqKSBzdHJpbmcgd2l0aE9wdGlvbnM6KE5TU3RyaW5nQ29tcGFyZU9wdGlvbnMp IG9wdGlvbnM7CiAtICh2b2lkKSBjYW5jZWxGaW5kU3RyaW5nOworLSAodm9pZCkgY2FuY2VsRmlu ZFN0cmluZ1dpdGhIaWdobGlnaHRzQ2xlYXJlZDooQk9PTCljbGVhcmVkOwogLSAodm9pZCkgZm9j dXNPblNlYXJjaFJlc3VsdEF0SW5kZXg6KE5TVUludGVnZXIpIHNlYXJjaEluZGV4OwogCiAtIChO U0ludGVnZXIpIGN1cnJlbnRQYWdlSW5kZXg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL UERGVmlldy5tbQppbmRleCBkZmY0YzZjYmYwMDMyZTE1NWNiY2I5MWYxM2FiZmIzZGMyMzQwMWVh Li42ZGRkNjM1YmEyMGZmOTU4NTFkMTdjMGM2M2NhNDQ1NGVmNTlhNWFiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tQREZWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS1BERlZpZXcubW0KQEAgLTM5MiwxNCArMzkyLDE4IEBAIC0gKHZv aWQpcGRmSG9zdFZpZXdDb250cm9sbGVyOihQREZIb3N0Vmlld0NvbnRyb2xsZXIgKiljb250cm9s bGVyIGRvY3VtZW50RGlkVW5sCiAKIC0gKHZvaWQpcGRmSG9zdFZpZXdDb250cm9sbGVyOihQREZI b3N0Vmlld0NvbnRyb2xsZXIgKiljb250cm9sbGVyIGZpbmRTdHJpbmdVcGRhdGU6KE5TVUludGVn ZXIpbnVtRm91bmQgZG9uZTooQk9PTClkb25lCiB7Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBz dG9wIHNlYXJjaGluZyBvbmNlIG51bUZvdW5kIGV4Y2VlZHMgX2ZpbmRTdHJpbmdNYXhDb3VudCwg YnV0IFBERktpdCBkb2Vzbid0Ci0gICAgLy8gYWxsb3cgdXMgdG8gc3RvcCB0aGUgc2VhcmNoIHdp dGhvdXQgYWxzbyBjbGVhcmluZyB0aGUgc2VhcmNoIGhpZ2hsaWdodHMuIFNlZSA8cmRhcjovL3By b2JsZW0vMzk1NDY5NzM+LgorICAgIGlmIChudW1Gb3VuZCA+IF9maW5kU3RyaW5nTWF4Q291bnQg JiYgIWRvbmUpIHsKKyAgICAgICAgW2NvbnRyb2xsZXIgY2FuY2VsRmluZFN0cmluZ1dpdGhIaWdo bGlnaHRzQ2xlYXJlZDpOT107CisgICAgICAgIGRvbmUgPSBZRVM7CisgICAgfQorICAgIAogICAg IGlmICghZG9uZSkKICAgICAgICAgcmV0dXJuOwotCi0gICAgX2ZpbmRTdHJpbmdDb3VudCA9IG51 bUZvdW5kOwotICAgIGlmIChhdXRvIGZpbmRDb21wbGV0aW9uID0gc3RkOjpleGNoYW5nZShfZmlu ZENvbXBsZXRpb24sIG5pbCkpCisgICAgCisgICAgaWYgKGF1dG8gZmluZENvbXBsZXRpb24gPSBz dGQ6OmV4Y2hhbmdlKF9maW5kQ29tcGxldGlvbiwgbmlsKSkgeworICAgICAgICBfZmluZFN0cmlu Z0NvdW50ID0gbnVtRm91bmQ7CiAgICAgICAgIGZpbmRDb21wbGV0aW9uKCk7CisgICAgfQogfQog CiAtIChOU1VSTCAqKV9VUkxXaXRoUGFnZUluZGV4OihOU0ludGVnZXIpcGFnZUluZGV4Cg==