136876 2014-09-16 17:15:15 -0700 Should have an editing behavior specific for IOS 2014-09-16 18:30:21 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 enrica enrica commit-queue rniwa sam oldest_to_newest 1035634 0 enrica 2014-09-16 17:15:15 -0700 In order to avoid using PLATFORM guards to have different editing behaviors on iOS we should have an editing behavior that is specific to iOS. 1035641 1 238228 enrica 2014-09-16 17:27:44 -0700 Created attachment 238228 Patch 1035643 2 commit-queue 2014-09-16 17:29:20 -0700 Attachment 238228 did not pass style-queue: ERROR: Source/WebCore/editing/DeleteSelectionCommand.cpp:868: Consider using toText helper function in WebCore/dom/Text.h instead of static_cast<Text*> [readability/check] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1035647 3 238228 sam 2014-09-16 17:42:32 -0700 Comment on attachment 238228 Patch Looks good! Now that we have this as a behavior, can we add a test for it. 1035648 4 238228 rniwa 2014-09-16 17:47:36 -0700 Comment on attachment 238228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238228&action=review > Source/WebCore/editing/FrameSelection.cpp:619 > - if (m_frame && m_frame->settings().editingBehaviorType() == EditingMacBehavior) > + if (m_frame && (m_frame->settings().editingBehaviorType() == EditingMacBehavior || m_frame->settings().editingBehaviorType() == EditingIOSBehavior)) We should extract this into a helper function in EditingBehavior.h, not that you should do it in this patch. > Source/WebCore/testing/InternalSettings.cpp:353 > + else if (equalIgnoringCase(editingBehavior, "ios")) > + settings()->setEditingBehaviorType(EditingIOSBehavior); Are you gonna update existing tests in a follow up patch? 1035651 5 enrica 2014-09-16 17:50:37 -0700 > We should extract this into a helper function in EditingBehavior.h, not that you should do it in this patch. > Agreed. This is the only place where we check the EditingBehaviorType directly. > > Source/WebCore/testing/InternalSettings.cpp:353 > > + else if (equalIgnoringCase(editingBehavior, "ios")) > > + settings()->setEditingBehaviorType(EditingIOSBehavior); > > Are you gonna update existing tests in a follow up patch? All the tests currently set the editing behavior as Mac and they should all continue to work. We don't have any test that currently test the iOS behavior, but this change will allow us to have some. 1035656 6 sam 2014-09-16 18:30:21 -0700 (In reply to comment #5) > > We should extract this into a helper function in EditingBehavior.h, not that you should do it in this patch. > > > Agreed. This is the only place where we check the EditingBehaviorType directly. > > > > Source/WebCore/testing/InternalSettings.cpp:353 > > > + else if (equalIgnoringCase(editingBehavior, "ios")) > > > + settings()->setEditingBehaviorType(EditingIOSBehavior); > > > > Are you gonna update existing tests in a follow up patch? > All the tests currently set the editing behavior as Mac and they should all continue to work. > We don't have any test that currently test the iOS behavior, but this change will allow us to have some. Hm, I probably should have had you break this up into two patches then, one to add the ability to test the iOS behavior, and one that actually changed the code and added a test. Please do add a test though. 238228 2014-09-16 17:27:44 -0700 2014-09-16 17:47:36 -0700 Patch iosbehavior.txt text/plain 9675 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDE0LTA5LTE2ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgU2hvdWxkIGhhdmUgYW4gZWRp dGluZyBiZWhhdmlvciBzcGVjaWZpYyBmb3IgSU9TLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2ODc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBpbnRyb2R1Y2VzIGEgbmV3IGVkaXRp bmcgYmVoYXZpb3IgdHlwZSB0byBiZSBhYmxlCisgICAgICAgIHRvIHBlcmZvcm0gZWRpdGluZyB0 YXNrcyB0aGF0IGFyZSBzcGVjaWZpYyB0byBpT1MuCisgICAgICAgIEFsbCB0aGUgZXhpc3Rpbmcg RWRpdGluZ0JlaGF2aW9yIG1ldGhvZHMgcmV0dXJuIHRoZSBzYW1lIGJvb2xlYW4KKyAgICAgICAg dmFsdWUgZm9yIGZvciBNYWMgYW5kIGlPUy4gQSBuZXcgb25lIGhhcyBiZWVuIGludHJvZHVjZWQg dG8gc3VwcG9ydAorICAgICAgICBhIHNwZWNpZmljIGJlaGF2aW9yIGluIHRoZSBEZWxldGVTZWxl Y3Rpb25Db21tYW5kLgorCisgICAgICAgICogZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5k LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlbGV0ZVNlbGVjdGlvbkNvbW1hbmQ6OmRvQXBwbHkp OgorICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ0JlaGF2aW9yLmg6CisgICAgICAgIChXZWJDb3Jl OjpFZGl0aW5nQmVoYXZpb3I6OnNob3VsZENvbnNpZGVyU2VsZWN0aW9uQXNEaXJlY3Rpb25hbCk6 CisgICAgICAgIChXZWJDb3JlOjpFZGl0aW5nQmVoYXZpb3I6OnNob3VsZENlbnRlckFsaWduV2hl blNlbGVjdGlvbklzUmV2ZWFsZWQpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ0JlaGF2aW9y OjpzaG91bGRUb2dnbGVTdHlsZUJhc2VkT25TdGFydE9mU2VsZWN0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OkVkaXRpbmdCZWhhdmlvcjo6c2hvdWxkQWx3YXlzR3Jvd1NlbGVjdGlvbldoZW5FeHRl bmRpbmdUb0JvdW5kYXJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRpbmdCZWhhdmlvcjo6c2hv dWxkU2VsZWN0T25Db250ZXh0dWFsTWVudUNsaWNrKToKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRp bmdCZWhhdmlvcjo6c2hvdWxkRXh0ZW5kU2VsZWN0aW9uQnlXb3JkT3JMaW5lQWNyb3NzQ2FyZXQp OgorICAgICAgICAoV2ViQ29yZTo6RWRpdGluZ0JlaGF2aW9yOjpzaG91bGRSZWJhbGFuY2VXaGl0 ZVNwYWNlc0luU2VjdXJlRmllbGQpOgorICAgICAgICAqIGVkaXRpbmcvRWRpdGluZ0JlaGF2aW9y VHlwZXMuaDoKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjpwb3NpdGlvbkZvclBsYXRmb3JtKToKKyAgICAgICAg KiBwYWdlL1NldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmVkaXRpbmdCZWhhdmlvclR5 cGVGb3JQbGF0Zm9ybSk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OnNldEVkaXRpbmdCZWhhdmlvcik6 CisKIDIwMTQtMDktMTYgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNzM2NzAuCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5jcHAJKHJldmlz aW9uIDE3MzY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRGVsZXRlU2VsZWN0aW9uQ29t bWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg2MSwyNCArODYxLDE3IEBAIHZvaWQgRGVsZXRl U2VsZWN0aW9uQ29tbWFuZDo6ZG9BcHBseSgpCiAgICAgICAgIGluc2VydE5vZGVBdChwbGFjZWhv bGRlci5nZXQoKSwgbV9lbmRpbmdQb3NpdGlvbik7CiAgICAgfQogCi0jaWYgUExBVEZPUk0oSU9T KQotICAgIC8vIFRoaXMgY2hlY2tpbmcgaXMgZHVlIHRvIGlwaG9uZSBzaG93cyB0aGUgbGFzdCBl bnRlcmVkIGNoYXJhY3RlciBtb21lbnRhcmlseSwgcmVtb3ZpbmcgYW5kIGFkZGluZyBiYWNrIHRo ZSAKLSAgICAvLyBzcGFjZSB3aGVuIGRlbGV0aW5nIHBhc3N3b3JkIGNhdXNlIHNwYWNlIGJlZW4g c2hvd2VkIGluc2VjdXJlbHkuCi0gICAgYm9vbCBpc1NlY3VyZSA9IE5POwotICAgIE5vZGUqIG5v ZGUgPSBtX2VuZGluZ1Bvc2l0aW9uLmRlcHJlY2F0ZWROb2RlKCk7Ci0gICAgaWYgKG5vZGUgJiYg bm9kZS0+aXNUZXh0Tm9kZSgpKSB7Ci0gICAgICAgIFRleHQqIHRleHROb2RlID0gc3RhdGljX2Nh c3Q8VGV4dCo+KG5vZGUpOyAgICAKLSAgICAgICAgaWYgKHRleHROb2RlLT5sZW5ndGgoKSA+IDAp IHsKLSAgICAgICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSB0ZXh0Tm9kZS0+cmVuZGVy ZXIoKTsKLSAgICAgICAgICAgIGlzU2VjdXJlID0gcmVuZGVyZXItPnN0eWxlKCkudGV4dFNlY3Vy aXR5KCkgIT0gVFNOT05FOwotICAgICAgICB9CisgICAgYm9vbCBzaG91bGRSZWJhbGFjZVdoaXRl U3BhY2UgPSB0cnVlOworICAgIGlmICghZnJhbWUoKS5lZGl0b3IoKS5iZWhhdmlvcigpLnNob3Vs ZFJlYmFsYW5jZVdoaXRlU3BhY2VzSW5TZWN1cmVGaWVsZCgpKSB7CisgICAgICAgIE5vZGUqIG5v ZGUgPSBtX2VuZGluZ1Bvc2l0aW9uLmRlcHJlY2F0ZWROb2RlKCk7CisgICAgICAgIGlmIChub2Rl ICYmIG5vZGUtPmlzVGV4dE5vZGUoKSkgeworICAgICAgICAgICAgVGV4dCogdGV4dE5vZGUgPSBz dGF0aWNfY2FzdDxUZXh0Kj4obm9kZSk7CisgICAgICAgICAgICBpZiAodGV4dE5vZGUtPmxlbmd0 aCgpKQorICAgICAgICAgICAgICAgIHNob3VsZFJlYmFsYWNlV2hpdGVTcGFjZSA9IHRleHROb2Rl LT5yZW5kZXJlcigpLT5zdHlsZSgpLnRleHRTZWN1cml0eSgpID09IFRTTk9ORTsKKyAgICAgICAg fSAgICAgICAgCiAgICAgfQotICAgICAgICAKLSAgICBpZiAoIWlzU2VjdXJlKQorICAgIGlmIChz aG91bGRSZWJhbGFjZVdoaXRlU3BhY2UpCiAgICAgICAgIHJlYmFsYW5jZVdoaXRlc3BhY2VBdCht X2VuZGluZ1Bvc2l0aW9uKTsKLSNlbHNlCi0gICAgcmViYWxhbmNlV2hpdGVzcGFjZUF0KG1fZW5k aW5nUG9zaXRpb24pOwotI2VuZGlmCiAKICAgICBjYWxjdWxhdGVUeXBpbmdTdHlsZUFmdGVyRGVs ZXRlKCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ0JlaGF2aW9yLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3IuaAko cmV2aXNpb24gMTczNjc5KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZp b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsMjIgKzQ2LDIyIEBAIHB1YmxpYzoKIAogICAgIC8v IE9uIFdpbmRvd3MsIHNlbGVjdGlvbnMgc2hvdWxkIGFsd2F5cyBiZSBjb25zaWRlcmVkIGFzIGRp cmVjdGlvbmFsLCByZWdhcmRsZXNzIGlmIGl0IGlzCiAgICAgLy8gbW91c2UtYmFzZWQgb3Iga2V5 Ym9hcmQtYmFzZWQuCi0gICAgYm9vbCBzaG91bGRDb25zaWRlclNlbGVjdGlvbkFzRGlyZWN0aW9u YWwoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgIT0gRWRpdGluZ01hY0JlaGF2aW9yOyB9CisgICAg Ym9vbCBzaG91bGRDb25zaWRlclNlbGVjdGlvbkFzRGlyZWN0aW9uYWwoKSBjb25zdCB7IHJldHVy biBtX3R5cGUgIT0gRWRpdGluZ01hY0JlaGF2aW9yICYmIG1fdHlwZSAhPSBFZGl0aW5nSU9TQmVo YXZpb3I7IH0KIAogICAgIC8vIE9uIE1hYywgd2hlbiByZXZlYWxpbmcgYSBzZWxlY3Rpb24gKGZv ciBleGFtcGxlIGFzIGEgcmVzdWx0IG9mIGEgRmluZCBvcGVyYXRpb24gb24gdGhlIEJyb3dzZXIp LAogICAgIC8vIGNvbnRlbnQgc2hvdWxkIGJlIHNjcm9sbGVkIHN1Y2ggdGhhdCB0aGUgc2VsZWN0 aW9uIGdldHMgY2VydGVyIGFsaWduZWQuCi0gICAgYm9vbCBzaG91bGRDZW50ZXJBbGlnbldoZW5T ZWxlY3Rpb25Jc1JldmVhbGVkKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IEVkaXRpbmdNYWNC ZWhhdmlvcjsgfQorICAgIGJvb2wgc2hvdWxkQ2VudGVyQWxpZ25XaGVuU2VsZWN0aW9uSXNSZXZl YWxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBFZGl0aW5nTWFjQmVoYXZpb3IgfHwgbV90 eXBlID09IEVkaXRpbmdJT1NCZWhhdmlvcjsgfQogCiAgICAgLy8gT24gTWFjLCBzdHlsZSBpcyBj b25zaWRlcmVkIHByZXNlbnQgd2hlbiBwcmVzZW50IGF0IHRoZSBiZWdpbm5pbmcgb2Ygc2VsZWN0 aW9uLiBPbiBvdGhlciBwbGF0Zm9ybXMsCiAgICAgLy8gc3R5bGUgaGFzIHRvIGJlIHByZXNlbnQg dGhyb3VnaG91dCB0aGUgc2VsZWN0aW9uLgotICAgIGJvb2wgc2hvdWxkVG9nZ2xlU3R5bGVCYXNl ZE9uU3RhcnRPZlNlbGVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBFZGl0aW5nTWFj QmVoYXZpb3I7IH0KKyAgICBib29sIHNob3VsZFRvZ2dsZVN0eWxlQmFzZWRPblN0YXJ0T2ZTZWxl Y3Rpb24oKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gRWRpdGluZ01hY0JlaGF2aW9yIHx8IG1f dHlwZSA9PSBFZGl0aW5nSU9TQmVoYXZpb3I7IH0KIAogICAgIC8vIFN0YW5kYXJkIE1hYyBiZWhh dmlvciB3aGVuIGV4dGVuZGluZyB0byBhIGJvdW5kYXJ5IGlzIGdyb3cgdGhlIHNlbGVjdGlvbiBy YXRoZXIgdGhhbiBsZWF2aW5nIHRoZSBiYXNlCiAgICAgLy8gaW4gcGxhY2UgYW5kIG1vdmluZyB0 aGUgZXh0ZW50LiBNYXRjaGVzIE5TVGV4dFZpZXcuCi0gICAgYm9vbCBzaG91bGRBbHdheXNHcm93 U2VsZWN0aW9uV2hlbkV4dGVuZGluZ1RvQm91bmRhcnkoKSBjb25zdCB7IHJldHVybiBtX3R5cGUg PT0gRWRpdGluZ01hY0JlaGF2aW9yOyB9CisgICAgYm9vbCBzaG91bGRBbHdheXNHcm93U2VsZWN0 aW9uV2hlbkV4dGVuZGluZ1RvQm91bmRhcnkoKSBjb25zdCB7IHJldHVybiBtX3R5cGUgPT0gRWRp dGluZ01hY0JlaGF2aW9yIHx8IG1fdHlwZSA9PSBFZGl0aW5nSU9TQmVoYXZpb3I7IH0KIAogICAg IC8vIE9uIE1hYywgd2hlbiBwcm9jZXNzaW5nIGEgY29udGV4dHVhbCBjbGljaywgdGhlIG9iamVj dCBiZWluZyBjbGlja2VkIHVwb24gc2hvdWxkIGJlIHNlbGVjdGVkLgotICAgIGJvb2wgc2hvdWxk U2VsZWN0T25Db250ZXh0dWFsTWVudUNsaWNrKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IEVk aXRpbmdNYWNCZWhhdmlvcjsgfQorICAgIGJvb2wgc2hvdWxkU2VsZWN0T25Db250ZXh0dWFsTWVu dUNsaWNrKCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IEVkaXRpbmdNYWNCZWhhdmlvciB8fCBt X3R5cGUgPT0gRWRpdGluZ0lPU0JlaGF2aW9yOyB9CiAKICAgICAvLyBPbiBMaW51eCwgc2hvdWxk IGJlIGFibGUgdG8gZ2V0IGFuZCBpbnNlcnQgc3BlbGxpbmcgc3VnZ2VzdGlvbnMgd2l0aG91dCBz ZWxlY3RpbmcgdGhlIG1pc3NwZWxsZWQgd29yZC4KICAgICBib29sIHNob3VsZEFsbG93U3BlbGxp bmdTdWdnZXN0aW9uc1dpdGhvdXRTZWxlY3Rpb24oKSBjb25zdApAQCAtNzgsMTMgKzc4LDE3IEBA IHB1YmxpYzoKICAgICAvLyBPbiBNYWMsIHNlbGVjdGluZyBiYWNrd2FyZHMgYnkgd29yZC9saW5l IGZyb20gdGhlIG1pZGRsZSBvZiBhIHdvcmQvbGluZSwgYW5kIHRoZW4gZ29pbmcKICAgICAvLyBm b3J3YXJkIGxlYXZlcyB0aGUgY2FyZXQgYmFjayBpbiB0aGUgbWlkZGxlIHdpdGggbm8gc2VsZWN0 aW9uLCBpbnN0ZWFkIG9mIGRpcmVjdGx5IHNlbGVjdGluZwogICAgIC8vIHRvIHRoZSBvdGhlciBl bmQgb2YgdGhlIGxpbmUvd29yZCAoVW5peC9XaW5kb3dzIGJlaGF2aW9yKS4KLSAgICBib29sIHNo b3VsZEV4dGVuZFNlbGVjdGlvbkJ5V29yZE9yTGluZUFjcm9zc0NhcmV0KCkgY29uc3QgeyByZXR1 cm4gbV90eXBlICE9IEVkaXRpbmdNYWNCZWhhdmlvcjsgfQorICAgIGJvb2wgc2hvdWxkRXh0ZW5k U2VsZWN0aW9uQnlXb3JkT3JMaW5lQWNyb3NzQ2FyZXQoKSBjb25zdCB7IHJldHVybiBtX3R5cGUg IT0gRWRpdGluZ01hY0JlaGF2aW9yICYmIG1fdHlwZSAhPSBFZGl0aW5nSU9TQmVoYXZpb3I7IH0K IAogICAgIC8vIEJhc2VkIG9uIG5hdGl2ZSBiZWhhdmlvciwgd2hlbiB1c2luZyBjdHJsKGFsdCkr YXJyb3cgdG8gbW92ZSBjYXJldCBieSB3b3JkLCBjdHJsKGFsdCkrbGVmdCBhcnJvdyBtb3ZlcyBj YXJldCB0bwogICAgIC8vIGltbWVkaWF0ZWx5IGJlZm9yZSB0aGUgd29yZCBpbiBhbGwgcGxhdGZv cm1zLCBmb3IgZXhhbXBsZSwgdGhlIHdvcmQgYnJlYWsgcG9zaXRpb25zIGFyZTogInxhYmMgfGRl ZiB8aGlqIHxvcHEiLgogICAgIC8vIEJ1dCBjdHJsK3JpZ2h0IGFycm93IG1vdmVzIGNhcmV0IHRv ICJhYmMgfGRlZiB8aGlqIHxvcHEiIG9uIFdpbmRvd3MgYW5kICJhYmN8IGRlZnwgaGlqfCBvcHF8 IiBvbiBNYWMgYW5kIExpbnV4LgogICAgIGJvb2wgc2hvdWxkU2tpcFNwYWNlV2hlbk1vdmluZ1Jp Z2h0KCkgY29uc3QgeyByZXR1cm4gbV90eXBlID09IEVkaXRpbmdXaW5kb3dzQmVoYXZpb3I7IH0K IAorICAgIC8vIE9uIGlPUyB0aGUgbGFzdCBlbnRlcmVkIGNoYXJhY3RlciBpbiBhIHNlY3VyZSBm aWxlZCBpcyBzaG93biBtb21lbnRhcmlseSwgcmVtb3ZpbmcgYW5kIGFkZGluZyBiYWNrIHRoZQor ICAgIC8vIHNwYWNlIHdoZW4gZGVsZXRpbmcgcGFzc3dvcmQgY2F1c2Ugc3BhY2UgYmVlbiBzaG93 ZWQgaW5zZWN1cmVseS4KKyAgICBib29sIHNob3VsZFJlYmFsYW5jZVdoaXRlU3BhY2VzSW5TZWN1 cmVGaWVsZCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSAhPSBFZGl0aW5nSU9TQmVoYXZpb3I7IH0K KwogcHJpdmF0ZToKICAgICBFZGl0aW5nQmVoYXZpb3JUeXBlIG1fdHlwZTsKIH07CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvclR5cGVzLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZpb3JUeXBlcy5oCShyZXZpc2lv biAxNzM2NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvclR5cGVz LmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDcgKzM5LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ZW51bSBFZGl0aW5nQmVoYXZpb3JUeXBlIHsKICAgICBFZGl0aW5nTWFjQmVoYXZpb3IsCiAgICAg RWRpdGluZ1dpbmRvd3NCZWhhdmlvciwKLSAgICBFZGl0aW5nVW5peEJlaGF2aW9yCisgICAgRWRp dGluZ1VuaXhCZWhhdmlvciwKKyAgICBFZGl0aW5nSU9TQmVoYXZpb3IKIH07CiAKIH0gLy8gV2Vi Q29yZSBuYW1lc3BhY2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rp b24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rp b24uY3BwCShyZXZpc2lvbiAxNzM2NzkpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjE2LDcgKzYxNiw3IEBAIHZvaWQgRnJh bWVTZWxlY3Rpb246OndpbGxCZU1vZGlmaWVkKEVBbHQKIAogVmlzaWJsZVBvc2l0aW9uIEZyYW1l U2VsZWN0aW9uOjpwb3NpdGlvbkZvclBsYXRmb3JtKGJvb2wgaXNHZXRTdGFydCkgY29uc3QKIHsK LSAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1lLT5zZXR0aW5ncygpLmVkaXRpbmdCZWhhdmlvclR5 cGUoKSA9PSBFZGl0aW5nTWFjQmVoYXZpb3IpCisgICAgaWYgKG1fZnJhbWUgJiYgKG1fZnJhbWUt PnNldHRpbmdzKCkuZWRpdGluZ0JlaGF2aW9yVHlwZSgpID09IEVkaXRpbmdNYWNCZWhhdmlvciB8 fCBtX2ZyYW1lLT5zZXR0aW5ncygpLmVkaXRpbmdCZWhhdmlvclR5cGUoKSA9PSBFZGl0aW5nSU9T QmVoYXZpb3IpKQogICAgICAgICByZXR1cm4gaXNHZXRTdGFydCA/IG1fc2VsZWN0aW9uLnZpc2li bGVTdGFydCgpIDogbV9zZWxlY3Rpb24udmlzaWJsZUVuZCgpOwogICAgIC8vIExpbnV4IGFuZCBX aW5kb3dzIGFsd2F5cyBleHRlbmQgc2VsZWN0aW9ucyBmcm9tIHRoZSBleHRlbnQgZW5kcG9pbnQu CiAgICAgLy8gRklYTUU6IFZpc2libGVTZWxlY3Rpb24gc2hvdWxkIGJlIGZpeGVkIHRvIGVuc3Vy ZSBhcyBhbiBpbnZhcmlhbnQgdGhhdApJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5n cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHJl dmlzaW9uIDE3MzY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDcsNyArMTA3LDkgQEAgYm9vbCBTZXR0aW5nczo6Z01hbmFnZUF1ZGlv U2Vzc2lvbiA9IGZhbAogc3RhdGljIEVkaXRpbmdCZWhhdmlvclR5cGUgZWRpdGluZ0JlaGF2aW9y VHlwZUZvclBsYXRmb3JtKCkKIHsKICAgICByZXR1cm4KLSNpZiBPUyhEQVJXSU4pCisjaWYgUExB VEZPUk0oSU9TKQorICAgIEVkaXRpbmdJT1NCZWhhdmlvcgorI2VsaWYgT1MoREFSV0lOKQogICAg IEVkaXRpbmdNYWNCZWhhdmlvcgogI2VsaWYgT1MoV0lORE9XUykKICAgICBFZGl0aW5nV2luZG93 c0JlaGF2aW9yCkluZGV4OiBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFsU2V0dGluZ3Mu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5n cy5jcHAJKHJldmlzaW9uIDE3MzY3OSkKKysrIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJu YWxTZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0OSw2ICszNDksOCBAQCB2b2lkIElu dGVybmFsU2V0dGluZ3M6OnNldEVkaXRpbmdCZWhhdmlvCiAgICAgICAgIHNldHRpbmdzKCktPnNl dEVkaXRpbmdCZWhhdmlvclR5cGUoRWRpdGluZ01hY0JlaGF2aW9yKTsKICAgICBlbHNlIGlmIChl cXVhbElnbm9yaW5nQ2FzZShlZGl0aW5nQmVoYXZpb3IsICJ1bml4IikpCiAgICAgICAgIHNldHRp bmdzKCktPnNldEVkaXRpbmdCZWhhdmlvclR5cGUoRWRpdGluZ1VuaXhCZWhhdmlvcik7CisgICAg ZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UoZWRpdGluZ0JlaGF2aW9yLCAiaW9zIikpCisgICAg ICAgIHNldHRpbmdzKCktPnNldEVkaXRpbmdCZWhhdmlvclR5cGUoRWRpdGluZ0lPU0JlaGF2aW9y KTsKICAgICBlbHNlCiAgICAgICAgIGVjID0gU1lOVEFYX0VSUjsKIH0K