66014 2011-08-10 14:48:39 -0700 Get rid of calls to deprecatedNode and deprecatedEditingOffset in AccessibilityRenderObject.cpp and InsertTextCommand.cpp 2011-08-17 10:27:49 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 52099 1 rniwa rniwa cfleizach darin enrica eric tony webkit.review.bot oldest_to_newest 449410 0 rniwa 2011-08-10 14:48:39 -0700 Some low hanging fruits here. 449418 1 103538 rniwa 2011-08-10 14:58:29 -0700 Created attachment 103538 refactoring 449420 2 103538 gyuyoung.kim 2011-08-10 15:04:49 -0700 Comment on attachment 103538 refactoring Attachment 103538 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/9344306 449421 3 103538 webkit-ews 2011-08-10 15:06:58 -0700 Comment on attachment 103538 refactoring Attachment 103538 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/9344307 449424 4 103539 rniwa 2011-08-10 15:18:14 -0700 Created attachment 103539 fixed build failure 451479 5 103539 morrita 2011-08-15 21:17:12 -0700 Comment on attachment 103539 fixed build failure View in context: https://bugs.webkit.org/attachment.cgi?id=103539&action=review > Source/WebCore/dom/Position.h:131 > + Element* rootEditableElement() const? > Source/WebCore/dom/Range.h:106 > + void setStart(const Position&, ExceptionCode&); You can give ASSERT_NO_EXCEPTION for the default value of the second parameter. 451942 6 104112 rniwa 2011-08-16 16:01:41 -0700 Created attachment 104112 Made Position::rootEditableElement() const 452143 7 104112 morrita 2011-08-16 23:12:47 -0700 Comment on attachment 104112 Made Position::rootEditableElement() const OK once all bots pass. 452145 8 rniwa 2011-08-16 23:33:46 -0700 Thanks for the review! 452193 9 104112 webkit.review.bot 2011-08-17 03:52:15 -0700 Comment on attachment 104112 Made Position::rootEditableElement() const Clearing flags on attachment: 104112 Committed r93199: <http://trac.webkit.org/changeset/93199> 452194 10 webkit.review.bot 2011-08-17 03:52:20 -0700 All reviewed patches have been landed. Closing bug. 452332 11 104112 darin 2011-08-17 10:24:02 -0700 Comment on attachment 104112 Made Position::rootEditableElement() const View in context: https://bugs.webkit.org/attachment.cgi?id=104112&action=review > Source/WebCore/dom/Range.cpp:287 > +void Range::setStart(const Position& start, ExceptionCode& ec) > +{ > + Position parentAnchored = start.parentAnchoredEquivalent(); > + setStart(parentAnchored.containerNode(), parentAnchored.offsetInContainerNode(), ec); > +} > + > +void Range::setEnd(const Position& end, ExceptionCode& ec) > +{ > + Position parentAnchored = end.parentAnchoredEquivalent(); > + setStart(parentAnchored.containerNode(), parentAnchored.offsetInContainerNode(), ec); > +} Do callers really need the exception capability? Instead could we just have these fail silently or assert? 452335 12 104112 rniwa 2011-08-17 10:25:55 -0700 Comment on attachment 104112 Made Position::rootEditableElement() const View in context: https://bugs.webkit.org/attachment.cgi?id=104112&action=review >> Source/WebCore/dom/Range.cpp:287 >> +} > > Do callers really need the exception capability? Instead could we just have these fail silently or assert? We can do that. Or pass ASSERT_NO_EXCEPTION by default as morrita suggested. 452337 13 darin 2011-08-17 10:27:49 -0700 Generally, the ExceptionCode& thing should only be used for actual DOM binding since it’s how the DOM cis specified. Not internal use, because it’s an awkward way to report errors in C++. ASSERT_NO_EXCEPTION is a fine way to make a function that’s intended for DOM binding easier to use internally. But a function intended for user internally probably should not even use ExceptionCode&. 103538 2011-08-10 14:58:29 -0700 2011-08-10 15:18:11 -0700 refactoring bug-66014-20110810145828.patch text/plain 7259 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyNzk5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDgtMTAgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgR2V0IHJpZCBvZiBjYWxscyB0byBk ZXByZWNhdGVkTm9kZSBhbmQgZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQgaW4KKyAgICAgICAgQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYW5kIEluc2VydFRleHRDb21tYW5kLmNwcAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYwMTQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIGNhbGxz IHRvIGRlcHJlY2F0ZWROb2RlIGFuZCBkZXByZWNhdGVkRWRpdGluZ09mZnNldHMgaW4gdGhlIGZv bGxvd2luZyBmaWxlcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjppbmRleEZvclZpc2libGVQb3NpdGlvbik6IENhbGxzIFBvc2l0aW9uOjpyb290RWRpdGFi bGVFbGVtZW50CisgICAgICAgIGFuZCBSYW5nZTo6c2V0RW5kKGNvbnN0IFBvc2l0aW9uJiwgRXhj ZXB0aW9uQ29kZSkgaW5zdGVhZCBvZiBtYW51YWxseSBwdWxsaW5nIGRlcHJlY2F0ZWROb2RlCisg ICAgICAgIGFuZCBkZXByZWNhdGVkRWRpdGluZ09mZnNldC4KKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmluZGV4KTogQWJzdHJhY3RlZCB0aGUgbG9naWMgdG8g bG9vcCB0aHJvdWdoIHJlbmRlciBvYmplY3RzCisgICAgICAgIGZyb20gZGVwcmVjYXRlZE5vZGVz JyByZW5kZXJlciB0byBtX3JlbmRlcmVyIGFzIHJlbmRlck9iamVjdENvbnRhaW5zUG9zaXRpb24u CisgICAgICAgICogZG9tL1Bvc2l0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpQb3NpdGlvbjo6 cm9vdEVkaXRhYmxlRWxlbWVudCk6IEFkZGVkLgorICAgICAgICAqIGRvbS9SYW5nZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYW5nZTo6c2V0U3RhcnQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJhbmdlOjpzZXRFbmQpOiBBZGRlZC4KKyAgICAgICAgKiBkb20vUmFuZ2UuaDoKKyAgICAg ICAgKiBlZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c2VydFRleHRDb21tYW5kOjppbnNlcnRUYWIpOgorICAgICAgICAqIGVkaXRpbmcvUmVuZGVyZWRQ b3NpdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZW5kZXJPYmplY3RDb250YWluc1Bvc2l0 aW9uKTogRXh0cmFjdGVkIGZyb20gQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aW5kZXguCisg ICAgICAgICogZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmg6CisKIDIwMTEtMDgtMTAgIEFiaGlz aGVrIEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDaGVjayB0aGF0IHdl IGRvIG5vdCBuZWVkIGxheW91dCBiZWZvcmUgdHJ5aW5nIHRvIGRpcnR5CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAJKHJldmlzaW9uIDkyNzgxKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjUx NywxMyArMjUxNywxMyBAQCBpbnQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aW5kZXhGb3JW CiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIFBvc2l0aW9uIGluZGV4UG9zaXRpb24gPSBw b3MuZGVlcEVxdWl2YWxlbnQoKTsKLSAgICBpZiAoIWluZGV4UG9zaXRpb24uYW5jaG9yTm9kZSgp IHx8IGluZGV4UG9zaXRpb24uYW5jaG9yTm9kZSgpLT5yb290RWRpdGFibGVFbGVtZW50KCkgIT0g bm9kZSkKKyAgICBpZiAoaW5kZXhQb3NpdGlvbi5pc051bGwoKSB8fCBwb3Mucm9vdEVkaXRhYmxl RWxlbWVudCgpICE9IG5vZGUpCiAgICAgICAgIHJldHVybiAwOwogICAgIAogICAgIEV4Y2VwdGlv bkNvZGUgZWMgPSAwOwogICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKG1f cmVuZGVyZXItPmRvY3VtZW50KCkpOwogICAgIHJhbmdlLT5zZXRTdGFydChub2RlLCAwLCBlYyk7 Ci0gICAgcmFuZ2UtPnNldEVuZChpbmRleFBvc2l0aW9uLmFuY2hvck5vZGUoKSwgaW5kZXhQb3Np dGlvbi5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpLCBlYyk7CisgICAgcmFuZ2UtPnNldEVuZChp bmRleFBvc2l0aW9uLCBlYyk7CiAKICNpZiBQTEFURk9STShHVEspCiAgICAgLy8gV2UgbmVlZCB0 byBjb25zaWRlciByZXBsYWNlZCBlbGVtZW50cyBmb3IgR1RLLCBhcyB0aGV5IHdpbGwgYmUKQEAg LTI2NzIsMTUgKzI2NzIsOSBAQCBpbnQgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aW5kZXgo Y29uCiB7CiAgICAgaWYgKCFpc1RleHRDb250cm9sKCkpCiAgICAgICAgIHJldHVybiAtMTsKLSAg ICAKLSAgICBOb2RlKiBub2RlID0gcG9zaXRpb24uZGVlcEVxdWl2YWxlbnQoKS5kZXByZWNhdGVk Tm9kZSgpOwotICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIC0xOwotICAgIAotICAgIGZv ciAoUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7IHJlbmRlcmVyICYm IHJlbmRlcmVyLT5ub2RlKCk7IHJlbmRlcmVyID0gcmVuZGVyZXItPnBhcmVudCgpKSB7Ci0gICAg ICAgIGlmIChyZW5kZXJlciA9PSBtX3JlbmRlcmVyKQotICAgICAgICAgICAgcmV0dXJuIGluZGV4 Rm9yVmlzaWJsZVBvc2l0aW9uKHBvc2l0aW9uKTsKLSAgICB9CisKKyAgICBpZiAocmVuZGVyT2Jq ZWN0Q29udGFpbnNQb3NpdGlvbihtX3JlbmRlcmVyLCBwb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgp KSkKKyAgICAgICAgcmV0dXJuIGluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKHBvc2l0aW9uKTsKICAg ICAKICAgICByZXR1cm4gLTE7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24u aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uaAkocmV2aXNpb24g OTI3ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uaAkod29ya2luZyBjb3B5KQpA QCAtMTI4LDYgKzEyOCwxMSBAQCBwdWJsaWM6CiAgICAgTm9kZSogZGVwcmVjYXRlZE5vZGUoKSBj b25zdCB7IHJldHVybiBtX2FuY2hvck5vZGUuZ2V0KCk7IH0KIAogICAgIERvY3VtZW50KiBkb2N1 bWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fYW5jaG9yTm9kZSA/IG1fYW5jaG9yTm9kZS0+ZG9jdW1l bnQoKSA6IDA7IH0KKyAgICBFbGVtZW50KiByb290RWRpdGFibGVFbGVtZW50KCkKKyAgICB7Cisg ICAgICAgIE5vZGUqIGNvbnRhaW5lciA9IGNvbnRhaW5lck5vZGUoKTsKKyAgICAgICAgcmV0dXJu IGNvbnRhaW5lciA/IGNvbnRhaW5lci0+cm9vdEVkaXRhYmxlRWxlbWVudCgpIDogMDsKKyAgICB9 CiAKICAgICAvLyBUaGVzZSBzaG91bGQgb25seSBiZSB1c2VkIGZvciBQb3NpdGlvbklzT2Zmc2V0 SW5BbmNob3IgcG9zaXRpb25zLCB1bmxlc3MKICAgICAvLyB0aGUgcG9zaXRpb24gaXMgYSBsZWdh Y3kgZWRpdGluZyBwb3NpdGlvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAkocmV2aXNpb24gOTI3 ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0y NzQsNiArMjc0LDE4IEBAIHZvaWQgUmFuZ2U6OnNldEVuZChQYXNzUmVmUHRyPE5vZGU+IHJlZk4K ICAgICB9CiB9CiAKK3ZvaWQgUmFuZ2U6OnNldFN0YXJ0KGNvbnN0IFBvc2l0aW9uJiBzdGFydCwg RXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAgUG9zaXRpb24gcGFyZW50QW5jaG9yZWQgPSBzdGFy dC5wYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQoKTsKKyAgICBzZXRTdGFydChwYXJlbnRBbmNob3Jl ZC5jb250YWluZXJOb2RlKCksIHBhcmVudEFuY2hvcmVkLm9mZnNldEluQ29udGFpbmVyTm9kZSgp LCBlYyk7Cit9CisKK3ZvaWQgUmFuZ2U6OnNldEVuZChjb25zdCBQb3NpdGlvbiYgZW5kLCBFeGNl cHRpb25Db2RlJiBlYykKK3sKKyAgICBQb3NpdGlvbiBwYXJlbnRBbmNob3JlZCA9IGVuZC5wYXJl bnRBbmNob3JlZEVxdWl2YWxlbnQoKTsKKyAgICBzZXRTdGFydChwYXJlbnRBbmNob3JlZC5jb250 YWluZXJOb2RlKCksIHBhcmVudEFuY2hvcmVkLm9mZnNldEluQ29udGFpbmVyTm9kZSgpLCBlYyk7 Cit9CisKIHZvaWQgUmFuZ2U6OmNvbGxhcHNlKGJvb2wgdG9TdGFydCwgRXhjZXB0aW9uQ29kZSYg ZWMpCiB7CiAgICAgaWYgKCFtX3N0YXJ0LmNvbnRhaW5lcigpKSB7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9kb20vUmFuZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2Uu aAkocmV2aXNpb24gOTI3ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTAzLDYgKzEwMyw4IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFBvc2l0aW9u IHN0YXJ0UG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBtX3N0YXJ0LnRvUG9zaXRpb24oKTsgfQog ICAgIGNvbnN0IFBvc2l0aW9uIGVuZFBvc2l0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9lbmQudG9Q b3NpdGlvbigpOyB9CisgICAgdm9pZCBzZXRTdGFydChjb25zdCBQb3NpdGlvbiYsIEV4Y2VwdGlv bkNvZGUmKTsKKyAgICB2b2lkIHNldEVuZChjb25zdCBQb3NpdGlvbiYsIEV4Y2VwdGlvbkNvZGUm KTsKIAogICAgIE5vZGUqIGZpcnN0Tm9kZSgpIGNvbnN0OwogICAgIE5vZGUqIHBhc3RMYXN0Tm9k ZSgpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFu ZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNlcnRUZXh0Q29t bWFuZC5jcHAJKHJldmlzaW9uIDkyNzgxKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNl cnRUZXh0Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5Niw5ICsxOTYsOSBAQCB2b2lk IEluc2VydFRleHRDb21tYW5kOjpkb0FwcGx5KCkKIFBvc2l0aW9uIEluc2VydFRleHRDb21tYW5k OjppbnNlcnRUYWIoY29uc3QgUG9zaXRpb24mIHBvcykKIHsKICAgICBQb3NpdGlvbiBpbnNlcnRQ b3MgPSBWaXNpYmxlUG9zaXRpb24ocG9zLCBET1dOU1RSRUFNKS5kZWVwRXF1aXZhbGVudCgpOwot ICAgICAgICAKLSAgICBOb2RlKiBub2RlID0gaW5zZXJ0UG9zLmRlcHJlY2F0ZWROb2RlKCk7Ci0g ICAgdW5zaWduZWQgaW50IG9mZnNldCA9IGluc2VydFBvcy5kZXByZWNhdGVkRWRpdGluZ09mZnNl dCgpOworCisgICAgTm9kZSogbm9kZSA9IGluc2VydFBvcy5jb250YWluZXJOb2RlKCk7CisgICAg dW5zaWduZWQgaW50IG9mZnNldCA9IG5vZGUtPmlzVGV4dE5vZGUoKSA/IGluc2VydFBvcy5vZmZz ZXRJbkNvbnRhaW5lck5vZGUoKSA6IDA7CiAKICAgICAvLyBrZWVwIHRhYnMgY29hbGVzY2VkIGlu IHRhYiBzcGFuCiAgICAgaWYgKGlzVGFiU3BhblRleHROb2RlKG5vZGUpKSB7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL1JlbmRlcmVkUG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVuZGVyZWRQb3NpdGlvbi5jcHAJKHJldmlzaW9uIDkyNzgx KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTAxLDQgKzEwMSwxMyBAQCBMYXlvdXRSZWN0IFJlbmRlcmVkUG9zaXRpb246 OmFic29sdXRlUmVjCiAgICAgcmV0dXJuIGxvY2FsUmVjdCA9PSBMYXlvdXRSZWN0KCkgPyBMYXlv dXRSZWN0KCkgOiBtX3JlbmRlcmVyLT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UmVjdChsb2Nh bFJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwogfQogCitib29sIHJlbmRlck9iamVjdENv bnRhaW5zUG9zaXRpb24oUmVuZGVyT2JqZWN0KiB0YXJnZXQsIGNvbnN0IFBvc2l0aW9uJiBwb3Np dGlvbikKK3sKKyAgICBmb3IgKFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSByZW5kZXJlckZyb21Q b3NpdGlvbihwb3NpdGlvbik7IHJlbmRlcmVyICYmIHJlbmRlcmVyLT5ub2RlKCk7IHJlbmRlcmVy ID0gcmVuZGVyZXItPnBhcmVudCgpKSB7CisgICAgICAgIGlmIChyZW5kZXJlciA9PSB0YXJnZXQp CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQor CiB9OwpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmgJKHJl dmlzaW9uIDkyNzgxKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9u LmgJKHdvcmtpbmcgY29weSkKQEAgLTY4LDYgKzY4LDggQEAgaW5saW5lIFJlbmRlcmVkUG9zaXRp b246OlJlbmRlcmVkUG9zaXRpbwogewogfQogCitib29sIHJlbmRlck9iamVjdENvbnRhaW5zUG9z aXRpb24oUmVuZGVyT2JqZWN0KiwgY29uc3QgUG9zaXRpb24mKTsKKwogfTsKIAogI2VuZGlmIC8v IFJlbmRlcmVkUG9zaXRpb25faAo= 103539 2011-08-10 15:18:14 -0700 2011-08-16 16:01:38 -0700 fixed build failure bug-66014-20110810151813.patch text/plain 7460 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyNzk5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDgtMTAgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgR2V0IHJpZCBvZiBjYWxscyB0byBk ZXByZWNhdGVkTm9kZSBhbmQgZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQgaW4KKyAgICAgICAgQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYW5kIEluc2VydFRleHRDb21tYW5kLmNwcAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYwMTQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIGNhbGxz IHRvIGRlcHJlY2F0ZWROb2RlIGFuZCBkZXByZWNhdGVkRWRpdGluZ09mZnNldHMgaW4gdGhlIGZv bGxvd2luZyBmaWxlcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjppbmRleEZvclZpc2libGVQb3NpdGlvbik6IENhbGxzIFBvc2l0aW9uOjpyb290RWRpdGFi bGVFbGVtZW50CisgICAgICAgIGFuZCBSYW5nZTo6c2V0RW5kKGNvbnN0IFBvc2l0aW9uJiwgRXhj ZXB0aW9uQ29kZSkgaW5zdGVhZCBvZiBtYW51YWxseSBwdWxsaW5nIGRlcHJlY2F0ZWROb2RlCisg ICAgICAgIGFuZCBkZXByZWNhdGVkRWRpdGluZ09mZnNldC4KKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmluZGV4KTogQWJzdHJhY3RlZCB0aGUgbG9naWMgdG8g bG9vcCB0aHJvdWdoIHJlbmRlciBvYmplY3RzCisgICAgICAgIGZyb20gZGVwcmVjYXRlZE5vZGVz JyByZW5kZXJlciB0byBtX3JlbmRlcmVyIGFzIHJlbmRlck9iamVjdENvbnRhaW5zUG9zaXRpb24u CisgICAgICAgICogZG9tL1Bvc2l0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpQb3NpdGlvbjo6 cm9vdEVkaXRhYmxlRWxlbWVudCk6IEFkZGVkLgorICAgICAgICAqIGRvbS9SYW5nZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYW5nZTo6c2V0U3RhcnQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJhbmdlOjpzZXRFbmQpOiBBZGRlZC4KKyAgICAgICAgKiBkb20vUmFuZ2UuaDoKKyAgICAg ICAgKiBlZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c2VydFRleHRDb21tYW5kOjppbnNlcnRUYWIpOgorICAgICAgICAqIGVkaXRpbmcvUmVuZGVyZWRQ b3NpdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZW5kZXJPYmplY3RDb250YWluc1Bvc2l0 aW9uKTogRXh0cmFjdGVkIGZyb20gQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aW5kZXguCisg ICAgICAgICogZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmg6CisKIDIwMTEtMDgtMTAgIEFiaGlz aGVrIEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDaGVjayB0aGF0IHdl IGRvIG5vdCBuZWVkIGxheW91dCBiZWZvcmUgdHJ5aW5nIHRvIGRpcnR5CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAJKHJldmlzaW9uIDkyNzgxKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzMs NiArNzMsNyBAQAogI2luY2x1ZGUgIlJlbmRlclRoZW1lLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmll dy5oIgogI2luY2x1ZGUgIlJlbmRlcldpZGdldC5oIgorI2luY2x1ZGUgIlJlbmRlcmVkUG9zaXRp b24uaCIKICNpbmNsdWRlICJTZWxlY3RFbGVtZW50LmgiCiAjaW5jbHVkZSAiVGV4dC5oIgogI2lu Y2x1ZGUgIlRleHRJdGVyYXRvci5oIgpAQCAtMjUxNywxMyArMjUxOCwxMyBAQCBpbnQgQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdDo6aW5kZXhGb3JWCiAgICAgICAgIHJldHVybiAwOwogICAgIAog ICAgIFBvc2l0aW9uIGluZGV4UG9zaXRpb24gPSBwb3MuZGVlcEVxdWl2YWxlbnQoKTsKLSAgICBp ZiAoIWluZGV4UG9zaXRpb24uYW5jaG9yTm9kZSgpIHx8IGluZGV4UG9zaXRpb24uYW5jaG9yTm9k ZSgpLT5yb290RWRpdGFibGVFbGVtZW50KCkgIT0gbm9kZSkKKyAgICBpZiAoaW5kZXhQb3NpdGlv bi5pc051bGwoKSB8fCBwb3Mucm9vdEVkaXRhYmxlRWxlbWVudCgpICE9IG5vZGUpCiAgICAgICAg IHJldHVybiAwOwogICAgIAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIFJlZlB0cjxS YW5nZT4gcmFuZ2UgPSBSYW5nZTo6Y3JlYXRlKG1fcmVuZGVyZXItPmRvY3VtZW50KCkpOwogICAg IHJhbmdlLT5zZXRTdGFydChub2RlLCAwLCBlYyk7Ci0gICAgcmFuZ2UtPnNldEVuZChpbmRleFBv c2l0aW9uLmFuY2hvck5vZGUoKSwgaW5kZXhQb3NpdGlvbi5kZXByZWNhdGVkRWRpdGluZ09mZnNl dCgpLCBlYyk7CisgICAgcmFuZ2UtPnNldEVuZChpbmRleFBvc2l0aW9uLCBlYyk7CiAKICNpZiBQ TEFURk9STShHVEspCiAgICAgLy8gV2UgbmVlZCB0byBjb25zaWRlciByZXBsYWNlZCBlbGVtZW50 cyBmb3IgR1RLLCBhcyB0aGV5IHdpbGwgYmUKQEAgLTI2NzIsMTUgKzI2NzMsOSBAQCBpbnQgQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aW5kZXgoY29uCiB7CiAgICAgaWYgKCFpc1RleHRDb250 cm9sKCkpCiAgICAgICAgIHJldHVybiAtMTsKLSAgICAKLSAgICBOb2RlKiBub2RlID0gcG9zaXRp b24uZGVlcEVxdWl2YWxlbnQoKS5kZXByZWNhdGVkTm9kZSgpOwotICAgIGlmICghbm9kZSkKLSAg ICAgICAgcmV0dXJuIC0xOwotICAgIAotICAgIGZvciAoUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9 IG5vZGUtPnJlbmRlcmVyKCk7IHJlbmRlcmVyICYmIHJlbmRlcmVyLT5ub2RlKCk7IHJlbmRlcmVy ID0gcmVuZGVyZXItPnBhcmVudCgpKSB7Ci0gICAgICAgIGlmIChyZW5kZXJlciA9PSBtX3JlbmRl cmVyKQotICAgICAgICAgICAgcmV0dXJuIGluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKHBvc2l0aW9u KTsKLSAgICB9CisKKyAgICBpZiAocmVuZGVyT2JqZWN0Q29udGFpbnNQb3NpdGlvbihtX3JlbmRl cmVyLCBwb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgpKSkKKyAgICAgICAgcmV0dXJuIGluZGV4Rm9y VmlzaWJsZVBvc2l0aW9uKHBvc2l0aW9uKTsKICAgICAKICAgICByZXR1cm4gLTE7CiB9CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9kb20vUG9zaXRpb24uaAkocmV2aXNpb24gOTI3ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9k b20vUG9zaXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDYgKzEyOCwxMSBAQCBwdWJsaWM6 CiAgICAgTm9kZSogZGVwcmVjYXRlZE5vZGUoKSBjb25zdCB7IHJldHVybiBtX2FuY2hvck5vZGUu Z2V0KCk7IH0KIAogICAgIERvY3VtZW50KiBkb2N1bWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fYW5j aG9yTm9kZSA/IG1fYW5jaG9yTm9kZS0+ZG9jdW1lbnQoKSA6IDA7IH0KKyAgICBFbGVtZW50KiBy b290RWRpdGFibGVFbGVtZW50KCkKKyAgICB7CisgICAgICAgIE5vZGUqIGNvbnRhaW5lciA9IGNv bnRhaW5lck5vZGUoKTsKKyAgICAgICAgcmV0dXJuIGNvbnRhaW5lciA/IGNvbnRhaW5lci0+cm9v dEVkaXRhYmxlRWxlbWVudCgpIDogMDsKKyAgICB9CiAKICAgICAvLyBUaGVzZSBzaG91bGQgb25s eSBiZSB1c2VkIGZvciBQb3NpdGlvbklzT2Zmc2V0SW5BbmNob3IgcG9zaXRpb25zLCB1bmxlc3MK ICAgICAvLyB0aGUgcG9zaXRpb24gaXMgYSBsZWdhY3kgZWRpdGluZyBwb3NpdGlvbi4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZG9tL1JhbmdlLmNwcAkocmV2aXNpb24gOTI3ODEpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20v UmFuZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzQsNiArMjc0LDE4IEBAIHZvaWQgUmFuZ2U6 OnNldEVuZChQYXNzUmVmUHRyPE5vZGU+IHJlZk4KICAgICB9CiB9CiAKK3ZvaWQgUmFuZ2U6OnNl dFN0YXJ0KGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgRXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAg UG9zaXRpb24gcGFyZW50QW5jaG9yZWQgPSBzdGFydC5wYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQo KTsKKyAgICBzZXRTdGFydChwYXJlbnRBbmNob3JlZC5jb250YWluZXJOb2RlKCksIHBhcmVudEFu Y2hvcmVkLm9mZnNldEluQ29udGFpbmVyTm9kZSgpLCBlYyk7Cit9CisKK3ZvaWQgUmFuZ2U6OnNl dEVuZChjb25zdCBQb3NpdGlvbiYgZW5kLCBFeGNlcHRpb25Db2RlJiBlYykKK3sKKyAgICBQb3Np dGlvbiBwYXJlbnRBbmNob3JlZCA9IGVuZC5wYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQoKTsKKyAg ICBzZXRTdGFydChwYXJlbnRBbmNob3JlZC5jb250YWluZXJOb2RlKCksIHBhcmVudEFuY2hvcmVk Lm9mZnNldEluQ29udGFpbmVyTm9kZSgpLCBlYyk7Cit9CisKIHZvaWQgUmFuZ2U6OmNvbGxhcHNl KGJvb2wgdG9TdGFydCwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgaWYgKCFtX3N0YXJ0LmNv bnRhaW5lcigpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAkocmV2aXNpb24gOTI3ODEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9kb20vUmFuZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTAzLDYgKzEwMyw4IEBA IHB1YmxpYzoKIAogICAgIGNvbnN0IFBvc2l0aW9uIHN0YXJ0UG9zaXRpb24oKSBjb25zdCB7IHJl dHVybiBtX3N0YXJ0LnRvUG9zaXRpb24oKTsgfQogICAgIGNvbnN0IFBvc2l0aW9uIGVuZFBvc2l0 aW9uKCkgY29uc3QgeyByZXR1cm4gbV9lbmQudG9Qb3NpdGlvbigpOyB9CisgICAgdm9pZCBzZXRT dGFydChjb25zdCBQb3NpdGlvbiYsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICB2b2lkIHNldEVuZChj b25zdCBQb3NpdGlvbiYsIEV4Y2VwdGlvbkNvZGUmKTsKIAogICAgIE5vZGUqIGZpcnN0Tm9kZSgp IGNvbnN0OwogICAgIE5vZGUqIHBhc3RMYXN0Tm9kZSgpIGNvbnN0OwpJbmRleDogU291cmNlL1dl YkNvcmUvZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5jcHAJKHJldmlzaW9uIDkyNzgxKQor KysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNlcnRUZXh0Q29tbWFuZC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE5Niw5ICsxOTYsOSBAQCB2b2lkIEluc2VydFRleHRDb21tYW5kOjpkb0FwcGx5 KCkKIFBvc2l0aW9uIEluc2VydFRleHRDb21tYW5kOjppbnNlcnRUYWIoY29uc3QgUG9zaXRpb24m IHBvcykKIHsKICAgICBQb3NpdGlvbiBpbnNlcnRQb3MgPSBWaXNpYmxlUG9zaXRpb24ocG9zLCBE T1dOU1RSRUFNKS5kZWVwRXF1aXZhbGVudCgpOwotICAgICAgICAKLSAgICBOb2RlKiBub2RlID0g aW5zZXJ0UG9zLmRlcHJlY2F0ZWROb2RlKCk7Ci0gICAgdW5zaWduZWQgaW50IG9mZnNldCA9IGlu c2VydFBvcy5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpOworCisgICAgTm9kZSogbm9kZSA9IGlu c2VydFBvcy5jb250YWluZXJOb2RlKCk7CisgICAgdW5zaWduZWQgaW50IG9mZnNldCA9IG5vZGUt PmlzVGV4dE5vZGUoKSA/IGluc2VydFBvcy5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSA6IDA7CiAK ICAgICAvLyBrZWVwIHRhYnMgY29hbGVzY2VkIGluIHRhYiBzcGFuCiAgICAgaWYgKGlzVGFiU3Bh blRleHROb2RlKG5vZGUpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1JlbmRlcmVk UG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVuZGVy ZWRQb3NpdGlvbi5jcHAJKHJldmlzaW9uIDkyNzgxKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9SZW5kZXJlZFBvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDQgKzEwMSwxMyBA QCBMYXlvdXRSZWN0IFJlbmRlcmVkUG9zaXRpb246OmFic29sdXRlUmVjCiAgICAgcmV0dXJuIGxv Y2FsUmVjdCA9PSBMYXlvdXRSZWN0KCkgPyBMYXlvdXRSZWN0KCkgOiBtX3JlbmRlcmVyLT5sb2Nh bFRvQWJzb2x1dGVRdWFkKEZsb2F0UmVjdChsb2NhbFJlY3QpKS5lbmNsb3NpbmdCb3VuZGluZ0Jv eCgpOwogfQogCitib29sIHJlbmRlck9iamVjdENvbnRhaW5zUG9zaXRpb24oUmVuZGVyT2JqZWN0 KiB0YXJnZXQsIGNvbnN0IFBvc2l0aW9uJiBwb3NpdGlvbikKK3sKKyAgICBmb3IgKFJlbmRlck9i amVjdCogcmVuZGVyZXIgPSByZW5kZXJlckZyb21Qb3NpdGlvbihwb3NpdGlvbik7IHJlbmRlcmVy ICYmIHJlbmRlcmVyLT5ub2RlKCk7IHJlbmRlcmVyID0gcmVuZGVyZXItPnBhcmVudCgpKSB7Cisg ICAgICAgIGlmIChyZW5kZXJlciA9PSB0YXJnZXQpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB9OwpJbmRleDogU291cmNlL1dlYkNvcmUv ZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmgJKHJldmlzaW9uIDkyNzgxKQorKysgU291cmNlL1dl YkNvcmUvZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTY4LDYg KzY4LDggQEAgaW5saW5lIFJlbmRlcmVkUG9zaXRpb246OlJlbmRlcmVkUG9zaXRpbwogewogfQog Citib29sIHJlbmRlck9iamVjdENvbnRhaW5zUG9zaXRpb24oUmVuZGVyT2JqZWN0KiwgY29uc3Qg UG9zaXRpb24mKTsKKwogfTsKIAogI2VuZGlmIC8vIFJlbmRlcmVkUG9zaXRpb25faAo= 104112 2011-08-16 16:01:41 -0700 2011-08-17 10:25:55 -0700 Made Position::rootEditableElement() const bug-66014-20110816160140.patch text/plain 7470 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzMTcwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDgtMTYgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgR2V0IHJpZCBvZiBjYWxscyB0byBk ZXByZWNhdGVkTm9kZSBhbmQgZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQgaW4KKyAgICAgICAgQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAgYW5kIEluc2VydFRleHRDb21tYW5kLmNwcAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYwMTQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmVkIGNhbGxz IHRvIGRlcHJlY2F0ZWROb2RlIGFuZCBkZXByZWNhdGVkRWRpdGluZ09mZnNldHMgaW4gdGhlIGZv bGxvd2luZyBmaWxlcy4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0OjppbmRleEZvclZpc2libGVQb3NpdGlvbik6IENhbGxzIFBvc2l0aW9uOjpyb290RWRpdGFi bGVFbGVtZW50CisgICAgICAgIGFuZCBSYW5nZTo6c2V0RW5kKGNvbnN0IFBvc2l0aW9uJiwgRXhj ZXB0aW9uQ29kZSkgaW5zdGVhZCBvZiBtYW51YWxseSBwdWxsaW5nIGRlcHJlY2F0ZWROb2RlCisg ICAgICAgIGFuZCBkZXByZWNhdGVkRWRpdGluZ09mZnNldC4KKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmluZGV4KTogQWJzdHJhY3RlZCB0aGUgbG9naWMgdG8g bG9vcCB0aHJvdWdoIHJlbmRlciBvYmplY3RzCisgICAgICAgIGZyb20gZGVwcmVjYXRlZE5vZGVz JyByZW5kZXJlciB0byBtX3JlbmRlcmVyIGFzIHJlbmRlck9iamVjdENvbnRhaW5zUG9zaXRpb24u CisgICAgICAgICogZG9tL1Bvc2l0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpQb3NpdGlvbjo6 cm9vdEVkaXRhYmxlRWxlbWVudCk6IEFkZGVkLgorICAgICAgICAqIGRvbS9SYW5nZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYW5nZTo6c2V0U3RhcnQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJhbmdlOjpzZXRFbmQpOiBBZGRlZC4KKyAgICAgICAgKiBkb20vUmFuZ2UuaDoKKyAgICAg ICAgKiBlZGl0aW5nL0luc2VydFRleHRDb21tYW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c2VydFRleHRDb21tYW5kOjppbnNlcnRUYWIpOgorICAgICAgICAqIGVkaXRpbmcvUmVuZGVyZWRQ b3NpdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpyZW5kZXJPYmplY3RDb250YWluc1Bvc2l0 aW9uKTogRXh0cmFjdGVkIGZyb20gQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6aW5kZXguCisg ICAgICAgICogZWRpdGluZy9SZW5kZXJlZFBvc2l0aW9uLmg6CisKIDIwMTEtMDgtMTYgIEpvc2Vw aCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIENo cm9taXVtIFdpbmRvd3MgYnVpbGQgZml4IGFmdGVyIHI5MzE0MC4gVGFrZSA0LgpJbmRleDogU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlS ZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA5MzE3MCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTczLDYgKzczLDcgQEAKICNpbmNsdWRlICJSZW5kZXJUaGVtZS5oIgogI2luY2x1ZGUgIlJlbmRl clZpZXcuaCIKICNpbmNsdWRlICJSZW5kZXJXaWRnZXQuaCIKKyNpbmNsdWRlICJSZW5kZXJlZFBv c2l0aW9uLmgiCiAjaW5jbHVkZSAiU2VsZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIlRleHQuaCIK ICNpbmNsdWRlICJUZXh0SXRlcmF0b3IuaCIKQEAgLTI1MTcsMTMgKzI1MTgsMTMgQEAgaW50IEFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmluZGV4Rm9yVgogICAgICAgICByZXR1cm4gMDsKICAg ICAKICAgICBQb3NpdGlvbiBpbmRleFBvc2l0aW9uID0gcG9zLmRlZXBFcXVpdmFsZW50KCk7Ci0g ICAgaWYgKCFpbmRleFBvc2l0aW9uLmFuY2hvck5vZGUoKSB8fCBpbmRleFBvc2l0aW9uLmFuY2hv ck5vZGUoKS0+cm9vdEVkaXRhYmxlRWxlbWVudCgpICE9IG5vZGUpCisgICAgaWYgKGluZGV4UG9z aXRpb24uaXNOdWxsKCkgfHwgcG9zLnJvb3RFZGl0YWJsZUVsZW1lbnQoKSAhPSBub2RlKQogICAg ICAgICByZXR1cm4gMDsKICAgICAKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBSZWZQ dHI8UmFuZ2U+IHJhbmdlID0gUmFuZ2U6OmNyZWF0ZShtX3JlbmRlcmVyLT5kb2N1bWVudCgpKTsK ICAgICByYW5nZS0+c2V0U3RhcnQobm9kZSwgMCwgZWMpOwotICAgIHJhbmdlLT5zZXRFbmQoaW5k ZXhQb3NpdGlvbi5hbmNob3JOb2RlKCksIGluZGV4UG9zaXRpb24uZGVwcmVjYXRlZEVkaXRpbmdP ZmZzZXQoKSwgZWMpOworICAgIHJhbmdlLT5zZXRFbmQoaW5kZXhQb3NpdGlvbiwgZWMpOwogCiAj aWYgUExBVEZPUk0oR1RLKQogICAgIC8vIFdlIG5lZWQgdG8gY29uc2lkZXIgcmVwbGFjZWQgZWxl bWVudHMgZm9yIEdUSywgYXMgdGhleSB3aWxsIGJlCkBAIC0yNjcyLDE1ICsyNjczLDkgQEAgaW50 IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmluZGV4KGNvbgogewogICAgIGlmICghaXNUZXh0 Q29udHJvbCgpKQogICAgICAgICByZXR1cm4gLTE7Ci0gICAgCi0gICAgTm9kZSogbm9kZSA9IHBv c2l0aW9uLmRlZXBFcXVpdmFsZW50KCkuZGVwcmVjYXRlZE5vZGUoKTsKLSAgICBpZiAoIW5vZGUp Ci0gICAgICAgIHJldHVybiAtMTsKLSAgICAKLSAgICBmb3IgKFJlbmRlck9iamVjdCogcmVuZGVy ZXIgPSBub2RlLT5yZW5kZXJlcigpOyByZW5kZXJlciAmJiByZW5kZXJlci0+bm9kZSgpOyByZW5k ZXJlciA9IHJlbmRlcmVyLT5wYXJlbnQoKSkgewotICAgICAgICBpZiAocmVuZGVyZXIgPT0gbV9y ZW5kZXJlcikKLSAgICAgICAgICAgIHJldHVybiBpbmRleEZvclZpc2libGVQb3NpdGlvbihwb3Np dGlvbik7Ci0gICAgfQorCisgICAgaWYgKHJlbmRlck9iamVjdENvbnRhaW5zUG9zaXRpb24obV9y ZW5kZXJlciwgcG9zaXRpb24uZGVlcEVxdWl2YWxlbnQoKSkpCisgICAgICAgIHJldHVybiBpbmRl eEZvclZpc2libGVQb3NpdGlvbihwb3NpdGlvbik7CiAgICAgCiAgICAgcmV0dXJuIC0xOwogfQpJ bmRleDogU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmgJKHJldmlzaW9uIDkzMTcwKQorKysgU291cmNlL1dlYkNv cmUvZG9tL1Bvc2l0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw2ICsxMjgsMTEgQEAgcHVi bGljOgogICAgIE5vZGUqIGRlcHJlY2F0ZWROb2RlKCkgY29uc3QgeyByZXR1cm4gbV9hbmNob3JO b2RlLmdldCgpOyB9CiAKICAgICBEb2N1bWVudCogZG9jdW1lbnQoKSBjb25zdCB7IHJldHVybiBt X2FuY2hvck5vZGUgPyBtX2FuY2hvck5vZGUtPmRvY3VtZW50KCkgOiAwOyB9CisgICAgRWxlbWVu dCogcm9vdEVkaXRhYmxlRWxlbWVudCgpIGNvbnN0CisgICAgeworICAgICAgICBOb2RlKiBjb250 YWluZXIgPSBjb250YWluZXJOb2RlKCk7CisgICAgICAgIHJldHVybiBjb250YWluZXIgPyBjb250 YWluZXItPnJvb3RFZGl0YWJsZUVsZW1lbnQoKSA6IDA7CisgICAgfQogCiAgICAgLy8gVGhlc2Ug c2hvdWxkIG9ubHkgYmUgdXNlZCBmb3IgUG9zaXRpb25Jc09mZnNldEluQW5jaG9yIHBvc2l0aW9u cywgdW5sZXNzCiAgICAgLy8gdGhlIHBvc2l0aW9uIGlzIGEgbGVnYWN5IGVkaXRpbmcgcG9zaXRp b24uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAJKHJldmlzaW9uIDkzMTcwKQorKysgU291cmNlL1dl YkNvcmUvZG9tL1JhbmdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc0LDYgKzI3NCwxOCBAQCB2 b2lkIFJhbmdlOjpzZXRFbmQoUGFzc1JlZlB0cjxOb2RlPiByZWZOCiAgICAgfQogfQogCit2b2lk IFJhbmdlOjpzZXRTdGFydChjb25zdCBQb3NpdGlvbiYgc3RhcnQsIEV4Y2VwdGlvbkNvZGUmIGVj KQoreworICAgIFBvc2l0aW9uIHBhcmVudEFuY2hvcmVkID0gc3RhcnQucGFyZW50QW5jaG9yZWRF cXVpdmFsZW50KCk7CisgICAgc2V0U3RhcnQocGFyZW50QW5jaG9yZWQuY29udGFpbmVyTm9kZSgp LCBwYXJlbnRBbmNob3JlZC5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSwgZWMpOworfQorCit2b2lk IFJhbmdlOjpzZXRFbmQoY29uc3QgUG9zaXRpb24mIGVuZCwgRXhjZXB0aW9uQ29kZSYgZWMpCit7 CisgICAgUG9zaXRpb24gcGFyZW50QW5jaG9yZWQgPSBlbmQucGFyZW50QW5jaG9yZWRFcXVpdmFs ZW50KCk7CisgICAgc2V0U3RhcnQocGFyZW50QW5jaG9yZWQuY29udGFpbmVyTm9kZSgpLCBwYXJl bnRBbmNob3JlZC5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSwgZWMpOworfQorCiB2b2lkIFJhbmdl Ojpjb2xsYXBzZShib29sIHRvU3RhcnQsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGlmICgh bV9zdGFydC5jb250YWluZXIoKSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgJKHJldmlzaW9uIDkzMTcw KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMyw2 ICsxMDMsOCBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBQb3NpdGlvbiBzdGFydFBvc2l0aW9uKCkg Y29uc3QgeyByZXR1cm4gbV9zdGFydC50b1Bvc2l0aW9uKCk7IH0KICAgICBjb25zdCBQb3NpdGlv biBlbmRQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fZW5kLnRvUG9zaXRpb24oKTsgfQorICAg IHZvaWQgc2V0U3RhcnQoY29uc3QgUG9zaXRpb24mLCBFeGNlcHRpb25Db2RlJik7CisgICAgdm9p ZCBzZXRFbmQoY29uc3QgUG9zaXRpb24mLCBFeGNlcHRpb25Db2RlJik7CiAKICAgICBOb2RlKiBm aXJzdE5vZGUoKSBjb25zdDsKICAgICBOb2RlKiBwYXN0TGFzdE5vZGUoKSBjb25zdDsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3BwCShyZXZpc2lv biA5MzE3MCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0VGV4dENvbW1hbmQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xOTgsOSArMTk4LDkgQEAgdm9pZCBJbnNlcnRUZXh0Q29tbWFu ZDo6ZG9BcHBseSgpCiBQb3NpdGlvbiBJbnNlcnRUZXh0Q29tbWFuZDo6aW5zZXJ0VGFiKGNvbnN0 IFBvc2l0aW9uJiBwb3MpCiB7CiAgICAgUG9zaXRpb24gaW5zZXJ0UG9zID0gVmlzaWJsZVBvc2l0 aW9uKHBvcywgRE9XTlNUUkVBTSkuZGVlcEVxdWl2YWxlbnQoKTsKLSAgICAgICAgCi0gICAgTm9k ZSogbm9kZSA9IGluc2VydFBvcy5kZXByZWNhdGVkTm9kZSgpOwotICAgIHVuc2lnbmVkIGludCBv ZmZzZXQgPSBpbnNlcnRQb3MuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKTsKKworICAgIE5vZGUq IG5vZGUgPSBpbnNlcnRQb3MuY29udGFpbmVyTm9kZSgpOworICAgIHVuc2lnbmVkIGludCBvZmZz ZXQgPSBub2RlLT5pc1RleHROb2RlKCkgPyBpbnNlcnRQb3Mub2Zmc2V0SW5Db250YWluZXJOb2Rl KCkgOiAwOwogCiAgICAgLy8ga2VlcCB0YWJzIGNvYWxlc2NlZCBpbiB0YWIgc3BhbgogICAgIGlm IChpc1RhYlNwYW5UZXh0Tm9kZShub2RlKSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9SZW5kZXJlZFBvc2l0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1JlbmRlcmVkUG9zaXRpb24uY3BwCShyZXZpc2lvbiA5MzE3MCkKKysrIFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvUmVuZGVyZWRQb3NpdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwMSw0 ICsxMDEsMTMgQEAgTGF5b3V0UmVjdCBSZW5kZXJlZFBvc2l0aW9uOjphYnNvbHV0ZVJlYwogICAg IHJldHVybiBsb2NhbFJlY3QgPT0gTGF5b3V0UmVjdCgpID8gTGF5b3V0UmVjdCgpIDogbV9yZW5k ZXJlci0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3QobG9jYWxSZWN0KSkuZW5jbG9zaW5n Qm91bmRpbmdCb3goKTsKIH0KIAorYm9vbCByZW5kZXJPYmplY3RDb250YWluc1Bvc2l0aW9uKFJl bmRlck9iamVjdCogdGFyZ2V0LCBjb25zdCBQb3NpdGlvbiYgcG9zaXRpb24pCit7CisgICAgZm9y IChSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gcmVuZGVyZXJGcm9tUG9zaXRpb24ocG9zaXRpb24p OyByZW5kZXJlciAmJiByZW5kZXJlci0+bm9kZSgpOyByZW5kZXJlciA9IHJlbmRlcmVyLT5wYXJl bnQoKSkgeworICAgICAgICBpZiAocmVuZGVyZXIgPT0gdGFyZ2V0KQorICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogfTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvUmVuZGVyZWRQb3NpdGlvbi5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvUmVuZGVyZWRQb3NpdGlvbi5oCShyZXZpc2lvbiA5MzE3MCkKKysr IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVuZGVyZWRQb3NpdGlvbi5oCSh3b3JraW5nIGNvcHkp CkBAIC02OCw2ICs2OCw4IEBAIGlubGluZSBSZW5kZXJlZFBvc2l0aW9uOjpSZW5kZXJlZFBvc2l0 aW8KIHsKIH0KIAorYm9vbCByZW5kZXJPYmplY3RDb250YWluc1Bvc2l0aW9uKFJlbmRlck9iamVj dCosIGNvbnN0IFBvc2l0aW9uJik7CisKIH07CiAKICNlbmRpZiAvLyBSZW5kZXJlZFBvc2l0aW9u X2gK