59041 2011-04-20 17:01:21 -0700 Skia port should implement BitmapImage::checkForSolidColor() 2011-05-01 11:35:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 psolanki reed commit-queue jamesr jknotten psolanki reed senorblanco twiz oldest_to_newest 389647 0 psolanki 2011-04-20 17:01:21 -0700 The implementation of the above functions is void BitmapImage::checkForSolidColor() { m_checkedForSolidColor = true; } This should be correctly implemented so it sets m_isSolidColor to true when you have 1x1 image with 1 frame so it can make use os optimization in Image.cpp that does a color fill when you're drawing a 1x1 image. 389974 1 senorblanco 2011-04-21 06:18:12 -0700 See http://code.google.com/p/chromium/issues/detail?id=80011 -- same issue, i think. If so, pls coordinate w/twiz. 390043 2 reed 2011-04-21 08:20:10 -0700 possible duplicate of http://code.google.com/p/chromium/issues/detail?id=80011 394308 3 jknotten 2011-04-28 01:52:38 -0700 See also related bug https://bugs.webkit.org/show_bug.cgi?id=58926 394783 4 91563 twiz 2011-04-28 15:02:51 -0700 Created attachment 91563 Patch 394790 5 91563 twiz 2011-04-28 15:04:36 -0700 Comment on attachment 91563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91563&action=review > Source/WebCore/platform/graphics/skia/ImageSkia.cpp:471 > + WebCore::NativeImageSkia* frame = frameAtIndex(currentFrame()); Is there a possibility that I need to check for a decode complete status here as well? 394806 6 91563 jamesr 2011-04-28 15:20:46 -0700 Comment on attachment 91563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91563&action=review > Source/WebCore/platform/graphics/skia/ImageSkia.cpp:466 > + if (frameCount() != 1) the other ports seem to implement this check as frameCount() > 1. is there any significance to this being different? >> Source/WebCore/platform/graphics/skia/ImageSkia.cpp:471 >> + WebCore::NativeImageSkia* frame = frameAtIndex(currentFrame()); > > Is there a possibility that I need to check for a decode complete status here as well? it seems like this codepath wouldn't work if the bitmap was not decoded yet or if insufficient data was available to decode the image, right? the other ports null check the image here, at least. can you see in what cases the null check fails in the other ports and see what happens here? > Source/WebCore/platform/graphics/skia/ImageSkia.cpp:472 > + frame->lockPixels(); don't we have a pixel autolocker class to avoid the manual lock/unlock? 394923 7 91590 twiz 2011-04-28 16:54:28 -0700 Created attachment 91590 Patch 394939 8 91563 twiz 2011-04-28 17:02:15 -0700 Comment on attachment 91563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91563&action=review >> Source/WebCore/platform/graphics/skia/ImageSkia.cpp:466 >> + if (frameCount() != 1) > > the other ports seem to implement this check as frameCount() > 1. is there any significance to this being different? I was trying to be more defensive - in the case that frameCount could be 0. Uploaded a new patch, following the style of the other ports. >>> Source/WebCore/platform/graphics/skia/ImageSkia.cpp:471 >>> + WebCore::NativeImageSkia* frame = frameAtIndex(currentFrame()); >> >> Is there a possibility that I need to check for a decode complete status here as well? > > it seems like this codepath wouldn't work if the bitmap was not decoded yet or if insufficient data was available to decode the image, right? the other ports null check the image here, at least. > > can you see in what cases the null check fails in the other ports and see what happens here? Added a check for null in a new patch. The other ports do not check for completion of decoding of the image. I'm not familiar with this code - is it even possible to receive an incomplete bitmap at this point? >> Source/WebCore/platform/graphics/skia/ImageSkia.cpp:472 >> + frame->lockPixels(); > > don't we have a pixel autolocker class to avoid the manual lock/unlock? Uploaded new patch using the autolocker. 395212 9 reed 2011-04-29 04:48:31 -0700 Fringe case, you'll want to check that there are valid pixels after the lock call. if (bitmap.getPixels() == NULL) { // there are no pixels allocated, or the lock failed } 395261 10 91678 twiz 2011-04-29 07:47:49 -0700 Created attachment 91678 Patch 395272 11 91686 twiz 2011-04-29 08:25:31 -0700 Created attachment 91686 Patch 395273 12 91686 twiz 2011-04-29 08:26:51 -0700 Comment on attachment 91686 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91686&action=review > Source/WebCore/platform/graphics/skia/ImageSkia.cpp:477 > + m_solidColor = Color(frame->getColor(0, 0)); Removed the clunky construction of Color from individual components, as per recommendation from Stephen White. 395955 13 91686 eric 2011-05-01 10:47:06 -0700 Comment on attachment 91686 Patch YES! This is a huge win for some pages. 395970 14 91686 commit-queue 2011-05-01 11:35:18 -0700 Comment on attachment 91686 Patch Clearing flags on attachment: 91686 Committed r85422: <http://trac.webkit.org/changeset/85422> 395971 15 commit-queue 2011-05-01 11:35:24 -0700 All reviewed patches have been landed. Closing bug. 91563 2011-04-28 15:02:51 -0700 2011-04-28 17:02:15 -0700 Patch bug-59041-20110428180249.patch text/plain 2437 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMjggIEplZmYgVGlt YW51cyAgPHR3aXpAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBzb2xpZC1jb2xvciBjaGVja2luZyB0byBCaXRtYXBJbWFn ZTo6Y2hlY2tGb3JTb2xpZENvbG91ciBpbiB0aGUgc2tpYSBwb3J0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwNDEKKworICAgICAgICBUZXN0OmNz czIuMS90MTQwMjAxLWM1MzMtYmdpbWFnZS0wMC1hLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0ltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlOjpkcmF3VGlsZWQp OiBSZW1vdmFsIG9mIG1hY3JvIGV4Y2x1c2lvbiBvZiBhc3NlcnQgZm9yIFNraWEgcGF0aC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpCaXRtYXBJbWFnZTo6Y2hlY2tGb3JTb2xpZENvbG9yKToKKwogMjAxMS0wNC0yOCAg TWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVG9ueSBDaGFuZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lt YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZS5jcHAJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvSW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsOCArMTEyLDggQEAgdm9pZCBJ bWFnZTo6ZHJhd1RpbGVkKEdyYXBoaWNzQ29udGV4dCogYwogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0MT4gYW5kIDxodHRwczov L3dlYmtpdC5vcmcvYi81OTA0Mz4uCi0jaWYgIVVTRShTS0lBKSAmJiAhUExBVEZPUk0oV1gpCisg ICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0Mz4uCisjaWYgIVBMQVRGT1JNKFdY KQogICAgIEFTU0VSVCghaXNCaXRtYXBJbWFnZSgpIHx8IHN0YXRpY19jYXN0PEJpdG1hcEltYWdl Kj4odGhpcyktPm5vdFNvbGlkQ29sb3IoKSk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAkocmV2aXNp b24gODUyNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2MCw3ICs0NjAsMjAgQEAgdm9pZCBCaXRtYXBJ bWFnZTo6aW52YWxpZGF0ZVBsYXRmb3JtRGF0YQogCiB2b2lkIEJpdG1hcEltYWdlOjpjaGVja0Zv clNvbGlkQ29sb3IoKQogeworICAgIG1faXNTb2xpZENvbG9yID0gZmFsc2U7CiAgICAgbV9jaGVj a2VkRm9yU29saWRDb2xvciA9IHRydWU7CisKKyAgICBpZiAoZnJhbWVDb3VudCgpICE9IDEpCisg ICAgICAgIHJldHVybjsKKworICAgIGlmIChzaXplKCkud2lkdGgoKSA9PSAxICYmIHNpemUoKS5o ZWlnaHQoKSA9PSAxKSB7CisgICAgICAgIG1faXNTb2xpZENvbG9yID0gdHJ1ZTsKKyAgICAgICAg V2ViQ29yZTo6TmF0aXZlSW1hZ2VTa2lhKiBmcmFtZSA9IGZyYW1lQXRJbmRleChjdXJyZW50RnJh bWUoKSk7CisgICAgICAgIGZyYW1lLT5sb2NrUGl4ZWxzKCk7CisgICAgICAgIFNrQ29sb3IgY29s b3IgPSBmcmFtZS0+Z2V0Q29sb3IoMCwgMCk7CisgICAgICAgIGZyYW1lLT51bmxvY2tQaXhlbHMo KTsKKyAgICAgICAgbV9zb2xpZENvbG9yID0gQ29sb3Ioc3RhdGljX2Nhc3Q8aW50PihTa0NvbG9y R2V0Uihjb2xvcikpLCBzdGF0aWNfY2FzdDxpbnQ+KFNrQ29sb3JHZXRHKGNvbG9yKSksIHN0YXRp Y19jYXN0PGludD4oU2tDb2xvckdldEIoY29sb3IpKSwgc3RhdGljX2Nhc3Q8aW50PihTa0NvbG9y R2V0QShjb2xvcikpKTsKKyAgICB9CiB9CiAKIHZvaWQgQml0bWFwSW1hZ2U6OmRyYXcoR3JhcGhp Y3NDb250ZXh0KiBjdHh0LCBjb25zdCBGbG9hdFJlY3QmIGRzdFJlY3QsCg== 91590 2011-04-28 16:54:28 -0700 2011-04-29 07:47:43 -0700 Patch bug-59041-20110428195426.patch text/plain 2408 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMjggIEplZmYgVGlt YW51cyAgPHR3aXpAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBzb2xpZC1jb2xvciBjaGVja2luZyB0byBCaXRtYXBJbWFn ZTo6Y2hlY2tGb3JTb2xpZENvbG91ciBpbiB0aGUgc2tpYSBwb3J0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwNDEKKworICAgICAgICBUZXN0OmNz czIuMS90MTQwMjAxLWM1MzMtYmdpbWFnZS0wMC1hLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0ltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlOjpkcmF3VGlsZWQp OiBSZW1vdmFsIG9mIG1hY3JvIGV4Y2x1c2lvbiBvZiBhc3NlcnQgZm9yIFNraWEgcGF0aC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpCaXRtYXBJbWFnZTo6Y2hlY2tGb3JTb2xpZENvbG9yKToKKwogMjAxMS0wNC0yOCAg TWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVG9ueSBDaGFuZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lt YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZS5jcHAJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvSW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsOCArMTEyLDggQEAgdm9pZCBJ bWFnZTo6ZHJhd1RpbGVkKEdyYXBoaWNzQ29udGV4dCogYwogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0MT4gYW5kIDxodHRwczov L3dlYmtpdC5vcmcvYi81OTA0Mz4uCi0jaWYgIVVTRShTS0lBKSAmJiAhUExBVEZPUk0oV1gpCisg ICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0Mz4uCisjaWYgIVBMQVRGT1JNKFdY KQogICAgIEFTU0VSVCghaXNCaXRtYXBJbWFnZSgpIHx8IHN0YXRpY19jYXN0PEJpdG1hcEltYWdl Kj4odGhpcyktPm5vdFNvbGlkQ29sb3IoKSk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAkocmV2aXNp b24gODUyNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2MCw3ICs0NjAsMjAgQEAgdm9pZCBCaXRtYXBJ bWFnZTo6aW52YWxpZGF0ZVBsYXRmb3JtRGF0YQogCiB2b2lkIEJpdG1hcEltYWdlOjpjaGVja0Zv clNvbGlkQ29sb3IoKQogeworICAgIG1faXNTb2xpZENvbG9yID0gZmFsc2U7CiAgICAgbV9jaGVj a2VkRm9yU29saWRDb2xvciA9IHRydWU7CisKKyAgICBpZiAoZnJhbWVDb3VudCgpID4gMSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6TmF0aXZlSW1hZ2VTa2lhKiBmcmFtZSA9IGZy YW1lQXRJbmRleCgwKTsKKworICAgIGlmIChmcmFtZSAmJiBzaXplKCkud2lkdGgoKSA9PSAxICYm IHNpemUoKS5oZWlnaHQoKSA9PSAxKSB7CisgICAgICAgIG1faXNTb2xpZENvbG9yID0gdHJ1ZTsK KyAgICAgICAgU2tBdXRvTG9ja1BpeGVscyBsb2NrKCpmcmFtZSk7CisgICAgICAgIFNrQ29sb3Ig Y29sb3IgPSBmcmFtZS0+Z2V0Q29sb3IoMCwgMCk7CisgICAgICAgIG1fc29saWRDb2xvciA9IENv bG9yKHN0YXRpY19jYXN0PGludD4oU2tDb2xvckdldFIoY29sb3IpKSwgc3RhdGljX2Nhc3Q8aW50 PihTa0NvbG9yR2V0Ryhjb2xvcikpLCBzdGF0aWNfY2FzdDxpbnQ+KFNrQ29sb3JHZXRCKGNvbG9y KSksIHN0YXRpY19jYXN0PGludD4oU2tDb2xvckdldEEoY29sb3IpKSk7CisgICAgfQogfQogCiB2 b2lkIEJpdG1hcEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxvYXRS ZWN0JiBkc3RSZWN0LAo= 91678 2011-04-29 07:47:49 -0700 2011-04-29 08:25:25 -0700 Patch bug-59041-20110429104747.patch text/plain 2465 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMjggIEplZmYgVGlt YW51cyAgPHR3aXpAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBzb2xpZC1jb2xvciBjaGVja2luZyB0byBCaXRtYXBJbWFn ZTo6Y2hlY2tGb3JTb2xpZENvbG91ciBpbiB0aGUgc2tpYSBwb3J0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwNDEKKworICAgICAgICBUZXN0OmNz czIuMS90MTQwMjAxLWM1MzMtYmdpbWFnZS0wMC1hLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0ltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlOjpkcmF3VGlsZWQp OiBSZW1vdmFsIG9mIG1hY3JvIGV4Y2x1c2lvbiBvZiBhc3NlcnQgZm9yIFNraWEgcGF0aC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpCaXRtYXBJbWFnZTo6Y2hlY2tGb3JTb2xpZENvbG9yKToKKwogMjAxMS0wNC0yOCAg TWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVG9ueSBDaGFuZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lt YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZS5jcHAJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvSW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsOCArMTEyLDggQEAgdm9pZCBJ bWFnZTo6ZHJhd1RpbGVkKEdyYXBoaWNzQ29udGV4dCogYwogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0MT4gYW5kIDxodHRwczov L3dlYmtpdC5vcmcvYi81OTA0Mz4uCi0jaWYgIVVTRShTS0lBKSAmJiAhUExBVEZPUk0oV1gpCisg ICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0Mz4uCisjaWYgIVBMQVRGT1JNKFdY KQogICAgIEFTU0VSVCghaXNCaXRtYXBJbWFnZSgpIHx8IHN0YXRpY19jYXN0PEJpdG1hcEltYWdl Kj4odGhpcyktPm5vdFNvbGlkQ29sb3IoKSk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAkocmV2aXNp b24gODUyNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2MCw3ICs0NjAsMjMgQEAgdm9pZCBCaXRtYXBJ bWFnZTo6aW52YWxpZGF0ZVBsYXRmb3JtRGF0YQogCiB2b2lkIEJpdG1hcEltYWdlOjpjaGVja0Zv clNvbGlkQ29sb3IoKQogeworICAgIG1faXNTb2xpZENvbG9yID0gZmFsc2U7CiAgICAgbV9jaGVj a2VkRm9yU29saWRDb2xvciA9IHRydWU7CisKKyAgICBpZiAoZnJhbWVDb3VudCgpID4gMSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6TmF0aXZlSW1hZ2VTa2lhKiBmcmFtZSA9IGZy YW1lQXRJbmRleCgwKTsKKworICAgIGlmIChmcmFtZSAmJiBzaXplKCkud2lkdGgoKSA9PSAxICYm IHNpemUoKS5oZWlnaHQoKSA9PSAxKSB7CisgICAgICAgIFNrQXV0b0xvY2tQaXhlbHMgbG9jaygq ZnJhbWUpOworICAgICAgICBpZiAoIWZyYW1lLT5nZXRQaXhlbHMoKSkKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICBtX2lzU29saWRDb2xvciA9IHRydWU7CisgICAgICAgIFNrQ29sb3Ig Y29sb3IgPSBmcmFtZS0+Z2V0Q29sb3IoMCwgMCk7CisgICAgICAgIG1fc29saWRDb2xvciA9IENv bG9yKHN0YXRpY19jYXN0PGludD4oU2tDb2xvckdldFIoY29sb3IpKSwgc3RhdGljX2Nhc3Q8aW50 PihTa0NvbG9yR2V0Ryhjb2xvcikpLCBzdGF0aWNfY2FzdDxpbnQ+KFNrQ29sb3JHZXRCKGNvbG9y KSksIHN0YXRpY19jYXN0PGludD4oU2tDb2xvckdldEEoY29sb3IpKSk7CisgICAgfQogfQogCiB2 b2lkIEJpdG1hcEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxvYXRS ZWN0JiBkc3RSZWN0LAo= 91686 2011-04-29 08:25:31 -0700 2011-05-01 11:35:18 -0700 Patch bug-59041-20110429112529.patch text/plain 2288 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMjggIEplZmYgVGlt YW51cyAgPHR3aXpAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBzb2xpZC1jb2xvciBjaGVja2luZyB0byBCaXRtYXBJbWFn ZTo6Y2hlY2tGb3JTb2xpZENvbG91ciBpbiB0aGUgc2tpYSBwb3J0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkwNDEKKworICAgICAgICBUZXN0OmNz czIuMS90MTQwMjAxLWM1MzMtYmdpbWFnZS0wMC1hLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0ltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlOjpkcmF3VGlsZWQp OiBSZW1vdmFsIG9mIG1hY3JvIGV4Y2x1c2lvbiBvZiBhc3NlcnQgZm9yIFNraWEgcGF0aC4KKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpCaXRtYXBJbWFnZTo6Y2hlY2tGb3JTb2xpZENvbG9yKToKKwogMjAxMS0wNC0yOCAg TWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgVG9ueSBDaGFuZy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0lt YWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9J bWFnZS5jcHAJKHJldmlzaW9uIDg1MjQyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvSW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTIsOCArMTEyLDggQEAgdm9pZCBJ bWFnZTo6ZHJhd1RpbGVkKEdyYXBoaWNzQ29udGV4dCogYwogICAgICAgICByZXR1cm47CiAgICAg fQogCi0gICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0MT4gYW5kIDxodHRwczov L3dlYmtpdC5vcmcvYi81OTA0Mz4uCi0jaWYgIVVTRShTS0lBKSAmJiAhUExBVEZPUk0oV1gpCisg ICAgLy8gU2VlIDxodHRwczovL3dlYmtpdC5vcmcvYi81OTA0Mz4uCisjaWYgIVBMQVRGT1JNKFdY KQogICAgIEFTU0VSVCghaXNCaXRtYXBJbWFnZSgpIHx8IHN0YXRpY19jYXN0PEJpdG1hcEltYWdl Kj4odGhpcyktPm5vdFNvbGlkQ29sb3IoKSk7CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcAkocmV2aXNp b24gODUyNDIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2MCw3ICs0NjAsMjIgQEAgdm9pZCBCaXRtYXBJ bWFnZTo6aW52YWxpZGF0ZVBsYXRmb3JtRGF0YQogCiB2b2lkIEJpdG1hcEltYWdlOjpjaGVja0Zv clNvbGlkQ29sb3IoKQogeworICAgIG1faXNTb2xpZENvbG9yID0gZmFsc2U7CiAgICAgbV9jaGVj a2VkRm9yU29saWRDb2xvciA9IHRydWU7CisKKyAgICBpZiAoZnJhbWVDb3VudCgpID4gMSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgV2ViQ29yZTo6TmF0aXZlSW1hZ2VTa2lhKiBmcmFtZSA9IGZy YW1lQXRJbmRleCgwKTsKKworICAgIGlmIChmcmFtZSAmJiBzaXplKCkud2lkdGgoKSA9PSAxICYm IHNpemUoKS5oZWlnaHQoKSA9PSAxKSB7CisgICAgICAgIFNrQXV0b0xvY2tQaXhlbHMgbG9jaygq ZnJhbWUpOworICAgICAgICBpZiAoIWZyYW1lLT5nZXRQaXhlbHMoKSkKKyAgICAgICAgICAgIHJl dHVybjsKKworICAgICAgICBtX2lzU29saWRDb2xvciA9IHRydWU7CisgICAgICAgIG1fc29saWRD b2xvciA9IENvbG9yKGZyYW1lLT5nZXRDb2xvcigwLCAwKSk7CisgICAgfQogfQogCiB2b2lkIEJp dG1hcEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3QgRmxvYXRSZWN0JiBk c3RSZWN0LAo=