72327 2011-11-14 16:40:49 -0800 WebGLRenderingContext: Remove duplicate DrawingBuffer binding code 2011-11-23 12:34:41 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 72450 1 twiz twiz cc-bugs dglazkov jamesr jchaffraix kbr senorblanco webkit.review.bot oldest_to_newest 502454 0 twiz 2011-11-14 16:40:49 -0800 The code paths in various WebGLRenderingContext methods duplicate the following structures frequently: // Commit DrawingBuffer if needed (e.g., for multisampling) if (!m_framebufferBinding && m_drawingBuffer) m_drawingBuffer->commit(); // Interesting rendering code here . . . . // Restore DrawingBuffer if needed if (!m_framebufferBinding && m_drawingBuffer) m_drawingBuffer->bind(); The code duplication should be eliminated via a scoped object. See comments in https://bugs.webkit.org/show_bug.cgi?id=53201#c56 502461 1 115058 twiz 2011-11-14 16:45:42 -0800 Created attachment 115058 Patch 502481 2 115058 webkit.review.bot 2011-11-14 16:55:43 -0800 Comment on attachment 115058 Patch Attachment 115058 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10484102 502562 3 115058 webkit-ews 2011-11-14 18:10:39 -0800 Comment on attachment 115058 Patch Attachment 115058 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10372339 502577 4 115081 twiz 2011-11-14 18:38:35 -0800 Created attachment 115081 Patch 502578 5 115081 twiz 2011-11-14 18:43:27 -0800 Comment on attachment 115081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115081&action=review > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:1236 > + ScopedDrawingBufferBinder(m_drawingBuffer, m_framebufferBinding); Yikes! There was a missing { } pair here that wasn't caught in my earlier submit. Fixing here. 502872 6 115081 senorblanco 2011-11-15 06:47:21 -0800 Comment on attachment 115081 Patch Nice cleanup! r=me 502953 7 115081 jchaffraix 2011-11-15 09:10:51 -0800 Comment on attachment 115081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115081&action=review > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:105 > + RefPtr<WebGLFramebuffer> m_framebufferBinding; Quick question: do we really need to hold a reference to those 2 objects here? It looks like WebGLRenderingContext already hold a strong reference to those 2 so it just adds some reference churn. 502965 8 115081 twiz 2011-11-15 09:26:02 -0800 Comment on attachment 115081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115081&action=review >> Source/WebCore/html/canvas/WebGLRenderingContext.cpp:105 >> + RefPtr<WebGLFramebuffer> m_framebufferBinding; > > Quick question: do we really need to hold a reference to those 2 objects here? It looks like WebGLRenderingContext already hold a strong reference to those 2 so it just adds some reference churn. No, there is no strict need for references to be held. Raw pointers would also suffice. Is there a preference for smart pointers versus raw? I chose smart pointers arbitrarily, because I have a slight aversion to storing raw pointers, except when necessary to prevent reference cycles or due to other implementation details. 502970 9 115081 jchaffraix 2011-11-15 09:30:58 -0800 Comment on attachment 115081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115081&action=review >>> Source/WebCore/html/canvas/WebGLRenderingContext.cpp:105 >>> + RefPtr<WebGLFramebuffer> m_framebufferBinding; >> >> Quick question: do we really need to hold a reference to those 2 objects here? It looks like WebGLRenderingContext already hold a strong reference to those 2 so it just adds some reference churn. > > No, there is no strict need for references to be held. Raw pointers would also suffice. > > Is there a preference for smart pointers versus raw? I chose smart pointers arbitrarily, because I have a slight aversion to storing raw pointers, except when necessary to prevent reference cycles or due to other implementation details. There is usually a preference towards using RefPtr only when you explicitly need to hold a reference to the object. It seems safe to switch that to raw pointers here so I would lean towards doing that (make sure you also change the constructor's arguments as PassRefPtr as the same effect). 503038 10 115195 twiz 2011-11-15 10:36:33 -0800 Created attachment 115195 Patch 503116 11 115195 jchaffraix 2011-11-15 11:53:24 -0800 Comment on attachment 115195 Patch Forwarding Stephen's r+ as he knows the code better and I am fine with the new change. Thanks! 503148 12 115195 webkit.review.bot 2011-11-15 12:21:24 -0800 Comment on attachment 115195 Patch Clearing flags on attachment: 115195 Committed r100308: <http://trac.webkit.org/changeset/100308> 503149 13 webkit.review.bot 2011-11-15 12:21:29 -0800 All reviewed patches have been landed. Closing bug. 503518 14 115301 twiz 2011-11-15 19:34:32 -0800 Created attachment 115301 Patch 503520 15 115301 twiz 2011-11-15 19:36:57 -0800 Comment on attachment 115301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115301&action=review > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:1190 > + ScopedDrawingBufferBinder binder(m_drawingBuffer.get(), m_framebufferBinding.get()); The previous changes had failed to make a local of the ScopedDrawingBufferBinder instance. An anonymous instance was created, which was constructed and destroyed within the same sequence point, not at the scope block. 503522 16 kbr 2011-11-15 19:38:50 -0800 For the record, previous patch was rolled out in https://bugs.webkit.org/show_bug.cgi?id=72450 / http://trac.webkit.org/changeset/100394 due to conformance suite regressions. 503523 17 115301 kbr 2011-11-15 19:39:49 -0800 Comment on attachment 115301 Patch Nice cleanup and good catch. r=me 503550 18 twiz 2011-11-15 20:31:58 -0800 (In reply to comment #14) > Created an attachment (id=115301) [details] > Patch I can confirm that this change corrects all of the WebGL conformance regressions introduced by patch #3. This patch fixes chrome bug crbug.com/104407, which had been opened in response to these regressions. 503551 19 115301 kbr 2011-11-15 20:32:37 -0800 Comment on attachment 115301 Patch Sounds great. Marking cq+. 503558 20 115301 webkit.review.bot 2011-11-15 20:47:28 -0800 Comment on attachment 115301 Patch Clearing flags on attachment: 115301 Committed r100399: <http://trac.webkit.org/changeset/100399> 503559 21 webkit.review.bot 2011-11-15 20:47:34 -0800 All reviewed patches have been landed. Closing bug. 508300 22 116399 twiz 2011-11-23 12:31:06 -0800 Created attachment 116399 Patch 508302 23 twiz 2011-11-23 12:34:36 -0800 (In reply to comment #22) > Created an attachment (id=116399) [details] > Patch Disregard this patch. This patch was not intended for this issue. 115058 2011-11-14 16:45:42 -0800 2011-11-14 18:38:30 -0800 Patch bug-72327-20111114194236.patch text/plain 6638 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDIxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTExLTE0ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBQYXRjaCByZW1vdmluZyBkdXBs aWNhdGVkIGNvZGUgaW4gdGhlIHNldHVwIG9mIHRoZSBEcmF3aW5nQnVmZmVyIHVzZWQKKyAgICAg ICAgdG8gaG9zdCB0aGUgYmFjay1idWZmZXIgZm9yIFdlYkdMIGNvbnRlbnRzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OmNvcHlUZXhJbWFnZTJEKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Y29weVRleFN1YkltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpyZWFkUGl4ZWxzKToKKwogMjAxMS0xMS0xNCAgQWRhbSBCYXJ0aCAgPGFi YXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVuaXF1ZSBvcmlnaW5zIHNob3VsZG4ndCByZW1l bWJlciB0aGVpciBzY2hlbWUsIGhvc3QsIG9yIHBvcnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24g MTAwMTM5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODIsNiArODIsMjkgQEAgY29uc3QgZG91YmxlIHNl Y29uZHNCZXR3ZWVuUmVzdG9yZUF0dGVtcAogCiBuYW1lc3BhY2UgewogCisgICAgY2xhc3MgU2Nv cGVkRHJhd2luZ0J1ZmZlckJpbmRlciB7CisgICAgcHVibGljOgorICAgICAgICBTY29wZWREcmF3 aW5nQnVmZmVyQmluZGVyKFBhc3NSZWZQdHI8RHJhd2luZ0J1ZmZlcj4gZHJhd2luZ0J1ZmZlciwg UGFzc1JlZlB0cjxXZWJHTEZyYW1lYnVmZmVyPiBmcmFtZWJ1ZmZlcikKKyAgICAgICAgICAgIDog bV9kcmF3aW5nQnVmZmVyKGRyYXdpbmdCdWZmZXIpCisgICAgICAgICAgICAsIG1fZnJhbWVidWZm ZXIoZnJhbWVidWZmZXIpCisgICAgICAgIHsKKyAgICAgICAgICAgIC8vIENvbW1pdCBEcmF3aW5n QnVmZmVyIGlmIG5lZWRlZCAoZS5nLiwgZm9yIG11bHRpc2FtcGxpbmcpCisgICAgICAgICAgICBp ZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKKyAgICAgICAgICAg ICAgICBtX2RyYXdpbmdCdWZmZXItPmNvbW1pdCgpOworICAgICAgICB9CisKKyAgICAgICAgflNj b3BlZERyYXdpbmdCdWZmZXJCaW5kZXIoKQorICAgICAgICB7CisgICAgICAgICAgICAvLyBSZXN0 b3JlIERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkCisgICAgICAgICAgICBpZiAoIW1fZnJhbWVidWZm ZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKKyAgICAgICAgICAgICAgICBtX2RyYXdpbmdC dWZmZXItPmJpbmQoKTsKKyAgICAgICAgfQorCisgICAgcHJpdmF0ZToKKyAgICAgICAgUmVmUHRy PERyYXdpbmdCdWZmZXI+IG1fZHJhd2luZ0J1ZmZlcjsKKyAgICAgICAgUmVmUHRyPFdlYkdMRnJh bWVidWZmZXI+IG1fZnJhbWVidWZmZXJCaW5kaW5nOworICAgIH07CisKICAgICBQbGF0Zm9ybTNE T2JqZWN0IG9iamVjdE9yWmVybyhXZWJHTE9iamVjdCogb2JqZWN0KQogICAgIHsKICAgICAgICAg cmV0dXJuIG9iamVjdCA/IG9iamVjdC0+b2JqZWN0KCkgOiAwOwpAQCAtMTE2NCwyMCArMTE4Nywx MCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y29weVRleEltYWdlCiAgICAgfQogICAg IGNsZWFySWZDb21wb3NpdGVkKCk7CiAgICAgaWYgKGlzUmVzb3VyY2VTYWZlKCkpIHsKLSAgICAg ICAgLy8gQ29tbWl0IERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkIChlLmcuLCBmb3IgbXVsdGlzYW1w bGluZykKLSAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBtX2RyYXdpbmdCdWZm ZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmNvbW1pdCgpOwotCisgICAgICAgIFNj b3BlZERyYXdpbmdCdWZmZXJCaW5kZXIobV9kcmF3aW5nQnVmZmVyLCBtX2ZyYW1lYnVmZmVyQmlu ZGluZyk7CiAgICAgICAgIG1fY29udGV4dC0+Y29weVRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwg aW50ZXJuYWxmb3JtYXQsIHgsIHksIHdpZHRoLCBoZWlnaHQsIGJvcmRlcik7Ci0KLSAgICAgICAg Ly8gUmVzdG9yZSBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZAotICAgICAgICBpZiAoIW1fZnJhbWVi dWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1 ZmZlci0+YmluZCgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIENvbW1pdCBEcmF3aW5nQnVm ZmVyIGlmIG5lZWRlZCAoZS5nLiwgZm9yIG11bHRpc2FtcGxpbmcpCi0gICAgICAgIGlmICghbV9m cmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgbV9kcmF3 aW5nQnVmZmVyLT5jb21taXQoKTsKLQorICAgICAgICBTY29wZWREcmF3aW5nQnVmZmVyQmluZGVy KG1fZHJhd2luZ0J1ZmZlciwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcpOwogICAgICAgICBHQzNEaW50 IGNsaXBwZWRYLCBjbGlwcGVkWTsKICAgICAgICAgR0MzRHNpemVpIGNsaXBwZWRXaWR0aCwgY2xp cHBlZEhlaWdodDsKICAgICAgICAgaWYgKGNsaXAyRCh4LCB5LCB3aWR0aCwgaGVpZ2h0LCBnZXRC b3VuZEZyYW1lYnVmZmVyV2lkdGgoKSwgZ2V0Qm91bmRGcmFtZWJ1ZmZlckhlaWdodCgpLCAmY2xp cHBlZFgsICZjbGlwcGVkWSwgJmNsaXBwZWRXaWR0aCwgJmNsaXBwZWRIZWlnaHQpKSB7CkBAIC0x MTg5LDEwICsxMjAyLDYgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNvcHlUZXhJbWFn ZQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG1fY29udGV4dC0+ Y29weVRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgaW50ZXJuYWxmb3JtYXQsIHgsIHksIHdpZHRo LCBoZWlnaHQsIGJvcmRlcik7Ci0KLSAgICAgICAgLy8gUmVzdG9yZSBEcmF3aW5nQnVmZmVyIGlm IG5lZWRlZAotICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1 ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgpOwogICAgIH0KICAgICAv LyBGSVhNRTogaWYgdGhlIGZyYW1lYnVmZmVyIGlzIG5vdCBjb21wbGV0ZSwgbm9uZSBvZiB0aGUg YmVsb3cgc2hvdWxkIGJlIGV4ZWN1dGVkLgogICAgIHRleC0+c2V0TGV2ZWxJbmZvKHRhcmdldCwg bGV2ZWwsIGludGVybmFsZm9ybWF0LCB3aWR0aCwgaGVpZ2h0LCBHcmFwaGljc0NvbnRleHQzRDo6 VU5TSUdORURfQllURSk7CkBAIC0xMjI0LDE1ICsxMjMzLDggQEAgdm9pZCBXZWJHTFJlbmRlcmlu Z0NvbnRleHQ6OmNvcHlUZXhTdWJJbQogICAgIH0KICAgICBjbGVhcklmQ29tcG9zaXRlZCgpOwog ICAgIGlmIChpc1Jlc291cmNlU2FmZSgpKQotICAgICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZl ciBpZiBuZWVkZWQgKGUuZy4sIGZvciBtdWx0aXNhbXBsaW5nKQotICAgICAgICBpZiAoIW1fZnJh bWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2lu Z0J1ZmZlci0+Y29tbWl0KCk7Ci0KKyAgICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZlckJpbmRlciht X2RyYXdpbmdCdWZmZXIsIG1fZnJhbWVidWZmZXJCaW5kaW5nKTsKICAgICAgICAgbV9jb250ZXh0 LT5jb3B5VGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zmc2V0LCB5b2Zmc2V0LCB4LCB5 LCB3aWR0aCwgaGVpZ2h0KTsKLQotICAgICAgICAvLyBSZXN0b3JlIERyYXdpbmdCdWZmZXIgaWYg bmVlZGVkCi0gICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVm ZmVyKQotICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5iaW5kKCk7CiAgICAgZWxzZSB7CiAg ICAgICAgIEdDM0RpbnQgY2xpcHBlZFgsIGNsaXBwZWRZOwogICAgICAgICBHQzNEc2l6ZWkgY2xp cHBlZFdpZHRoLCBjbGlwcGVkSGVpZ2h0OwpAQCAtMTI1NiwyNyArMTI1OCwxMyBAQCB2b2lkIFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6Y29weVRleFN1YkltCiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICBtX2NvbnRleHQtPnRleFN1YkltYWdlMkQodGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9m ZnNldCwgd2lkdGgsIGhlaWdodCwgZm9ybWF0LCB0eXBlLCB6ZXJvLmdldCgpKTsKICAgICAgICAg ICAgIGlmIChjbGlwcGVkV2lkdGggPiAwICYmIGNsaXBwZWRIZWlnaHQgPiAwKSB7Ci0gICAgICAg ICAgICAgICAgLy8gQ29tbWl0IERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkIChlLmcuLCBmb3IgbXVs dGlzYW1wbGluZykKLSAgICAgICAgICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYm IG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5j b21taXQoKTsKLQorICAgICAgICAgICAgICAgIFNjb3BlZERyYXdpbmdCdWZmZXJCaW5kZXIobV9k cmF3aW5nQnVmZmVyLCBtX2ZyYW1lYnVmZmVyQmluZGluZyk7CiAgICAgICAgICAgICAgICAgbV9j b250ZXh0LT5jb3B5VGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zmc2V0ICsgY2xpcHBl ZFggLSB4LCB5b2Zmc2V0ICsgY2xpcHBlZFkgLSB5LAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY2xpcHBlZFgsIGNsaXBwZWRZLCBjbGlwcGVkV2lkdGgsIGNs aXBwZWRIZWlnaHQpOwotCi0gICAgICAgICAgICAgICAvLyBSZXN0b3JlIERyYXdpbmdCdWZmZXIg aWYgbmVlZGVkCi0gICAgICAgICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1f ZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgp OwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gQ29tbWl0 IERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkIChlLmcuLCBmb3IgbXVsdGlzYW1wbGluZykKLSAgICAg ICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAg ICAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+Y29tbWl0KCk7Ci0KKyAgICAgICAgICAgIFNj b3BlZERyYXdpbmdCdWZmZXJCaW5kZXIobV9kcmF3aW5nQnVmZmVyLCBtX2ZyYW1lYnVmZmVyQmlu ZGluZyk7CiAgICAgICAgICAgICBtX2NvbnRleHQtPmNvcHlUZXhTdWJJbWFnZTJEKHRhcmdldCwg bGV2ZWwsIHhvZmZzZXQsIHlvZmZzZXQsIHgsIHksIHdpZHRoLCBoZWlnaHQpOwotCi0gICAgICAg ICAgICAvLyBSZXN0b3JlIERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkCi0gICAgICAgICAgICBpZiAo IW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgICAg ICBtX2RyYXdpbmdCdWZmZXItPmJpbmQoKTsKICAgICAgICAgfQogICAgIH0KICAgICBjbGVhbnVw QWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwpAQCAtMzA0MSwxNSArMzAyOSwxMCBAQCB2b2lkIFdl YkdMUmVuZGVyaW5nQ29udGV4dDo6cmVhZFBpeGVscyhHCiAgICAgY2xlYXJJZkNvbXBvc2l0ZWQo KTsKICAgICB2b2lkKiBkYXRhID0gcGl4ZWxzLT5iYXNlQWRkcmVzcygpOwogCi0gICAgLy8gQ29t bWl0IERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkIChlLmcuLCBmb3IgbXVsdGlzYW1wbGluZykKLSAg ICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAg bV9kcmF3aW5nQnVmZmVyLT5jb21taXQoKTsKLQotICAgIG1fY29udGV4dC0+cmVhZFBpeGVscyh4 LCB5LCB3aWR0aCwgaGVpZ2h0LCBmb3JtYXQsIHR5cGUsIGRhdGEpOwotCi0gICAgLy8gUmVzdG9y ZSBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZAotICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcg JiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmJpbmQoKTsKKyAg ICB7CisgICAgICAgIFNjb3BlZERyYXdpbmdCdWZmZXJCaW5kZXIobV9kcmF3aW5nQnVmZmVyLCBt X2ZyYW1lYnVmZmVyQmluZGluZyk7CisgICAgICAgIG1fY29udGV4dC0+cmVhZFBpeGVscyh4LCB5 LCB3aWR0aCwgaGVpZ2h0LCBmb3JtYXQsIHR5cGUsIGRhdGEpOworICAgIH0KIAogI2lmIE9TKERB UldJTikKICAgICAvLyBGSVhNRTogcmVtb3ZlIHRoaXMgc2VjdGlvbiB3aGVuIEdMIGRyaXZlciBi dWcgb24gTWFjIGlzIGZpeGVkLCBpLmUuLAo= 115081 2011-11-14 18:38:35 -0800 2011-11-15 10:36:27 -0800 Patch bug-72327-20111114213528.patch text/plain 6874 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDIxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTExLTE0ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBQYXRjaCByZW1vdmluZyBkdXBs aWNhdGVkIGNvZGUgaW4gdGhlIHNldHVwIG9mIHRoZSBEcmF3aW5nQnVmZmVyIHVzZWQKKyAgICAg ICAgdG8gaG9zdCB0aGUgYmFjay1idWZmZXIgZm9yIFdlYkdMIGNvbnRlbnRzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OmNvcHlUZXhJbWFnZTJEKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Y29weVRleFN1YkltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpyZWFkUGl4ZWxzKToKKwogMjAxMS0xMS0xNCAgQWRhbSBCYXJ0aCAgPGFi YXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVuaXF1ZSBvcmlnaW5zIHNob3VsZG4ndCByZW1l bWJlciB0aGVpciBzY2hlbWUsIGhvc3QsIG9yIHBvcnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24g MTAwMTM5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODIsNiArODIsMjkgQEAgY29uc3QgZG91YmxlIHNl Y29uZHNCZXR3ZWVuUmVzdG9yZUF0dGVtcAogCiBuYW1lc3BhY2UgewogCisgICAgY2xhc3MgU2Nv cGVkRHJhd2luZ0J1ZmZlckJpbmRlciB7CisgICAgcHVibGljOgorICAgICAgICBTY29wZWREcmF3 aW5nQnVmZmVyQmluZGVyKFBhc3NSZWZQdHI8RHJhd2luZ0J1ZmZlcj4gZHJhd2luZ0J1ZmZlciwg UGFzc1JlZlB0cjxXZWJHTEZyYW1lYnVmZmVyPiBmcmFtZWJ1ZmZlckJpbmRpbmcpCisgICAgICAg ICAgICA6IG1fZHJhd2luZ0J1ZmZlcihkcmF3aW5nQnVmZmVyKQorICAgICAgICAgICAgLCBtX2Zy YW1lYnVmZmVyQmluZGluZyhmcmFtZWJ1ZmZlckJpbmRpbmcpCisgICAgICAgIHsKKyAgICAgICAg ICAgIC8vIENvbW1pdCBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZCAoZS5nLiwgZm9yIG11bHRpc2Ft cGxpbmcpCisgICAgICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2lu Z0J1ZmZlcikKKyAgICAgICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmNvbW1pdCgpOworICAg ICAgICB9CisKKyAgICAgICAgflNjb3BlZERyYXdpbmdCdWZmZXJCaW5kZXIoKQorICAgICAgICB7 CisgICAgICAgICAgICAvLyBSZXN0b3JlIERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkCisgICAgICAg ICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKKyAgICAg ICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmJpbmQoKTsKKyAgICAgICAgfQorCisgICAgcHJp dmF0ZToKKyAgICAgICAgUmVmUHRyPERyYXdpbmdCdWZmZXI+IG1fZHJhd2luZ0J1ZmZlcjsKKyAg ICAgICAgUmVmUHRyPFdlYkdMRnJhbWVidWZmZXI+IG1fZnJhbWVidWZmZXJCaW5kaW5nOworICAg IH07CisKICAgICBQbGF0Zm9ybTNET2JqZWN0IG9iamVjdE9yWmVybyhXZWJHTE9iamVjdCogb2Jq ZWN0KQogICAgIHsKICAgICAgICAgcmV0dXJuIG9iamVjdCA/IG9iamVjdC0+b2JqZWN0KCkgOiAw OwpAQCAtMTE2NCwyMCArMTE4NywxMCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y29w eVRleEltYWdlCiAgICAgfQogICAgIGNsZWFySWZDb21wb3NpdGVkKCk7CiAgICAgaWYgKGlzUmVz b3VyY2VTYWZlKCkpIHsKLSAgICAgICAgLy8gQ29tbWl0IERyYXdpbmdCdWZmZXIgaWYgbmVlZGVk IChlLmcuLCBmb3IgbXVsdGlzYW1wbGluZykKLSAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmlu ZGluZyAmJiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmNv bW1pdCgpOwotCisgICAgICAgIFNjb3BlZERyYXdpbmdCdWZmZXJCaW5kZXIobV9kcmF3aW5nQnVm ZmVyLCBtX2ZyYW1lYnVmZmVyQmluZGluZyk7CiAgICAgICAgIG1fY29udGV4dC0+Y29weVRleElt YWdlMkQodGFyZ2V0LCBsZXZlbCwgaW50ZXJuYWxmb3JtYXQsIHgsIHksIHdpZHRoLCBoZWlnaHQs IGJvcmRlcik7Ci0KLSAgICAgICAgLy8gUmVzdG9yZSBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZAot ICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAg ICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAg IC8vIENvbW1pdCBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZCAoZS5nLiwgZm9yIG11bHRpc2FtcGxp bmcpCi0gICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVy KQotICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5jb21taXQoKTsKLQorICAgICAgICBTY29w ZWREcmF3aW5nQnVmZmVyQmluZGVyKG1fZHJhd2luZ0J1ZmZlciwgbV9mcmFtZWJ1ZmZlckJpbmRp bmcpOwogICAgICAgICBHQzNEaW50IGNsaXBwZWRYLCBjbGlwcGVkWTsKICAgICAgICAgR0MzRHNp emVpIGNsaXBwZWRXaWR0aCwgY2xpcHBlZEhlaWdodDsKICAgICAgICAgaWYgKGNsaXAyRCh4LCB5 LCB3aWR0aCwgaGVpZ2h0LCBnZXRCb3VuZEZyYW1lYnVmZmVyV2lkdGgoKSwgZ2V0Qm91bmRGcmFt ZWJ1ZmZlckhlaWdodCgpLCAmY2xpcHBlZFgsICZjbGlwcGVkWSwgJmNsaXBwZWRXaWR0aCwgJmNs aXBwZWRIZWlnaHQpKSB7CkBAIC0xMTg5LDEwICsxMjAyLDYgQEAgdm9pZCBXZWJHTFJlbmRlcmlu Z0NvbnRleHQ6OmNvcHlUZXhJbWFnZQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UKICAg ICAgICAgICAgIG1fY29udGV4dC0+Y29weVRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgaW50ZXJu YWxmb3JtYXQsIHgsIHksIHdpZHRoLCBoZWlnaHQsIGJvcmRlcik7Ci0KLSAgICAgICAgLy8gUmVz dG9yZSBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZAotICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJC aW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+ YmluZCgpOwogICAgIH0KICAgICAvLyBGSVhNRTogaWYgdGhlIGZyYW1lYnVmZmVyIGlzIG5vdCBj b21wbGV0ZSwgbm9uZSBvZiB0aGUgYmVsb3cgc2hvdWxkIGJlIGV4ZWN1dGVkLgogICAgIHRleC0+ c2V0TGV2ZWxJbmZvKHRhcmdldCwgbGV2ZWwsIGludGVybmFsZm9ybWF0LCB3aWR0aCwgaGVpZ2h0 LCBHcmFwaGljc0NvbnRleHQzRDo6VU5TSUdORURfQllURSk7CkBAIC0xMjIzLDE3ICsxMjMyLDEw IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojpjb3B5VGV4U3ViSW0KICAgICAgICAgcmV0 dXJuOwogICAgIH0KICAgICBjbGVhcklmQ29tcG9zaXRlZCgpOwotICAgIGlmIChpc1Jlc291cmNl U2FmZSgpKQotICAgICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUuZy4s IGZvciBtdWx0aXNhbXBsaW5nKQotICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYm IG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+Y29tbWl0KCk7 Ci0KKyAgICBpZiAoaXNSZXNvdXJjZVNhZmUoKSkgeworICAgICAgICBTY29wZWREcmF3aW5nQnVm ZmVyQmluZGVyKG1fZHJhd2luZ0J1ZmZlciwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcpOwogICAgICAg ICBtX2NvbnRleHQtPmNvcHlUZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIHhvZmZzZXQsIHlv ZmZzZXQsIHgsIHksIHdpZHRoLCBoZWlnaHQpOwotCi0gICAgICAgIC8vIFJlc3RvcmUgRHJhd2lu Z0J1ZmZlciBpZiBuZWVkZWQKLSAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBt X2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmJpbmQoKTsKLSAg ICBlbHNlIHsKKyAgICB9IGVsc2UgewogICAgICAgICBHQzNEaW50IGNsaXBwZWRYLCBjbGlwcGVk WTsKICAgICAgICAgR0MzRHNpemVpIGNsaXBwZWRXaWR0aCwgY2xpcHBlZEhlaWdodDsKICAgICAg ICAgaWYgKGNsaXAyRCh4LCB5LCB3aWR0aCwgaGVpZ2h0LCBnZXRCb3VuZEZyYW1lYnVmZmVyV2lk dGgoKSwgZ2V0Qm91bmRGcmFtZWJ1ZmZlckhlaWdodCgpLCAmY2xpcHBlZFgsICZjbGlwcGVkWSwg JmNsaXBwZWRXaWR0aCwgJmNsaXBwZWRIZWlnaHQpKSB7CkBAIC0xMjU2LDI3ICsxMjU4LDEzIEBA IHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojpjb3B5VGV4U3ViSW0KICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIG1fY29udGV4dC0+dGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zm c2V0LCB5b2Zmc2V0LCB3aWR0aCwgaGVpZ2h0LCBmb3JtYXQsIHR5cGUsIHplcm8uZ2V0KCkpOwog ICAgICAgICAgICAgaWYgKGNsaXBwZWRXaWR0aCA+IDAgJiYgY2xpcHBlZEhlaWdodCA+IDApIHsK LSAgICAgICAgICAgICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUuZy4s IGZvciBtdWx0aXNhbXBsaW5nKQotICAgICAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJp bmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgICAgICAgICBtX2RyYXdpbmdC dWZmZXItPmNvbW1pdCgpOwotCisgICAgICAgICAgICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZlckJp bmRlcihtX2RyYXdpbmdCdWZmZXIsIG1fZnJhbWVidWZmZXJCaW5kaW5nKTsKICAgICAgICAgICAg ICAgICBtX2NvbnRleHQtPmNvcHlUZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIHhvZmZzZXQg KyBjbGlwcGVkWCAtIHgsIHlvZmZzZXQgKyBjbGlwcGVkWSAtIHksCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlwcGVkWCwgY2xpcHBlZFksIGNsaXBwZWRX aWR0aCwgY2xpcHBlZEhlaWdodCk7Ci0KLSAgICAgICAgICAgICAgIC8vIFJlc3RvcmUgRHJhd2lu Z0J1ZmZlciBpZiBuZWVkZWQKLSAgICAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRp bmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVy LT5iaW5kKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAv LyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUuZy4sIGZvciBtdWx0aXNhbXBsaW5n KQotICAgICAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBtX2RyYXdpbmdCdWZm ZXIpCi0gICAgICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5jb21taXQoKTsKLQorICAgICAg ICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZlckJpbmRlcihtX2RyYXdpbmdCdWZmZXIsIG1fZnJhbWVi dWZmZXJCaW5kaW5nKTsKICAgICAgICAgICAgIG1fY29udGV4dC0+Y29weVRleFN1YkltYWdlMkQo dGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9mZnNldCwgeCwgeSwgd2lkdGgsIGhlaWdodCk7Ci0K LSAgICAgICAgICAgIC8vIFJlc3RvcmUgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQKLSAgICAgICAg ICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAg ICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgpOwogICAgICAgICB9CiAgICAgfQogICAg IGNsZWFudXBBZnRlckdyYXBoaWNzQ2FsbChmYWxzZSk7CkBAIC0zMDQxLDE1ICszMDI5LDEwIEBA IHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpyZWFkUGl4ZWxzKEcKICAgICBjbGVhcklmQ29t cG9zaXRlZCgpOwogICAgIHZvaWQqIGRhdGEgPSBwaXhlbHMtPmJhc2VBZGRyZXNzKCk7CiAKLSAg ICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUuZy4sIGZvciBtdWx0aXNhbXBs aW5nKQotICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQot ICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmNvbW1pdCgpOwotCi0gICAgbV9jb250ZXh0LT5yZWFk UGl4ZWxzKHgsIHksIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwgdHlwZSwgZGF0YSk7Ci0KLSAgICAv LyBSZXN0b3JlIERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkCi0gICAgaWYgKCFtX2ZyYW1lYnVmZmVy QmluZGluZyAmJiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+Ymlu ZCgpOworICAgIHsKKyAgICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZlckJpbmRlcihtX2RyYXdpbmdC dWZmZXIsIG1fZnJhbWVidWZmZXJCaW5kaW5nKTsKKyAgICAgICAgbV9jb250ZXh0LT5yZWFkUGl4 ZWxzKHgsIHksIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwgdHlwZSwgZGF0YSk7CisgICAgfQogCiAj aWYgT1MoREFSV0lOKQogICAgIC8vIEZJWE1FOiByZW1vdmUgdGhpcyBzZWN0aW9uIHdoZW4gR0wg ZHJpdmVyIGJ1ZyBvbiBNYWMgaXMgZml4ZWQsIGkuZS4sCg== 115195 2011-11-15 10:36:33 -0800 2011-11-15 19:34:25 -0800 Patch bug-72327-20111115133325.patch text/plain 6910 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDIxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTExLTE0ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBQYXRjaCByZW1vdmluZyBkdXBs aWNhdGVkIGNvZGUgaW4gdGhlIHNldHVwIG9mIHRoZSBEcmF3aW5nQnVmZmVyIHVzZWQKKyAgICAg ICAgdG8gaG9zdCB0aGUgYmFjay1idWZmZXIgZm9yIFdlYkdMIGNvbnRlbnRzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OmNvcHlUZXhJbWFnZTJEKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Y29weVRleFN1YkltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpyZWFkUGl4ZWxzKToKKwogMjAxMS0xMS0xNCAgQWRhbSBCYXJ0aCAgPGFi YXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVuaXF1ZSBvcmlnaW5zIHNob3VsZG4ndCByZW1l bWJlciB0aGVpciBzY2hlbWUsIGhvc3QsIG9yIHBvcnQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24g MTAwMTM5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODIsNiArODIsMjkgQEAgY29uc3QgZG91YmxlIHNl Y29uZHNCZXR3ZWVuUmVzdG9yZUF0dGVtcAogCiBuYW1lc3BhY2UgewogCisgICAgY2xhc3MgU2Nv cGVkRHJhd2luZ0J1ZmZlckJpbmRlciB7CisgICAgcHVibGljOgorICAgICAgICBTY29wZWREcmF3 aW5nQnVmZmVyQmluZGVyKERyYXdpbmdCdWZmZXIqIGRyYXdpbmdCdWZmZXIsIFdlYkdMRnJhbWVi dWZmZXIqIGZyYW1lYnVmZmVyQmluZGluZykKKyAgICAgICAgICAgIDogbV9kcmF3aW5nQnVmZmVy KGRyYXdpbmdCdWZmZXIpCisgICAgICAgICAgICAsIG1fZnJhbWVidWZmZXJCaW5kaW5nKGZyYW1l YnVmZmVyQmluZGluZykKKyAgICAgICAgeworICAgICAgICAgICAgLy8gQ29tbWl0IERyYXdpbmdC dWZmZXIgaWYgbmVlZGVkIChlLmcuLCBmb3IgbXVsdGlzYW1wbGluZykKKyAgICAgICAgICAgIGlm ICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQorICAgICAgICAgICAg ICAgIG1fZHJhd2luZ0J1ZmZlci0+Y29tbWl0KCk7CisgICAgICAgIH0KKworICAgICAgICB+U2Nv cGVkRHJhd2luZ0J1ZmZlckJpbmRlcigpCisgICAgICAgIHsKKyAgICAgICAgICAgIC8vIFJlc3Rv cmUgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQKKyAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZl ckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQorICAgICAgICAgICAgICAgIG1fZHJhd2luZ0J1 ZmZlci0+YmluZCgpOworICAgICAgICB9CisKKyAgICBwcml2YXRlOgorICAgICAgICBEcmF3aW5n QnVmZmVyKiBtX2RyYXdpbmdCdWZmZXI7CisgICAgICAgIFdlYkdMRnJhbWVidWZmZXIqIG1fZnJh bWVidWZmZXJCaW5kaW5nOworICAgIH07CisKICAgICBQbGF0Zm9ybTNET2JqZWN0IG9iamVjdE9y WmVybyhXZWJHTE9iamVjdCogb2JqZWN0KQogICAgIHsKICAgICAgICAgcmV0dXJuIG9iamVjdCA/ IG9iamVjdC0+b2JqZWN0KCkgOiAwOwpAQCAtMTE2NCwyMCArMTE4NywxMCBAQCB2b2lkIFdlYkdM UmVuZGVyaW5nQ29udGV4dDo6Y29weVRleEltYWdlCiAgICAgfQogICAgIGNsZWFySWZDb21wb3Np dGVkKCk7CiAgICAgaWYgKGlzUmVzb3VyY2VTYWZlKCkpIHsKLSAgICAgICAgLy8gQ29tbWl0IERy YXdpbmdCdWZmZXIgaWYgbmVlZGVkIChlLmcuLCBmb3IgbXVsdGlzYW1wbGluZykKLSAgICAgICAg aWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAg ICBtX2RyYXdpbmdCdWZmZXItPmNvbW1pdCgpOwotCisgICAgICAgIFNjb3BlZERyYXdpbmdCdWZm ZXJCaW5kZXIobV9kcmF3aW5nQnVmZmVyLmdldCgpLCBtX2ZyYW1lYnVmZmVyQmluZGluZy5nZXQo KSk7CiAgICAgICAgIG1fY29udGV4dC0+Y29weVRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgaW50 ZXJuYWxmb3JtYXQsIHgsIHksIHdpZHRoLCBoZWlnaHQsIGJvcmRlcik7Ci0KLSAgICAgICAgLy8g UmVzdG9yZSBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZAotICAgICAgICBpZiAoIW1fZnJhbWVidWZm ZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZl ci0+YmluZCgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIENvbW1pdCBEcmF3aW5nQnVmZmVy IGlmIG5lZWRlZCAoZS5nLiwgZm9yIG11bHRpc2FtcGxpbmcpCi0gICAgICAgIGlmICghbV9mcmFt ZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgbV9kcmF3aW5n QnVmZmVyLT5jb21taXQoKTsKLQorICAgICAgICBTY29wZWREcmF3aW5nQnVmZmVyQmluZGVyKG1f ZHJhd2luZ0J1ZmZlci5nZXQoKSwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcuZ2V0KCkpOwogICAgICAg ICBHQzNEaW50IGNsaXBwZWRYLCBjbGlwcGVkWTsKICAgICAgICAgR0MzRHNpemVpIGNsaXBwZWRX aWR0aCwgY2xpcHBlZEhlaWdodDsKICAgICAgICAgaWYgKGNsaXAyRCh4LCB5LCB3aWR0aCwgaGVp Z2h0LCBnZXRCb3VuZEZyYW1lYnVmZmVyV2lkdGgoKSwgZ2V0Qm91bmRGcmFtZWJ1ZmZlckhlaWdo dCgpLCAmY2xpcHBlZFgsICZjbGlwcGVkWSwgJmNsaXBwZWRXaWR0aCwgJmNsaXBwZWRIZWlnaHQp KSB7CkBAIC0xMTg5LDEwICsxMjAyLDYgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmNv cHlUZXhJbWFnZQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIG1f Y29udGV4dC0+Y29weVRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgaW50ZXJuYWxmb3JtYXQsIHgs IHksIHdpZHRoLCBoZWlnaHQsIGJvcmRlcik7Ci0KLSAgICAgICAgLy8gUmVzdG9yZSBEcmF3aW5n QnVmZmVyIGlmIG5lZWRlZAotICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1f ZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgpOwogICAg IH0KICAgICAvLyBGSVhNRTogaWYgdGhlIGZyYW1lYnVmZmVyIGlzIG5vdCBjb21wbGV0ZSwgbm9u ZSBvZiB0aGUgYmVsb3cgc2hvdWxkIGJlIGV4ZWN1dGVkLgogICAgIHRleC0+c2V0TGV2ZWxJbmZv KHRhcmdldCwgbGV2ZWwsIGludGVybmFsZm9ybWF0LCB3aWR0aCwgaGVpZ2h0LCBHcmFwaGljc0Nv bnRleHQzRDo6VU5TSUdORURfQllURSk7CkBAIC0xMjIzLDE3ICsxMjMyLDEwIEBAIHZvaWQgV2Vi R0xSZW5kZXJpbmdDb250ZXh0Ojpjb3B5VGV4U3ViSW0KICAgICAgICAgcmV0dXJuOwogICAgIH0K ICAgICBjbGVhcklmQ29tcG9zaXRlZCgpOwotICAgIGlmIChpc1Jlc291cmNlU2FmZSgpKQotICAg ICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUuZy4sIGZvciBtdWx0aXNh bXBsaW5nKQotICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1 ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+Y29tbWl0KCk7Ci0KKyAgICBpZiAo aXNSZXNvdXJjZVNhZmUoKSkgeworICAgICAgICBTY29wZWREcmF3aW5nQnVmZmVyQmluZGVyKG1f ZHJhd2luZ0J1ZmZlci5nZXQoKSwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcuZ2V0KCkpOwogICAgICAg ICBtX2NvbnRleHQtPmNvcHlUZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIHhvZmZzZXQsIHlv ZmZzZXQsIHgsIHksIHdpZHRoLCBoZWlnaHQpOwotCi0gICAgICAgIC8vIFJlc3RvcmUgRHJhd2lu Z0J1ZmZlciBpZiBuZWVkZWQKLSAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBt X2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmJpbmQoKTsKLSAg ICBlbHNlIHsKKyAgICB9IGVsc2UgewogICAgICAgICBHQzNEaW50IGNsaXBwZWRYLCBjbGlwcGVk WTsKICAgICAgICAgR0MzRHNpemVpIGNsaXBwZWRXaWR0aCwgY2xpcHBlZEhlaWdodDsKICAgICAg ICAgaWYgKGNsaXAyRCh4LCB5LCB3aWR0aCwgaGVpZ2h0LCBnZXRCb3VuZEZyYW1lYnVmZmVyV2lk dGgoKSwgZ2V0Qm91bmRGcmFtZWJ1ZmZlckhlaWdodCgpLCAmY2xpcHBlZFgsICZjbGlwcGVkWSwg JmNsaXBwZWRXaWR0aCwgJmNsaXBwZWRIZWlnaHQpKSB7CkBAIC0xMjU2LDI3ICsxMjU4LDEzIEBA IHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojpjb3B5VGV4U3ViSW0KICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIG1fY29udGV4dC0+dGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zm c2V0LCB5b2Zmc2V0LCB3aWR0aCwgaGVpZ2h0LCBmb3JtYXQsIHR5cGUsIHplcm8uZ2V0KCkpOwog ICAgICAgICAgICAgaWYgKGNsaXBwZWRXaWR0aCA+IDAgJiYgY2xpcHBlZEhlaWdodCA+IDApIHsK LSAgICAgICAgICAgICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUuZy4s IGZvciBtdWx0aXNhbXBsaW5nKQotICAgICAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJp bmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgICAgICAgICBtX2RyYXdpbmdC dWZmZXItPmNvbW1pdCgpOwotCisgICAgICAgICAgICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZlckJp bmRlcihtX2RyYXdpbmdCdWZmZXIuZ2V0KCksIG1fZnJhbWVidWZmZXJCaW5kaW5nLmdldCgpKTsK ICAgICAgICAgICAgICAgICBtX2NvbnRleHQtPmNvcHlUZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2 ZWwsIHhvZmZzZXQgKyBjbGlwcGVkWCAtIHgsIHlvZmZzZXQgKyBjbGlwcGVkWSAtIHksCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlwcGVkWCwgY2xpcHBl ZFksIGNsaXBwZWRXaWR0aCwgY2xpcHBlZEhlaWdodCk7Ci0KLSAgICAgICAgICAgICAgIC8vIFJl c3RvcmUgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQKLSAgICAgICAgICAgICAgIGlmICghbV9mcmFt ZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgICAgICAgbV9k cmF3aW5nQnVmZmVyLT5iaW5kKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUuZy4sIGZvciBt dWx0aXNhbXBsaW5nKQotICAgICAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBt X2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5jb21taXQo KTsKLQorICAgICAgICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZlckJpbmRlcihtX2RyYXdpbmdCdWZm ZXIuZ2V0KCksIG1fZnJhbWVidWZmZXJCaW5kaW5nLmdldCgpKTsKICAgICAgICAgICAgIG1fY29u dGV4dC0+Y29weVRleFN1YkltYWdlMkQodGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9mZnNldCwg eCwgeSwgd2lkdGgsIGhlaWdodCk7Ci0KLSAgICAgICAgICAgIC8vIFJlc3RvcmUgRHJhd2luZ0J1 ZmZlciBpZiBuZWVkZWQKLSAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYg bV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgp OwogICAgICAgICB9CiAgICAgfQogICAgIGNsZWFudXBBZnRlckdyYXBoaWNzQ2FsbChmYWxzZSk7 CkBAIC0zMDQxLDE1ICszMDI5LDEwIEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpyZWFk UGl4ZWxzKEcKICAgICBjbGVhcklmQ29tcG9zaXRlZCgpOwogICAgIHZvaWQqIGRhdGEgPSBwaXhl bHMtPmJhc2VBZGRyZXNzKCk7CiAKLSAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVk ZWQgKGUuZy4sIGZvciBtdWx0aXNhbXBsaW5nKQotICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRp bmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmNvbW1pdCgp OwotCi0gICAgbV9jb250ZXh0LT5yZWFkUGl4ZWxzKHgsIHksIHdpZHRoLCBoZWlnaHQsIGZvcm1h dCwgdHlwZSwgZGF0YSk7Ci0KLSAgICAvLyBSZXN0b3JlIERyYXdpbmdCdWZmZXIgaWYgbmVlZGVk Ci0gICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAmJiBtX2RyYXdpbmdCdWZmZXIpCi0gICAg ICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgpOworICAgIHsKKyAgICAgICAgU2NvcGVkRHJhd2lu Z0J1ZmZlckJpbmRlcihtX2RyYXdpbmdCdWZmZXIuZ2V0KCksIG1fZnJhbWVidWZmZXJCaW5kaW5n LmdldCgpKTsKKyAgICAgICAgbV9jb250ZXh0LT5yZWFkUGl4ZWxzKHgsIHksIHdpZHRoLCBoZWln aHQsIGZvcm1hdCwgdHlwZSwgZGF0YSk7CisgICAgfQogCiAjaWYgT1MoREFSV0lOKQogICAgIC8v IEZJWE1FOiByZW1vdmUgdGhpcyBzZWN0aW9uIHdoZW4gR0wgZHJpdmVyIGJ1ZyBvbiBNYWMgaXMg Zml4ZWQsIGkuZS4sCg== 115301 2011-11-15 19:34:32 -0800 2011-11-23 12:30:45 -0800 Patch bug-72327-20111115223123.patch text/plain 6934 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDM5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTExLTE1ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBQYXRjaCByZW1vdmluZyBkdXBs aWNhdGVkIGNvZGUgaW4gdGhlIHNldHVwIG9mIHRoZSBEcmF3aW5nQnVmZmVyIHVzZWQKKyAgICAg ICAgdG8gaG9zdCB0aGUgYmFjay1idWZmZXIgZm9yIFdlYkdMIGNvbnRlbnRzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OmNvcHlUZXhJbWFnZTJEKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Y29weVRleFN1YkltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpyZWFkUGl4ZWxzKToKKwogMjAxMS0xMS0xNSAgU2hlcmlmZiBCb3QgIDx3 ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEwMDMwOC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVu ZGVyaW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52 YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24gMTAwMzA3KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtODIsNiArODIsMjkgQEAgY29uc3QgZG91YmxlIHNlY29uZHNCZXR3ZWVuUmVzdG9y ZUF0dGVtcAogCiBuYW1lc3BhY2UgewogCisgICAgY2xhc3MgU2NvcGVkRHJhd2luZ0J1ZmZlckJp bmRlciB7CisgICAgcHVibGljOgorICAgICAgICBTY29wZWREcmF3aW5nQnVmZmVyQmluZGVyKERy YXdpbmdCdWZmZXIqIGRyYXdpbmdCdWZmZXIsIFdlYkdMRnJhbWVidWZmZXIqIGZyYW1lYnVmZmVy QmluZGluZykKKyAgICAgICAgICAgIDogbV9kcmF3aW5nQnVmZmVyKGRyYXdpbmdCdWZmZXIpCisg ICAgICAgICAgICAsIG1fZnJhbWVidWZmZXJCaW5kaW5nKGZyYW1lYnVmZmVyQmluZGluZykKKyAg ICAgICAgeworICAgICAgICAgICAgLy8gQ29tbWl0IERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkIChl LmcuLCBmb3IgbXVsdGlzYW1wbGluZykKKyAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJp bmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQorICAgICAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZl ci0+Y29tbWl0KCk7CisgICAgICAgIH0KKworICAgICAgICB+U2NvcGVkRHJhd2luZ0J1ZmZlckJp bmRlcigpCisgICAgICAgIHsKKyAgICAgICAgICAgIC8vIFJlc3RvcmUgRHJhd2luZ0J1ZmZlciBp ZiBuZWVkZWQKKyAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3 aW5nQnVmZmVyKQorICAgICAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgpOworICAg ICAgICB9CisKKyAgICBwcml2YXRlOgorICAgICAgICBEcmF3aW5nQnVmZmVyKiBtX2RyYXdpbmdC dWZmZXI7CisgICAgICAgIFdlYkdMRnJhbWVidWZmZXIqIG1fZnJhbWVidWZmZXJCaW5kaW5nOwor ICAgIH07CisKICAgICBQbGF0Zm9ybTNET2JqZWN0IG9iamVjdE9yWmVybyhXZWJHTE9iamVjdCog b2JqZWN0KQogICAgIHsKICAgICAgICAgcmV0dXJuIG9iamVjdCA/IG9iamVjdC0+b2JqZWN0KCkg OiAwOwpAQCAtMTE2NCwyMCArMTE4NywxMCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6 Y29weVRleEltYWdlCiAgICAgfQogICAgIGNsZWFySWZDb21wb3NpdGVkKCk7CiAgICAgaWYgKGlz UmVzb3VyY2VTYWZlKCkpIHsKLSAgICAgICAgLy8gQ29tbWl0IERyYXdpbmdCdWZmZXIgaWYgbmVl ZGVkIChlLmcuLCBmb3IgbXVsdGlzYW1wbGluZykKLSAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVy QmluZGluZyAmJiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXIt PmNvbW1pdCgpOwotCisgICAgICAgIFNjb3BlZERyYXdpbmdCdWZmZXJCaW5kZXIgYmluZGVyKG1f ZHJhd2luZ0J1ZmZlci5nZXQoKSwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcuZ2V0KCkpOwogICAgICAg ICBtX2NvbnRleHQtPmNvcHlUZXhJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIGludGVybmFsZm9ybWF0 LCB4LCB5LCB3aWR0aCwgaGVpZ2h0LCBib3JkZXIpOwotCi0gICAgICAgIC8vIFJlc3RvcmUgRHJh d2luZ0J1ZmZlciBpZiBuZWVkZWQKLSAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAm JiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmJpbmQoKTsK ICAgICB9IGVsc2UgewotICAgICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQg KGUuZy4sIGZvciBtdWx0aXNhbXBsaW5nKQotICAgICAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5k aW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+Y29t bWl0KCk7Ci0KKyAgICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZlckJpbmRlciBiaW5kZXIobV9kcmF3 aW5nQnVmZmVyLmdldCgpLCBtX2ZyYW1lYnVmZmVyQmluZGluZy5nZXQoKSk7CiAgICAgICAgIEdD M0RpbnQgY2xpcHBlZFgsIGNsaXBwZWRZOwogICAgICAgICBHQzNEc2l6ZWkgY2xpcHBlZFdpZHRo LCBjbGlwcGVkSGVpZ2h0OwogICAgICAgICBpZiAoY2xpcDJEKHgsIHksIHdpZHRoLCBoZWlnaHQs IGdldEJvdW5kRnJhbWVidWZmZXJXaWR0aCgpLCBnZXRCb3VuZEZyYW1lYnVmZmVySGVpZ2h0KCks ICZjbGlwcGVkWCwgJmNsaXBwZWRZLCAmY2xpcHBlZFdpZHRoLCAmY2xpcHBlZEhlaWdodCkpIHsK QEAgLTExODksMTAgKzEyMDIsNiBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y29weVRl eEltYWdlCiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgbV9jb250 ZXh0LT5jb3B5VGV4SW1hZ2UyRCh0YXJnZXQsIGxldmVsLCBpbnRlcm5hbGZvcm1hdCwgeCwgeSwg d2lkdGgsIGhlaWdodCwgYm9yZGVyKTsKLQotICAgICAgICAvLyBSZXN0b3JlIERyYXdpbmdCdWZm ZXIgaWYgbmVlZGVkCi0gICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3 aW5nQnVmZmVyKQotICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5iaW5kKCk7CiAgICAgfQog ICAgIC8vIEZJWE1FOiBpZiB0aGUgZnJhbWVidWZmZXIgaXMgbm90IGNvbXBsZXRlLCBub25lIG9m IHRoZSBiZWxvdyBzaG91bGQgYmUgZXhlY3V0ZWQuCiAgICAgdGV4LT5zZXRMZXZlbEluZm8odGFy Z2V0LCBsZXZlbCwgaW50ZXJuYWxmb3JtYXQsIHdpZHRoLCBoZWlnaHQsIEdyYXBoaWNzQ29udGV4 dDNEOjpVTlNJR05FRF9CWVRFKTsKQEAgLTEyMjMsMTcgKzEyMzIsMTAgQEAgdm9pZCBXZWJHTFJl bmRlcmluZ0NvbnRleHQ6OmNvcHlUZXhTdWJJbQogICAgICAgICByZXR1cm47CiAgICAgfQogICAg IGNsZWFySWZDb21wb3NpdGVkKCk7Ci0gICAgaWYgKGlzUmVzb3VyY2VTYWZlKCkpCi0gICAgICAg IC8vIENvbW1pdCBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZCAoZS5nLiwgZm9yIG11bHRpc2FtcGxp bmcpCi0gICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVy KQotICAgICAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5jb21taXQoKTsKLQorICAgIGlmIChpc1Jl c291cmNlU2FmZSgpKSB7CisgICAgICAgIFNjb3BlZERyYXdpbmdCdWZmZXJCaW5kZXIgYmluZGVy KG1fZHJhd2luZ0J1ZmZlci5nZXQoKSwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcuZ2V0KCkpOwogICAg ICAgICBtX2NvbnRleHQtPmNvcHlUZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIHhvZmZzZXQs IHlvZmZzZXQsIHgsIHksIHdpZHRoLCBoZWlnaHQpOwotCi0gICAgICAgIC8vIFJlc3RvcmUgRHJh d2luZ0J1ZmZlciBpZiBuZWVkZWQKLSAgICAgICAgaWYgKCFtX2ZyYW1lYnVmZmVyQmluZGluZyAm JiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICBtX2RyYXdpbmdCdWZmZXItPmJpbmQoKTsK LSAgICBlbHNlIHsKKyAgICB9IGVsc2UgewogICAgICAgICBHQzNEaW50IGNsaXBwZWRYLCBjbGlw cGVkWTsKICAgICAgICAgR0MzRHNpemVpIGNsaXBwZWRXaWR0aCwgY2xpcHBlZEhlaWdodDsKICAg ICAgICAgaWYgKGNsaXAyRCh4LCB5LCB3aWR0aCwgaGVpZ2h0LCBnZXRCb3VuZEZyYW1lYnVmZmVy V2lkdGgoKSwgZ2V0Qm91bmRGcmFtZWJ1ZmZlckhlaWdodCgpLCAmY2xpcHBlZFgsICZjbGlwcGVk WSwgJmNsaXBwZWRXaWR0aCwgJmNsaXBwZWRIZWlnaHQpKSB7CkBAIC0xMjU2LDI3ICsxMjU4LDEz IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojpjb3B5VGV4U3ViSW0KICAgICAgICAgICAg IH0KICAgICAgICAgICAgIG1fY29udGV4dC0+dGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4 b2Zmc2V0LCB5b2Zmc2V0LCB3aWR0aCwgaGVpZ2h0LCBmb3JtYXQsIHR5cGUsIHplcm8uZ2V0KCkp OwogICAgICAgICAgICAgaWYgKGNsaXBwZWRXaWR0aCA+IDAgJiYgY2xpcHBlZEhlaWdodCA+IDAp IHsKLSAgICAgICAgICAgICAgICAvLyBDb21taXQgRHJhd2luZ0J1ZmZlciBpZiBuZWVkZWQgKGUu Zy4sIGZvciBtdWx0aXNhbXBsaW5nKQotICAgICAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZl ckJpbmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgICAgICAgICBtX2RyYXdp bmdCdWZmZXItPmNvbW1pdCgpOwotCisgICAgICAgICAgICAgICAgU2NvcGVkRHJhd2luZ0J1ZmZl ckJpbmRlciBiaW5kZXIobV9kcmF3aW5nQnVmZmVyLmdldCgpLCBtX2ZyYW1lYnVmZmVyQmluZGlu Zy5nZXQoKSk7CiAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5jb3B5VGV4U3ViSW1hZ2UyRCh0 YXJnZXQsIGxldmVsLCB4b2Zmc2V0ICsgY2xpcHBlZFggLSB4LCB5b2Zmc2V0ICsgY2xpcHBlZFkg LSB5LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xpcHBl ZFgsIGNsaXBwZWRZLCBjbGlwcGVkV2lkdGgsIGNsaXBwZWRIZWlnaHQpOwotCi0gICAgICAgICAg ICAgICAvLyBSZXN0b3JlIERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkCi0gICAgICAgICAgICAgICBp ZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJhd2luZ0J1ZmZlcikKLSAgICAgICAgICAg ICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+YmluZCgpOwogICAgICAgICAgICAgfQogICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgLy8gQ29tbWl0IERyYXdpbmdCdWZmZXIgaWYgbmVlZGVkIChl LmcuLCBmb3IgbXVsdGlzYW1wbGluZykKLSAgICAgICAgICAgIGlmICghbV9mcmFtZWJ1ZmZlckJp bmRpbmcgJiYgbV9kcmF3aW5nQnVmZmVyKQotICAgICAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZl ci0+Y29tbWl0KCk7Ci0KKyAgICAgICAgICAgIFNjb3BlZERyYXdpbmdCdWZmZXJCaW5kZXIgYmlu ZGVyKG1fZHJhd2luZ0J1ZmZlci5nZXQoKSwgbV9mcmFtZWJ1ZmZlckJpbmRpbmcuZ2V0KCkpOwog ICAgICAgICAgICAgbV9jb250ZXh0LT5jb3B5VGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4 b2Zmc2V0LCB5b2Zmc2V0LCB4LCB5LCB3aWR0aCwgaGVpZ2h0KTsKLQotICAgICAgICAgICAgLy8g UmVzdG9yZSBEcmF3aW5nQnVmZmVyIGlmIG5lZWRlZAotICAgICAgICAgICAgaWYgKCFtX2ZyYW1l YnVmZmVyQmluZGluZyAmJiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgICAgICAgICAgbV9kcmF3 aW5nQnVmZmVyLT5iaW5kKCk7CiAgICAgICAgIH0KICAgICB9CiAgICAgY2xlYW51cEFmdGVyR3Jh cGhpY3NDYWxsKGZhbHNlKTsKQEAgLTMwNDEsMTUgKzMwMjksMTAgQEAgdm9pZCBXZWJHTFJlbmRl cmluZ0NvbnRleHQ6OnJlYWRQaXhlbHMoRwogICAgIGNsZWFySWZDb21wb3NpdGVkKCk7CiAgICAg dm9pZCogZGF0YSA9IHBpeGVscy0+YmFzZUFkZHJlc3MoKTsKIAotICAgIC8vIENvbW1pdCBEcmF3 aW5nQnVmZmVyIGlmIG5lZWRlZCAoZS5nLiwgZm9yIG11bHRpc2FtcGxpbmcpCi0gICAgaWYgKCFt X2ZyYW1lYnVmZmVyQmluZGluZyAmJiBtX2RyYXdpbmdCdWZmZXIpCi0gICAgICAgIG1fZHJhd2lu Z0J1ZmZlci0+Y29tbWl0KCk7Ci0KLSAgICBtX2NvbnRleHQtPnJlYWRQaXhlbHMoeCwgeSwgd2lk dGgsIGhlaWdodCwgZm9ybWF0LCB0eXBlLCBkYXRhKTsKLQotICAgIC8vIFJlc3RvcmUgRHJhd2lu Z0J1ZmZlciBpZiBuZWVkZWQKLSAgICBpZiAoIW1fZnJhbWVidWZmZXJCaW5kaW5nICYmIG1fZHJh d2luZ0J1ZmZlcikKLSAgICAgICAgbV9kcmF3aW5nQnVmZmVyLT5iaW5kKCk7CisgICAgeworICAg ICAgICBTY29wZWREcmF3aW5nQnVmZmVyQmluZGVyIGJpbmRlcihtX2RyYXdpbmdCdWZmZXIuZ2V0 KCksIG1fZnJhbWVidWZmZXJCaW5kaW5nLmdldCgpKTsKKyAgICAgICAgbV9jb250ZXh0LT5yZWFk UGl4ZWxzKHgsIHksIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwgdHlwZSwgZGF0YSk7CisgICAgfQog CiAjaWYgT1MoREFSV0lOKQogICAgIC8vIEZJWE1FOiByZW1vdmUgdGhpcyBzZWN0aW9uIHdoZW4g R0wgZHJpdmVyIGJ1ZyBvbiBNYWMgaXMgZml4ZWQsIGkuZS4sCg== 116399 2011-11-23 12:31:06 -0800 2011-11-23 13:14:28 -0800 Patch bug-72327-20111123152745.patch text/plain 7651 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDExLTExLTE0ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBQYXRjaCByZW1vdmluZyBkdXBs aWNhdGVkIGNvZGUgaW4gdGhlIHNldHVwIG9mIHRoZSBEcmF3aW5nQnVmZmVyIHVzZWQKKyAgICAg ICAgdG8gaG9zdCB0aGUgYmFjay1idWZmZXIgZm9yIFdlYkdMIGNvbnRlbnRzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzMjcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OmNvcHlUZXhJbWFnZTJEKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Y29weVRleFN1YkltYWdlMkQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpyZWFkUGl4ZWxzKToKKworPDw8PDw8PCAubWluZQorMjAxMS0xMS0yMyAg SmVmZiBUaW1hbnVzICA8dHdpekBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSAg UHJldmVudCBEcmF3aW5nQnVmZmVyIGluc3RhbmNlcyBmcm9tIGNvcnJ1cHRpbmcgdGhlIGFjdGl2 ZQorICAgICAgICB0ZXh0dXJlIHN0YXRlIG9mIHRoZSBXZWJHTCBjb250ZXh0cy4gVGhlIERyYXdp bmdCdWZmZXIgbm93IHRyYWNrcyB0aGUKKyAgICAgICAgc3RhdGUgb2YgdGV4dHVyZSB1bml0IDAs IGFuZCB0aGUgYWN0aXZlIHRleHR1cmUgdW5pdCwgc28gdGhhdCBzdGF0ZSBjYW4KKyAgICAgICAg YmUgcmVzdG9yZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03MzAzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6YWN0aXZlVGV4dHVyZSk6CisgICAgICAgIChX ZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmJpbmRUZXh0dXJlKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcik6CisgICAgICAgIChX ZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpwdWJsaXNoVG9QbGF0Zm9ybUxheWVyKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oOgorICAgICAgICAoV2ViQ29y ZTo6RHJhd2luZ0J1ZmZlcjo6c2V0VGV4dHVyZTJEQmluZGluZyk6CisgICAgICAgIChXZWJDb3Jl OjpEcmF3aW5nQnVmZmVyOjpzZXRBY3RpdmVUZXh0dXJlVW5pdCk6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L21hYy9EcmF3aW5nQnVmZmVyTWFjLm1tOgorICAgICAgICAoV2ViQ29y ZTo6RHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L3F0L0RyYXdpbmdCdWZmZXJRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEcmF3 aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n dGsvRHJhd2luZ0J1ZmZlckd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVy OjpEcmF3aW5nQnVmZmVyKToKKworPT09PT09PQogMjAxMS0xMS0yMyAgRG1pdHJ5IExvbW92ICA8 ZHNsb21vdkBnb29nbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJlYmFzZWxpbmUgYmlu ZGluZyB0ZXN0cyBhZnRlciBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xMDEwNjQu CkBAIC03LDYgKzQ4LDcgQEAKICAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhG bG9hdDY0QXJyYXkuY3BwOgogICAgICAgICAoV2ViQ29yZTo6VjhGbG9hdDY0QXJyYXk6OndyYXBT bG93KToKIAorPj4+Pj4+PiAucjEwMTA5OQogMjAxMS0xMS0yMyAgU2hlcmlmZiBCb3QgIDx3ZWJr aXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjEwMTA2OS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVy aW5nQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkocmV2aXNpb24gMTAxMDk5KQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzU4LDYgKzc1OCwxMCBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6YWN0aXZl VGV4dHVyCiAgICAgfQogICAgIG1fYWN0aXZlVGV4dHVyZVVuaXQgPSB0ZXh0dXJlIC0gR3JhcGhp Y3NDb250ZXh0M0Q6OlRFWFRVUkUwOwogICAgIG1fY29udGV4dC0+YWN0aXZlVGV4dHVyZSh0ZXh0 dXJlKTsKKworICAgIGlmIChtX2RyYXdpbmdCdWZmZXIpCisgICAgICAgIG1fZHJhd2luZ0J1ZmZl ci0+c2V0QWN0aXZlVGV4dHVyZVVuaXQodGV4dHVyZSk7CisKICAgICBjbGVhbnVwQWZ0ZXJHcmFw aGljc0NhbGwoZmFsc2UpOwogfQogCkBAIC04ODgsNiArODkyLDEwIEBAIHZvaWQgV2ViR0xSZW5k ZXJpbmdDb250ZXh0OjpiaW5kVGV4dHVyZSgKICAgICBpZiAodGFyZ2V0ID09IEdyYXBoaWNzQ29u dGV4dDNEOjpURVhUVVJFXzJEKSB7CiAgICAgICAgIG1fdGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4 dHVyZVVuaXRdLm1fdGV4dHVyZTJEQmluZGluZyA9IHRleHR1cmU7CiAgICAgICAgIG1heExldmVs ID0gbV9tYXhUZXh0dXJlTGV2ZWw7CisKKyAgICAgICAgaWYgKG1fZHJhd2luZ0J1ZmZlciAmJiAh bV9hY3RpdmVUZXh0dXJlVW5pdCkKKyAgICAgICAgICAgIG1fZHJhd2luZ0J1ZmZlci0+c2V0VGV4 dHVyZUJpbmRpbmcob2JqZWN0T3JaZXJvKHRleHR1cmUpKTsKKwogICAgIH0gZWxzZSBpZiAodGFy Z2V0ID09IEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFX0NVQkVfTUFQKSB7CiAgICAgICAgIG1f dGV4dHVyZVVuaXRzW21fYWN0aXZlVGV4dHVyZVVuaXRdLm1fdGV4dHVyZUN1YmVNYXBCaW5kaW5n ID0gdGV4dHVyZTsKICAgICAgICAgbWF4TGV2ZWwgPSBtX21heEN1YmVNYXBUZXh0dXJlTGV2ZWw7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5n QnVmZmVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDEw MTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdp bmdCdWZmZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYyLDYgKzYyLDggQEAgRHJh d2luZ0J1ZmZlcjo6RHJhd2luZ0J1ZmZlcihHcmFwaGljc0NvbgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBib29sIHNlcGFyYXRlQmFja2luZ1RleHR1cmUpCiAgICAgOiBtX3NlcGFyYXRl QmFja2luZ1RleHR1cmUoc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkKICAgICAsIG1fc2Npc3NvckVu YWJsZWQoZmFsc2UpCisgICAgLCBtX3RleHR1cmUyREJpbmRpbmcoMCkKKyAgICAsIG1fYWN0aXZl VGV4dHVyZVVuaXQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkUwKQogICAgICwgbV9jb250ZXh0 KGNvbnRleHQpCiAgICAgLCBtX3NpemUoLTEsIC0xKQogICAgICwgbV9tdWx0aXNhbXBsZUV4dGVu c2lvblN1cHBvcnRlZChtdWx0aXNhbXBsZUV4dGVuc2lvblN1cHBvcnRlZCkKQEAgLTExOCw5ICsx MjAsMTYgQEAgdm9pZCBEcmF3aW5nQnVmZmVyOjpwdWJsaXNoVG9QbGF0Zm9ybUxheQogCiAgICAg aWYgKG1fc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkgewogICAgICAgICBtX2NvbnRleHQtPmJpbmRG cmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fZmJvKTsKKworICAg ICAgICAvLyBUaGlzIHBhdGggYWx3YXlzIHVzZXMgVEVYVFVSRTAsIGFuZCByZXN0b3JlcyBpdHMg c3RhdGUgYmVsb3cuCisgICAgICAgIG1fY29udGV4dC0+YWN0aXZlVGV4dHVyZShHcmFwaGljc0Nv bnRleHQzRDo6VEVYVFVSRTApOwogICAgICAgICBtX2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBo aWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX2JhY2tpbmdDb2xvckJ1ZmZlcik7CisKICAgICAg ICAgdW5zaWduZWQgY29sb3JGb3JtYXQgPSBtX2NvbnRleHQtPmdldENvbnRleHRBdHRyaWJ1dGVz KCkuYWxwaGEgPyBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSA6IEdyYXBoaWNzQ29udGV4dDNEOjpS R0I7CiAgICAgICAgIG1fY29udGV4dC0+Y29weVRleEltYWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6 OlRFWFRVUkVfMkQsIDAsIGNvbG9yRm9ybWF0LCAwLCAwLCBzaXplKCkud2lkdGgoKSwgc2l6ZSgp LmhlaWdodCgpLCAwKTsKKworICAgICAgICBtX2NvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNz Q29udGV4dDNEOjpURVhUVVJFXzJELCBtX3RleHR1cmUyREJpbmRpbmcpOworICAgICAgICBtX2Nv bnRleHQtPmFjdGl2ZVRleHR1cmUobV9hY3RpdmVUZXh0dXJlVW5pdCk7CiAgICAgfQogCiAgICAg aWYgKG11bHRpc2FtcGxlKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ncHUvRHJhd2luZ0J1ZmZlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTg1LDYgKzg1LDE0IEBAIHB1YmxpYzoKICAgICAvLyBjYW4gYmUgZGlzYWJs ZWQgZHVyaW5nIGNhbGxzIHRvIGNvbW1pdC4KICAgICB2b2lkIHNldFNjaXNzb3JFbmFibGVkKGJv b2wgc2Npc3NvckVuYWJsZWQpIHsgbV9zY2lzc29yRW5hYmxlZCA9IHNjaXNzb3JFbmFibGVkOyB9 CiAKKyAgICAvLyBUaGUgRHJhd2luZ0J1ZmZlciBuZWVkcyB0byB0cmFjayB0aGUgdGV4dHVyZSBi b3VuZCB0byB0ZXh0dXJlIHVuaXQgMC4KKyAgICAvLyBUaGUgYm91bmQgdGV4dHVyZSBpcyB0cmFj a2VkIHRvIGF2b2lkIGNvc3RseSBxdWVyaWVzIGR1cmluZyByZW5kZXJpbmcuCisgICAgdm9pZCBz ZXRUZXh0dXJlMkRCaW5kaW5nKEdDM0RpbnQgdGV4dHVyZSkgeyBtX3RleHR1cmUyREJpbmRpbmcg PSB0ZXh0dXJlOyB9CisKKyAgICAvLyBUcmFjayB0aGUgY3VycmVudGx5IGFjdGl2ZSB0ZXh0dXJl IHVuaXQuIFRleHR1cmUgdW5pdCAwIGlzIHVzZWQgYXMgaG9zdCBmb3IgYSBzY3JhdGNoCisgICAg Ly8gdGV4dHVyZS4KKyAgICB2b2lkIHNldEFjdGl2ZVRleHR1cmVVbml0KEdDM0RpbnQgdGV4dHVy ZVVuaXQpIHsgbV9hY3RpdmVUZXh0dXJlVW5pdCA9IHRleHR1cmVVbml0OyB9CisKICAgICBib29s IG11bHRpc2FtcGxlKCkgY29uc3Q7CiAKICAgICBQbGF0Zm9ybTNET2JqZWN0IHBsYXRmb3JtQ29s b3JCdWZmZXIoKSBjb25zdDsKQEAgLTExMiw2ICsxMjAsOCBAQCBwcml2YXRlOgogCiAgICAgYm9v bCBtX3NlcGFyYXRlQmFja2luZ1RleHR1cmU7CiAgICAgYm9vbCBtX3NjaXNzb3JFbmFibGVkOwor ICAgIFBsYXRmb3JtM0RPYmplY3QgbV90ZXh0dXJlMkRCaW5kaW5nOworICAgIEdDM0RlbnVtIG1f YWN0aXZlVGV4dHVyZVVuaXQ7CiAKICAgICBSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IG1fY29u dGV4dDsKICAgICBJbnRTaXplIG1fc2l6ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dwdS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvbWFjL0RyYXdpbmdCdWZmZXJNYWMubW0J KHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dw dS9tYWMvRHJhd2luZ0J1ZmZlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsOCBA QCBEcmF3aW5nQnVmZmVyOjpEcmF3aW5nQnVmZmVyKEdyYXBoaWNzQ29uCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJvb2wgc2VwYXJhdGVCYWNraW5nVGV4dHVyZSkKICAgICA6IG1fc2Vw YXJhdGVCYWNraW5nVGV4dHVyZShzZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKQogICAgICwgbV9zY2lz c29yRW5hYmxlZChmYWxzZSkKKyAgICAsIG1fdGV4dHVyZTJEQmluZGluZygwKQorICAgICwgbV9h Y3RpdmVUZXh0dXJlVW5pdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRTApCiAgICAgLCBtX2Nv bnRleHQoY29udGV4dCkKICAgICAsIG1fc2l6ZSgtMSwgLTEpCiAgICAgLCBtX211bHRpc2FtcGxl RXh0ZW5zaW9uU3VwcG9ydGVkKG11bHRpc2FtcGxlRXh0ZW5zaW9uU3VwcG9ydGVkKQpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L3F0L0RyYXdpbmdCdWZmZXJRdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L3F0 L0RyYXdpbmdCdWZmZXJRdC5jcHAJKHJldmlzaW9uIDEwMTA5OSkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9xdC9EcmF3aW5nQnVmZmVyUXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zOCw2ICszOCw4IEBAIERyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhp Y3NDb24KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBzZXBhcmF0ZUJhY2tpbmdU ZXh0dXJlKQogICAgIDogbV9zZXBhcmF0ZUJhY2tpbmdUZXh0dXJlKHNlcGFyYXRlQmFja2luZ1Rl eHR1cmUpCiAgICAgLCBtX3NjaXNzb3JFbmFibGVkKGZhbHNlKQorICAgICwgbV90ZXh0dXJlMkRC aW5kaW5nKDApCisgICAgLCBtX2FjdGl2ZVRleHR1cmVVbml0KEdyYXBoaWNzQ29udGV4dDNEOjpU RVhUVVJFMCkKICAgICAsIG1fY29udGV4dChjb250ZXh0KQogICAgICwgbV9zaXplKC0xLCAtMSkK ICAgICAsIG1fbXVsdGlzYW1wbGVFeHRlbnNpb25TdXBwb3J0ZWQobXVsdGlzYW1wbGVFeHRlbnNp b25TdXBwb3J0ZWQpCg==