61893 2011-06-01 16:35:04 -0700 Switch ContainerNode to use IntPoint 2011-06-07 14:06:43 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61949 60318 1 eae eae eric leviw simon.fraser webkit.review.bot oldest_to_newest 413749 0 eae 2011-06-01 16:35:04 -0700 ContainerNode uses x, y, w, h in a couple of places when dealing with render boxes and line layout. Convert this to points and sizes instead. 413772 1 95690 eae 2011-06-01 17:03:30 -0700 Created attachment 95690 Patch 414145 2 95690 eric 2011-06-02 08:33:47 -0700 Comment on attachment 95690 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95690&action=review I think we should consider renaming the move() calls to moveBy() or something to make it clear what move(Point) is doing. (I know rect and IntPoint use the same naming, so maybe that should be a separate change?) > Source/WebCore/dom/ContainerNode.cpp:881 > + point.move(box->location()); Bleh. I'm liking generic move(IntPoint) less and less. it's not clear if it sets or moves. > Source/WebCore/dom/ContainerNode.cpp:907 > + point.move(box->size()); move(Size) is OK, but we still might want to rename both of these to moveBy. > Source/WebCore/platform/graphics/FloatPoint.h:107 > + return IntPoint(m_x > other.m_x ? m_x : other.m_x, > + m_y > other.m_y ? m_y : other.m_y); I don't think the wrapping his helpful here. 416676 3 96271 eae 2011-06-07 11:41:32 -0700 Created attachment 96271 Patch 416705 4 96271 eric 2011-06-07 12:04:26 -0700 Comment on attachment 96271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96271&action=review > Source/WebCore/platform/graphics/FloatPoint.h:125 > + return FloatPoint(m_x > other.m_x ? m_x : other.m_x, m_y > other.m_y ? m_y : other.m_y); This sounds like std::min/std::max.... 416710 5 eae 2011-06-07 12:08:06 -0700 Thanks, didn't realize we could use std::min/max in WebCore. 416739 6 96286 eae 2011-06-07 12:51:44 -0700 Created attachment 96286 Patch for landing 416776 7 96286 webkit.review.bot 2011-06-07 14:06:39 -0700 Comment on attachment 96286 Patch for landing Clearing flags on attachment: 96286 Committed r88264: <http://trac.webkit.org/changeset/88264> 416777 8 webkit.review.bot 2011-06-07 14:06:43 -0700 All reviewed patches have been landed. Closing bug. 95690 2011-06-01 17:03:30 -0700 2011-06-07 11:41:29 -0700 Patch bug-61893-20110601170329.patch text/plain 4281 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3ODY1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDEgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN3aXRjaCBDb250YWluZXJOb2RlIHRvIHVzZSBJbnRQb2ludAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE4OTMKKwor ICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogZG9tL0NvbnRh aW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6Z2V0VXBwZXJM ZWZ0Q29ybmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OmdldExvd2VyUmln aHRDb3JuZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6Z2V0UmVjdCk6Cisg ICAgICAgIENoYW5nZSB0byB1c2UgbWF4WC9tYXhZIGluc3RlYWQgb2YgeCt3aWR0aC95K2hlaWdo dAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oOgorICAgICAgICAo V2ViQ29yZTo6RmxvYXRQb2ludDo6bW92ZSk6CisgICAgICAgIChXZWJDb3JlOjpGbG9hdFBvaW50 OjpleHBhbmRlZFRvKToKKyAgICAgICAgQWRkIG1vdmUgYW5kIGV4cGFuZGVkVG8gbWlycm9yaW5n IHRoZSBJbnRQb2ludCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgc2FtZS4KKwogMjAxMS0wNi0wMSAg RW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCShyZXZp c2lvbiA4NzgyOCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODc4LDcgKzg3OCw3IEBAIGJvb2wgQ29udGFpbmVyTm9kZTo6Z2V0VXBw ZXJMZWZ0Q29ybmVyKEYKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRvUmVuZGVyVGV4dChv KS0+Zmlyc3RUZXh0Qm94KCktPnJvb3QoKS0+bGluZVRvcCgpKTsKICAgICAgICAgICAgIH0gZWxz ZSBpZiAoby0+aXNCb3goKSkgewogICAgICAgICAgICAgICAgIFJlbmRlckJveCogYm94ID0gdG9S ZW5kZXJCb3gobyk7Ci0gICAgICAgICAgICAgICAgcG9pbnQubW92ZShib3gtPngoKSwgYm94LT55 KCkpOworICAgICAgICAgICAgICAgIHBvaW50Lm1vdmUoYm94LT5sb2NhdGlvbigpKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIHBvaW50ID0gby0+Y29udGFpbmVyKCktPmxvY2FsVG9BYnNv bHV0ZShwb2ludCwgZmFsc2UsIHRydWUpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC05 MDQsNyArOTA0LDcgQEAgYm9vbCBDb250YWluZXJOb2RlOjpnZXRMb3dlclJpZ2h0Q29ybmVyKAog ICAgIGlmICghby0+aXNJbmxpbmUoKSB8fCBvLT5pc1JlcGxhY2VkKCkpIHsKICAgICAgICAgUmVu ZGVyQm94KiBib3ggPSB0b1JlbmRlckJveChvKTsKICAgICAgICAgcG9pbnQgPSBvLT5sb2NhbFRv QWJzb2x1dGUoRmxvYXRQb2ludCgpLCBmYWxzZSwgdHJ1ZSk7Ci0gICAgICAgIHBvaW50Lm1vdmUo Ym94LT53aWR0aCgpLCBib3gtPmhlaWdodCgpKTsKKyAgICAgICAgcG9pbnQubW92ZShib3gtPnNp emUoKSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApAQCAtOTMwLDEyICs5MzAsMTIg QEAgYm9vbCBDb250YWluZXJOb2RlOjpnZXRMb3dlclJpZ2h0Q29ybmVyKAogICAgICAgICAgICAg aWYgKG8tPmlzVGV4dCgpKSB7CiAgICAgICAgICAgICAgICAgUmVuZGVyVGV4dCogdGV4dCA9IHRv UmVuZGVyVGV4dChvKTsKICAgICAgICAgICAgICAgICBJbnRSZWN0IGxpbmVzQm94ID0gdGV4dC0+ bGluZXNCb3VuZGluZ0JveCgpOwotICAgICAgICAgICAgICAgIGlmICghbGluZXNCb3gueCgpICYm ICFsaW5lc0JveC53aWR0aCgpICYmICFsaW5lc0JveC55KCkgJiYgIWxpbmVzQm94LmhlaWdodCgp KQorICAgICAgICAgICAgICAgIGlmICghbGluZXNCb3gubWF4WCgpICYmICFsaW5lc0JveC5tYXhZ KCkpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgICAgIHBvaW50 Lm1vdmUobGluZXNCb3gueCgpICsgbGluZXNCb3gud2lkdGgoKSwgbGluZXNCb3gueSgpICsgbGlu ZXNCb3guaGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIHBvaW50Lm1vdmUobGluZXNCb3gubWF4 WE1heFlDb3JuZXIoKSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIFJl bmRlckJveCogYm94ID0gdG9SZW5kZXJCb3gobyk7Ci0gICAgICAgICAgICAgICAgcG9pbnQubW92 ZShib3gtPngoKSArIGJveC0+d2lkdGgoKSwgYm94LT55KCkgKyBib3gtPmhlaWdodCgpKTsKKyAg ICAgICAgICAgICAgICBwb2ludC5tb3ZlKGJveC0+ZnJhbWVSZWN0KCkubWF4WE1heFlDb3JuZXIo KSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBwb2ludCA9IG8tPmNvbnRhaW5lcigpLT5s b2NhbFRvQWJzb2x1dGUocG9pbnQsIGZhbHNlLCB0cnVlKTsKICAgICAgICAgICAgIHJldHVybiB0 cnVlOwpAQCAtOTU5LDEwICs5NTksNyBAQCBJbnRSZWN0IENvbnRhaW5lck5vZGU6OmdldFJlY3Qo KSBjb25zdAogICAgICAgICAgICAgdXBwZXJMZWZ0ID0gbG93ZXJSaWdodDsKICAgICB9IAogCi0g ICAgbG93ZXJSaWdodC5zZXRYKG1heCh1cHBlckxlZnQueCgpLCBsb3dlclJpZ2h0LngoKSkpOwot ICAgIGxvd2VyUmlnaHQuc2V0WShtYXgodXBwZXJMZWZ0LnkoKSwgbG93ZXJSaWdodC55KCkpKTsK LSAgICAKLSAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChGbG9hdFJlY3QodXBwZXJMZWZ0LCBs b3dlclJpZ2h0IC0gdXBwZXJMZWZ0KSk7CisgICAgcmV0dXJuIGVuY2xvc2luZ0ludFJlY3QoRmxv YXRSZWN0KHVwcGVyTGVmdCwgbG93ZXJSaWdodC5leHBhbmRlZFRvKHVwcGVyTGVmdCkgLSB1cHBl ckxlZnQpKTsKIH0KIAogdm9pZCBDb250YWluZXJOb2RlOjpzZXRGb2N1cyhib29sIHJlY2VpdmVk KQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UG9pbnQu aAkocmV2aXNpb24gODc4MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G bG9hdFBvaW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDggKzYxLDkgQEAgc3RydWN0IFNrUG9p bnQ7CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEFmZmluZVRyYW5zZm9ybTsKLWNsYXNz IFRyYW5zZm9ybWF0aW9uTWF0cml4OwogY2xhc3MgSW50UG9pbnQ7CitjbGFzcyBJbnRTaXplOwor Y2xhc3MgVHJhbnNmb3JtYXRpb25NYXRyaXg7CiAKIGNsYXNzIEZsb2F0UG9pbnQgewogcHVibGlj OgpAQCAtOTAsNiArOTEsMjEgQEAgcHVibGljOgogICAgICAgICBtX3ggKz0gZHg7CiAgICAgICAg IG1feSArPSBkeTsKICAgICB9CisgICAgdm9pZCBtb3ZlKGNvbnN0IEludFNpemUmIGEpCisgICAg eworICAgICAgICBtX3ggKz0gYS53aWR0aCgpOworICAgICAgICBtX3kgKz0gYS5oZWlnaHQoKTsK KyAgICB9CisgICAgdm9pZCBtb3ZlKGNvbnN0IEludFBvaW50JiBhKQorICAgIHsKKyAgICAgICAg bV94ICs9IGEueCgpOworICAgICAgICBtX3kgKz0gYS55KCk7CisgICAgfQorICAgIEZsb2F0UG9p bnQgZXhwYW5kZWRUbyhjb25zdCBGbG9hdFBvaW50JiBvdGhlcikgY29uc3QKKyAgICB7CisgICAg ICAgIHJldHVybiBJbnRQb2ludChtX3ggPiBvdGhlci5tX3ggPyBtX3ggOiBvdGhlci5tX3gsCisg ICAgICAgICAgICBtX3kgPiBvdGhlci5tX3kgPyBtX3kgOiBvdGhlci5tX3kpOworICAgIH0gICAK ICAgICB2b2lkIHNjYWxlKGZsb2F0IHN4LCBmbG9hdCBzeSkKICAgICB7CiAgICAgICAgIG1feCAq PSBzeDsK 96271 2011-06-07 11:41:32 -0700 2011-06-07 12:51:42 -0700 Patch bug-61893-20110607114131.patch text/plain 4334 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MjQ5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDYtMDcgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFN3aXRjaCBDb250YWluZXJOb2RlIHRvIHVzZSBJbnRQb2ludAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE4OTMKKwor ICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogZG9tL0NvbnRh aW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6Z2V0VXBwZXJM ZWZ0Q29ybmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OmdldExvd2VyUmln aHRDb3JuZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6Z2V0UmVjdCk6Cisg ICAgICAgIENoYW5nZSB0byB1c2UgbWF4WC9tYXhZIGluc3RlYWQgb2YgeCt3aWR0aC95K2hlaWdo dAorICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50Lmg6Cisg ICAgICAgIChXZWJDb3JlOjpGbG9hdFBvaW50Ojptb3ZlKToKKyAgICAgICAgKFdlYkNvcmU6OkZs b2F0UG9pbnQ6Om1vdmVCeSk6CisgICAgICAgIChXZWJDb3JlOjpGbG9hdFBvaW50OjpleHBhbmRl ZFRvKToKKyAgICAgICAgQWRkIG1vdmUsIG1vdmVCeSBhbmQgZXhwYW5kZWRUbyBtaXJyb3Jpbmcg dGhlIEludFBvaW50IGltcGxlbWVudGF0aW9uIG9mIHRoZSBzYW1lLgorCiAyMDExLTA2LTA3ICBZ b3VuZyBIYW4gTGVlICA8am95YnJvQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogU291cmNlL1dlYkNvcmUvZG9t L0NvbnRhaW5lck5vZGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Db250 YWluZXJOb2RlLmNwcAkocmV2aXNpb24gODgyNDcpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vQ29u dGFpbmVyTm9kZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3OCw3ICs4NzgsNyBAQCBib29sIENv bnRhaW5lck5vZGU6OmdldFVwcGVyTGVmdENvcm5lcihGCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICB0b1JlbmRlclRleHQobyktPmZpcnN0VGV4dEJveCgpLT5yb290KCktPmxpbmVUb3AoKSk7 CiAgICAgICAgICAgICB9IGVsc2UgaWYgKG8tPmlzQm94KCkpIHsKICAgICAgICAgICAgICAgICBS ZW5kZXJCb3gqIGJveCA9IHRvUmVuZGVyQm94KG8pOwotICAgICAgICAgICAgICAgIHBvaW50Lm1v dmUoYm94LT54KCksIGJveC0+eSgpKTsKKyAgICAgICAgICAgICAgICBwb2ludC5tb3ZlQnkoYm94 LT5sb2NhdGlvbigpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHBvaW50ID0gby0+Y29u dGFpbmVyKCktPmxvY2FsVG9BYnNvbHV0ZShwb2ludCwgZmFsc2UsIHRydWUpOwogICAgICAgICAg ICAgcmV0dXJuIHRydWU7CkBAIC05MDQsNyArOTA0LDcgQEAgYm9vbCBDb250YWluZXJOb2RlOjpn ZXRMb3dlclJpZ2h0Q29ybmVyKAogICAgIGlmICghby0+aXNJbmxpbmUoKSB8fCBvLT5pc1JlcGxh Y2VkKCkpIHsKICAgICAgICAgUmVuZGVyQm94KiBib3ggPSB0b1JlbmRlckJveChvKTsKICAgICAg ICAgcG9pbnQgPSBvLT5sb2NhbFRvQWJzb2x1dGUoRmxvYXRQb2ludCgpLCBmYWxzZSwgdHJ1ZSk7 Ci0gICAgICAgIHBvaW50Lm1vdmUoYm94LT53aWR0aCgpLCBib3gtPmhlaWdodCgpKTsKKyAgICAg ICAgcG9pbnQubW92ZShib3gtPnNpemUoKSk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K IApAQCAtOTMwLDEyICs5MzAsMTIgQEAgYm9vbCBDb250YWluZXJOb2RlOjpnZXRMb3dlclJpZ2h0 Q29ybmVyKAogICAgICAgICAgICAgaWYgKG8tPmlzVGV4dCgpKSB7CiAgICAgICAgICAgICAgICAg UmVuZGVyVGV4dCogdGV4dCA9IHRvUmVuZGVyVGV4dChvKTsKICAgICAgICAgICAgICAgICBJbnRS ZWN0IGxpbmVzQm94ID0gdGV4dC0+bGluZXNCb3VuZGluZ0JveCgpOwotICAgICAgICAgICAgICAg IGlmICghbGluZXNCb3gueCgpICYmICFsaW5lc0JveC53aWR0aCgpICYmICFsaW5lc0JveC55KCkg JiYgIWxpbmVzQm94LmhlaWdodCgpKQorICAgICAgICAgICAgICAgIGlmICghbGluZXNCb3gubWF4 WCgpICYmICFsaW5lc0JveC5tYXhZKCkpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICAgICAgICAgIHBvaW50Lm1vdmUobGluZXNCb3gueCgpICsgbGluZXNCb3gud2lkdGgo KSwgbGluZXNCb3gueSgpICsgbGluZXNCb3guaGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIHBv aW50Lm1vdmVCeShsaW5lc0JveC5tYXhYTWF4WUNvcm5lcigpKTsKICAgICAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAgICAgUmVuZGVyQm94KiBib3ggPSB0b1JlbmRlckJveChvKTsKLSAg ICAgICAgICAgICAgICBwb2ludC5tb3ZlKGJveC0+eCgpICsgYm94LT53aWR0aCgpLCBib3gtPnko KSArIGJveC0+aGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIHBvaW50Lm1vdmVCeShib3gtPmZy YW1lUmVjdCgpLm1heFhNYXhZQ29ybmVyKCkpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg cG9pbnQgPSBvLT5jb250YWluZXIoKS0+bG9jYWxUb0Fic29sdXRlKHBvaW50LCBmYWxzZSwgdHJ1 ZSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTk1OSwxMCArOTU5LDcgQEAgSW50UmVj dCBDb250YWluZXJOb2RlOjpnZXRSZWN0KCkgY29uc3QKICAgICAgICAgICAgIHVwcGVyTGVmdCA9 IGxvd2VyUmlnaHQ7CiAgICAgfSAKIAotICAgIGxvd2VyUmlnaHQuc2V0WChtYXgodXBwZXJMZWZ0 LngoKSwgbG93ZXJSaWdodC54KCkpKTsKLSAgICBsb3dlclJpZ2h0LnNldFkobWF4KHVwcGVyTGVm dC55KCksIGxvd2VyUmlnaHQueSgpKSk7Ci0gICAgCi0gICAgcmV0dXJuIGVuY2xvc2luZ0ludFJl Y3QoRmxvYXRSZWN0KHVwcGVyTGVmdCwgbG93ZXJSaWdodCAtIHVwcGVyTGVmdCkpOworICAgIHJl dHVybiBlbmNsb3NpbmdJbnRSZWN0KEZsb2F0UmVjdCh1cHBlckxlZnQsIGxvd2VyUmlnaHQuZXhw YW5kZWRUbyh1cHBlckxlZnQpIC0gdXBwZXJMZWZ0KSk7CiB9CiAKIHZvaWQgQ29udGFpbmVyTm9k ZTo6c2V0Rm9jdXMoYm9vbCByZWNlaXZlZCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0Zsb2F0UG9pbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmgJKHJldmlzaW9uIDg4MjQ3KQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2ludC5oCSh3b3JraW5nIGNvcHkpCkBAIC05 MSw2ICs5MSwxNiBAQCBwdWJsaWM6CiAgICAgICAgIG1feCArPSBkeDsKICAgICAgICAgbV95ICs9 IGR5OwogICAgIH0KKyAgICB2b2lkIG1vdmUoY29uc3QgSW50U2l6ZSYgYSkKKyAgICB7CisgICAg ICAgIG1feCArPSBhLndpZHRoKCk7CisgICAgICAgIG1feSArPSBhLmhlaWdodCgpOworICAgIH0K KyAgICB2b2lkIG1vdmVCeShjb25zdCBJbnRQb2ludCYgYSkKKyAgICB7CisgICAgICAgIG1feCAr PSBhLngoKTsKKyAgICAgICAgbV95ICs9IGEueSgpOworICAgIH0KICAgICB2b2lkIHNjYWxlKGZs b2F0IHN4LCBmbG9hdCBzeSkKICAgICB7CiAgICAgICAgIG1feCAqPSBzeDsKQEAgLTExMCw2ICsx MjAsMTEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV94ICogbV94ICsgbV95ICogbV95Owog ICAgIH0KIAorICAgIEZsb2F0UG9pbnQgZXhwYW5kZWRUbyhjb25zdCBGbG9hdFBvaW50JiBvdGhl cikgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiBGbG9hdFBvaW50KG1feCA+IG90aGVyLm1f eCA/IG1feCA6IG90aGVyLm1feCwgbV95ID4gb3RoZXIubV95ID8gbV95IDogb3RoZXIubV95KTsK KyAgICB9ICAgCisKICNpZiBVU0UoQ0cpIHx8IFVTRShTS0lBX09OX01BQ19DSFJPTUUpCiAgICAg RmxvYXRQb2ludChjb25zdCBDR1BvaW50Jik7CiAgICAgb3BlcmF0b3IgQ0dQb2ludCgpIGNvbnN0 Owo= 96286 2011-06-07 12:51:44 -0700 2011-06-07 14:06:39 -0700 Patch for landing bug-61893-20110607125143.patch text/plain 4293 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MjU1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDYtMDcgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgorCisgICAgICAgIFN3aXRjaCBDb250YWluZXJOb2RlIHRvIHVzZSBJbnRQb2ludAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE4OTMKKworICAg ICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogZG9tL0NvbnRhaW5l ck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6Z2V0VXBwZXJMZWZ0 Q29ybmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OmdldExvd2VyUmlnaHRD b3JuZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6Z2V0UmVjdCk6CisgICAg ICAgIENoYW5nZSB0byB1c2UgbWF4WC9tYXhZIGluc3RlYWQgb2YgeCt3aWR0aC95K2hlaWdodAor ICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50Lmg6CisgICAg ICAgIChXZWJDb3JlOjpGbG9hdFBvaW50Ojptb3ZlKToKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0 UG9pbnQ6Om1vdmVCeSk6CisgICAgICAgIChXZWJDb3JlOjpGbG9hdFBvaW50OjpleHBhbmRlZFRv KToKKyAgICAgICAgQWRkIG1vdmUsIG1vdmVCeSBhbmQgZXhwYW5kZWRUbyBtaXJyb3JpbmcgdGhl IEludFBvaW50IGltcGxlbWVudGF0aW9uIG9mIHRoZSBzYW1lLgorCiAyMDExLTA2LTA3ICBFbWls IEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmlj IFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAJKHJldmlzaW9u IDg4MjU1KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC04NzgsNyArODc4LDcgQEAgYm9vbCBDb250YWluZXJOb2RlOjpnZXRVcHBlckxl ZnRDb3JuZXIoRgogICAgICAgICAgICAgICAgICAgICAgICAgICAgdG9SZW5kZXJUZXh0KG8pLT5m aXJzdFRleHRCb3goKS0+cm9vdCgpLT5saW5lVG9wKCkpOwogICAgICAgICAgICAgfSBlbHNlIGlm IChvLT5pc0JveCgpKSB7CiAgICAgICAgICAgICAgICAgUmVuZGVyQm94KiBib3ggPSB0b1JlbmRl ckJveChvKTsKLSAgICAgICAgICAgICAgICBwb2ludC5tb3ZlKGJveC0+eCgpLCBib3gtPnkoKSk7 CisgICAgICAgICAgICAgICAgcG9pbnQubW92ZUJ5KGJveC0+bG9jYXRpb24oKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBwb2ludCA9IG8tPmNvbnRhaW5lcigpLT5sb2NhbFRvQWJzb2x1 dGUocG9pbnQsIGZhbHNlLCB0cnVlKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtOTA0 LDcgKzkwNCw3IEBAIGJvb2wgQ29udGFpbmVyTm9kZTo6Z2V0TG93ZXJSaWdodENvcm5lcigKICAg ICBpZiAoIW8tPmlzSW5saW5lKCkgfHwgby0+aXNSZXBsYWNlZCgpKSB7CiAgICAgICAgIFJlbmRl ckJveCogYm94ID0gdG9SZW5kZXJCb3gobyk7CiAgICAgICAgIHBvaW50ID0gby0+bG9jYWxUb0Fi c29sdXRlKEZsb2F0UG9pbnQoKSwgZmFsc2UsIHRydWUpOwotICAgICAgICBwb2ludC5tb3ZlKGJv eC0+d2lkdGgoKSwgYm94LT5oZWlnaHQoKSk7CisgICAgICAgIHBvaW50Lm1vdmUoYm94LT5zaXpl KCkpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKQEAgLTkzMCwxMiArOTMwLDEyIEBA IGJvb2wgQ29udGFpbmVyTm9kZTo6Z2V0TG93ZXJSaWdodENvcm5lcigKICAgICAgICAgICAgIGlm IChvLT5pc1RleHQoKSkgewogICAgICAgICAgICAgICAgIFJlbmRlclRleHQqIHRleHQgPSB0b1Jl bmRlclRleHQobyk7CiAgICAgICAgICAgICAgICAgSW50UmVjdCBsaW5lc0JveCA9IHRleHQtPmxp bmVzQm91bmRpbmdCb3goKTsKLSAgICAgICAgICAgICAgICBpZiAoIWxpbmVzQm94LngoKSAmJiAh bGluZXNCb3gud2lkdGgoKSAmJiAhbGluZXNCb3gueSgpICYmICFsaW5lc0JveC5oZWlnaHQoKSkK KyAgICAgICAgICAgICAgICBpZiAoIWxpbmVzQm94Lm1heFgoKSAmJiAhbGluZXNCb3gubWF4WSgp KQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAgICBwb2ludC5t b3ZlKGxpbmVzQm94LngoKSArIGxpbmVzQm94LndpZHRoKCksIGxpbmVzQm94LnkoKSArIGxpbmVz Qm94LmhlaWdodCgpKTsKKyAgICAgICAgICAgICAgICBwb2ludC5tb3ZlQnkobGluZXNCb3gubWF4 WE1heFlDb3JuZXIoKSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIFJl bmRlckJveCogYm94ID0gdG9SZW5kZXJCb3gobyk7Ci0gICAgICAgICAgICAgICAgcG9pbnQubW92 ZShib3gtPngoKSArIGJveC0+d2lkdGgoKSwgYm94LT55KCkgKyBib3gtPmhlaWdodCgpKTsKKyAg ICAgICAgICAgICAgICBwb2ludC5tb3ZlQnkoYm94LT5mcmFtZVJlY3QoKS5tYXhYTWF4WUNvcm5l cigpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHBvaW50ID0gby0+Y29udGFpbmVyKCkt PmxvY2FsVG9BYnNvbHV0ZShwb2ludCwgZmFsc2UsIHRydWUpOwogICAgICAgICAgICAgcmV0dXJu IHRydWU7CkBAIC05NTksMTAgKzk1OSw3IEBAIEludFJlY3QgQ29udGFpbmVyTm9kZTo6Z2V0UmVj dCgpIGNvbnN0CiAgICAgICAgICAgICB1cHBlckxlZnQgPSBsb3dlclJpZ2h0OwogICAgIH0gCiAK LSAgICBsb3dlclJpZ2h0LnNldFgobWF4KHVwcGVyTGVmdC54KCksIGxvd2VyUmlnaHQueCgpKSk7 Ci0gICAgbG93ZXJSaWdodC5zZXRZKG1heCh1cHBlckxlZnQueSgpLCBsb3dlclJpZ2h0LnkoKSkp OwotICAgIAotICAgIHJldHVybiBlbmNsb3NpbmdJbnRSZWN0KEZsb2F0UmVjdCh1cHBlckxlZnQs IGxvd2VyUmlnaHQgLSB1cHBlckxlZnQpKTsKKyAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChG bG9hdFJlY3QodXBwZXJMZWZ0LCBsb3dlclJpZ2h0LmV4cGFuZGVkVG8odXBwZXJMZWZ0KSAtIHVw cGVyTGVmdCkpOwogfQogCiB2b2lkIENvbnRhaW5lck5vZGU6OnNldEZvY3VzKGJvb2wgcmVjZWl2 ZWQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFBvaW50LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRQb2lu dC5oCShyZXZpc2lvbiA4ODI1NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0Zsb2F0UG9pbnQuaAkod29ya2luZyBjb3B5KQpAQCAtOTEsNiArOTEsMTYgQEAgcHVibGljOgog ICAgICAgICBtX3ggKz0gZHg7CiAgICAgICAgIG1feSArPSBkeTsKICAgICB9CisgICAgdm9pZCBt b3ZlKGNvbnN0IEludFNpemUmIGEpCisgICAgeworICAgICAgICBtX3ggKz0gYS53aWR0aCgpOwor ICAgICAgICBtX3kgKz0gYS5oZWlnaHQoKTsKKyAgICB9CisgICAgdm9pZCBtb3ZlQnkoY29uc3Qg SW50UG9pbnQmIGEpCisgICAgeworICAgICAgICBtX3ggKz0gYS54KCk7CisgICAgICAgIG1feSAr PSBhLnkoKTsKKyAgICB9CiAgICAgdm9pZCBzY2FsZShmbG9hdCBzeCwgZmxvYXQgc3kpCiAgICAg ewogICAgICAgICBtX3ggKj0gc3g7CkBAIC0xMTAsNiArMTIwLDExIEBAIHB1YmxpYzoKICAgICAg ICAgcmV0dXJuIG1feCAqIG1feCArIG1feSAqIG1feTsKICAgICB9CiAKKyAgICBGbG9hdFBvaW50 IGV4cGFuZGVkVG8oY29uc3QgRmxvYXRQb2ludCYgb3RoZXIpIGNvbnN0CisgICAgeworICAgICAg ICByZXR1cm4gRmxvYXRQb2ludChzdGQ6Om1heChtX3gsIG90aGVyLm1feCksIHN0ZDo6bWF4KG1f eSwgb3RoZXIubV95KSk7CisgICAgfSAgIAorCiAjaWYgVVNFKENHKSB8fCBVU0UoU0tJQV9PTl9N QUNfQ0hST01FKQogICAgIEZsb2F0UG9pbnQoY29uc3QgQ0dQb2ludCYpOwogICAgIG9wZXJhdG9y IENHUG9pbnQoKSBjb25zdDsK