62406 2011-06-09 14:36:05 -0700 [chromium] Printing does not work for accelerated <canvas> 2011-08-01 06:45:38 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 senorblanco senorblanco jamesr mdelaney7 reed oldest_to_newest 418310 0 senorblanco 2011-06-09 14:36:05 -0700 When accelerated canvas is enabled, canvas elements are omitted from the printed output. 418311 1 senorblanco 2011-06-09 14:36:23 -0700 See also http://code.google.com/p/chromium/issues/detail?id=55927 418321 2 96648 senorblanco 2011-06-09 14:47:40 -0700 Created attachment 96648 Patch 418352 3 96654 senorblanco 2011-06-09 15:31:16 -0700 Created attachment 96654 Patch 418371 4 96654 jamesr 2011-06-09 16:04:40 -0700 Comment on attachment 96654 Patch Is there any way we can hide this in paintsIntoCanvasBuffer() or something? Sucks to modify the GraphicsContext interface just for this... 418393 5 senorblanco 2011-06-09 16:54:38 -0700 (In reply to comment #4) > (From update of attachment 96654 [details]) > Is there any way we can hide this in paintsIntoCanvasBuffer() or something? Sucks to modify the GraphicsContext interface just for this... Unfortunately, no. paintsIntoCanvasBuffer() is on the source GraphicsContext3D/SharedGraphicsContext3D, whereas we need to check the destination GraphicsContext. Even if SGC3D had access to the GraphicsContext, it would be the wrong one. 418395 6 jamesr 2011-06-09 16:57:02 -0700 Le suck - what about asking our Document if we're printing? I believe the only time we'll try to paint a canvas when printing is when it's in the DOM, and Document already has a printing() accessor. Remember to null check on the way to the Document. 418429 7 senorblanco 2011-06-09 17:39:54 -0700 (In reply to comment #6) > Le suck - what about asking our Document if we're printing? I believe the only time we'll try to paint a canvas when printing is when it's in the DOM, and Document already has a printing() accessor. Remember to null check on the way to the Document. Great idea. Will give that a shot. 418440 8 96677 senorblanco 2011-06-09 17:46:20 -0700 Created attachment 96677 Patch 418441 9 96677 jamesr 2011-06-09 17:53:55 -0700 Comment on attachment 96677 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96677&action=review R=me > Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp:139 > + if (!bitmap.getPixels()) { can you leave some sort of comment indicating when getPixels() returns NULL and why we gotta do a readPixels() when it does? 418652 10 reed 2011-06-10 04:33:44 -0700 can we not pass srcRect to the readPixels call, to avoid reading back more than we need? 418700 11 senorblanco 2011-06-10 07:22:04 -0700 (In reply to comment #10) > can we not pass srcRect to the readPixels call, to avoid reading back more than we need? See the FIXME. I was going to do this in a followup just to make sure I didn't screw up the resulting srcRect adjustment, but I'll give it a shot now. 418724 12 reed 2011-06-10 09:21:58 -0700 Skia fix in sight. Monday or Tuesday. 418827 13 96770 senorblanco 2011-06-10 12:03:52 -0700 Created attachment 96770 Patch 418830 14 96770 jamesr 2011-06-10 12:08:45 -0700 Comment on attachment 96770 Patch R=me. Sounds like we'll be able to get rid of this soon with a skia change, tho, right? 418832 15 senorblanco 2011-06-10 12:13:28 -0700 (In reply to comment #14) > (From update of attachment 96770 [details]) > R=me. Sounds like we'll be able to get rid of this soon with a skia change, tho, right? Yes, that's my understanding. Note that further testing has revealed that this is not a complete fix -- it works for Maps directions and some simple pages, but doesn't work for more complex pages. I'm guessing this is because although canvas is doing a readback, the compositor isn't. I might look into that before committing this. 443067 16 102166 senorblanco 2011-07-27 12:18:55 -0700 Created attachment 102166 Patch 443081 17 102169 senorblanco 2011-07-27 12:25:55 -0700 Created attachment 102169 Patch 443087 18 senorblanco 2011-07-27 12:28:01 -0700 (In reply to comment #17) > Created an attachment (id=102169) [details] > Patch Updated to recent WebKit and to use the pixel readback now built-in to SkBitmap::lockPixels(). 443093 19 102169 jamesr 2011-07-27 12:31:33 -0700 Comment on attachment 102169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102169&action=review Looks good > Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp:119 > context->platformContext()->makeGrContextCurrent(); do you still need this makeCurrent()? 443096 20 senorblanco 2011-07-27 12:33:49 -0700 (In reply to comment #19) > (From update of attachment 102169 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=102169&action=review > > Looks good > > > Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp:119 > > context->platformContext()->makeGrContextCurrent(); > > do you still need this makeCurrent()? In theory, no, since we always use the same context under the hood. But it seems a little fragile to rely on that, so I think this is safer. 443166 21 senorblanco 2011-07-27 14:51:22 -0700 Committed r91870: <http://trac.webkit.org/changeset/91870> 444181 22 102169 jamesr 2011-07-29 17:02:51 -0700 Comment on attachment 102169 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102169&action=review > Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp:118 > + m_context->platformContext()->makeGrContextCurrent(); > + SkDevice* srcDevice = m_context->platformContext()->canvas()->getDevice(); > + SkBitmap bitmap = srcDevice->accessBitmap(false); > + SkAutoLockPixels bitmapLock(bitmap); I'm pretty sure that something in here is causing us to do a readback for every canvas->canvas draw now :/ 444677 23 reed 2011-08-01 06:45:38 -0700 The lockpixels seems unnecessary. We should only see that in a stackframe if we're directly accessing the pixels in the same frame. Are we sure we need this here? Calling BitmapImageSingleFrameSkia::create(bitmap, forceCopy) will perform a readback if forceCopy is set to true. I will work with Brian to see if we can change bitmap::copyTo() to not force a readback. 96648 2011-06-09 14:47:40 -0700 2011-06-09 15:24:03 -0700 Patch bug-62406-20110609174738.patch text/plain 5807 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NDg1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDYtMDkgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZvciBwcmludGluZyB3aXRoIGFjY2VsZXJh dGVkIDxjYW52YXM+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MjQwNgorCisgICAgICAgIFRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBzaWRlIG9mIHRo aXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZXhpc3RpbmcKKyAgICAgICAgdGVzdHMuICBQcmludGlu ZyBpbiBDaHJvbWUgaGFzIGZldyB0ZXN0cywgc2FkbHkuICA6KAorCisgICAgICAgICogaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ2FudmFzRWxlbWVu dDo6cGFpbnQpOgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OkNhbnZh c1JlbmRlcmluZ0NvbnRleHQyRCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6aXNQcmlu dGluZyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6aXNQcmludGluZyk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW1hZ2VCdWZmZXI6OmRyYXcpOgorCiAyMDExLTA2LTA5ICBKdWxpZW4gQ2hhZmZy YWl4ICA8amNoYWZmcmFpeEBjb2RlYXVyb3JhLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBB bnR0aSBLb2l2aXN0by4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1l bnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1l bnQuY3BwCShyZXZpc2lvbiA4ODQ4NSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZh c0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzEsNyArMjcxLDcgQEAgdm9pZCBIVE1M Q2FudmFzRWxlbWVudDo6cGFpbnQoR3JhcGhpY3NDbwogICAgICAgICByZXR1cm47CiAgICAgCiAg ICAgaWYgKG1fY29udGV4dCkgewotICAgICAgICBpZiAoIW1fY29udGV4dC0+cGFpbnRzSW50b0Nh bnZhc0J1ZmZlcigpKQorICAgICAgICBpZiAoIW1fY29udGV4dC0+cGFpbnRzSW50b0NhbnZhc0J1 ZmZlcigpICYmICFjb250ZXh0LT5pc1ByaW50aW5nKCkpCiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIG1fY29udGV4dC0+cGFpbnRSZW5kZXJpbmdSZXN1bHRzVG9DYW52YXMoKTsKICAgICB9 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0 MkQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRC5jcHAJKHJldmlzaW9uIDg4NDg1KQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTQ2LDYgKzE0NiwxNSBAQCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OkNhbnZhc1JlbmRl cmluCiAgICAgaWYgKEdyYXBoaWNzQ29udGV4dCogYyA9IGRyYXdpbmdDb250ZXh0KCkpIHsKICAg ICAgICAgbV9jb250ZXh0M0QgPSBwLT5zaGFyZWRHcmFwaGljc0NvbnRleHQzRCgpOwogICAgICAg ICBpZiAobV9jb250ZXh0M0QpIHsKKyNpZiAwIC8vIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKKyAgICAgICAgICAgIC8vIElmIHdlIGFza2VkIGZvciBhY2NlbGVyYXRlZCBjb21wb3NpdGlu ZywgYnV0IGRpZG4ndCBnZXQgaXQsCisgICAgICAgICAgICAvLyBkcm9wIHRvIHNvZnR3YXJlIHJl bmRlcmluZyBmb3IgY2FudmFzIGFzIHdlbGwuCisgICAgICAgICAgICBpZiAocC0+c2V0dGluZ3Mo KS0+YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoKSAmJiBtX2NvbnRleHQzRC0+cGFpbnRz SW50b0NhbnZhc0J1ZmZlcigpKSB7CisgICAgICAgICAgICAgICAgYy0+c2V0U2hhcmVkR3JhcGhp Y3NDb250ZXh0M0QoMCwgMCwgSW50U2l6ZSgpKTsKKyAgICAgICAgICAgICAgICBtX2NvbnRleHQz RC5jbGVhcigpOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyNlbmRp ZgogICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyID0gbV9jb250ZXh0M0QtPmdyYXBoaWNzQ29u dGV4dDNEKCktPmNyZWF0ZURyYXdpbmdCdWZmZXIoSW50U2l6ZShjYW52YXMtPndpZHRoKCksIGNh bnZhcy0+aGVpZ2h0KCkpKTsKICAgICAgICAgICAgIGlmICghbV9kcmF3aW5nQnVmZmVyKSB7CiAg ICAgICAgICAgICAgICAgYy0+c2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QoMCwgMCwgSW50U2l6 ZSgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0LmNwcAkocmV2aXNpb24gODg0ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 MDcsNiArNzA3LDExIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzeW5jU29mdHdhcmVDYW52YXMK IHZvaWQgR3JhcGhpY3NDb250ZXh0OjptYXJrRGlydHlSZWN0KGNvbnN0IEludFJlY3QmKQogewog fQorCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6aXNQcmludGluZygpCit7CisgICAgcmV0dXJuIGZh bHNlOworfQogI2VuZGlmCiAKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgJKHJldmlzaW9uIDg4NDg1KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTUwNiw2ICs1MDYsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQg c3luY1NvZnR3YXJlQ2FudmFzKCk7CiAgICAgICAgIHZvaWQgbWFya0RpcnR5UmVjdChjb25zdCBJ bnRSZWN0Jik7IC8vIEhpbnRzIHRoYXQgYSBwb3J0aW9uIG9mIHRoZSBiYWNraW5nIHN0b3JlIGlz IGRpcnR5LgogCisgICAgICAgIGJvb2wgaXNQcmludGluZygpOworCiAgICAgICAgIHN0YXRpYyB2 b2lkIGFkanVzdExpbmVUb1BpeGVsQm91bmRhcmllcyhGbG9hdFBvaW50JiBwMSwgRmxvYXRQb2lu dCYgcDIsIGZsb2F0IHN0cm9rZVdpZHRoLCBTdHJva2VTdHlsZSk7CiAKICAgICBwcml2YXRlOgpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRl eHRTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCShyZXZpc2lvbiA4ODQ4NSkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTEyODksNCArMTI4OSw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjptYXJrRGlydHlSZWN0KGNvbnMKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+bWFya0RpcnR5UmVj dChyZWN0KTsKIH0KIAorYm9vbCBHcmFwaGljc0NvbnRleHQ6OmlzUHJpbnRpbmcoKQoreworICAg IHJldHVybiBwbGF0Zm9ybUNvbnRleHQoKS0+cHJpbnRpbmcoKTsKK30KKwogfSAgLy8gbmFtZXNw YWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv SW1hZ2VCdWZmZXJTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJldmlzaW9uIDg4NDg1KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNyArMTMzLDE4IEBAIHZvaWQgSW1hZ2VCdWZmZXI6OmRy YXcoR3JhcGhpY3NDb250ZXh0KiAKICAgICAgICAgbV9kYXRhLm1fcGxhdGZvcm1Db250ZXh0LnN5 bmNTb2Z0d2FyZUNhbnZhcygpOwogICAgIH0KIAotICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBC aXRtYXBJbWFnZVNpbmdsZUZyYW1lU2tpYTo6Y3JlYXRlKCptX2RhdGEubV9wbGF0Zm9ybUNvbnRl eHQuYml0bWFwKCksIGNvbnRleHQgPT0gbV9jb250ZXh0KTsKKyAgICBTa0RldmljZSogc3JjRGV2 aWNlID0gbV9kYXRhLm1fcGxhdGZvcm1Db250ZXh0LmNhbnZhcygpLT5nZXREZXZpY2UoKTsKKyAg ICBTa0JpdG1hcCBiaXRtYXAgPSBzcmNEZXZpY2UtPmFjY2Vzc0JpdG1hcChmYWxzZSk7CisgICAg U2tBdXRvTG9ja1BpeGVscyBiaXRtYXBMb2NrKGJpdG1hcCk7CisgICAgaWYgKCFiaXRtYXAuZ2V0 UGl4ZWxzKCkpIHsKKyAgICAgICAgLy8gRklYTUU6IHRoaXMgZG9lcyBhIHJlYWRQaXhlbHMgb2Yg dGhlIGVudGlyZSBkZXZpY2UsIHRoZW4gZHJhd3MgYQorICAgICAgICAvLyAgICAgICAgc3Vic2V0 IG9mIHRoZSBiaXRtYXAuIENvdWxkIHJlYWRQaXhlbHMgYSBzdWJzZXQsIHRoZW4gYWRqdXN0Cisg ICAgICAgIC8vICAgICAgICB0aGUgc3JjUmVjdC4KKyAgICAgICAgU2tJUmVjdCBib3VuZHMgPSBT a0lSZWN0OjpNYWtlV0goc3JjRGV2aWNlLT53aWR0aCgpLCBzcmNEZXZpY2UtPmhlaWdodCgpKTsK KyAgICAgICAgaWYgKCFzcmNEZXZpY2UtPnJlYWRQaXhlbHMoYm91bmRzLCAmYml0bWFwKSkKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IEJpdG1h cEltYWdlU2luZ2xlRnJhbWVTa2lhOjpjcmVhdGUoYml0bWFwLCBjb250ZXh0ID09IG1fY29udGV4 dCk7CiAgICAgY29udGV4dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBzdHlsZUNvbG9yU3BhY2Us IGRlc3RSZWN0LCBzcmNSZWN0LCBvcCwgdXNlTG93UXVhbGl0eVNjYWxlKTsKIH0KIAo= 96654 2011-06-09 15:31:16 -0700 2011-06-09 17:46:14 -0700 Patch bug-62406-20110609183112.patch text/plain 4538 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NDkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDYtMDkgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZvciBwcmludGluZyB3aXRoIGFjY2VsZXJh dGVkIDxjYW52YXM+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MjQwNgorCisgICAgICAgIFRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBzaWRlIG9mIHRo aXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZXhpc3RpbmcKKyAgICAgICAgdGVzdHMuICBQcmludGlu ZyBpbiBDaHJvbWUgaGFzIGZldyB0ZXN0cywgc2FkbHkuICA6KAorCisgICAgICAgICogaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ2FudmFzRWxlbWVu dDo6cGFpbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmlzUHJpbnRpbmcpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmlzUHJpbnRpbmcpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlQnVmZmVyOjpkcmF3KToKKwogMjAxMS0wNi0wOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2 aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjg4 NDY4LgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAJKHJl dmlzaW9uIDg4NDkwKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI3MSw3ICsyNzEsNyBAQCB2b2lkIEhUTUxDYW52YXNFbGVt ZW50OjpwYWludChHcmFwaGljc0NvCiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBpZiAobV9j b250ZXh0KSB7Ci0gICAgICAgIGlmICghbV9jb250ZXh0LT5wYWludHNJbnRvQ2FudmFzQnVmZmVy KCkpCisgICAgICAgIGlmICghbV9jb250ZXh0LT5wYWludHNJbnRvQ2FudmFzQnVmZmVyKCkgJiYg IWNvbnRleHQtPmlzUHJpbnRpbmcoKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgbV9j b250ZXh0LT5wYWludFJlbmRlcmluZ1Jlc3VsdHNUb0NhbnZhcygpOwogICAgIH0KSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0 LmNwcAkocmV2aXNpb24gODg0OTApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MDcsNiArNzA3LDExIEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzeW5jU29mdHdhcmVDYW52YXMKIHZvaWQgR3JhcGhpY3ND b250ZXh0OjptYXJrRGlydHlSZWN0KGNvbnN0IEludFJlY3QmKQogewogfQorCitib29sIEdyYXBo aWNzQ29udGV4dDo6aXNQcmludGluZygpCit7CisgICAgcmV0dXJuIGZhbHNlOworfQogI2VuZGlm CiAKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmgJKHJldmlzaW9uIDg4NDkwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTUwNiw2ICs1 MDYsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc3luY1NvZnR3YXJlQ2Fu dmFzKCk7CiAgICAgICAgIHZvaWQgbWFya0RpcnR5UmVjdChjb25zdCBJbnRSZWN0Jik7IC8vIEhp bnRzIHRoYXQgYSBwb3J0aW9uIG9mIHRoZSBiYWNraW5nIHN0b3JlIGlzIGRpcnR5LgogCisgICAg ICAgIGJvb2wgaXNQcmludGluZygpOworCiAgICAgICAgIHN0YXRpYyB2b2lkIGFkanVzdExpbmVU b1BpeGVsQm91bmRhcmllcyhGbG9hdFBvaW50JiBwMSwgRmxvYXRQb2ludCYgcDIsIGZsb2F0IHN0 cm9rZVdpZHRoLCBTdHJva2VTdHlsZSk7CiAKICAgICBwcml2YXRlOgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNz Q29udGV4dFNraWEuY3BwCShyZXZpc2lvbiA4ODQ5MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEyODksNCArMTI4OSw5IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjptYXJrRGlydHlSZWN0 KGNvbnMKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+bWFya0RpcnR5UmVjdChyZWN0KTsKIH0KIAor Ym9vbCBHcmFwaGljc0NvbnRleHQ6OmlzUHJpbnRpbmcoKQoreworICAgIHJldHVybiBwbGF0Zm9y bUNvbnRleHQoKS0+cHJpbnRpbmcoKTsKK30KKwogfSAgLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lh LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJldmlzaW9uIDg4NDkwKQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xMzMsNyArMTMzLDE4IEBAIHZvaWQgSW1hZ2VCdWZmZXI6OmRyYXcoR3JhcGhpY3NDb250 ZXh0KiAKICAgICAgICAgbV9kYXRhLm1fcGxhdGZvcm1Db250ZXh0LnN5bmNTb2Z0d2FyZUNhbnZh cygpOwogICAgIH0KIAotICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBCaXRtYXBJbWFnZVNpbmds ZUZyYW1lU2tpYTo6Y3JlYXRlKCptX2RhdGEubV9wbGF0Zm9ybUNvbnRleHQuYml0bWFwKCksIGNv bnRleHQgPT0gbV9jb250ZXh0KTsKKyAgICBTa0RldmljZSogc3JjRGV2aWNlID0gbV9kYXRhLm1f cGxhdGZvcm1Db250ZXh0LmNhbnZhcygpLT5nZXREZXZpY2UoKTsKKyAgICBTa0JpdG1hcCBiaXRt YXAgPSBzcmNEZXZpY2UtPmFjY2Vzc0JpdG1hcChmYWxzZSk7CisgICAgU2tBdXRvTG9ja1BpeGVs cyBiaXRtYXBMb2NrKGJpdG1hcCk7CisgICAgaWYgKCFiaXRtYXAuZ2V0UGl4ZWxzKCkpIHsKKyAg ICAgICAgLy8gRklYTUU6IHRoaXMgZG9lcyBhIHJlYWRQaXhlbHMgb2YgdGhlIGVudGlyZSBkZXZp Y2UsIHRoZW4gZHJhd3MgYQorICAgICAgICAvLyAgICAgICAgc3Vic2V0IG9mIHRoZSBiaXRtYXAu IENvdWxkIHJlYWRQaXhlbHMgYSBzdWJzZXQsIHRoZW4gYWRqdXN0CisgICAgICAgIC8vICAgICAg ICB0aGUgc3JjUmVjdC4KKyAgICAgICAgU2tJUmVjdCBib3VuZHMgPSBTa0lSZWN0OjpNYWtlV0go c3JjRGV2aWNlLT53aWR0aCgpLCBzcmNEZXZpY2UtPmhlaWdodCgpKTsKKyAgICAgICAgaWYgKCFz cmNEZXZpY2UtPnJlYWRQaXhlbHMoYm91bmRzLCAmYml0bWFwKSkKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICB9CisgICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IEJpdG1hcEltYWdlU2luZ2xlRnJh bWVTa2lhOjpjcmVhdGUoYml0bWFwLCBjb250ZXh0ID09IG1fY29udGV4dCk7CiAgICAgY29udGV4 dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3RSZWN0LCBzcmNS ZWN0LCBvcCwgdXNlTG93UXVhbGl0eVNjYWxlKTsKIH0KIAo= 96677 2011-06-09 17:46:20 -0700 2011-06-10 12:03:47 -0700 Patch bug-62406-20110609204618.patch text/plain 2682 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NDkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMDkgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZvciBwcmludGluZyB3aXRoIGFjY2VsZXJh dGVkIDxjYW52YXM+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MjQwNgorCisgICAgICAgIFRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBzaWRlIG9mIHRo aXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZXhpc3RpbmcKKyAgICAgICAgdGVzdHMuICBQcmludGlu ZyBpbiBDaHJvbWUgaGFzIGZldyB0ZXN0cywgc2FkbHkuICA6KAorCisgICAgICAgICogaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ2FudmFzRWxlbWVu dDo6cGFpbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJT a2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpkcmF3KToKKwogMjAxMS0w Ni0wOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjg4NDY4LgpJbmRleDogU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAJKHJldmlzaW9uIDg4NDkwKQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3MSw3 ICsyNzEsNyBAQCB2b2lkIEhUTUxDYW52YXNFbGVtZW50OjpwYWludChHcmFwaGljc0NvCiAgICAg ICAgIHJldHVybjsKICAgICAKICAgICBpZiAobV9jb250ZXh0KSB7Ci0gICAgICAgIGlmICghbV9j b250ZXh0LT5wYWludHNJbnRvQ2FudmFzQnVmZmVyKCkpCisgICAgICAgIGlmICghbV9jb250ZXh0 LT5wYWludHNJbnRvQ2FudmFzQnVmZmVyKCkgJiYgIWRvY3VtZW50KCktPnByaW50aW5nKCkpCiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIG1fY29udGV4dC0+cGFpbnRSZW5kZXJpbmdSZXN1 bHRzVG9DYW52YXMoKTsKICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCShyZXZpc2lvbiA4 ODQ5MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZm ZXJTa2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDcgKzEzMywxOCBAQCB2b2lkIEltYWdl QnVmZmVyOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogCiAgICAgICAgIG1fZGF0YS5tX3BsYXRmb3Jt Q29udGV4dC5zeW5jU29mdHdhcmVDYW52YXMoKTsKICAgICB9CiAKLSAgICBSZWZQdHI8SW1hZ2U+ IGltYWdlID0gQml0bWFwSW1hZ2VTaW5nbGVGcmFtZVNraWE6OmNyZWF0ZSgqbV9kYXRhLm1fcGxh dGZvcm1Db250ZXh0LmJpdG1hcCgpLCBjb250ZXh0ID09IG1fY29udGV4dCk7CisgICAgU2tEZXZp Y2UqIHNyY0RldmljZSA9IG1fZGF0YS5tX3BsYXRmb3JtQ29udGV4dC5jYW52YXMoKS0+Z2V0RGV2 aWNlKCk7CisgICAgU2tCaXRtYXAgYml0bWFwID0gc3JjRGV2aWNlLT5hY2Nlc3NCaXRtYXAoZmFs c2UpOworICAgIFNrQXV0b0xvY2tQaXhlbHMgYml0bWFwTG9jayhiaXRtYXApOworICAgIGlmICgh Yml0bWFwLmdldFBpeGVscygpKSB7CisgICAgICAgIC8vIEZJWE1FOiB0aGlzIGRvZXMgYSByZWFk UGl4ZWxzIG9mIHRoZSBlbnRpcmUgZGV2aWNlLCB0aGVuIGRyYXdzIGEKKyAgICAgICAgLy8gICAg ICAgIHN1YnNldCBvZiB0aGUgYml0bWFwLiBDb3VsZCByZWFkUGl4ZWxzIGEgc3Vic2V0LCB0aGVu IGFkanVzdAorICAgICAgICAvLyAgICAgICAgdGhlIHNyY1JlY3QuCisgICAgICAgIFNrSVJlY3Qg Ym91bmRzID0gU2tJUmVjdDo6TWFrZVdIKHNyY0RldmljZS0+d2lkdGgoKSwgc3JjRGV2aWNlLT5o ZWlnaHQoKSk7CisgICAgICAgIGlmICghc3JjRGV2aWNlLT5yZWFkUGl4ZWxzKGJvdW5kcywgJmJp dG1hcCkpCisgICAgICAgICAgICByZXR1cm47CisgICAgfQorICAgIFJlZlB0cjxJbWFnZT4gaW1h Z2UgPSBCaXRtYXBJbWFnZVNpbmdsZUZyYW1lU2tpYTo6Y3JlYXRlKGJpdG1hcCwgY29udGV4dCA9 PSBtX2NvbnRleHQpOwogICAgIGNvbnRleHQtPmRyYXdJbWFnZShpbWFnZS5nZXQoKSwgc3R5bGVD b2xvclNwYWNlLCBkZXN0UmVjdCwgc3JjUmVjdCwgb3AsIHVzZUxvd1F1YWxpdHlTY2FsZSk7CiB9 CiAK 96770 2011-06-10 12:03:52 -0700 2011-07-27 12:18:50 -0700 Patch bug-62406-20110610150351.patch text/plain 2851 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NTU0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMDkgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGZvciBwcmludGluZyB3aXRoIGFjY2VsZXJh dGVkIDxjYW52YXM+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02MjQwNgorCisgICAgICAgIFRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBzaWRlIG9mIHRo aXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZXhpc3RpbmcKKyAgICAgICAgdGVzdHMuICBQcmludGlu ZyBpbiBDaHJvbWUgaGFzIGZldyB0ZXN0cywgc2FkbHkuICA6KAorCisgICAgICAgICogaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ2FudmFzRWxlbWVu dDo6cGFpbnQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJT a2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpkcmF3KToKKwogMjAxMS0w Ni0xMCAgTHVrZSBNYWNwaGVyc29uICAgPG1hY3BoZXJzb25AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHAJKHJldmlzaW9uIDg4NTU0KQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3MSw3ICsyNzEs NyBAQCB2b2lkIEhUTUxDYW52YXNFbGVtZW50OjpwYWludChHcmFwaGljc0NvCiAgICAgICAgIHJl dHVybjsKICAgICAKICAgICBpZiAobV9jb250ZXh0KSB7Ci0gICAgICAgIGlmICghbV9jb250ZXh0 LT5wYWludHNJbnRvQ2FudmFzQnVmZmVyKCkpCisgICAgICAgIGlmICghbV9jb250ZXh0LT5wYWlu dHNJbnRvQ2FudmFzQnVmZmVyKCkgJiYgIWRvY3VtZW50KCktPnByaW50aW5nKCkpCiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIG1fY29udGV4dC0+cGFpbnRSZW5kZXJpbmdSZXN1bHRzVG9D YW52YXMoKTsKICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9z a2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCShyZXZpc2lvbiA4ODU1NCkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lh LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMzLDggKzEzMywxOSBAQCB2b2lkIEltYWdlQnVmZmVy OjpkcmF3KEdyYXBoaWNzQ29udGV4dCogCiAgICAgICAgIG1fZGF0YS5tX3BsYXRmb3JtQ29udGV4 dC5zeW5jU29mdHdhcmVDYW52YXMoKTsKICAgICB9CiAKLSAgICBSZWZQdHI8SW1hZ2U+IGltYWdl ID0gQml0bWFwSW1hZ2VTaW5nbGVGcmFtZVNraWE6OmNyZWF0ZSgqbV9kYXRhLm1fcGxhdGZvcm1D b250ZXh0LmJpdG1hcCgpLCBjb250ZXh0ID09IG1fY29udGV4dCk7Ci0gICAgY29udGV4dC0+ZHJh d0ltYWdlKGltYWdlLmdldCgpLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3RSZWN0LCBzcmNSZWN0LCBv cCwgdXNlTG93UXVhbGl0eVNjYWxlKTsKKyAgICBTa0RldmljZSogc3JjRGV2aWNlID0gbV9kYXRh Lm1fcGxhdGZvcm1Db250ZXh0LmNhbnZhcygpLT5nZXREZXZpY2UoKTsKKyAgICBTa0JpdG1hcCBi aXRtYXAgPSBzcmNEZXZpY2UtPmFjY2Vzc0JpdG1hcChmYWxzZSk7CisgICAgU2tBdXRvTG9ja1Bp eGVscyBiaXRtYXBMb2NrKGJpdG1hcCk7CisgICAgRmxvYXRSZWN0IHNyY1JlY3RBZGp1c3RlZChz cmNSZWN0KTsKKyAgICBpZiAoIWJpdG1hcC5nZXRQaXhlbHMoKSAmJiAhY29udGV4dC0+cGxhdGZv cm1Db250ZXh0KCktPnVzZVNraWFHUFUoKSkgeworICAgICAgICBTa0lSZWN0IGJvdW5kczsKKyAg ICAgICAgKChTa1JlY3QpIHNyY1JlY3QpLnJvdW5kT3V0KCZib3VuZHMpOworICAgICAgICBpZiAo IXNyY0RldmljZS0+cmVhZFBpeGVscyhib3VuZHMsICZiaXRtYXApKQorICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICBzcmNSZWN0QWRqdXN0ZWQubW92ZSgtYm91bmRzLmZMZWZ0LCAtYm91bmRz LmZUb3ApOworICAgIH0KKyAgICBSZWZQdHI8SW1hZ2U+IGltYWdlID0gQml0bWFwSW1hZ2VTaW5n bGVGcmFtZVNraWE6OmNyZWF0ZShiaXRtYXAsIGNvbnRleHQgPT0gbV9jb250ZXh0KTsKKyAgICBj b250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UuZ2V0KCksIHN0eWxlQ29sb3JTcGFjZSwgZGVzdFJlY3Qs IHNyY1JlY3RBZGp1c3RlZCwgb3AsIHVzZUxvd1F1YWxpdHlTY2FsZSk7CiB9CiAKIHZvaWQgSW1h Z2VCdWZmZXI6OmRyYXdQYXR0ZXJuKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxv YXRSZWN0JiBzcmNSZWN0LCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mIHBhdHRlcm5UcmFuc2Zvcm0s Cg== 102166 2011-07-27 12:18:55 -0700 2011-07-27 12:25:50 -0700 Patch bug-62406-20110727151854.patch text/plain 2329 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxODYyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMjcgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IGZvciBwcmlu dGluZyB3aXRoIGFjY2VsZXJhdGVkIDxjYW52YXM+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjQwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBzaWRlIG9mIHRo aXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZXhpc3RpbmcKKyAgICAgICAgdGVzdHMuICBQcmludGlu ZyBpdHNlbGYgaW4gQ2hyb21lIGhhcyBmZXcgdGVzdHMsIHNhZGx5LiAgOigKKworICAgICAgICAq IGh0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZh c0VsZW1lbnQ6OnBhaW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl QnVmZmVyU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6ZHJhdyk6CisK IDIwMTEtMDctMjUgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW0Nocm9taXVtXSBBZGQgYmV0dGVyIFdlYktpdCBBUEkgZm9yIGNocm9tZS50YWJzLmlu c2VydENTUyBleHRlbnNpb24gQVBJCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmNwcAkocmV2aXNpb24gOTE4NDUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxDYW52YXNFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgxLDcgKzI4MSw3IEBAIHZv aWQgSFRNTENhbnZhc0VsZW1lbnQ6OnBhaW50KEdyYXBoaWNzQ28KICAgICAgICAgcmV0dXJuOwog ICAgIAogICAgIGlmIChtX2NvbnRleHQpIHsKLSAgICAgICAgaWYgKCFtX2NvbnRleHQtPnBhaW50 c0ludG9DYW52YXNCdWZmZXIoKSkKKyAgICAgICAgaWYgKCFtX2NvbnRleHQtPnBhaW50c0ludG9D YW52YXNCdWZmZXIoKSAmJiAhZG9jdW1lbnQoKS0+cHJpbnRpbmcoKSkKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgbV9jb250ZXh0LT5wYWludFJlbmRlcmluZ1Jlc3VsdHNUb0NhbnZhcygp OwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1h Z2VCdWZmZXJTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJldmlzaW9uIDkxODQ1KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTMsNyArMTEzLDkgQEAgdm9pZCBJbWFnZUJ1ZmZlcjo6ZHJhdyhH cmFwaGljc0NvbnRleHQqIAogICAgICAgICAgICAgICAgICAgICAgICBDb21wb3NpdGVPcGVyYXRv ciBvcCwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUpCiB7CiAgICAgY29udGV4dC0+cGxhdGZvcm1D b250ZXh0KCktPm1ha2VHckNvbnRleHRDdXJyZW50KCk7Ci0gICAgUmVmUHRyPEltYWdlPiBpbWFn ZSA9IEJpdG1hcEltYWdlU2luZ2xlRnJhbWVTa2lhOjpjcmVhdGUoKm1fZGF0YS5tX3BsYXRmb3Jt Q29udGV4dC5iaXRtYXAoKSwgY29udGV4dCA9PSBtX2NvbnRleHQpOworICAgIFNrQml0bWFwIGJp dG1hcCA9IHNyY0RldmljZS0+YWNjZXNzQml0bWFwKGZhbHNlKTsKKyAgICBTa0F1dG9Mb2NrUGl4 ZWxzIGJpdG1hcExvY2soYml0bWFwKTsKKyAgICBSZWZQdHI8SW1hZ2U+IGltYWdlID0gQml0bWFw SW1hZ2VTaW5nbGVGcmFtZVNraWE6OmNyZWF0ZShiaXRtYXAsIGNvbnRleHQgPT0gbV9jb250ZXh0 KTsKICAgICBjb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UuZ2V0KCksIHN0eWxlQ29sb3JTcGFjZSwg ZGVzdFJlY3QsIHNyY1JlY3QsIG9wLCB1c2VMb3dRdWFsaXR5U2NhbGUpOwogfQogCg== 102169 2011-07-27 12:25:55 -0700 2011-07-29 17:02:51 -0700 Patch bug-62406-20110727152554.patch text/plain 2600 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxODYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMjcgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IGZvciBwcmlu dGluZyB3aXRoIGFjY2VsZXJhdGVkIDxjYW52YXM+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjQwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoZSBwbGF0Zm9ybS1pbmRlcGVuZGVudCBzaWRlIG9mIHRo aXMgc2hvdWxkIGJlIGNvdmVyZWQgYnkgZXhpc3RpbmcKKyAgICAgICAgdGVzdHMuICBQcmludGlu ZyBpdHNlbGYgaW4gQ2hyb21lIGhhcyBmZXcgdGVzdHMsIHNhZGx5LiAgOigKKworICAgICAgICAq IGh0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZh c0VsZW1lbnQ6OnBhaW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl QnVmZmVyU2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6ZHJhdyk6CisK IDIwMTEtMDctMjUgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgW0Nocm9taXVtXSBBZGQgYmV0dGVyIFdlYktpdCBBUEkgZm9yIGNocm9tZS50YWJzLmlu c2VydENTUyBleHRlbnNpb24gQVBJCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmNwcAkocmV2aXNpb24gOTE4NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxDYW52YXNFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgxLDcgKzI4MSw3IEBAIHZv aWQgSFRNTENhbnZhc0VsZW1lbnQ6OnBhaW50KEdyYXBoaWNzQ28KICAgICAgICAgcmV0dXJuOwog ICAgIAogICAgIGlmIChtX2NvbnRleHQpIHsKLSAgICAgICAgaWYgKCFtX2NvbnRleHQtPnBhaW50 c0ludG9DYW52YXNCdWZmZXIoKSkKKyAgICAgICAgaWYgKCFtX2NvbnRleHQtPnBhaW50c0ludG9D YW52YXNCdWZmZXIoKSAmJiAhZG9jdW1lbnQoKS0+cHJpbnRpbmcoKSkKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgbV9jb250ZXh0LT5wYWludFJlbmRlcmluZ1Jlc3VsdHNUb0NhbnZhcygp OwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1h Z2VCdWZmZXJTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJldmlzaW9uIDkxODYzKQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTIsOCArMTEyLDEyIEBAIHZvaWQgSW1hZ2VCdWZmZXI6OmNsaXAo R3JhcGhpY3NDb250ZXh0KiAKIHZvaWQgSW1hZ2VCdWZmZXI6OmRyYXcoR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBk ZXN0UmVjdCwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LAogICAgICAgICAgICAgICAgICAgICAg ICBDb21wb3NpdGVPcGVyYXRvciBvcCwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUpCiB7CisgICAg bV9jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+bWFrZUdyQ29udGV4dEN1cnJlbnQoKTsKKyAg ICBTa0RldmljZSogc3JjRGV2aWNlID0gbV9jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+Y2Fu dmFzKCktPmdldERldmljZSgpOworICAgIFNrQml0bWFwIGJpdG1hcCA9IHNyY0RldmljZS0+YWNj ZXNzQml0bWFwKGZhbHNlKTsKKyAgICBTa0F1dG9Mb2NrUGl4ZWxzIGJpdG1hcExvY2soYml0bWFw KTsKICAgICBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+bWFrZUdyQ29udGV4dEN1cnJlbnQo KTsKLSAgICBSZWZQdHI8SW1hZ2U+IGltYWdlID0gQml0bWFwSW1hZ2VTaW5nbGVGcmFtZVNraWE6 OmNyZWF0ZSgqbV9kYXRhLm1fcGxhdGZvcm1Db250ZXh0LmJpdG1hcCgpLCBjb250ZXh0ID09IG1f Y29udGV4dCk7CisgICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IEJpdG1hcEltYWdlU2luZ2xlRnJh bWVTa2lhOjpjcmVhdGUoYml0bWFwLCBjb250ZXh0ID09IG1fY29udGV4dCk7CiAgICAgY29udGV4 dC0+ZHJhd0ltYWdlKGltYWdlLmdldCgpLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3RSZWN0LCBzcmNS ZWN0LCBvcCwgdXNlTG93UXVhbGl0eVNjYWxlKTsKIH0KIAo=