157611 2016-05-11 22:45:08 -0700 indexForVisiblePosition should use the root editable element as the scope 2016-05-12 12:50:22 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa darin enrica webkit-bug-importer oldest_to_newest 1192227 0 rniwa 2016-05-11 22:45:08 -0700 We should be using the highest editing host as the scope in indexForVisiblePosition when it's called inside an editable region. This is blocking the work to make VoiceOver work with undo/redo after the rewrite in the bug 153361. 1192228 1 webkit-bug-importer 2016-05-11 22:45:48 -0700 <rdar://problem/26239047> 1192232 2 278700 rniwa 2016-05-11 22:53:41 -0700 Created attachment 278700 Cleanup 1192233 3 278701 rniwa 2016-05-11 22:54:34 -0700 Created attachment 278701 Removed redundant assertion 1192352 4 278701 darin 2016-05-12 09:17:54 -0700 Comment on attachment 278701 Removed redundant assertion View in context: https://bugs.webkit.org/attachment.cgi?id=278701&action=review > Source/WebCore/editing/ApplyBlockElementCommand.cpp:100 > + // Workaround the fact indexForVisiblePosition can return a larger index due to TextIterator The verb is two word: "work around". The noun is "workaround". Here we are using it as a verb. > Source/WebCore/editing/ApplyBlockElementCommand.cpp:102 > + // FIXME: Add a new TextIterator beavhior to suppress this behavior. Spelling error here in the first "behavior". I find the two uses of the word "behavior" here confusing, so I would use the identifier TextIteratorBehavior to be clearer. > Source/WebCore/editing/htmlediting.cpp:1137 > + Document& document = *position.document(); auto& perhaps > Source/WebCore/editing/htmlediting.cpp:1141 > + scope = downcast<ContainerNode>(editableRoot); If this is a safe cast, then why does highestEditableRoot return a Node* and not a ContanerNode*? > Source/WebCore/editing/htmlediting.cpp:1149 > + RefPtr<Range> range = Range::create(document, firstPositionInNode(scope.get()), position.parentAnchoredEquivalent()); Should use auto here instead of RefPtr<Range>. I believe this will make range be a Ref instead of a RefPtr. 1192423 5 278701 rniwa 2016-05-12 12:50:02 -0700 Comment on attachment 278701 Removed redundant assertion View in context: https://bugs.webkit.org/attachment.cgi?id=278701&action=review Thanks for the review >> Source/WebCore/editing/htmlediting.cpp:1141 >> + scope = downcast<ContainerNode>(editableRoot); > > If this is a safe cast, then why does highestEditableRoot return a Node* and not a ContanerNode*? We should probably change highestEditableRoot to return a ContainerNode* later. 1192424 6 rniwa 2016-05-12 12:50:22 -0700 Committed r200787: <http://trac.webkit.org/changeset/200787> 278700 2016-05-11 22:53:41 -0700 2016-05-11 22:54:30 -0700 Cleanup bug-157611-20160511225431.patch text/plain 7288 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDc0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA1LTExICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIGluZGV4Rm9yVmlzaWJsZVBvc2l0 aW9uIHNob3VsZCB1c2UgdGhlIHJvb3QgZWRpdGFibGUgZWxlbWVudCBhcyB0aGUgc2NvcGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzYxMQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgaGln aGVzdCBlZGl0aW5nIGhvc3QgaW5zdGVhZCBvZiB0aGUgZG9jdW1lbnQgbm9kZSBhcyB0aGUgc2Nv cGUgaW4gaW5kZXhGb3JWaXNpYmxlUG9zaXRpb24KKyAgICAgICAgd2hlbiBpdCdzIGNhbGxlZCBp bnNpZGUgYW4gZWRpdGFibGUgcmVnaW9uLiBUaGlzIHJlZmFjdG9yaW5nIGlzIG5lY2Vzc2FyeSB0 byB1bmJsb2NrIHRoZSB3b3JrIHRvIHN1cHBvcnQKKyAgICAgICAgdW5kby9yZWRvIGluIFZvaWNl T3ZlciBhZnRlciByMTk5MDMwLgorCisgICAgICAgIFdlIGhhdmUgdG8gd29ya2Fyb3VuZCBhIGJ1 ZyBpbiBpbmRleEZvclZpc2libGVQb3NpdGlvbiB0aGF0IGl0IGNvdWxkIHJldHVybiBhIHNsaWdo dGx5IGhpZ2hlciBpbmRleCB0aGFuCisgICAgICAgIHRoZSBleHBlY3RlZCB2YWx1ZSBiZWNhdXNl IFRleHRJdGVyYXRvciBlbWl0cyBhbiBleHRyYSBuZXcgbGluZSBhZnRlciBhIGJsb2NrIGVsZW1l bnQgd2l0aCBhIGxhcmdlIG1hcmdpbgorICAgICAgICBhdCB0aGUgYm90dG9tLiBVbmZvcnR1bmF0 ZWx5LCBmaXhpbmcgdGhpcyByZXF1aXJlcyBhIGxvdCBvZiBjb2RlIGNoYW5nZXMgc2luY2UgdGhl IHJlc3Qgb2YgdGhlIGVkaXRpbmcKKyAgICAgICAgY29kZSBhc3N1bWVzIHRoaXMgYmVoYXZpb3Ig YW5kL29yIGhhcHBlbnMgdG8gY2FuY2VsIGl0IG91dCB3aXRoIHNvbWUgb3RoZXIgcXVpcmtzLgor CisgICAgICAgICogZWRpdGluZy9BcHBseUJsb2NrRWxlbWVudENvbW1hbmQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6QXBwbHlCbG9ja0VsZW1lbnRDb21tYW5kOjpkb0FwcGx5KToKKyAgICAgICAg KiBlZGl0aW5nL2h0bWxlZGl0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluZGV4Rm9yVmlz aWJsZVBvc2l0aW9uKToKKwogMjAxNi0wNS0xMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIEtpbGwgTm9kZTo6YW5jZXN0b3JFbGVtZW50KCkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlCbG9ja0VsZW1lbnRDb21tYW5kLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FwcGx5QmxvY2tFbGVtZW50Q29tbWFuZC5jcHAJ KHJldmlzaW9uIDIwMDczNikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlCbG9ja0Vs ZW1lbnRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcsMTEgQEAgdm9pZCBB cHBseUJsb2NrRWxlbWVudENvbW1hbmQ6OmRvQXBwbHkoKQogICAgIGlmIChzdGFydFNjb3BlID09 IGVuZFNjb3BlICYmIHN0YXJ0SW5kZXggPj0gMCAmJiBzdGFydEluZGV4IDw9IGVuZEluZGV4KSB7 CiAgICAgICAgIFZpc2libGVQb3NpdGlvbiBzdGFydCh2aXNpYmxlUG9zaXRpb25Gb3JJbmRleChz dGFydEluZGV4LCBzdGFydFNjb3BlLmdldCgpKSk7CiAgICAgICAgIFZpc2libGVQb3NpdGlvbiBl bmQodmlzaWJsZVBvc2l0aW9uRm9ySW5kZXgoZW5kSW5kZXgsIGVuZFNjb3BlLmdldCgpKSk7Cisg ICAgICAgIC8vIFdvcmthcm91bmQgdGhlIGZhY3QgaW5kZXhGb3JWaXNpYmxlUG9zaXRpb24gY2Fu IHJldHVybiBhIGxhcmdlciBpbmRleCBkdWUgdG8gVGV4dEl0ZXJhdG9yCisgICAgICAgIC8vIHVz aW5nIGFuIGV4dHJhIG5ld2xpbmUgdG8gcmVwcmVzZW50IGEgbGFyZ2UgbWFyZ2luLgorICAgICAg ICAvLyBGSVhNRTogQWRkIGEgbmV3IFRleHRJdGVyYXRvciBiZWF2aGlvciB0byBzdXBwcmVzcyB0 aGlzIGJlaGF2aW9yLgorICAgICAgICBpZiAoc3RhcnQuaXNOb3ROdWxsKCkgJiYgZW5kLmlzTnVs bCgpKQorICAgICAgICAgICAgZW5kID0gbGFzdFBvc2l0aW9uSW5Ob2RlKGVuZFNjb3BlLmdldCgp KTsKICAgICAgICAgaWYgKHN0YXJ0LmlzTm90TnVsbCgpICYmIGVuZC5pc05vdE51bGwoKSkKICAg ICAgICAgICAgIHNldEVuZGluZ1NlbGVjdGlvbihWaXNpYmxlU2VsZWN0aW9uKHN0YXJ0LCBlbmQs IGVuZGluZ1NlbGVjdGlvbigpLmlzRGlyZWN0aW9uYWwoKSkpOwogICAgIH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCShyZXZpc2lvbiAyMDA3MzYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEz MywxNiArMTEzMywyMSBAQCBpbnQgaW5kZXhGb3JWaXNpYmxlUG9zaXRpb24oY29uc3QgVmlzaWJs CiAgICAgaWYgKHZpc2libGVQb3NpdGlvbi5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIDA7CiAK LSAgICBQb3NpdGlvbiBwKHZpc2libGVQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpKTsKLSAgICBE b2N1bWVudCYgZG9jdW1lbnQgPSBwLmFuY2hvck5vZGUoKS0+ZG9jdW1lbnQoKTsKLSAgICBTaGFk b3dSb290KiBzaGFkb3dSb290ID0gcC5hbmNob3JOb2RlKCktPmNvbnRhaW5pbmdTaGFkb3dSb290 KCk7Ci0KLSAgICBpZiAoc2hhZG93Um9vdCkKLSAgICAgICAgc2NvcGUgPSBzaGFkb3dSb290Owot ICAgIGVsc2UKLSAgICAgICAgc2NvcGUgPSBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKTsKKyAg ICBQb3NpdGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpOwor ICAgIERvY3VtZW50JiBkb2N1bWVudCA9ICpwb3NpdGlvbi5kb2N1bWVudCgpOwogCi0gICAgUmVm UHRyPFJhbmdlPiByYW5nZSA9IFJhbmdlOjpjcmVhdGUoZG9jdW1lbnQsIGZpcnN0UG9zaXRpb25J bk5vZGUoc2NvcGUuZ2V0KCkpLCBwLnBhcmVudEFuY2hvcmVkRXF1aXZhbGVudCgpKTsKKyAgICBO b2RlKiBlZGl0YWJsZVJvb3QgPSBoaWdoZXN0RWRpdGFibGVSb290KHBvc2l0aW9uLCBBWE9iamVj dENhY2hlOjphY2Nlc3NpYmlsaXR5RW5hYmxlZCgpID8gSGFzRWRpdGFibGVBWFJvbGUgOiBDb250 ZW50SXNFZGl0YWJsZSk7CisgICAgaWYgKGVkaXRhYmxlUm9vdCAmJiAhZG9jdW1lbnQuaW5EZXNp Z25Nb2RlKCkpIHsKKyAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oaXM8 Q29udGFpbmVyTm9kZT4oZWRpdGFibGVSb290KSk7CisgICAgICAgIHNjb3BlID0gZG93bmNhc3Q8 Q29udGFpbmVyTm9kZT4oZWRpdGFibGVSb290KTsKKyAgICB9IGVsc2UgeworICAgICAgICBpZiAo cG9zaXRpb24uY29udGFpbmVyTm9kZSgpLT5pc0luU2hhZG93VHJlZSgpKQorICAgICAgICAgICAg c2NvcGUgPSBwb3NpdGlvbi5jb250YWluZXJOb2RlKCktPmNvbnRhaW5pbmdTaGFkb3dSb290KCk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHNjb3BlID0gJmRvY3VtZW50OworICAgIH0KKwor ICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKGRvY3VtZW50LCBmaXJzdFBv c2l0aW9uSW5Ob2RlKHNjb3BlLmdldCgpKSwgcG9zaXRpb24ucGFyZW50QW5jaG9yZWRFcXVpdmFs ZW50KCkpOwogICAgIHJldHVybiBUZXh0SXRlcmF0b3I6OnJhbmdlTGVuZ3RoKHJhbmdlLmdldCgp LCB0cnVlKTsKIH0KIApJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjAwNzM2KQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTYtMDUtMTEgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgaW5kZXhGb3JWaXNpYmxl UG9zaXRpb24gc2hvdWxkIHVzZSB0aGUgcm9vdCBlZGl0YWJsZSBlbGVtZW50IGFzIHRoZSBzY29w ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NjEx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmViYXNl bGluZWQgdGVzdHMgd2l0aCBwcm9ncmVzc2lvbnMuCisKKyAgICAgICAgKiBlZGl0aW5nL2V4ZWND b21tYW5kL2NyYXNoLWluZGVudGluZy1saXN0LWl0ZW0tZXhwZWN0ZWQudHh0OiBOb3cgcHJlc2V2 ZXMgdGhlIHNlbGVjdGlvbiBhdCB0aGUgYmVnaW5uaW5nIG9mCisgICAgICAgIHRoZSBlZGl0YWJs ZSByZWdpb24gaW5zdGVhZCBvZiBtb3ZpbmcgaXQgdG8gdGhlIGVuZC4KKyAgICAgICAgKiBlZGl0 aW5nL2V4ZWNDb21tYW5kL2Zvcm1hdC1ibG9jay1tdWx0aXBsZS1wYXJhZ3JhcGhzLWluLXByZS1l eHBlY3RlZC50eHQ6IE5vdyBwcmVzZXJ2ZXMgc2VsZWN0aW9uIGluIG1vcmUgdGVzdAorICAgICAg ICBjYXNlcy4gVGhpcyB0ZXN0IGlzIHRoZSBvbmUgdGhhdCByZXF1aXJlZCB0aGUgd29ya2Fyb3Vu ZCBpbiBBcHBseUJsb2NrRWxlbWVudENvbW1hbmQ6OmRvQXBwbHkuIE9uZSBvZiB0aGUgdGVzdAor ICAgICAgICBjYXNlcyB3b3VsZCByZWdyZXNzIGFuZCBjbGVhciB0aGUgc2VsZWN0aW9uIHdpdGhv dXQgaXQuCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtcHJlLWxpc3QtZXhw ZWN0ZWQudHh0OiBOb3cgcHJlc2VydmVzIHRoZSBzZWxlY3Rpb24gaW5zdGVhZCBvZiBjbGVhcmlu ZyBpdC4KKwogMjAxNi0wNS0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIEFic29sdXRlIHBvc2l0aW9uZWQgZWxlbWVudCBpcyBub3QgcGxhY2VkIHByb3Blcmx5 IHdoZW4gcGFyZW50IGJlY29tZXMgdGhlIGNvbnRhaW5pbmcgYmxvY2suCkluZGV4OiBMYXlvdXRU ZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2NyYXNoLWluZGVudGluZy1saXN0LWl0ZW0tZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvY3Jh c2gtaW5kZW50aW5nLWxpc3QtaXRlbS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIwMDczNikKKysr IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvY3Jhc2gtaW5kZW50aW5nLWxpc3QtaXRl bS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTcsOCArNyw4IEBACiB8ICAgICAgICAg PHVsPgogfCAgICAgICAgICAgPGxpPgogfCAgICAgICAgICAgICBpZD0iZm9vIgorfCAgICAgICAg ICAgICA8I3NlbGVjdGlvbi1jYXJldD4KIHwgICAgICAgICAgICAgIlBBU1NFRCIKLXwgICAgICAg ICA8I3NlbGVjdGlvbi1jYXJldD4KIHwgICAgICIKICIKIHwgICAgIDxzY3JpcHQ+CkluZGV4OiBM YXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2Zvcm1hdC1ibG9jay1tdWx0aXBsZS1wYXJh Z3JhcGhzLWluLXByZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRp dGluZy9leGVjQ29tbWFuZC9mb3JtYXQtYmxvY2stbXVsdGlwbGUtcGFyYWdyYXBocy1pbi1wcmUt ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAyMDA3MzYpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4 ZWNDb21tYW5kL2Zvcm1hdC1ibG9jay1tdWx0aXBsZS1wYXJhZ3JhcGhzLWluLXByZS1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTQsNyArNCw3IEBAIEZvcm1hdHRpbmcgYWxsIHBhcmFn cmFwaHMgYnkgaDMgeWllbGRzOgogfCAiCiAiCiB8IDxoMz4KLXwgICAiaGVsbG8iCit8ICAgIjwj c2VsZWN0aW9uLWFuY2hvcj5oZWxsbyIKIHwgICA8YnI+CiB8ICAgIgogIgpAQCAtMTIsNyArMTIs NyBAQCBGb3JtYXR0aW5nIGFsbCBwYXJhZ3JhcGhzIGJ5IGgzIHlpZWxkczoKIHwgICA8YnI+CiB8 ICAgIgogIgotfCAgICJ3ZWJraXQiCit8ICAgIndlYmtpdDwjc2VsZWN0aW9uLWZvY3VzPiIKIHwg IgogIgogCkBAIC02NSwxMiArNjUsMTEgQEAgRm9ybWF0dGluZyBhbGwgYnV0IHRoZSBmaXJzdCBw YXJhZ3JhcGggYgogfCAgICJoZWxsbwogIgogfCAgIDxoMz4KLXwgICAgICIKK3wgICAgICI8I3Nl bGVjdGlvbi1hbmNob3I+CiAiCiB8ICAgICAid29ybGQiCiB8ICAgICAiCiAiCi18ICAgICAid2Vi a2l0IgotfCAgIDwjc2VsZWN0aW9uLWNhcmV0PgorfCAgICAgIndlYmtpdDwjc2VsZWN0aW9uLWZv Y3VzPiIKIHwgIgogIgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRl bnQtcHJlLWxpc3QtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRp bmcvZXhlY0NvbW1hbmQvaW5kZW50LXByZS1saXN0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMjAw NzM2KQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9pbmRlbnQtcHJlLWxpc3Qt ZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC02OSwxMSArNjksMTEgQEAgeWllbGRzOgog fCAgICAgPHByZT4KIHwgICAgICAgPGJsb2NrcXVvdGU+CiB8ICAgICAgICAgc3R5bGU9Im1hcmdp bjogMCAwIDAgNDBweDsgYm9yZGVyOiBub25lOyBwYWRkaW5nOiAwcHg7IgotfCAgICAgICAgICJo ZWxsbyIKK3wgICAgICAgICAiPCNzZWxlY3Rpb24tYW5jaG9yPmhlbGxvIgogfCAgICAgICAgIDxi cj4KIHwgICAgICAgICAid29ybGQiCiB8ICAgICAgICAgPGJyPgotfCAgICAgICAgICJ3ZWJraXQi Cit8ICAgICAgICAgIndlYmtpdDwjc2VsZWN0aW9uLWZvY3VzPiIKIHwgIgogIgogCg== 278701 2016-05-11 22:54:34 -0700 2016-05-12 12:50:02 -0700 Removed redundant assertion bug-157611-20160511225524.patch text/plain 7208 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDc0MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA1LTExICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIGluZGV4Rm9yVmlzaWJsZVBvc2l0 aW9uIHNob3VsZCB1c2UgdGhlIHJvb3QgZWRpdGFibGUgZWxlbWVudCBhcyB0aGUgc2NvcGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzYxMQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgaGln aGVzdCBlZGl0aW5nIGhvc3QgaW5zdGVhZCBvZiB0aGUgZG9jdW1lbnQgbm9kZSBhcyB0aGUgc2Nv cGUgaW4gaW5kZXhGb3JWaXNpYmxlUG9zaXRpb24KKyAgICAgICAgd2hlbiBpdCdzIGNhbGxlZCBp bnNpZGUgYW4gZWRpdGFibGUgcmVnaW9uLiBUaGlzIHJlZmFjdG9yaW5nIGlzIG5lY2Vzc2FyeSB0 byB1bmJsb2NrIHRoZSB3b3JrIHRvIHN1cHBvcnQKKyAgICAgICAgdW5kby9yZWRvIGluIFZvaWNl T3ZlciBhZnRlciByMTk5MDMwLgorCisgICAgICAgIFdlIGhhdmUgdG8gd29ya2Fyb3VuZCBhIGJ1 ZyBpbiBpbmRleEZvclZpc2libGVQb3NpdGlvbiB0aGF0IGl0IGNvdWxkIHJldHVybiBhIHNsaWdo dGx5IGhpZ2hlciBpbmRleCB0aGFuCisgICAgICAgIHRoZSBleHBlY3RlZCB2YWx1ZSBiZWNhdXNl IFRleHRJdGVyYXRvciBlbWl0cyBhbiBleHRyYSBuZXcgbGluZSBhZnRlciBhIGJsb2NrIGVsZW1l bnQgd2l0aCBhIGxhcmdlIG1hcmdpbgorICAgICAgICBhdCB0aGUgYm90dG9tLiBVbmZvcnR1bmF0 ZWx5LCBmaXhpbmcgdGhpcyByZXF1aXJlcyBhIGxvdCBvZiBjb2RlIGNoYW5nZXMgc2luY2UgdGhl IHJlc3Qgb2YgdGhlIGVkaXRpbmcKKyAgICAgICAgY29kZSBhc3N1bWVzIHRoaXMgYmVoYXZpb3Ig YW5kL29yIGhhcHBlbnMgdG8gY2FuY2VsIGl0IG91dCB3aXRoIHNvbWUgb3RoZXIgcXVpcmtzLgor CisgICAgICAgICogZWRpdGluZy9BcHBseUJsb2NrRWxlbWVudENvbW1hbmQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6QXBwbHlCbG9ja0VsZW1lbnRDb21tYW5kOjpkb0FwcGx5KToKKyAgICAgICAg KiBlZGl0aW5nL2h0bWxlZGl0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluZGV4Rm9yVmlz aWJsZVBvc2l0aW9uKToKKwogMjAxNi0wNS0xMSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIEtpbGwgTm9kZTo6YW5jZXN0b3JFbGVtZW50KCkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlCbG9ja0VsZW1lbnRDb21tYW5kLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FwcGx5QmxvY2tFbGVtZW50Q29tbWFuZC5jcHAJ KHJldmlzaW9uIDIwMDczNikKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQXBwbHlCbG9ja0Vs ZW1lbnRDb21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTcsNiArOTcsMTEgQEAgdm9pZCBB cHBseUJsb2NrRWxlbWVudENvbW1hbmQ6OmRvQXBwbHkoKQogICAgIGlmIChzdGFydFNjb3BlID09 IGVuZFNjb3BlICYmIHN0YXJ0SW5kZXggPj0gMCAmJiBzdGFydEluZGV4IDw9IGVuZEluZGV4KSB7 CiAgICAgICAgIFZpc2libGVQb3NpdGlvbiBzdGFydCh2aXNpYmxlUG9zaXRpb25Gb3JJbmRleChz dGFydEluZGV4LCBzdGFydFNjb3BlLmdldCgpKSk7CiAgICAgICAgIFZpc2libGVQb3NpdGlvbiBl bmQodmlzaWJsZVBvc2l0aW9uRm9ySW5kZXgoZW5kSW5kZXgsIGVuZFNjb3BlLmdldCgpKSk7Cisg ICAgICAgIC8vIFdvcmthcm91bmQgdGhlIGZhY3QgaW5kZXhGb3JWaXNpYmxlUG9zaXRpb24gY2Fu IHJldHVybiBhIGxhcmdlciBpbmRleCBkdWUgdG8gVGV4dEl0ZXJhdG9yCisgICAgICAgIC8vIHVz aW5nIGFuIGV4dHJhIG5ld2xpbmUgdG8gcmVwcmVzZW50IGEgbGFyZ2UgbWFyZ2luLgorICAgICAg ICAvLyBGSVhNRTogQWRkIGEgbmV3IFRleHRJdGVyYXRvciBiZWF2aGlvciB0byBzdXBwcmVzcyB0 aGlzIGJlaGF2aW9yLgorICAgICAgICBpZiAoc3RhcnQuaXNOb3ROdWxsKCkgJiYgZW5kLmlzTnVs bCgpKQorICAgICAgICAgICAgZW5kID0gbGFzdFBvc2l0aW9uSW5Ob2RlKGVuZFNjb3BlLmdldCgp KTsKICAgICAgICAgaWYgKHN0YXJ0LmlzTm90TnVsbCgpICYmIGVuZC5pc05vdE51bGwoKSkKICAg ICAgICAgICAgIHNldEVuZGluZ1NlbGVjdGlvbihWaXNpYmxlU2VsZWN0aW9uKHN0YXJ0LCBlbmQs IGVuZGluZ1NlbGVjdGlvbigpLmlzRGlyZWN0aW9uYWwoKSkpOwogICAgIH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCShyZXZpc2lvbiAyMDA3MzYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEz MywxNiArMTEzMywyMCBAQCBpbnQgaW5kZXhGb3JWaXNpYmxlUG9zaXRpb24oY29uc3QgVmlzaWJs CiAgICAgaWYgKHZpc2libGVQb3NpdGlvbi5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIDA7CiAK LSAgICBQb3NpdGlvbiBwKHZpc2libGVQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpKTsKLSAgICBE b2N1bWVudCYgZG9jdW1lbnQgPSBwLmFuY2hvck5vZGUoKS0+ZG9jdW1lbnQoKTsKLSAgICBTaGFk b3dSb290KiBzaGFkb3dSb290ID0gcC5hbmNob3JOb2RlKCktPmNvbnRhaW5pbmdTaGFkb3dSb290 KCk7Ci0KLSAgICBpZiAoc2hhZG93Um9vdCkKLSAgICAgICAgc2NvcGUgPSBzaGFkb3dSb290Owot ICAgIGVsc2UKLSAgICAgICAgc2NvcGUgPSBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKTsKKyAg ICBQb3NpdGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpOwor ICAgIERvY3VtZW50JiBkb2N1bWVudCA9ICpwb3NpdGlvbi5kb2N1bWVudCgpOwogCi0gICAgUmVm UHRyPFJhbmdlPiByYW5nZSA9IFJhbmdlOjpjcmVhdGUoZG9jdW1lbnQsIGZpcnN0UG9zaXRpb25J bk5vZGUoc2NvcGUuZ2V0KCkpLCBwLnBhcmVudEFuY2hvcmVkRXF1aXZhbGVudCgpKTsKKyAgICBO b2RlKiBlZGl0YWJsZVJvb3QgPSBoaWdoZXN0RWRpdGFibGVSb290KHBvc2l0aW9uLCBBWE9iamVj dENhY2hlOjphY2Nlc3NpYmlsaXR5RW5hYmxlZCgpID8gSGFzRWRpdGFibGVBWFJvbGUgOiBDb250 ZW50SXNFZGl0YWJsZSk7CisgICAgaWYgKGVkaXRhYmxlUm9vdCAmJiAhZG9jdW1lbnQuaW5EZXNp Z25Nb2RlKCkpCisgICAgICAgIHNjb3BlID0gZG93bmNhc3Q8Q29udGFpbmVyTm9kZT4oZWRpdGFi bGVSb290KTsKKyAgICBlbHNlIHsKKyAgICAgICAgaWYgKHBvc2l0aW9uLmNvbnRhaW5lck5vZGUo KS0+aXNJblNoYWRvd1RyZWUoKSkKKyAgICAgICAgICAgIHNjb3BlID0gcG9zaXRpb24uY29udGFp bmVyTm9kZSgpLT5jb250YWluaW5nU2hhZG93Um9vdCgpOworICAgICAgICBlbHNlCisgICAgICAg ICAgICBzY29wZSA9ICZkb2N1bWVudDsKKyAgICB9CisKKyAgICBSZWZQdHI8UmFuZ2U+IHJhbmdl ID0gUmFuZ2U6OmNyZWF0ZShkb2N1bWVudCwgZmlyc3RQb3NpdGlvbkluTm9kZShzY29wZS5nZXQo KSksIHBvc2l0aW9uLnBhcmVudEFuY2hvcmVkRXF1aXZhbGVudCgpKTsKICAgICByZXR1cm4gVGV4 dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChyYW5nZS5nZXQoKSwgdHJ1ZSk7CiB9CiAKSW5kZXg6IExh eW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDIwMDczNikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA1LTExICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJr aXQub3JnPgorCisgICAgICAgIGluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uIHNob3VsZCB1c2UgdGhl IHJvb3QgZWRpdGFibGUgZWxlbWVudCBhcyB0aGUgc2NvcGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzYxMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlYmFzZWxpbmVkIHRlc3RzIHdpdGggcHJvZ3Jl c3Npb25zLgorCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9jcmFzaC1pbmRlbnRpbmct bGlzdC1pdGVtLWV4cGVjdGVkLnR4dDogTm93IHByZXNldmVzIHRoZSBzZWxlY3Rpb24gYXQgdGhl IGJlZ2lubmluZyBvZgorICAgICAgICB0aGUgZWRpdGFibGUgcmVnaW9uIGluc3RlYWQgb2YgbW92 aW5nIGl0IHRvIHRoZSBlbmQuCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9mb3JtYXQt YmxvY2stbXVsdGlwbGUtcGFyYWdyYXBocy1pbi1wcmUtZXhwZWN0ZWQudHh0OiBOb3cgcHJlc2Vy dmVzIHNlbGVjdGlvbiBpbiBtb3JlIHRlc3QKKyAgICAgICAgY2FzZXMuIFRoaXMgdGVzdCBpcyB0 aGUgb25lIHRoYXQgcmVxdWlyZWQgdGhlIHdvcmthcm91bmQgaW4gQXBwbHlCbG9ja0VsZW1lbnRD b21tYW5kOjpkb0FwcGx5LiBPbmUgb2YgdGhlIHRlc3QKKyAgICAgICAgY2FzZXMgd291bGQgcmVn cmVzcyBhbmQgY2xlYXIgdGhlIHNlbGVjdGlvbiB3aXRob3V0IGl0LgorICAgICAgICAqIGVkaXRp bmcvZXhlY0NvbW1hbmQvaW5kZW50LXByZS1saXN0LWV4cGVjdGVkLnR4dDogTm93IHByZXNlcnZl cyB0aGUgc2VsZWN0aW9uIGluc3RlYWQgb2YgY2xlYXJpbmcgaXQuCisKIDIwMTYtMDUtMTEgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBBYnNvbHV0ZSBwb3NpdGlv bmVkIGVsZW1lbnQgaXMgbm90IHBsYWNlZCBwcm9wZXJseSB3aGVuIHBhcmVudCBiZWNvbWVzIHRo ZSBjb250YWluaW5nIGJsb2NrLgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9jcmFzaC1pbmRlbnRpbmctbGlzdC1pdGVtLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2NyYXNoLWluZGVudGluZy1saXN0LWl0ZW0t ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAyMDA3MzYpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4 ZWNDb21tYW5kL2NyYXNoLWluZGVudGluZy1saXN0LWl0ZW0tZXhwZWN0ZWQudHh0CSh3b3JraW5n IGNvcHkpCkBAIC03LDggKzcsOCBAQAogfCAgICAgICAgIDx1bD4KIHwgICAgICAgICAgIDxsaT4K IHwgICAgICAgICAgICAgaWQ9ImZvbyIKK3wgICAgICAgICAgICAgPCNzZWxlY3Rpb24tY2FyZXQ+ CiB8ICAgICAgICAgICAgICJQQVNTRUQiCi18ICAgICAgICAgPCNzZWxlY3Rpb24tY2FyZXQ+CiB8 ICAgICAiCiAiCiB8ICAgICA8c2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVj Q29tbWFuZC9mb3JtYXQtYmxvY2stbXVsdGlwbGUtcGFyYWdyYXBocy1pbi1wcmUtZXhwZWN0ZWQu dHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvZm9ybWF0 LWJsb2NrLW11bHRpcGxlLXBhcmFncmFwaHMtaW4tcHJlLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MjAwNzM2KQorKysgTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9mb3JtYXQtYmxvY2st bXVsdGlwbGUtcGFyYWdyYXBocy1pbi1wcmUtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBA IC00LDcgKzQsNyBAQCBGb3JtYXR0aW5nIGFsbCBwYXJhZ3JhcGhzIGJ5IGgzIHlpZWxkczoKIHwg IgogIgogfCA8aDM+Ci18ICAgImhlbGxvIgorfCAgICI8I3NlbGVjdGlvbi1hbmNob3I+aGVsbG8i CiB8ICAgPGJyPgogfCAgICIKICIKQEAgLTEyLDcgKzEyLDcgQEAgRm9ybWF0dGluZyBhbGwgcGFy YWdyYXBocyBieSBoMyB5aWVsZHM6CiB8ICAgPGJyPgogfCAgICIKICIKLXwgICAid2Via2l0Igor fCAgICJ3ZWJraXQ8I3NlbGVjdGlvbi1mb2N1cz4iCiB8ICIKICIKIApAQCAtNjUsMTIgKzY1LDEx IEBAIEZvcm1hdHRpbmcgYWxsIGJ1dCB0aGUgZmlyc3QgcGFyYWdyYXBoIGIKIHwgICAiaGVsbG8K ICIKIHwgICA8aDM+Ci18ICAgICAiCit8ICAgICAiPCNzZWxlY3Rpb24tYW5jaG9yPgogIgogfCAg ICAgIndvcmxkIgogfCAgICAgIgogIgotfCAgICAgIndlYmtpdCIKLXwgICA8I3NlbGVjdGlvbi1j YXJldD4KK3wgICAgICJ3ZWJraXQ8I3NlbGVjdGlvbi1mb2N1cz4iCiB8ICIKICIKSW5kZXg6IExh eW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LXByZS1saXN0LWV4cGVjdGVkLnR4 dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2luZGVudC1w cmUtbGlzdC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIwMDczNikKKysrIExheW91dFRlc3RzL2Vk aXRpbmcvZXhlY0NvbW1hbmQvaW5kZW50LXByZS1saXN0LWV4cGVjdGVkLnR4dAkod29ya2luZyBj b3B5KQpAQCAtNjksMTEgKzY5LDExIEBAIHlpZWxkczoKIHwgICAgIDxwcmU+CiB8ICAgICAgIDxi bG9ja3F1b3RlPgogfCAgICAgICAgIHN0eWxlPSJtYXJnaW46IDAgMCAwIDQwcHg7IGJvcmRlcjog bm9uZTsgcGFkZGluZzogMHB4OyIKLXwgICAgICAgICAiaGVsbG8iCit8ICAgICAgICAgIjwjc2Vs ZWN0aW9uLWFuY2hvcj5oZWxsbyIKIHwgICAgICAgICA8YnI+CiB8ICAgICAgICAgIndvcmxkIgog fCAgICAgICAgIDxicj4KLXwgICAgICAgICAid2Via2l0IgorfCAgICAgICAgICJ3ZWJraXQ8I3Nl bGVjdGlvbi1mb2N1cz4iCiB8ICIKICIKIAo=