54986 2011-02-22 12:29:59 -0800 deprecatedEditingOffset should actually return the expected deprecated value for "after" positions 2011-03-02 18:30:39 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 52642 1 leviw webkit-unassigned buildbot darin dglazkov eric gustavo.noronha gustavo rniwa webkit-ews webkit.review.bot xan.lopez oldest_to_newest 355498 0 leviw 2011-02-22 12:29:59 -0800 In working on bug 52642, I've found numerous places in editing and non-editing code that calls deprecatedEditingOffset and does the wrong thing for new "after" positions, as this returns an offset of zero. As we transition away from deprecated positions, we need to do the right thing in these legacy call sites. I propose changing deprecatedEditingOffset to return the lastEditingOffset for "after" positions. This will match the legacy behavior until we can update the places that directly rely on deprecatedEditingOffset. My proposed change will cause this function to not be inlined (lastOffsetForEditing if defined in htmlediting.h, which can't be included in Position.h), which is my only concern. 355506 1 83364 leviw 2011-02-22 12:38:52 -0800 Created attachment 83364 Patch 355684 2 83409 leviw 2011-02-22 16:22:29 -0800 Created attachment 83409 Patch 355685 3 leviw 2011-02-22 16:23:22 -0800 (In reply to comment #2) > Created an attachment (id=83409) [details] > Patch Only using this path for new positions so it doesn't rely on "guessed" anchor types. 355709 4 83409 rniwa 2011-02-22 17:01:57 -0800 Comment on attachment 83409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83409&action=review > Source/WebCore/dom/Position.cpp:153 > +int Position::deprecatedEditingOffset() const > +{ > + // This should probably ASSERT(m_isLegacyEditingPosition); > + return (m_isLegacyEditingPosition || m_anchorType != PositionIsAfterAnchor) ? m_offset : lastOffsetForEditing(m_anchorNode.get()); > +} Why we can't keep this function inline? I'm afraid that making this function non-inline will have some performance impact. 355711 5 leviw 2011-02-22 17:04:24 -0800 (In reply to comment #4) > (From update of attachment 83409 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=83409&action=review > > > Source/WebCore/dom/Position.cpp:153 > > +int Position::deprecatedEditingOffset() const > > +{ > > + // This should probably ASSERT(m_isLegacyEditingPosition); > > + return (m_isLegacyEditingPosition || m_anchorType != PositionIsAfterAnchor) ? m_offset : lastOffsetForEditing(m_anchorNode.get()); > > +} > > Why we can't keep this function inline? I'm afraid that making this function non-inline will have some performance impact. See the first comment on this bug. 355713 6 83409 rniwa 2011-02-22 17:09:40 -0800 Comment on attachment 83409 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83409&action=review >>> Source/WebCore/dom/Position.cpp:153 >>> +} >> >> Why we can't keep this function inline? I'm afraid that making this function non-inline will have some performance impact. > > See the first comment on this bug. I see. We can't call lastOffsetInNode(anchorNode) instead? 355724 7 leviw 2011-02-22 17:20:48 -0800 (In reply to comment #6) > (From update of attachment 83409 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=83409&action=review > > >>> Source/WebCore/dom/Position.cpp:153 > >>> +} > >> > >> Why we can't keep this function inline? I'm afraid that making this function non-inline will have some performance impact. > > > > See the first comment on this bug. > > I see. We can't call lastOffsetInNode(anchorNode) instead? That won't properly handle nodes that return true for editingIgnoresContent :( The other option is to have the fast-path for legacy positions that's inlined, and a fallback that calls a private member function that does the right thing for new positions. It's still not ideal (though closer), but then again nothing is quite ideal in this mixed new/legacy position world. 355739 8 rniwa 2011-02-22 17:47:55 -0800 (In reply to comment #7) > The other option is to have the fast-path for legacy positions that's inlined, and a fallback that calls a private member function that does the right thing for new positions. It's still not ideal (though closer), but then again nothing is quite ideal in this mixed new/legacy position world. That sounds reasonable. I was going to suggest as well but I was concerned with the fact that'll result in two function calls in the slow patch. But then lastEditingOffset already results in a bunch of function calls so that might be okay. Eric & Darin, any opinions here? 355742 9 83422 leviw 2011-02-22 18:15:08 -0800 Created attachment 83422 Patch 355746 10 83422 rniwa 2011-02-22 18:25:48 -0800 Comment on attachment 83422 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83422&action=review The patch looks good. r=me provided you all layout tests ran successfully. > Source/WebCore/ChangeLog:11 > + No tests. This is intended to simplify the transition to new Positions, not change behavior. not "to" change behavior? > Source/WebCore/dom/Position.h:97 > + if (m_isLegacyEditingPosition || m_anchorType != PositionIsAfterAnchor) > + return m_offset; > + return offsetForPositionAfterAnchor(); Might be nice to special case position after node instead so that condition here matches the assertion? 355748 11 webkit.review.bot 2011-02-22 18:30:42 -0800 Attachment 83422 did not build on chromium: Build output: http://queues.webkit.org/results/7952018 355751 12 83422 rniwa 2011-02-22 18:34:10 -0800 Comment on attachment 83422 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83422&action=review Taking back my r+ given the build failure. > Source/WebCore/dom/Position.cpp:149 > +int Position::deprecatedOffsetForAfterPosition() const This should be offsetForPositionAfterAnchor instead. 355754 13 buildbot 2011-02-22 18:47:03 -0800 Attachment 83422 did not build on win: Build output: http://queues.webkit.org/results/7960034 355771 14 83422 eric 2011-02-22 19:22:58 -0800 Comment on attachment 83422 Patch deprecatedEditingOffset was never meant to be able to be derived from new-style positions. My thought had been instead that we would add the ASSERT(m_isLegacyEditingPosition) and then fix all the places that hit the ASSERT before adding new uses of new-style positions. 355780 15 webkit-ews 2011-02-22 19:35:45 -0800 Attachment 83422 did not build on qt: Build output: http://queues.webkit.org/results/7962039 355808 16 webkit.review.bot 2011-02-22 20:42:10 -0800 Attachment 83422 did not build on chromium: Build output: http://queues.webkit.org/results/7964043 355890 17 gustavo.noronha 2011-02-22 22:59:08 -0800 Attachment 83422 did not build on gtk: Build output: http://queues.webkit.org/results/7985046 355898 18 webkit.review.bot 2011-02-22 23:08:01 -0800 Attachment 83422 did not build on mac: Build output: http://queues.webkit.org/results/7987031 356239 19 83509 leviw 2011-02-23 11:23:43 -0800 Created attachment 83509 Patch 356316 20 83509 eric 2011-02-23 12:40:51 -0800 Comment on attachment 83509 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83509&action=review This was never intended to work. But if this makes your transition job easier I guess it's OK. > Source/WebCore/dom/Position.cpp:151 > + ASSERT(m_anchorType == PositionIsAfterAnchor && !m_isLegacyEditingPosition); Aren't these two redundant? Also generally we try to have one ASSERT per line as that makes it easier to see from the debug traces which one failed. 356317 21 eric 2011-02-23 12:41:19 -0800 Did you investigate making the ASSERT(m_isLegacy) a reality and seeing what callsites were assuming otherwise? 356381 22 leviw 2011-02-23 13:48:14 -0800 (In reply to comment #20) > > Source/WebCore/dom/Position.cpp:151 > > + ASSERT(m_anchorType == PositionIsAfterAnchor && !m_isLegacyEditingPosition); > > Aren't these two redundant? Also generally we try to have one ASSERT per line as that makes it easier to see from the debug traces which one failed. These aren't redundant because legacy positions call anchorTypeForLegacyEditingPosition(). We literally want to assert that we're only looking at After type positions for New positions, as only these have an offset that doesn't mesh with the legacy behavior. (In reply to comment #21) > Did you investigate making the ASSERT(m_isLegacy) a reality and seeing what callsites were assuming otherwise? The move that finally necessitated this was my fix for 52642, which ends up creating many more "New" positions. What I found in testing the change is that there are numerous call sites that are currently only working because they are still being fed legacy positions from first/lastDeepEditingPositionForNode. Removing calls to this function is definitely one of the next steps. 361102 23 leviw 2011-03-02 15:03:25 -0800 Hey Ryosuke, can I get a review now that the build failure is fixed? 361273 24 83509 rniwa 2011-03-02 18:00:56 -0800 Comment on attachment 83509 Patch Please split the assertion into 2 lines per Eric's comment before you land. Thanks for tackling a hard bug. Hopefully, we can remove deprecatedEditingOffset() soon. 361279 25 leviw 2011-03-02 18:16:15 -0800 Thanks for the review! Making the change and checking in. 361285 26 leviw 2011-03-02 18:30:39 -0800 Committed r80195: <http://trac.webkit.org/changeset/80195> 83364 2011-02-22 12:38:52 -0800 2011-02-22 16:22:27 -0800 Patch bug-54986-20110222123851.patch text/plain 2321 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5MzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMjIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IHNob3VsZCBhY3R1 YWxseSByZXR1cm4gdGhlIGV4cGVjdGVkIGRlcHJlY2F0ZWQgdmFsdWUgZm9yICJhZnRlciIgcG9z aXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NDk4NgorCisgICAgICAgIENhbGxzIHRvIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IG5lZWRzIHRv IHJldHVybiB0aGUgZXhwZWN0ZWQgdmFsdWUgZm9yIG5ldyBCZWZvcmUvQWZ0ZXIgcG9zaXRpb25z CisgICAgICAgIHVudGlsIHdlIGNhbiB1cGRhdGUgYWxsIHRoZSBjYWxsIHNpdGVzIHRvIGNvbnNp ZGVyIHRoZSBuZXcgcG9zaXRpb24gdHlwZXMuCisKKyAgICAgICAgTm8gdGVzdHMuIFRoaXMgaXMg aW50ZW5kZWQgdG8gc2ltcGxpZnkgdGhlIHRyYW5zaXRpb24gdG8gbmV3IFBvc2l0aW9ucywgbm90 IGNoYW5nZSBiZWhhdmlvci4KKworICAgICAgICAqIGRvbS9Qb3NpdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQb3NpdGlvbjo6ZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQpOgorICAgICAgICAq IGRvbS9Qb3NpdGlvbi5oOgorCiAyMDExLTAyLTIyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5jcHAJKHJldmlzaW9uIDc5MzQ0KQorKysgU291cmNlL1dl YkNvcmUvZG9tL1Bvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDYgKzE0NiwxMiBA QCBpbnQgUG9zaXRpb246OmNvbXB1dGVPZmZzZXRJbkNvbnRhaW5lck5vCiAgICAgcmV0dXJuIDA7 CiB9CiAKK2ludCBQb3NpdGlvbjo6ZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSBjb25zdAorewor ICAgIC8vIFRoaXMgc2hvdWxkIHByb2JhYmx5IEFTU0VSVChtX2lzTGVnYWN5RWRpdGluZ1Bvc2l0 aW9uKTsKKyAgICByZXR1cm4gbV9hbmNob3JUeXBlICE9IFBvc2l0aW9uSXNBZnRlckFuY2hvciA/ IG1fb2Zmc2V0IDogbGFzdE9mZnNldEZvckVkaXRpbmcobV9hbmNob3JOb2RlLmdldCgpKTsKK30K KwogLy8gTmVpZ2hib3ItYW5jaG9yZWQgcG9zaXRpb25zIGFyZSBpbnZhbGlkIERPTSBwb3NpdGlv bnMsIHNvIHRoZXkgbmVlZCB0byBiZQogLy8gZml4ZWQgdXAgYmVmb3JlIGhhbmRpbmcgdGhlbSBv ZmYgdG8gdGhlIFJhbmdlIG9iamVjdC4KIFBvc2l0aW9uIFBvc2l0aW9uOjpwYXJlbnRBbmNob3Jl ZEVxdWl2YWxlbnQoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmgJKHJldmlzaW9uIDc5 MzQ0KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAg LTkwLDExICs5MCw3IEBAIHB1YmxpYzoKICAgICB9CiAKICAgICAvLyBOZXcgY29kZSBzaG91bGQg bm90IHVzZSB0aGlzIGZ1bmN0aW9uLgotICAgIGludCBkZXByZWNhdGVkRWRpdGluZ09mZnNldCgp IGNvbnN0Ci0gICAgewotICAgICAgICAvLyBUaGlzIHNob3VsZCBwcm9iYWJseSBBU1NFUlQobV9p c0xlZ2FjeUVkaXRpbmdQb3NpdGlvbik7Ci0gICAgICAgIHJldHVybiBtX29mZnNldDsKLSAgICB9 CisgICAgaW50IGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkgY29uc3Q7CiAKICAgICAvLyBUaGVz ZSBhcmUgY29udmVuaWVuY2UgbWV0aG9kcyB3aGljaCBhcmUgc21hcnQgYWJvdXQgd2hldGhlciB0 aGUgcG9zaXRpb24gaXMgbmVpZ2hib3IgYW5jaG9yZWQgb3IgcGFyZW50IGFuY2hvcmVkCiAgICAg Tm9kZSogY29tcHV0ZU5vZGVCZWZvcmVQb3NpdGlvbigpIGNvbnN0Owo= 83409 2011-02-22 16:22:29 -0800 2011-02-22 18:15:05 -0800 Patch bug-54986-20110222162228.patch text/plain 2352 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5MzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMjIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IHNob3VsZCBhY3R1 YWxseSByZXR1cm4gdGhlIGV4cGVjdGVkIGRlcHJlY2F0ZWQgdmFsdWUgZm9yICJhZnRlciIgcG9z aXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NDk4NgorCisgICAgICAgIENhbGxzIHRvIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IG5lZWRzIHRv IHJldHVybiB0aGUgZXhwZWN0ZWQgdmFsdWUgZm9yIG5ldyBCZWZvcmUvQWZ0ZXIgcG9zaXRpb25z CisgICAgICAgIHVudGlsIHdlIGNhbiB1cGRhdGUgYWxsIHRoZSBjYWxsIHNpdGVzIHRvIGNvbnNp ZGVyIHRoZSBuZXcgcG9zaXRpb24gdHlwZXMuCisKKyAgICAgICAgTm8gdGVzdHMuIFRoaXMgaXMg aW50ZW5kZWQgdG8gc2ltcGxpZnkgdGhlIHRyYW5zaXRpb24gdG8gbmV3IFBvc2l0aW9ucywgbm90 IGNoYW5nZSBiZWhhdmlvci4KKworICAgICAgICAqIGRvbS9Qb3NpdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQb3NpdGlvbjo6ZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQpOgorICAgICAgICAq IGRvbS9Qb3NpdGlvbi5oOgorCiAyMDExLTAyLTIyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5jcHAJKHJldmlzaW9uIDc5MzQ0KQorKysgU291cmNlL1dl YkNvcmUvZG9tL1Bvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDYgKzE0NiwxMiBA QCBpbnQgUG9zaXRpb246OmNvbXB1dGVPZmZzZXRJbkNvbnRhaW5lck5vCiAgICAgcmV0dXJuIDA7 CiB9CiAKK2ludCBQb3NpdGlvbjo6ZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSBjb25zdAorewor ICAgIC8vIFRoaXMgc2hvdWxkIHByb2JhYmx5IEFTU0VSVChtX2lzTGVnYWN5RWRpdGluZ1Bvc2l0 aW9uKTsKKyAgICByZXR1cm4gKG1faXNMZWdhY3lFZGl0aW5nUG9zaXRpb24gfHwgbV9hbmNob3JU eXBlICE9IFBvc2l0aW9uSXNBZnRlckFuY2hvcikgPyBtX29mZnNldCA6IGxhc3RPZmZzZXRGb3JF ZGl0aW5nKG1fYW5jaG9yTm9kZS5nZXQoKSk7Cit9CisKIC8vIE5laWdoYm9yLWFuY2hvcmVkIHBv c2l0aW9ucyBhcmUgaW52YWxpZCBET00gcG9zaXRpb25zLCBzbyB0aGV5IG5lZWQgdG8gYmUKIC8v IGZpeGVkIHVwIGJlZm9yZSBoYW5kaW5nIHRoZW0gb2ZmIHRvIHRoZSBSYW5nZSBvYmplY3QuCiBQ b3NpdGlvbiBQb3NpdGlvbjo6cGFyZW50QW5jaG9yZWRFcXVpdmFsZW50KCkgY29uc3QKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2RvbS9Qb3NpdGlvbi5oCShyZXZpc2lvbiA3OTM0NCkKKysrIFNvdXJjZS9XZWJDb3JlL2Rv bS9Qb3NpdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC05MCwxMSArOTAsNyBAQCBwdWJsaWM6CiAg ICAgfQogCiAgICAgLy8gTmV3IGNvZGUgc2hvdWxkIG5vdCB1c2UgdGhpcyBmdW5jdGlvbi4KLSAg ICBpbnQgZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSBjb25zdAotICAgIHsKLSAgICAgICAgLy8g VGhpcyBzaG91bGQgcHJvYmFibHkgQVNTRVJUKG1faXNMZWdhY3lFZGl0aW5nUG9zaXRpb24pOwot ICAgICAgICByZXR1cm4gbV9vZmZzZXQ7Ci0gICAgfQorICAgIGludCBkZXByZWNhdGVkRWRpdGlu Z09mZnNldCgpIGNvbnN0OwogCiAgICAgLy8gVGhlc2UgYXJlIGNvbnZlbmllbmNlIG1ldGhvZHMg d2hpY2ggYXJlIHNtYXJ0IGFib3V0IHdoZXRoZXIgdGhlIHBvc2l0aW9uIGlzIG5laWdoYm9yIGFu Y2hvcmVkIG9yIHBhcmVudCBhbmNob3JlZAogICAgIE5vZGUqIGNvbXB1dGVOb2RlQmVmb3JlUG9z aXRpb24oKSBjb25zdDsK 83422 2011-02-22 18:15:08 -0800 2011-02-23 11:23:40 -0800 Patch bug-54986-20110222181507.patch text/plain 2720 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5MzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDItMjIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IHNob3VsZCBhY3R1 YWxseSByZXR1cm4gdGhlIGV4cGVjdGVkIGRlcHJlY2F0ZWQgdmFsdWUgZm9yICJhZnRlciIgcG9z aXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NDk4NgorCisgICAgICAgIENhbGxzIHRvIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IG5lZWRzIHRv IHJldHVybiB0aGUgZXhwZWN0ZWQgdmFsdWUgZm9yIG5ldyBCZWZvcmUvQWZ0ZXIgcG9zaXRpb25z CisgICAgICAgIHVudGlsIHdlIGNhbiB1cGRhdGUgYWxsIHRoZSBjYWxsIHNpdGVzIHRvIGNvbnNp ZGVyIHRoZSBuZXcgcG9zaXRpb24gdHlwZXMuCisKKyAgICAgICAgTm8gdGVzdHMuIFRoaXMgaXMg aW50ZW5kZWQgdG8gc2ltcGxpZnkgdGhlIHRyYW5zaXRpb24gdG8gbmV3IFBvc2l0aW9ucywgbm90 IGNoYW5nZSBiZWhhdmlvci4KKworICAgICAgICAqIGRvbS9Qb3NpdGlvbi5jcHA6CisgICAgICAg IChXZWJDb3JlOjpQb3NpdGlvbjo6ZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQpOgorICAgICAgICAo V2ViQ29yZTo6UG9zaXRpb246Om9mZnNldEZvclBvc2l0aW9uQWZ0ZXJBbmNob3IpOiBBZGRlZCB0 byBkbyB0aGUgcmlnaHQgdGhpbmcgd2hpbGUgZW5zdXJpbmcKKyAgICAgICAgaW5saW5lLXNwZWVk IGZvciBtb3N0IGNhbGxzIHRvIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0LgorICAgICAgICAqIGRv bS9Qb3NpdGlvbi5oOgorCiAyMDExLTAyLTIyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2RvbS9Qb3NpdGlvbi5jcHAJKHJldmlzaW9uIDc5MzQ0KQorKysgU291cmNlL1dlYkNv cmUvZG9tL1Bvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDYgKzE0NiwxMiBAQCBp bnQgUG9zaXRpb246OmNvbXB1dGVPZmZzZXRJbkNvbnRhaW5lck5vCiAgICAgcmV0dXJuIDA7CiB9 CiAKK2ludCBQb3NpdGlvbjo6ZGVwcmVjYXRlZE9mZnNldEZvckFmdGVyUG9zaXRpb24oKSBjb25z dAoreworICAgIEFTU0VSVChtX2FuY2hvclR5cGUgPT0gUG9zaXRpb25Jc0FmdGVyQW5jaG9yICYm ICFtX2lzTGVnYWN5RWRpdGluZ1Bvc2l0aW9uKTsKKyAgICByZXR1cm4gbGFzdE9mZnNldEZvckVk aXRpbmcobV9hbmNob3JOb2RlLmdldCgpKTsKK30KKwogLy8gTmVpZ2hib3ItYW5jaG9yZWQgcG9z aXRpb25zIGFyZSBpbnZhbGlkIERPTSBwb3NpdGlvbnMsIHNvIHRoZXkgbmVlZCB0byBiZQogLy8g Zml4ZWQgdXAgYmVmb3JlIGhhbmRpbmcgdGhlbSBvZmYgdG8gdGhlIFJhbmdlIG9iamVjdC4KIFBv c2l0aW9uIFBvc2l0aW9uOjpwYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQoKSBjb25zdApJbmRleDog U291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZG9tL1Bvc2l0aW9uLmgJKHJldmlzaW9uIDc5MzQ0KQorKysgU291cmNlL1dlYkNvcmUvZG9t L1Bvc2l0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTkyLDggKzkyLDkgQEAgcHVibGljOgogICAg IC8vIE5ldyBjb2RlIHNob3VsZCBub3QgdXNlIHRoaXMgZnVuY3Rpb24uCiAgICAgaW50IGRlcHJl Y2F0ZWRFZGl0aW5nT2Zmc2V0KCkgY29uc3QKICAgICB7Ci0gICAgICAgIC8vIFRoaXMgc2hvdWxk IHByb2JhYmx5IEFTU0VSVChtX2lzTGVnYWN5RWRpdGluZ1Bvc2l0aW9uKTsKLSAgICAgICAgcmV0 dXJuIG1fb2Zmc2V0OworICAgICAgICBpZiAobV9pc0xlZ2FjeUVkaXRpbmdQb3NpdGlvbiB8fCBt X2FuY2hvclR5cGUgIT0gUG9zaXRpb25Jc0FmdGVyQW5jaG9yKQorICAgICAgICAgICAgcmV0dXJu IG1fb2Zmc2V0OworICAgICAgICByZXR1cm4gb2Zmc2V0Rm9yUG9zaXRpb25BZnRlckFuY2hvcigp OwogICAgIH0KIAogICAgIC8vIFRoZXNlIGFyZSBjb252ZW5pZW5jZSBtZXRob2RzIHdoaWNoIGFy ZSBzbWFydCBhYm91dCB3aGV0aGVyIHRoZSBwb3NpdGlvbiBpcyBuZWlnaGJvciBhbmNob3JlZCBv ciBwYXJlbnQgYW5jaG9yZWQKQEAgLTE3MSw2ICsxNzIsOCBAQCBwdWJsaWM6CiAjZW5kaWYKICAg ICAKIHByaXZhdGU6CisgICAgaW50IG9mZnNldEZvclBvc2l0aW9uQWZ0ZXJBbmNob3IoKSBjb25z dDsKKwogICAgIGludCByZW5kZXJlZE9mZnNldCgpIGNvbnN0OwogCiAgICAgUG9zaXRpb24gcHJl dmlvdXNDaGFyYWN0ZXJQb3NpdGlvbihFQWZmaW5pdHkpIGNvbnN0Owo= 83509 2011-02-23 11:23:43 -0800 2011-03-02 18:00:56 -0800 Patch bug-54986-20110223112342.patch text/plain 2719 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5MzQ1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDItMjIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IHNob3VsZCBhY3R1 YWxseSByZXR1cm4gdGhlIGV4cGVjdGVkIGRlcHJlY2F0ZWQgdmFsdWUgZm9yICJhZnRlciIgcG9z aXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 NDk4NgorCisgICAgICAgIENhbGxzIHRvIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0IG5lZWRzIHRv IHJldHVybiB0aGUgZXhwZWN0ZWQgdmFsdWUgZm9yIG5ldyBCZWZvcmUvQWZ0ZXIgcG9zaXRpb25z CisgICAgICAgIHVudGlsIHdlIGNhbiB1cGRhdGUgYWxsIHRoZSBjYWxsIHNpdGVzIHRvIGNvbnNp ZGVyIHRoZSBuZXcgcG9zaXRpb24gdHlwZXMuCisKKyAgICAgICAgTm8gdGVzdHMuIFRoaXMgaXMg aW50ZW5kZWQgdG8gc2ltcGxpZnkgdGhlIHRyYW5zaXRpb24gdG8gbmV3IFBvc2l0aW9ucywgbm90 IHRvIGNoYW5nZSBiZWhhdmlvci4KKworICAgICAgICAqIGRvbS9Qb3NpdGlvbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQb3NpdGlvbjo6ZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQpOgorICAgICAg ICAoV2ViQ29yZTo6UG9zaXRpb246Om9mZnNldEZvclBvc2l0aW9uQWZ0ZXJBbmNob3IpOiBBZGRl ZCB0byBkbyB0aGUgcmlnaHQgdGhpbmcgd2hpbGUgZW5zdXJpbmcKKyAgICAgICAgaW5saW5lLXNw ZWVkIGZvciBtb3N0IGNhbGxzIHRvIGRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0LgorICAgICAgICAq IGRvbS9Qb3NpdGlvbi5oOgorCiAyMDExLTAyLTIyICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5jcHAJKHJldmlzaW9uIDc5MzQ0KQorKysgU291cmNlL1dl YkNvcmUvZG9tL1Bvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2LDYgKzE0NiwxMiBA QCBpbnQgUG9zaXRpb246OmNvbXB1dGVPZmZzZXRJbkNvbnRhaW5lck5vCiAgICAgcmV0dXJuIDA7 CiB9CiAKK2ludCBQb3NpdGlvbjo6b2Zmc2V0Rm9yUG9zaXRpb25BZnRlckFuY2hvcigpIGNvbnN0 Cit7CisgICAgQVNTRVJUKG1fYW5jaG9yVHlwZSA9PSBQb3NpdGlvbklzQWZ0ZXJBbmNob3IgJiYg IW1faXNMZWdhY3lFZGl0aW5nUG9zaXRpb24pOworICAgIHJldHVybiBsYXN0T2Zmc2V0Rm9yRWRp dGluZyhtX2FuY2hvck5vZGUuZ2V0KCkpOworfQorCiAvLyBOZWlnaGJvci1hbmNob3JlZCBwb3Np dGlvbnMgYXJlIGludmFsaWQgRE9NIHBvc2l0aW9ucywgc28gdGhleSBuZWVkIHRvIGJlCiAvLyBm aXhlZCB1cCBiZWZvcmUgaGFuZGluZyB0aGVtIG9mZiB0byB0aGUgUmFuZ2Ugb2JqZWN0LgogUG9z aXRpb24gUG9zaXRpb246OnBhcmVudEFuY2hvcmVkRXF1aXZhbGVudCgpIGNvbnN0CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9kb20vUG9zaXRpb24uaAkocmV2aXNpb24gNzkzNDQpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20v UG9zaXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtOTIsOCArOTIsOSBAQCBwdWJsaWM6CiAgICAg Ly8gTmV3IGNvZGUgc2hvdWxkIG5vdCB1c2UgdGhpcyBmdW5jdGlvbi4KICAgICBpbnQgZGVwcmVj YXRlZEVkaXRpbmdPZmZzZXQoKSBjb25zdAogICAgIHsKLSAgICAgICAgLy8gVGhpcyBzaG91bGQg cHJvYmFibHkgQVNTRVJUKG1faXNMZWdhY3lFZGl0aW5nUG9zaXRpb24pOwotICAgICAgICByZXR1 cm4gbV9vZmZzZXQ7CisgICAgICAgIGlmIChtX2lzTGVnYWN5RWRpdGluZ1Bvc2l0aW9uIHx8IG1f YW5jaG9yVHlwZSAhPSBQb3NpdGlvbklzQWZ0ZXJBbmNob3IpCisgICAgICAgICAgICByZXR1cm4g bV9vZmZzZXQ7CisgICAgICAgIHJldHVybiBvZmZzZXRGb3JQb3NpdGlvbkFmdGVyQW5jaG9yKCk7 CiAgICAgfQogCiAgICAgLy8gVGhlc2UgYXJlIGNvbnZlbmllbmNlIG1ldGhvZHMgd2hpY2ggYXJl IHNtYXJ0IGFib3V0IHdoZXRoZXIgdGhlIHBvc2l0aW9uIGlzIG5laWdoYm9yIGFuY2hvcmVkIG9y IHBhcmVudCBhbmNob3JlZApAQCAtMTcxLDYgKzE3Miw4IEBAIHB1YmxpYzoKICNlbmRpZgogICAg IAogcHJpdmF0ZToKKyAgICBpbnQgb2Zmc2V0Rm9yUG9zaXRpb25BZnRlckFuY2hvcigpIGNvbnN0 OworCiAgICAgaW50IHJlbmRlcmVkT2Zmc2V0KCkgY29uc3Q7CiAKICAgICBQb3NpdGlvbiBwcmV2 aW91c0NoYXJhY3RlclBvc2l0aW9uKEVBZmZpbml0eSkgY29uc3Q7Cg==