60739 2011-05-12 17:17:41 -0700 Switch paintCollapsedBorder to use IntRect 2011-05-13 11:22:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin dglazkov eae eric gustavo.noronha gustavo simon.fraser webkit.review.bot xan.lopez oldest_to_newest 403265 0 leviw 2011-05-12 17:17:41 -0700 It currently takes four ints representing a rect. This is the *last* function with this bad signature! :) 403269 1 93372 leviw 2011-05-12 17:22:19 -0700 Created attachment 93372 Patch 403270 2 93372 leviw 2011-05-12 17:23:37 -0700 Comment on attachment 93372 Patch Oops, made a mistake :p 403277 3 93372 webkit-ews 2011-05-12 17:32:12 -0700 Comment on attachment 93372 Patch Attachment 93372 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/8688895 403282 4 93372 webkit.review.bot 2011-05-12 17:44:46 -0700 Comment on attachment 93372 Patch Attachment 93372 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/8687849 403283 5 93372 webkit.review.bot 2011-05-12 17:48:51 -0700 Comment on attachment 93372 Patch Attachment 93372 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/8688903 403288 6 93372 webkit.review.bot 2011-05-12 18:06:41 -0700 Comment on attachment 93372 Patch Attachment 93372 did not pass cr-mac-ews (chromium): Output: http://queues.webkit.org/results/8687872 403289 7 93372 gustavo.noronha 2011-05-12 18:13:37 -0700 Comment on attachment 93372 Patch Attachment 93372 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/8685931 403309 8 93386 leviw 2011-05-12 18:48:19 -0700 Created attachment 93386 Patch 403315 9 93386 eric 2011-05-12 18:56:48 -0700 Comment on attachment 93386 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93386&action=review I don't think the adjustedPaintRect change is a ncessarily a win. > Source/WebCore/rendering/RenderTableCell.cpp:931 > + IntRect adjustedPaintRect = IntRect(paintRect.x() - leftWidth / 2, You don't have to do an equal here, you can just construct directly. Webkit doesn't normally do cascading indents like this though. > Source/WebCore/rendering/RenderTableCell.cpp:952 > + borders.addBorder(topVal, BSTop, renderTop, adjustedPaintRect.x(), adjustedPaintRect.y(), adjustedPaintRect.maxX(), adjustedPaintRect.y() + topWidth, topStyle); > + borders.addBorder(bottomVal, BSBottom, renderBottom, adjustedPaintRect.x(), adjustedPaintRect.maxY() - bottomWidth, adjustedPaintRect.maxX(), adjustedPaintRect.maxY(), bottomStyle); > + borders.addBorder(leftVal, BSLeft, renderLeft, adjustedPaintRect.x(), adjustedPaintRect.y(), adjustedPaintRect.x() + leftWidth, adjustedPaintRect.maxY(), leftStyle); > + borders.addBorder(rightVal, BSRight, renderRight, adjustedPaintRect.maxX() - rightWidth, adjustedPaintRect.y(), adjustedPaintRect.maxX(), adjustedPaintRect.maxY(), rightStyle); Seems like making the locals above might make this more clear? Unleass you plan to actually use the adjustedPaintRect as an object somewhere? 403674 10 93484 leviw 2011-05-13 11:05:37 -0700 Created attachment 93484 Patch 403677 11 93484 eric 2011-05-13 11:11:46 -0700 Comment on attachment 93484 Patch LGTM. 403685 12 93484 leviw 2011-05-13 11:21:15 -0700 Comment on attachment 93484 Patch Clearing flags on attachment: 93484 Committed r86449: <http://trac.webkit.org/changeset/86449> 403686 13 leviw 2011-05-13 11:21:19 -0700 All reviewed patches have been landed. Closing bug. 403687 14 leviw 2011-05-13 11:22:07 -0700 (In reply to comment #11) > (From update of attachment 93484 [details]) > LGTM. Thanks for the review! 93372 2011-05-12 17:22:19 -0700 2011-05-12 18:48:14 -0700 Patch bug-60739-20110512172218.patch text/plain 2614 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NDAzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMTIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludENvbGxhcHNlZEJvcmRlciB0byB1c2Ug SW50UmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjA3MzkKKworICAgICAgICBVcGRhdGluZyB0aGUgbGFzdCBvZmZlbmRpbmcgcGFpbnQgZnVuY3Rp b24gdGhhdCB0YWtlcyBmb3VyIGludHMKKyAgICAgICAgaW5zdGVhZCBvZiBhbiBJbnRSZWN0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIGlzIHNpbXBsZSByZWZhY3RvcmluZy4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGFibGVDZWxsOjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJs ZUNlbGw6OnBhaW50Q29sbGFwc2VkQm9yZGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGFibGVDZWxsLmg6CisKIDIwMTEtMDUtMTIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAkocmV2aXNpb24gODY0 MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODEyLDcgKzgxMiw3IEBAIHZvaWQgUmVuZGVyVGFibGVDZWxsOjpwYWlu dChQYWludEluZm8mIHAKICAgICAgICAgaW50IG9zID0gMiAqIG1heGltYWxPdXRsaW5lU2l6ZShw YWludEluZm8ucGhhc2UpOwogICAgICAgICBpZiAodHkgLSB0YWJsZSgpLT5vdXRlckJvcmRlclRv cCgpIDwgcGFpbnRJbmZvLnJlY3QubWF4WSgpICsgb3MKICAgICAgICAgICAgICYmIHR5ICsgaGVp Z2h0KCkgKyB0YWJsZSgpLT5vdXRlckJvcmRlckJvdHRvbSgpID4gcGFpbnRJbmZvLnJlY3QueSgp IC0gb3MpCi0gICAgICAgICAgICBwYWludENvbGxhcHNlZEJvcmRlcihwYWludEluZm8uY29udGV4 dCwgdHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CisgICAgICAgICAgICBwYWludENvbGxhcHNl ZEJvcmRlcihwYWludEluZm8uY29udGV4dCwgSW50UmVjdCh0eCwgdHksIHdpZHRoKCksIGhlaWdo dCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9IAogICAgIApAQCAtOTEyLDcgKzkxMiw3IEBA IHZvaWQgUmVuZGVyVGFibGVDZWxsOjpzb3J0Qm9yZGVyU3R5bGVzKEMKICAgICAgICAgY29tcGFy ZUJvcmRlclN0eWxlc0ZvclFTb3J0KTsKIH0KIAotdm9pZCBSZW5kZXJUYWJsZUNlbGw6OnBhaW50 Q29sbGFwc2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgdHgs IGludCB0eSwgaW50IHcsIGludCBoKQordm9pZCBSZW5kZXJUYWJsZUNlbGw6OnBhaW50Q29sbGFw c2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0 JiBwYWludFJlY3QpCiB7CiAgICAgaWYgKCF0YWJsZSgpLT5jdXJyZW50Qm9yZGVyU3R5bGUoKSkK ICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRh YmxlQ2VsbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU YWJsZUNlbGwuaAkocmV2aXNpb24gODY0MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGFibGVDZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0OSw3ICsxNDksNyBAQCBwcml2 YXRlOgogICAgIHZpcnR1YWwgSW50UmVjdCBjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludChS ZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lcik7CiAgICAgdmlydHVhbCB2b2lk IGNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRh aW5lciwgSW50UmVjdCYsIGJvb2wgZml4ZWQgPSBmYWxzZSk7CiAKLSAgICB2b2lkIHBhaW50Q29s bGFwc2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCosIGludCB4LCBpbnQgeSwgaW50IHcsIGludCBo KTsKKyAgICB2b2lkIHBhaW50Q29sbGFwc2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCosIGNvbnN0 IEludFJlY3QmKTsKIAogICAgIGludCBtX3JvdzsKICAgICBpbnQgbV9jb2x1bW47Cg== 93386 2011-05-12 18:48:19 -0700 2011-05-13 11:05:32 -0700 Patch bug-60739-20110512184817.patch text/plain 4938 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NDAzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMTIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludENvbGxhcHNlZEJvcmRlciB0byB1c2Ug SW50UmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjA3MzkKKworICAgICAgICBVcGRhdGluZyB0aGUgbGFzdCBvZmZlbmRpbmcgcGFpbnQgZnVuY3Rp b24gdGhhdCB0YWtlcyBmb3VyIGludHMKKyAgICAgICAgaW5zdGVhZCBvZiBhbiBJbnRSZWN0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIGlzIHNpbXBsZSByZWZhY3RvcmluZy4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGFibGVDZWxsOjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJs ZUNlbGw6OnBhaW50Q29sbGFwc2VkQm9yZGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGFibGVDZWxsLmg6CisKIDIwMTEtMDUtMTIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAkocmV2aXNpb24gODY0 MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODEyLDcgKzgxMiw3IEBAIHZvaWQgUmVuZGVyVGFibGVDZWxsOjpwYWlu dChQYWludEluZm8mIHAKICAgICAgICAgaW50IG9zID0gMiAqIG1heGltYWxPdXRsaW5lU2l6ZShw YWludEluZm8ucGhhc2UpOwogICAgICAgICBpZiAodHkgLSB0YWJsZSgpLT5vdXRlckJvcmRlclRv cCgpIDwgcGFpbnRJbmZvLnJlY3QubWF4WSgpICsgb3MKICAgICAgICAgICAgICYmIHR5ICsgaGVp Z2h0KCkgKyB0YWJsZSgpLT5vdXRlckJvcmRlckJvdHRvbSgpID4gcGFpbnRJbmZvLnJlY3QueSgp IC0gb3MpCi0gICAgICAgICAgICBwYWludENvbGxhcHNlZEJvcmRlcihwYWludEluZm8uY29udGV4 dCwgdHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CisgICAgICAgICAgICBwYWludENvbGxhcHNl ZEJvcmRlcihwYWludEluZm8uY29udGV4dCwgSW50UmVjdCh0eCwgdHksIHdpZHRoKCksIGhlaWdo dCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9IAogICAgIApAQCAtOTEyLDcgKzkxMiw3IEBA IHZvaWQgUmVuZGVyVGFibGVDZWxsOjpzb3J0Qm9yZGVyU3R5bGVzKEMKICAgICAgICAgY29tcGFy ZUJvcmRlclN0eWxlc0ZvclFTb3J0KTsKIH0KIAotdm9pZCBSZW5kZXJUYWJsZUNlbGw6OnBhaW50 Q29sbGFwc2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgdHgs IGludCB0eSwgaW50IHcsIGludCBoKQordm9pZCBSZW5kZXJUYWJsZUNlbGw6OnBhaW50Q29sbGFw c2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0 JiBwYWludFJlY3QpCiB7CiAgICAgaWYgKCF0YWJsZSgpLT5jdXJyZW50Qm9yZGVyU3R5bGUoKSkK ICAgICAgICAgcmV0dXJuOwpAQCAtOTI4LDEwICs5MjgsMTAgQEAgdm9pZCBSZW5kZXJUYWJsZUNl bGw6OnBhaW50Q29sbGFwc2VkQm9yZAogICAgIGludCBsZWZ0V2lkdGggPSBsZWZ0VmFsLndpZHRo KCk7CiAgICAgaW50IHJpZ2h0V2lkdGggPSByaWdodFZhbC53aWR0aCgpOwogICAgIAotICAgIHR4 IC09IGxlZnRXaWR0aCAvIDI7Ci0gICAgdHkgLT0gdG9wV2lkdGggLyAyOwotICAgIHcgKz0gbGVm dFdpZHRoIC8gMiArIChyaWdodFdpZHRoICsgMSkgLyAyOwotICAgIGggKz0gdG9wV2lkdGggLyAy ICsgKGJvdHRvbVdpZHRoICsgMSkgLyAyOworICAgIEludFJlY3QgYWRqdXN0ZWRQYWludFJlY3Qg PSBJbnRSZWN0KHBhaW50UmVjdC54KCkgLSBsZWZ0V2lkdGggLyAyLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHBhaW50UmVjdC55KCkgLSB0b3BXaWR0aCAvIDIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFpbnRSZWN0LndpZHRoKCkg KyBsZWZ0V2lkdGggLyAyICsgKHJpZ2h0V2lkdGggKyAxKSAvIDIsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcGFpbnRSZWN0LmhlaWdodCgpICsgdG9wV2lkdGggLyAy ICsgKGJvdHRvbVdpZHRoICsgMSkgLyAyKTsKICAgICAKICAgICBFQm9yZGVyU3R5bGUgdG9wU3R5 bGUgPSBjb2xsYXBzZWRCb3JkZXJTdHlsZSh0b3BWYWwuc3R5bGUoKSk7CiAgICAgRUJvcmRlclN0 eWxlIGJvdHRvbVN0eWxlID0gY29sbGFwc2VkQm9yZGVyU3R5bGUoYm90dG9tVmFsLnN0eWxlKCkp OwpAQCAtOTQ2LDEwICs5NDYsMTAgQEAgdm9pZCBSZW5kZXJUYWJsZUNlbGw6OnBhaW50Q29sbGFw c2VkQm9yZAogICAgIC8vIFdlIG5ldmVyIHBhaW50IGRpYWdvbmFscyBhdCB0aGUgam9pbnMuICBX ZSBzaW1wbHkgbGV0IHRoZSBib3JkZXIgd2l0aCB0aGUgaGlnaGVzdAogICAgIC8vIHByZWNlZGVu Y2UgcGFpbnQgb24gdG9wIG9mIGJvcmRlcnMgd2l0aCBsb3dlciBwcmVjZWRlbmNlLiAgCiAgICAg Q29sbGFwc2VkQm9yZGVycyBib3JkZXJzOwotICAgIGJvcmRlcnMuYWRkQm9yZGVyKHRvcFZhbCwg QlNUb3AsIHJlbmRlclRvcCwgdHgsIHR5LCB0eCArIHcsIHR5ICsgdG9wV2lkdGgsIHRvcFN0eWxl KTsKLSAgICBib3JkZXJzLmFkZEJvcmRlcihib3R0b21WYWwsIEJTQm90dG9tLCByZW5kZXJCb3R0 b20sIHR4LCB0eSArIGggLSBib3R0b21XaWR0aCwgdHggKyB3LCB0eSArIGgsIGJvdHRvbVN0eWxl KTsKLSAgICBib3JkZXJzLmFkZEJvcmRlcihsZWZ0VmFsLCBCU0xlZnQsIHJlbmRlckxlZnQsIHR4 LCB0eSwgdHggKyBsZWZ0V2lkdGgsIHR5ICsgaCwgbGVmdFN0eWxlKTsKLSAgICBib3JkZXJzLmFk ZEJvcmRlcihyaWdodFZhbCwgQlNSaWdodCwgcmVuZGVyUmlnaHQsIHR4ICsgdyAtIHJpZ2h0V2lk dGgsIHR5LCB0eCArIHcsIHR5ICsgaCwgcmlnaHRTdHlsZSk7CisgICAgYm9yZGVycy5hZGRCb3Jk ZXIodG9wVmFsLCBCU1RvcCwgcmVuZGVyVG9wLCBhZGp1c3RlZFBhaW50UmVjdC54KCksIGFkanVz dGVkUGFpbnRSZWN0LnkoKSwgYWRqdXN0ZWRQYWludFJlY3QubWF4WCgpLCBhZGp1c3RlZFBhaW50 UmVjdC55KCkgKyB0b3BXaWR0aCwgdG9wU3R5bGUpOworICAgIGJvcmRlcnMuYWRkQm9yZGVyKGJv dHRvbVZhbCwgQlNCb3R0b20sIHJlbmRlckJvdHRvbSwgYWRqdXN0ZWRQYWludFJlY3QueCgpLCBh ZGp1c3RlZFBhaW50UmVjdC5tYXhZKCkgLSBib3R0b21XaWR0aCwgYWRqdXN0ZWRQYWludFJlY3Qu bWF4WCgpLCBhZGp1c3RlZFBhaW50UmVjdC5tYXhZKCksIGJvdHRvbVN0eWxlKTsKKyAgICBib3Jk ZXJzLmFkZEJvcmRlcihsZWZ0VmFsLCBCU0xlZnQsIHJlbmRlckxlZnQsIGFkanVzdGVkUGFpbnRS ZWN0LngoKSwgYWRqdXN0ZWRQYWludFJlY3QueSgpLCBhZGp1c3RlZFBhaW50UmVjdC54KCkgKyBs ZWZ0V2lkdGgsIGFkanVzdGVkUGFpbnRSZWN0Lm1heFkoKSwgbGVmdFN0eWxlKTsKKyAgICBib3Jk ZXJzLmFkZEJvcmRlcihyaWdodFZhbCwgQlNSaWdodCwgcmVuZGVyUmlnaHQsIGFkanVzdGVkUGFp bnRSZWN0Lm1heFgoKSAtIHJpZ2h0V2lkdGgsIGFkanVzdGVkUGFpbnRSZWN0LnkoKSwgYWRqdXN0 ZWRQYWludFJlY3QubWF4WCgpLCBhZGp1c3RlZFBhaW50UmVjdC5tYXhZKCksIHJpZ2h0U3R5bGUp OwogICAgIAogICAgIGZvciAoQ29sbGFwc2VkQm9yZGVyKiBib3JkZXIgPSBib3JkZXJzLm5leHRC b3JkZXIoKTsgYm9yZGVyOyBib3JkZXIgPSBib3JkZXJzLm5leHRCb3JkZXIoKSkgewogICAgICAg ICBpZiAoYm9yZGVyLT5ib3JkZXJWYWx1ZSA9PSAqdGFibGUoKS0+Y3VycmVudEJvcmRlclN0eWxl KCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5oCShy ZXZpc2lvbiA4NjQwMykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNl bGwuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ5LDcgKzE0OSw3IEBAIHByaXZhdGU6CiAgICAgdmly dHVhbCBJbnRSZWN0IGNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVs T2JqZWN0KiByZXBhaW50Q29udGFpbmVyKTsKICAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVJlY3RG b3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBJbnRSZWN0 JiwgYm9vbCBmaXhlZCA9IGZhbHNlKTsKIAotICAgIHZvaWQgcGFpbnRDb2xsYXBzZWRCb3JkZXIo R3JhcGhpY3NDb250ZXh0KiwgaW50IHgsIGludCB5LCBpbnQgdywgaW50IGgpOworICAgIHZvaWQg cGFpbnRDb2xsYXBzZWRCb3JkZXIoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50UmVjdCYpOwog CiAgICAgaW50IG1fcm93OwogICAgIGludCBtX2NvbHVtbjsK 93484 2011-05-13 11:05:37 -0700 2011-05-13 11:21:15 -0700 Patch bug-60739-20110513110535.patch text/plain 4513 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NDAzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMTIgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBwYWludENvbGxhcHNlZEJvcmRlciB0byB1c2Ug SW50UmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjA3MzkKKworICAgICAgICBVcGRhdGluZyB0aGUgbGFzdCBvZmZlbmRpbmcgcGFpbnQgZnVuY3Rp b24gdGhhdCB0YWtlcyBmb3VyIGludHMKKyAgICAgICAgaW5zdGVhZCBvZiBhbiBJbnRSZWN0Lgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyBhcyB0aGlzIGlzIHNpbXBsZSByZWZhY3RvcmluZy4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGFibGVDZWxsOjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJs ZUNlbGw6OnBhaW50Q29sbGFwc2VkQm9yZGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGFibGVDZWxsLmg6CisKIDIwMTEtMDUtMTIgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAkocmV2aXNpb24gODY0 MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODEyLDcgKzgxMiw3IEBAIHZvaWQgUmVuZGVyVGFibGVDZWxsOjpwYWlu dChQYWludEluZm8mIHAKICAgICAgICAgaW50IG9zID0gMiAqIG1heGltYWxPdXRsaW5lU2l6ZShw YWludEluZm8ucGhhc2UpOwogICAgICAgICBpZiAodHkgLSB0YWJsZSgpLT5vdXRlckJvcmRlclRv cCgpIDwgcGFpbnRJbmZvLnJlY3QubWF4WSgpICsgb3MKICAgICAgICAgICAgICYmIHR5ICsgaGVp Z2h0KCkgKyB0YWJsZSgpLT5vdXRlckJvcmRlckJvdHRvbSgpID4gcGFpbnRJbmZvLnJlY3QueSgp IC0gb3MpCi0gICAgICAgICAgICBwYWludENvbGxhcHNlZEJvcmRlcihwYWludEluZm8uY29udGV4 dCwgdHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7CisgICAgICAgICAgICBwYWludENvbGxhcHNl ZEJvcmRlcihwYWludEluZm8uY29udGV4dCwgSW50UmVjdCh0eCwgdHksIHdpZHRoKCksIGhlaWdo dCgpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9IAogICAgIApAQCAtOTEyLDcgKzkxMiw3IEBA IHZvaWQgUmVuZGVyVGFibGVDZWxsOjpzb3J0Qm9yZGVyU3R5bGVzKEMKICAgICAgICAgY29tcGFy ZUJvcmRlclN0eWxlc0ZvclFTb3J0KTsKIH0KIAotdm9pZCBSZW5kZXJUYWJsZUNlbGw6OnBhaW50 Q29sbGFwc2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgdHgs IGludCB0eSwgaW50IHcsIGludCBoKQordm9pZCBSZW5kZXJUYWJsZUNlbGw6OnBhaW50Q29sbGFw c2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0 JiBwYWludFJlY3QpCiB7CiAgICAgaWYgKCF0YWJsZSgpLT5jdXJyZW50Qm9yZGVyU3R5bGUoKSkK ICAgICAgICAgcmV0dXJuOwpAQCAtOTI4LDEwICs5MjgsMTAgQEAgdm9pZCBSZW5kZXJUYWJsZUNl bGw6OnBhaW50Q29sbGFwc2VkQm9yZAogICAgIGludCBsZWZ0V2lkdGggPSBsZWZ0VmFsLndpZHRo KCk7CiAgICAgaW50IHJpZ2h0V2lkdGggPSByaWdodFZhbC53aWR0aCgpOwogICAgIAotICAgIHR4 IC09IGxlZnRXaWR0aCAvIDI7Ci0gICAgdHkgLT0gdG9wV2lkdGggLyAyOwotICAgIHcgKz0gbGVm dFdpZHRoIC8gMiArIChyaWdodFdpZHRoICsgMSkgLyAyOwotICAgIGggKz0gdG9wV2lkdGggLyAy ICsgKGJvdHRvbVdpZHRoICsgMSkgLyAyOworICAgIGludCB4ID0gcGFpbnRSZWN0LngoKSAtIGxl ZnRXaWR0aCAvIDI7CisgICAgaW50IHkgPSBwYWludFJlY3QueSgpIC0gdG9wV2lkdGggLyAyOwor ICAgIGludCB3ID0gcGFpbnRSZWN0LndpZHRoKCkgKyBsZWZ0V2lkdGggLyAyICsgKHJpZ2h0V2lk dGggKyAxKSAvIDI7CisgICAgaW50IGggPSBwYWludFJlY3QuaGVpZ2h0KCkgKyB0b3BXaWR0aCAv IDIgKyAoYm90dG9tV2lkdGggKyAxKSAvIDI7CiAgICAgCiAgICAgRUJvcmRlclN0eWxlIHRvcFN0 eWxlID0gY29sbGFwc2VkQm9yZGVyU3R5bGUodG9wVmFsLnN0eWxlKCkpOwogICAgIEVCb3JkZXJT dHlsZSBib3R0b21TdHlsZSA9IGNvbGxhcHNlZEJvcmRlclN0eWxlKGJvdHRvbVZhbC5zdHlsZSgp KTsKQEAgLTk0NiwxMCArOTQ2LDEwIEBAIHZvaWQgUmVuZGVyVGFibGVDZWxsOjpwYWludENvbGxh cHNlZEJvcmQKICAgICAvLyBXZSBuZXZlciBwYWludCBkaWFnb25hbHMgYXQgdGhlIGpvaW5zLiAg V2Ugc2ltcGx5IGxldCB0aGUgYm9yZGVyIHdpdGggdGhlIGhpZ2hlc3QKICAgICAvLyBwcmVjZWRl bmNlIHBhaW50IG9uIHRvcCBvZiBib3JkZXJzIHdpdGggbG93ZXIgcHJlY2VkZW5jZS4gIAogICAg IENvbGxhcHNlZEJvcmRlcnMgYm9yZGVyczsKLSAgICBib3JkZXJzLmFkZEJvcmRlcih0b3BWYWws IEJTVG9wLCByZW5kZXJUb3AsIHR4LCB0eSwgdHggKyB3LCB0eSArIHRvcFdpZHRoLCB0b3BTdHls ZSk7Ci0gICAgYm9yZGVycy5hZGRCb3JkZXIoYm90dG9tVmFsLCBCU0JvdHRvbSwgcmVuZGVyQm90 dG9tLCB0eCwgdHkgKyBoIC0gYm90dG9tV2lkdGgsIHR4ICsgdywgdHkgKyBoLCBib3R0b21TdHls ZSk7Ci0gICAgYm9yZGVycy5hZGRCb3JkZXIobGVmdFZhbCwgQlNMZWZ0LCByZW5kZXJMZWZ0LCB0 eCwgdHksIHR4ICsgbGVmdFdpZHRoLCB0eSArIGgsIGxlZnRTdHlsZSk7Ci0gICAgYm9yZGVycy5h ZGRCb3JkZXIocmlnaHRWYWwsIEJTUmlnaHQsIHJlbmRlclJpZ2h0LCB0eCArIHcgLSByaWdodFdp ZHRoLCB0eSwgdHggKyB3LCB0eSArIGgsIHJpZ2h0U3R5bGUpOworICAgIGJvcmRlcnMuYWRkQm9y ZGVyKHRvcFZhbCwgQlNUb3AsIHJlbmRlclRvcCwgeCwgeSwgeCArIHcsIHkgKyB0b3BXaWR0aCwg dG9wU3R5bGUpOworICAgIGJvcmRlcnMuYWRkQm9yZGVyKGJvdHRvbVZhbCwgQlNCb3R0b20sIHJl bmRlckJvdHRvbSwgeCwgeSArIGggLSBib3R0b21XaWR0aCwgeCArIHcsIHkgKyBoLCBib3R0b21T dHlsZSk7CisgICAgYm9yZGVycy5hZGRCb3JkZXIobGVmdFZhbCwgQlNMZWZ0LCByZW5kZXJMZWZ0 LCB4LCB5LCB4ICsgbGVmdFdpZHRoLCB5ICsgaCwgbGVmdFN0eWxlKTsKKyAgICBib3JkZXJzLmFk ZEJvcmRlcihyaWdodFZhbCwgQlNSaWdodCwgcmVuZGVyUmlnaHQsIHggKyB3IC0gcmlnaHRXaWR0 aCwgeSwgeCArIHcsIHkgKyBoLCByaWdodFN0eWxlKTsKICAgICAKICAgICBmb3IgKENvbGxhcHNl ZEJvcmRlciogYm9yZGVyID0gYm9yZGVycy5uZXh0Qm9yZGVyKCk7IGJvcmRlcjsgYm9yZGVyID0g Ym9yZGVycy5uZXh0Qm9yZGVyKCkpIHsKICAgICAgICAgaWYgKGJvcmRlci0+Ym9yZGVyVmFsdWUg PT0gKnRhYmxlKCktPmN1cnJlbnRCb3JkZXJTdHlsZSgpKQpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRhYmxlQ2VsbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuaAkocmV2aXNpb24gODY0MDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0 OSw3ICsxNDksNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgSW50UmVjdCBjbGlwcGVkT3ZlcmZs b3dSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lcik7 CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9i amVjdCogcmVwYWludENvbnRhaW5lciwgSW50UmVjdCYsIGJvb2wgZml4ZWQgPSBmYWxzZSk7CiAK LSAgICB2b2lkIHBhaW50Q29sbGFwc2VkQm9yZGVyKEdyYXBoaWNzQ29udGV4dCosIGludCB4LCBp bnQgeSwgaW50IHcsIGludCBoKTsKKyAgICB2b2lkIHBhaW50Q29sbGFwc2VkQm9yZGVyKEdyYXBo aWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsKIAogICAgIGludCBtX3JvdzsKICAgICBpbnQg bV9jb2x1bW47Cg==