62313 2011-06-08 13:13:04 -0700 Frobnosticate the RenderEmbeddedObject::getReplacementTextGeometry 2011-06-08 16:00:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric leviw simon.fraser webkit.review.bot oldest_to_newest 417451 0 eae 2011-06-08 13:13:04 -0700 This is the last remaining occurrence of "int tx, int ty". Yay! 417479 1 96472 eae 2011-06-08 13:46:07 -0700 Created attachment 96472 Patch 417496 2 96472 eric 2011-06-08 14:08:43 -0700 Comment on attachment 96472 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96472&action=review > Source/WebCore/platform/graphics/FloatRect.h:110 > + void moveBy(const IntPoint& delta) { m_location.move(delta.x(), delta.y()); } This should be FloatPoint, no? 417502 3 eae 2011-06-08 14:10:44 -0700 (In reply to comment #2) > (From update of attachment 96472 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=96472&action=review > > > Source/WebCore/platform/graphics/FloatRect.h:110 > > + void moveBy(const IntPoint& delta) { m_location.move(delta.x(), delta.y()); } > > This should be FloatPoint, no? No I actually want it to be IntPoint here, that way we save an extra conversion from int->float. I could add a FloatPoint version of moveBy in addition to the IntPoint one if you'd like. 417522 4 96472 eric 2011-06-08 14:18:01 -0700 Comment on attachment 96472 Patch Please add a Float version and a comment as to why you're adding the Int version. We don't normally have Int versions in these Float files. 417553 5 96484 eae 2011-06-08 14:42:15 -0700 Created attachment 96484 Patch 417555 6 eae 2011-06-08 14:44:49 -0700 PTAL. I'd be happy to revert the FloatRect changes and just do rect.move(accumulatedOffset.x(), accumulatedOffset.y()) if you think that makes more sense. 417556 7 96484 eric 2011-06-08 14:45:27 -0700 Comment on attachment 96484 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96484&action=review Otherwise seems OK. > Source/WebCore/platform/graphics/FloatRect.h:111 > + void moveBy(const IntPoint& delta) { m_location.move(delta.x(), delta.y()); } You should put a comment next to the IntPoint moveby as to why it's desired. Something like // We have an IntPoint version of moveBy to avoid unecessary float->int conversion when moving by an IntPoint. Actually, I don't see how your version helps at all? We already do the float to int conversion in the move( ) call, why not just do it once with the INtPoint->FloatPoint implicit converstion. I think we should remove your moveBy(IntPoint). 417558 8 eric 2011-06-08 14:46:11 -0700 No, I think the FloatRect addition of moveBy(FloatPoint) is good. I just don't think you want an IntPoint version. 417574 9 96489 eae 2011-06-08 14:58:03 -0700 Created attachment 96489 Patch 417590 10 eae 2011-06-08 15:21:42 -0700 Thanks Eric! 417643 11 leviw 2011-06-08 15:54:26 -0700 Finally! Frobnostication!! 417650 12 96489 webkit.review.bot 2011-06-08 16:00:17 -0700 Comment on attachment 96489 Patch Clearing flags on attachment: 96489 Committed r88400: <http://trac.webkit.org/changeset/88400> 417651 13 webkit.review.bot 2011-06-08 16:00:21 -0700 All reviewed patches have been landed. Closing bug. 96472 2011-06-08 13:46:07 -0700 2011-06-08 14:42:12 -0700 Patch bug-62313-20110608134606.patch text/plain 4613 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MzgyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDggIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpnZXRSZXBsYWNlbWVudFRl eHRHZW9tZXRyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjIzMTMKKworICAgICAgICBSZXBsYWNlIHRoZSBsYXN0IHVzZSBvZiB0eCwgdHkgd2l0aCBJ bnRQb2ludC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpGbG9h dFJlY3Q6Om1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6RmxvYXRSZWN0Ojptb3ZlQnkpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnRSZXBsYWNlZCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6Z2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzSW5NaXNzaW5nUGx1Z2lu SW5kaWNhdG9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaDoK KwogMjAxMS0wNi0wOCAgSmFtZXMgU2ltb25zZW4gIDxzaW1vbmphbUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgVG9ueSBHZW50aWxjb3JlLgpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmgJKHJldmlzaW9uIDg4Mzc3KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTcwLDYgKzcwLDcgQEAgY2xhc3MgVkdSZWN0OwogI2VuZGlmCiAKIGNsYXNzIEludFJl Y3Q7CitjbGFzcyBJbnRQb2ludDsKIAogY2xhc3MgRmxvYXRSZWN0IHsKIHB1YmxpYzoKQEAgLTEw NSw3ICsxMDYsOCBAQCBwdWJsaWM6CiAgICAgRmxvYXRQb2ludCBjZW50ZXIoKSBjb25zdCB7IHJl dHVybiBGbG9hdFBvaW50KHgoKSArIHdpZHRoKCkgLyAyLCB5KCkgKyBoZWlnaHQoKSAvIDIpOyB9 CiAKICAgICB2b2lkIG1vdmUoY29uc3QgRmxvYXRTaXplJiBkZWx0YSkgeyBtX2xvY2F0aW9uICs9 IGRlbHRhOyB9IAotICAgIHZvaWQgbW92ZShmbG9hdCBkeCwgZmxvYXQgZHkpIHsgbV9sb2NhdGlv bi5tb3ZlKGR4LCBkeSk7IH0gCisgICAgdm9pZCBtb3ZlKGZsb2F0IGR4LCBmbG9hdCBkeSkgeyBt X2xvY2F0aW9uLm1vdmUoZHgsIGR5KTsgfQorICAgIHZvaWQgbW92ZUJ5KGNvbnN0IEludFBvaW50 JiBkZWx0YSkgeyBtX2xvY2F0aW9uLm1vdmUoZGVsdGEueCgpLCBkZWx0YS55KCkpOyB9CiAKICAg ICBib29sIGludGVyc2VjdHMoY29uc3QgRmxvYXRSZWN0JikgY29uc3Q7CiAgICAgYm9vbCBjb250 YWlucyhjb25zdCBGbG9hdFJlY3QmKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcAkocmV2aXNpb24gODgzNzcpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNjMsNyArMTYzLDcgQEAgdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6 cGFpbnRSZXBsYWNlZAogICAgIEZvbnQgZm9udDsKICAgICBUZXh0UnVuIHJ1bigiIik7CiAgICAg ZmxvYXQgdGV4dFdpZHRoOwotICAgIGlmICghZ2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkocGFp bnRPZmZzZXQueCgpLCBwYWludE9mZnNldC55KCksIGNvbnRlbnRSZWN0LCBwYXRoLCByZXBsYWNl bWVudFRleHRSZWN0LCBmb250LCBydW4sIHRleHRXaWR0aCkpCisgICAgaWYgKCFnZXRSZXBsYWNl bWVudFRleHRHZW9tZXRyeShwYWludE9mZnNldCwgY29udGVudFJlY3QsIHBhdGgsIHJlcGxhY2Vt ZW50VGV4dFJlY3QsIGZvbnQsIHJ1biwgdGV4dFdpZHRoKSkKICAgICAgICAgcmV0dXJuOwogICAg IAogICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqY29udGV4dCk7CkBA IC0xODAsMTAgKzE4MCwxMCBAQCB2b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpwYWludFJlcGxh Y2VkCiAgICAgY29udGV4dC0+ZHJhd0JpZGlUZXh0KGZvbnQsIHJ1biwgRmxvYXRQb2ludChsYWJl bFgsIGxhYmVsWSkpOwogfQogCi1ib29sIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpnZXRSZXBsYWNl bWVudFRleHRHZW9tZXRyeShpbnQgdHgsIGludCB0eSwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwg UGF0aCYgcGF0aCwgRmxvYXRSZWN0JiByZXBsYWNlbWVudFRleHRSZWN0LCBGb250JiBmb250LCBU ZXh0UnVuJiBydW4sIGZsb2F0JiB0ZXh0V2lkdGgpCitib29sIFJlbmRlckVtYmVkZGVkT2JqZWN0 OjpnZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeShjb25zdCBJbnRQb2ludCYgYWNjdW11bGF0ZWRP ZmZzZXQsIEZsb2F0UmVjdCYgY29udGVudFJlY3QsIFBhdGgmIHBhdGgsIEZsb2F0UmVjdCYgcmVw bGFjZW1lbnRUZXh0UmVjdCwgRm9udCYgZm9udCwgVGV4dFJ1biYgcnVuLCBmbG9hdCYgdGV4dFdp ZHRoKQogewogICAgIGNvbnRlbnRSZWN0ID0gY29udGVudEJveFJlY3QoKTsKLSAgICBjb250ZW50 UmVjdC5tb3ZlKHR4LCB0eSk7CisgICAgY29udGVudFJlY3QubW92ZUJ5KGFjY3VtdWxhdGVkT2Zm c2V0KTsKICAgICAKICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uOwogICAgIFJl bmRlclRoZW1lOjpkZWZhdWx0VGhlbWUoKS0+c3lzdGVtRm9udChDU1NWYWx1ZVdlYmtpdFNtYWxs Q29udHJvbCwgZm9udERlc2NyaXB0aW9uKTsKQEAgLTI1Nyw3ICsyNTcsNyBAQCBib29sIFJlbmRl ckVtYmVkZGVkT2JqZWN0Ojppc0luTWlzc2luZ1BsCiAgICAgRm9udCBmb250OwogICAgIFRleHRS dW4gcnVuKCIiKTsKICAgICBmbG9hdCB0ZXh0V2lkdGg7Ci0gICAgaWYgKCFnZXRSZXBsYWNlbWVu dFRleHRHZW9tZXRyeSgwLCAwLCBjb250ZW50UmVjdCwgcGF0aCwgcmVwbGFjZW1lbnRUZXh0UmVj dCwgZm9udCwgcnVuLCB0ZXh0V2lkdGgpKQorICAgIGlmICghZ2V0UmVwbGFjZW1lbnRUZXh0R2Vv bWV0cnkoSW50UG9pbnQoKSwgY29udGVudFJlY3QsIHBhdGgsIHJlcGxhY2VtZW50VGV4dFJlY3Qs IGZvbnQsIHJ1biwgdGV4dFdpZHRoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAg IHJldHVybiBwYXRoLmNvbnRhaW5zKGFic29sdXRlVG9Mb2NhbChldmVudC0+YWJzb2x1dGVMb2Nh dGlvbigpLCBmYWxzZSwgdHJ1ZSkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVtYmVkZGVkT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgJKHJldmlzaW9uIDg4Mzc3KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAg LTY4LDcgKzY4LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIHNldE1pc3NpbmdQbHVnaW5J bmRpY2F0b3JJc1ByZXNzZWQoYm9vbCk7CiAgICAgYm9vbCBpc0luTWlzc2luZ1BsdWdpbkluZGlj YXRvcihNb3VzZUV2ZW50Kik7Ci0gICAgYm9vbCBnZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeShp bnQgdHgsIGludCB0eSwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgUGF0aCYsIEZsb2F0UmVjdCYg cmVwbGFjZW1lbnRUZXh0UmVjdCwgRm9udCYsIFRleHRSdW4mLCBmbG9hdCYgdGV4dFdpZHRoKTsK KyAgICBib29sIGdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGNvbnN0IEludFBvaW50JiBhY2N1 bXVsYXRlZE9mZnNldCwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgUGF0aCYsIEZsb2F0UmVjdCYg cmVwbGFjZW1lbnRUZXh0UmVjdCwgRm9udCYsIFRleHRSdW4mLCBmbG9hdCYgdGV4dFdpZHRoKTsK IAogICAgIFN0cmluZyBtX3JlcGxhY2VtZW50VGV4dDsKICAgICBib29sIG1faGFzRmFsbGJhY2tD b250ZW50OyAvLyBGSVhNRTogVGhpcyBiZWxvbmdzIG9uIEhUTUxPYmplY3RFbGVtZW50Lgo= 96484 2011-06-08 14:42:15 -0700 2011-06-08 14:57:59 -0700 Patch bug-62313-20110608144214.patch text/plain 4912 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4Mzg2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMDggIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpnZXRSZXBsYWNlbWVudFRl eHRHZW9tZXRyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjIzMTMKKworICAgICAgICBSZXBsYWNlIHRoZSBsYXN0IHVzZSBvZiB0eCwgdHkgd2l0aCBJ bnRQb2ludC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpGbG9h dFJlY3Q6Om1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6RmxvYXRSZWN0Ojptb3ZlQnkpOgorICAg ICAgICBBZGQgbW92ZUJ5KEZsb2F0UG9pbnQpIGFuZCBtb3ZlQnkoSW50UG9pbnQpLiBUaGUgSW50 UG9pbnQgdmVyc2lvbiBpcyBmb3IKKyAgICAgICAgYXZvaWRpbmcgYW4gZXh0cmEgaW50IHRvIGZs b2F0IGNvbnZlcnNpb24gd2hlbiBtb3ZpbmcgYSByZWN0IGJ5IHRoZQorICAgICAgICBhY2N1bXVs YXRlZE9mZnNldCBpbiB0aGUgcmVuZGVyaW5nIHRyZWUuCisgICAgICAgIAorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJFbWJlZGRlZE9iamVjdDo6cGFpbnRSZXBsYWNlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJFbWJlZGRlZE9iamVjdDo6Z2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzSW5NaXNzaW5nUGx1Z2luSW5kaWNhdG9y KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaDoKKwogMjAxMS0w Ni0wOCAgSm9obiBCYXVtYW4gIDxqYmF1bWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0Zsb2F0UmVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0Zsb2F0UmVjdC5oCShyZXZpc2lvbiA4ODM4NikKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC03MCw2ICs3 MCw3IEBAIGNsYXNzIFZHUmVjdDsKICNlbmRpZgogCiBjbGFzcyBJbnRSZWN0OworY2xhc3MgSW50 UG9pbnQ7CiAKIGNsYXNzIEZsb2F0UmVjdCB7CiBwdWJsaWM6CkBAIC0xMDUsNyArMTA2LDkgQEAg cHVibGljOgogICAgIEZsb2F0UG9pbnQgY2VudGVyKCkgY29uc3QgeyByZXR1cm4gRmxvYXRQb2lu dCh4KCkgKyB3aWR0aCgpIC8gMiwgeSgpICsgaGVpZ2h0KCkgLyAyKTsgfQogCiAgICAgdm9pZCBt b3ZlKGNvbnN0IEZsb2F0U2l6ZSYgZGVsdGEpIHsgbV9sb2NhdGlvbiArPSBkZWx0YTsgfSAKLSAg ICB2b2lkIG1vdmUoZmxvYXQgZHgsIGZsb2F0IGR5KSB7IG1fbG9jYXRpb24ubW92ZShkeCwgZHkp OyB9IAorICAgIHZvaWQgbW92ZShmbG9hdCBkeCwgZmxvYXQgZHkpIHsgbV9sb2NhdGlvbi5tb3Zl KGR4LCBkeSk7IH0KKyAgICB2b2lkIG1vdmVCeShjb25zdCBGbG9hdFBvaW50JiBkZWx0YSkgeyBt X2xvY2F0aW9uLm1vdmUoZGVsdGEueCgpLCBkZWx0YS55KCkpOyB9CisgICAgdm9pZCBtb3ZlQnko Y29uc3QgSW50UG9pbnQmIGRlbHRhKSB7IG1fbG9jYXRpb24ubW92ZShkZWx0YS54KCksIGRlbHRh LnkoKSk7IH0KIAogICAgIGJvb2wgaW50ZXJzZWN0cyhjb25zdCBGbG9hdFJlY3QmKSBjb25zdDsK ICAgICBib29sIGNvbnRhaW5zKGNvbnN0IEZsb2F0UmVjdCYpIGNvbnN0OwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCShyZXZp c2lvbiA4ODM4NikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9i amVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Myw3ICsxNjMsNyBAQCB2b2lkIFJlbmRlckVt YmVkZGVkT2JqZWN0OjpwYWludFJlcGxhY2VkCiAgICAgRm9udCBmb250OwogICAgIFRleHRSdW4g cnVuKCIiKTsKICAgICBmbG9hdCB0ZXh0V2lkdGg7Ci0gICAgaWYgKCFnZXRSZXBsYWNlbWVudFRl eHRHZW9tZXRyeShwYWludE9mZnNldC54KCksIHBhaW50T2Zmc2V0LnkoKSwgY29udGVudFJlY3Qs IHBhdGgsIHJlcGxhY2VtZW50VGV4dFJlY3QsIGZvbnQsIHJ1biwgdGV4dFdpZHRoKSkKKyAgICBp ZiAoIWdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KHBhaW50T2Zmc2V0LCBjb250ZW50UmVjdCwg cGF0aCwgcmVwbGFjZW1lbnRUZXh0UmVjdCwgZm9udCwgcnVuLCB0ZXh0V2lkdGgpKQogICAgICAg ICByZXR1cm47CiAgICAgCiAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVy KCpjb250ZXh0KTsKQEAgLTE4MCwxMCArMTgwLDEwIEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmpl Y3Q6OnBhaW50UmVwbGFjZWQKICAgICBjb250ZXh0LT5kcmF3QmlkaVRleHQoZm9udCwgcnVuLCBG bG9hdFBvaW50KGxhYmVsWCwgbGFiZWxZKSk7CiB9CiAKLWJvb2wgUmVuZGVyRW1iZWRkZWRPYmpl Y3Q6OmdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGludCB0eCwgaW50IHR5LCBGbG9hdFJlY3Qm IGNvbnRlbnRSZWN0LCBQYXRoJiBwYXRoLCBGbG9hdFJlY3QmIHJlcGxhY2VtZW50VGV4dFJlY3Qs IEZvbnQmIGZvbnQsIFRleHRSdW4mIHJ1biwgZmxvYXQmIHRleHRXaWR0aCkKK2Jvb2wgUmVuZGVy RW1iZWRkZWRPYmplY3Q6OmdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGNvbnN0IEludFBvaW50 JiBhY2N1bXVsYXRlZE9mZnNldCwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgUGF0aCYgcGF0aCwg RmxvYXRSZWN0JiByZXBsYWNlbWVudFRleHRSZWN0LCBGb250JiBmb250LCBUZXh0UnVuJiBydW4s IGZsb2F0JiB0ZXh0V2lkdGgpCiB7CiAgICAgY29udGVudFJlY3QgPSBjb250ZW50Qm94UmVjdCgp OwotICAgIGNvbnRlbnRSZWN0Lm1vdmUodHgsIHR5KTsKKyAgICBjb250ZW50UmVjdC5tb3ZlQnko YWNjdW11bGF0ZWRPZmZzZXQpOwogICAgIAogICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3Jp cHRpb247CiAgICAgUmVuZGVyVGhlbWU6OmRlZmF1bHRUaGVtZSgpLT5zeXN0ZW1Gb250KENTU1Zh bHVlV2Via2l0U21hbGxDb250cm9sLCBmb250RGVzY3JpcHRpb24pOwpAQCAtMjU3LDcgKzI1Nyw3 IEBAIGJvb2wgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzSW5NaXNzaW5nUGwKICAgICBGb250IGZv bnQ7CiAgICAgVGV4dFJ1biBydW4oIiIpOwogICAgIGZsb2F0IHRleHRXaWR0aDsKLSAgICBpZiAo IWdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KDAsIDAsIGNvbnRlbnRSZWN0LCBwYXRoLCByZXBs YWNlbWVudFRleHRSZWN0LCBmb250LCBydW4sIHRleHRXaWR0aCkpCisgICAgaWYgKCFnZXRSZXBs YWNlbWVudFRleHRHZW9tZXRyeShJbnRQb2ludCgpLCBjb250ZW50UmVjdCwgcGF0aCwgcmVwbGFj ZW1lbnRUZXh0UmVjdCwgZm9udCwgcnVuLCB0ZXh0V2lkdGgpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgCiAgICAgcmV0dXJuIHBhdGguY29udGFpbnMoYWJzb2x1dGVUb0xvY2FsKGV2ZW50 LT5hYnNvbHV0ZUxvY2F0aW9uKCksIGZhbHNlLCB0cnVlKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAkocmV2aXNpb24gODgzODYp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaAkod29y a2luZyBjb3B5KQpAQCAtNjgsNyArNjgsNyBAQCBwcml2YXRlOgogICAgIAogICAgIHZvaWQgc2V0 TWlzc2luZ1BsdWdpbkluZGljYXRvcklzUHJlc3NlZChib29sKTsKICAgICBib29sIGlzSW5NaXNz aW5nUGx1Z2luSW5kaWNhdG9yKE1vdXNlRXZlbnQqKTsKLSAgICBib29sIGdldFJlcGxhY2VtZW50 VGV4dEdlb21ldHJ5KGludCB0eCwgaW50IHR5LCBGbG9hdFJlY3QmIGNvbnRlbnRSZWN0LCBQYXRo JiwgRmxvYXRSZWN0JiByZXBsYWNlbWVudFRleHRSZWN0LCBGb250JiwgVGV4dFJ1biYsIGZsb2F0 JiB0ZXh0V2lkdGgpOworICAgIGJvb2wgZ2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkoY29uc3Qg SW50UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBGbG9hdFJlY3QmIGNvbnRlbnRSZWN0LCBQYXRo JiwgRmxvYXRSZWN0JiByZXBsYWNlbWVudFRleHRSZWN0LCBGb250JiwgVGV4dFJ1biYsIGZsb2F0 JiB0ZXh0V2lkdGgpOwogCiAgICAgU3RyaW5nIG1fcmVwbGFjZW1lbnRUZXh0OwogICAgIGJvb2wg bV9oYXNGYWxsYmFja0NvbnRlbnQ7IC8vIEZJWE1FOiBUaGlzIGJlbG9uZ3Mgb24gSFRNTE9iamVj dEVsZW1lbnQuCg== 96489 2011-06-08 14:58:03 -0700 2011-06-08 16:00:16 -0700 Patch bug-62313-20110608145802.patch text/plain 4610 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4Mzg2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDggIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpnZXRSZXBsYWNlbWVudFRl eHRHZW9tZXRyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjIzMTMKKworICAgICAgICBSZXBsYWNlIHRoZSBsYXN0IHVzZSBvZiB0eCwgdHkgd2l0aCBJ bnRQb2ludC4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpGbG9h dFJlY3Q6Om1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6RmxvYXRSZWN0Ojptb3ZlQnkpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnRSZXBsYWNlZCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6Z2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRW1iZWRkZWRPYmplY3Q6OmlzSW5NaXNzaW5nUGx1Z2lu SW5kaWNhdG9yKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuaDoK KwogMjAxMS0wNi0wOCAgSm9obiBCYXVtYW4gIDxqYmF1bWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCShyZXZpc2lvbiA4ODM4NikKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5oCSh3b3JraW5nIGNvcHkpCkBA IC03MCw2ICs3MCw3IEBAIGNsYXNzIFZHUmVjdDsKICNlbmRpZgogCiBjbGFzcyBJbnRSZWN0Owor Y2xhc3MgSW50UG9pbnQ7CiAKIGNsYXNzIEZsb2F0UmVjdCB7CiBwdWJsaWM6CkBAIC0xMDUsNyAr MTA2LDggQEAgcHVibGljOgogICAgIEZsb2F0UG9pbnQgY2VudGVyKCkgY29uc3QgeyByZXR1cm4g RmxvYXRQb2ludCh4KCkgKyB3aWR0aCgpIC8gMiwgeSgpICsgaGVpZ2h0KCkgLyAyKTsgfQogCiAg ICAgdm9pZCBtb3ZlKGNvbnN0IEZsb2F0U2l6ZSYgZGVsdGEpIHsgbV9sb2NhdGlvbiArPSBkZWx0 YTsgfSAKLSAgICB2b2lkIG1vdmUoZmxvYXQgZHgsIGZsb2F0IGR5KSB7IG1fbG9jYXRpb24ubW92 ZShkeCwgZHkpOyB9IAorICAgIHZvaWQgbW92ZShmbG9hdCBkeCwgZmxvYXQgZHkpIHsgbV9sb2Nh dGlvbi5tb3ZlKGR4LCBkeSk7IH0KKyAgICB2b2lkIG1vdmVCeShjb25zdCBGbG9hdFBvaW50JiBk ZWx0YSkgeyBtX2xvY2F0aW9uLm1vdmUoZGVsdGEueCgpLCBkZWx0YS55KCkpOyB9CiAKICAgICBi b29sIGludGVyc2VjdHMoY29uc3QgRmxvYXRSZWN0JikgY29uc3Q7CiAgICAgYm9vbCBjb250YWlu cyhjb25zdCBGbG9hdFJlY3QmKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcAkocmV2aXNpb24gODgzODYpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNjMsNyArMTYzLDcgQEAgdm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFp bnRSZXBsYWNlZAogICAgIEZvbnQgZm9udDsKICAgICBUZXh0UnVuIHJ1bigiIik7CiAgICAgZmxv YXQgdGV4dFdpZHRoOwotICAgIGlmICghZ2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0cnkocGFpbnRP ZmZzZXQueCgpLCBwYWludE9mZnNldC55KCksIGNvbnRlbnRSZWN0LCBwYXRoLCByZXBsYWNlbWVu dFRleHRSZWN0LCBmb250LCBydW4sIHRleHRXaWR0aCkpCisgICAgaWYgKCFnZXRSZXBsYWNlbWVu dFRleHRHZW9tZXRyeShwYWludE9mZnNldCwgY29udGVudFJlY3QsIHBhdGgsIHJlcGxhY2VtZW50 VGV4dFJlY3QsIGZvbnQsIHJ1biwgdGV4dFdpZHRoKSkKICAgICAgICAgcmV0dXJuOwogICAgIAog ICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqY29udGV4dCk7CkBAIC0x ODAsMTAgKzE4MCwxMCBAQCB2b2lkIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpwYWludFJlcGxhY2Vk CiAgICAgY29udGV4dC0+ZHJhd0JpZGlUZXh0KGZvbnQsIHJ1biwgRmxvYXRQb2ludChsYWJlbFgs IGxhYmVsWSkpOwogfQogCi1ib29sIFJlbmRlckVtYmVkZGVkT2JqZWN0OjpnZXRSZXBsYWNlbWVu dFRleHRHZW9tZXRyeShpbnQgdHgsIGludCB0eSwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgUGF0 aCYgcGF0aCwgRmxvYXRSZWN0JiByZXBsYWNlbWVudFRleHRSZWN0LCBGb250JiBmb250LCBUZXh0 UnVuJiBydW4sIGZsb2F0JiB0ZXh0V2lkdGgpCitib29sIFJlbmRlckVtYmVkZGVkT2JqZWN0Ojpn ZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeShjb25zdCBJbnRQb2ludCYgYWNjdW11bGF0ZWRPZmZz ZXQsIEZsb2F0UmVjdCYgY29udGVudFJlY3QsIFBhdGgmIHBhdGgsIEZsb2F0UmVjdCYgcmVwbGFj ZW1lbnRUZXh0UmVjdCwgRm9udCYgZm9udCwgVGV4dFJ1biYgcnVuLCBmbG9hdCYgdGV4dFdpZHRo KQogewogICAgIGNvbnRlbnRSZWN0ID0gY29udGVudEJveFJlY3QoKTsKLSAgICBjb250ZW50UmVj dC5tb3ZlKHR4LCB0eSk7CisgICAgY29udGVudFJlY3QubW92ZUJ5KGFjY3VtdWxhdGVkT2Zmc2V0 KTsKICAgICAKICAgICBGb250RGVzY3JpcHRpb24gZm9udERlc2NyaXB0aW9uOwogICAgIFJlbmRl clRoZW1lOjpkZWZhdWx0VGhlbWUoKS0+c3lzdGVtRm9udChDU1NWYWx1ZVdlYmtpdFNtYWxsQ29u dHJvbCwgZm9udERlc2NyaXB0aW9uKTsKQEAgLTI1Nyw3ICsyNTcsNyBAQCBib29sIFJlbmRlckVt YmVkZGVkT2JqZWN0Ojppc0luTWlzc2luZ1BsCiAgICAgRm9udCBmb250OwogICAgIFRleHRSdW4g cnVuKCIiKTsKICAgICBmbG9hdCB0ZXh0V2lkdGg7Ci0gICAgaWYgKCFnZXRSZXBsYWNlbWVudFRl eHRHZW9tZXRyeSgwLCAwLCBjb250ZW50UmVjdCwgcGF0aCwgcmVwbGFjZW1lbnRUZXh0UmVjdCwg Zm9udCwgcnVuLCB0ZXh0V2lkdGgpKQorICAgIGlmICghZ2V0UmVwbGFjZW1lbnRUZXh0R2VvbWV0 cnkoSW50UG9pbnQoKSwgY29udGVudFJlY3QsIHBhdGgsIHJlcGxhY2VtZW50VGV4dFJlY3QsIGZv bnQsIHJ1biwgdGV4dFdpZHRoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAogICAgIHJl dHVybiBwYXRoLmNvbnRhaW5zKGFic29sdXRlVG9Mb2NhbChldmVudC0+YWJzb2x1dGVMb2NhdGlv bigpLCBmYWxzZSwgdHJ1ZSkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVtYmVkZGVkT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVtYmVkZGVkT2JqZWN0LmgJKHJldmlzaW9uIDg4Mzg2KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTY4 LDcgKzY4LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIHNldE1pc3NpbmdQbHVnaW5JbmRp Y2F0b3JJc1ByZXNzZWQoYm9vbCk7CiAgICAgYm9vbCBpc0luTWlzc2luZ1BsdWdpbkluZGljYXRv cihNb3VzZUV2ZW50Kik7Ci0gICAgYm9vbCBnZXRSZXBsYWNlbWVudFRleHRHZW9tZXRyeShpbnQg dHgsIGludCB0eSwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgUGF0aCYsIEZsb2F0UmVjdCYgcmVw bGFjZW1lbnRUZXh0UmVjdCwgRm9udCYsIFRleHRSdW4mLCBmbG9hdCYgdGV4dFdpZHRoKTsKKyAg ICBib29sIGdldFJlcGxhY2VtZW50VGV4dEdlb21ldHJ5KGNvbnN0IEludFBvaW50JiBhY2N1bXVs YXRlZE9mZnNldCwgRmxvYXRSZWN0JiBjb250ZW50UmVjdCwgUGF0aCYsIEZsb2F0UmVjdCYgcmVw bGFjZW1lbnRUZXh0UmVjdCwgRm9udCYsIFRleHRSdW4mLCBmbG9hdCYgdGV4dFdpZHRoKTsKIAog ICAgIFN0cmluZyBtX3JlcGxhY2VtZW50VGV4dDsKICAgICBib29sIG1faGFzRmFsbGJhY2tDb250 ZW50OyAvLyBGSVhNRTogVGhpcyBiZWxvbmdzIG9uIEhUTUxPYmplY3RFbGVtZW50Lgo=