61953 2011-06-02 13:05:47 -0700 cleanup DrawingBufferChromium, correct comment 2011-06-02 19:11:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbates jbates commit-queue jamesr kbr oldest_to_newest 414375 0 jbates 2011-06-02 13:05:47 -0700 cleanup DrawingBufferChromium, correct comment 414377 1 95794 jbates 2011-06-02 13:07:40 -0700 Created attachment 95794 Patch 414381 2 jbates 2011-06-02 13:15:32 -0700 Ready for review 414388 3 95794 kbr 2011-06-02 13:28:05 -0700 Comment on attachment 95794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95794&action=review > Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:46 > +class Canvas2DLayerChromium { }; I doubt this will compile. RefPtr requires certain methods. 414393 4 95794 jamesr 2011-06-02 13:31:31 -0700 Comment on attachment 95794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95794&action=review Patch looks great, but R- for the odd forward declaration and lack of verbosity in the ChangeLog. Thanks a bunch for cleaning this up. > Source/WebCore/ChangeLog:8 > + https://bugs.webkit.org/show_bug.cgi?id=61953 > + > + * platform/graphics/chromium/DrawingBufferChromium.cpp: please put a more verbose description here if what this patch does. > Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:46 > +class Canvas2DLayerChromium { }; To forward declare Canvas2DLayerChromium just do: class Canvas2DLayerChromium; I don't think you need to do this, however - do you? I think all the references to Canvas2DLayerChromium are guarded by #if USE(ACCELERATED_COMPOSITING), or at least they should be. 414408 5 95794 jbates 2011-06-02 13:49:20 -0700 Comment on attachment 95794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95794&action=review >>> Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:46 >>> +class Canvas2DLayerChromium { }; >> >> I doubt this will compile. RefPtr requires certain methods. > > To forward declare Canvas2DLayerChromium just do: > > class Canvas2DLayerChromium; > > I don't think you need to do this, however - do you? I think all the references to Canvas2DLayerChromium are guarded by #if USE(ACCELERATED_COMPOSITING), or at least they should be. It wasn't a forward declare, it was a dirty attempt to avoid referring to USE(ACCELERATED_COMPOSITING) in DrawingBuffer.h. But, Ken's right, it won't compile since it doesn't have the RefPtr methods. I'll just use #if USE(ACCELERATED_COMPOSITING) in DrawingBuffer.h. 414423 6 95804 jbates 2011-06-02 14:11:55 -0700 Created attachment 95804 Patch 414428 7 95804 jamesr 2011-06-02 14:15:35 -0700 Comment on attachment 95804 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95804&action=review > Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:83 > + , m_platformLayer(0) You don't need to 0-initialize RefPtr<>s, and in fact this'll stop compiling when we get stricter about RefPtr/PassRefPtr usage. Just leave the initialization out - the default c'tor for RefPtr does the right thing. 414438 8 95794 jbates 2011-06-02 14:27:21 -0700 Comment on attachment 95794 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95794&action=review >> Source/WebCore/ChangeLog:8 >> + * platform/graphics/chromium/DrawingBufferChromium.cpp: > > please put a more verbose description here if what this patch does. Done. 414501 9 95823 jbates 2011-06-02 15:26:55 -0700 Created attachment 95823 Patch 414502 10 95804 jbates 2011-06-02 15:27:08 -0700 Comment on attachment 95804 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95804&action=review >> Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:83 >> + , m_platformLayer(0) > > You don't need to 0-initialize RefPtr<>s, and in fact this'll stop compiling when we get stricter about RefPtr/PassRefPtr usage. Just leave the initialization out - the default c'tor for RefPtr does the right thing. Done. 414508 11 95823 jamesr 2011-06-02 15:39:13 -0700 Comment on attachment 95823 Patch Rock 414601 12 95823 commit-queue 2011-06-02 19:11:00 -0700 Comment on attachment 95823 Patch Clearing flags on attachment: 95823 Committed r87987: <http://trac.webkit.org/changeset/87987> 414602 13 commit-queue 2011-06-02 19:11:05 -0700 All reviewed patches have been landed. Closing bug. 95794 2011-06-02 13:07:40 -0700 2011-06-02 14:27:21 -0700 Patch bug-61953-20110602130739.patch text/plain 5269 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogODc5MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MGYwNjIwODdhMDA5YTc0 NWZkNjZkODg1ZjRjN2JhOTUzZWIyNDU3Li40ZTIwNTZhMDIyNmZjZDI4YjMyZTE4Y2Y0N2QzMjU1 Y2NiMzVhOGQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMDIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBjbGVhbnVwIERyYXdpbmdCdWZmZXJDaHJvbWl1bSwgY29ycmVj dCBjb21tZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MTk1MworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1 ZmZlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OkRyYXdp bmdCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6fkRyYXdpbmdCdWZm ZXIpOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6cHVibGlzaFRvUGxhdGZvcm1M YXllcik6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpkaWRSZXNldCk6CisgICAg ICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpwbGF0Zm9ybUxheWVyKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oOgorCiAyMDExLTA2LTAyICBTaGVy aWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsaW5nIG91dCByODc5MjAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVt LmNwcAppbmRleCA4YjA0MmUzZTMwZTE0M2Q5YWQ5M2E2YmRiY2ZiYjNjNzMyODI4MDkyLi4zZGJk NDFkMDhmNzdmZjRmNGRhNWM5OGE1YjE5MGE3NjkyYjRlZTlkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdp bmdCdWZmZXJDaHJvbWl1bS5jcHAKQEAgLTQyLDE3ICs0MiwxMiBAQAogCiAjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQogI2luY2x1ZGUgIkNhbnZhczJETGF5ZXJDaHJvbWl1bS5oIgor I2Vsc2UKK2NsYXNzIENhbnZhczJETGF5ZXJDaHJvbWl1bSB7IH07CiAjZW5kaWYKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCi1zdHJ1Y3QgRHJhd2luZ0J1ZmZlckludGVybmFsIHsKLSAgICB1bnNp Z25lZCBvZmZzY3JlZW5Db2xvclRleHR1cmU7Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQotICAgIFJlZlB0cjxDYW52YXMyRExheWVyQ2hyb21pdW0+IHBsYXRmb3JtTGF5ZXI7Ci0j ZW5kaWYKLX07Ci0KIHN0YXRpYyB1bnNpZ25lZCBnZW5lcmF0ZUNvbG9yVGV4dHVyZShHcmFwaGlj c0NvbnRleHQzRCogY29udGV4dCwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICB1bnNpZ25l ZCBvZmZzY3JlZW5Db2xvclRleHR1cmUgPSBjb250ZXh0LT5jcmVhdGVUZXh0dXJlKCk7CkBAIC04 Niw3ICs4MSw3IEBAIERyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb250ZXh0 M0QqIGNvbnRleHQsCiAgICAgLCBtX3N0ZW5jaWxCdWZmZXIoMCkKICAgICAsIG1fbXVsdGlzYW1w bGVGQk8oMCkKICAgICAsIG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlcigwKQotICAgICwgbV9pbnRl cm5hbChhZG9wdFB0cihuZXcgRHJhd2luZ0J1ZmZlckludGVybmFsKSkKKyAgICAsIG1fcGxhdGZv cm1MYXllcigwKQogI2lmIFVTRShTS0lBKQogICAgICwgbV9nckNvbnRleHQoMCkKICNlbmRpZgpA QCAtMTA4LDggKzEwMyw4IEBAIERyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3ND b250ZXh0M0QqIGNvbnRleHQsCiBEcmF3aW5nQnVmZmVyOjp+RHJhd2luZ0J1ZmZlcigpCiB7CiAj aWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIGlmIChtX2ludGVybmFsLT5wbGF0 Zm9ybUxheWVyKQotICAgICAgICBtX2ludGVybmFsLT5wbGF0Zm9ybUxheWVyLT5zZXREcmF3aW5n QnVmZmVyKDApOworICAgIGlmIChtX3BsYXRmb3JtTGF5ZXIpCisgICAgICAgIG1fcGxhdGZvcm1M YXllci0+c2V0RHJhd2luZ0J1ZmZlcigwKTsKICNlbmRpZgogCiAgICAgaWYgKCFtX2NvbnRleHQp CkBAIC0xMjgsMTIgKzEyMywxMSBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRm b3JtTGF5ZXIoKQogICAgICAgICBtX2NhbGxiYWNrLT53aWxsUHVibGlzaCgpOwogICAgIGlmICht dWx0aXNhbXBsZSgpKQogICAgICAgICBjb21taXQoKTsKLSAgICB1bnNpZ25lZCBwYXJlbnRUZXh0 dXJlID0gbV9pbnRlcm5hbC0+cGxhdGZvcm1MYXllci0+dGV4dHVyZUlkKCk7Ci0gICAgLy8gRklY TUU6IFdlIGRvIHRoZSBjb3B5IGluIHRoZSBjYW52YXMnIChjaGlsZCkgY29udGV4dCBzbyB0aGF0 IGl0IGV4ZWN1dGVzIGluIHRoZSBjb3JyZWN0IG9yZGVyIHJlbGF0aXZlIHRvCi0gICAgLy8gb3Ro ZXIgY29tbWFuZHMgaW4gdGhlIGNoaWxkIGNvbnRleHQuICBUaGlzIGVuc3VyZXMgdGhhdCB0aGUg cGFyZW50IHRleHR1cmUgYWx3YXlzIGNvbnRhaW5zIGEgY29tcGxldGUKLSAgICAvLyBmcmFtZSBh bmQgbm90IHNvbWUgaW50ZXJtZWRpYXRlIHJlc3VsdC4gIEhvd2V2ZXIsIHRoZXJlIGlzIG5vIHN5 bmNocm9uaXphdGlvbiB0byBlbnN1cmUgdGhhdCB0aGlzIGNvcHkKLSAgICAvLyBoYXBwZW5zIGJl Zm9yZSB0aGUgY29tcG9zaXRvciBkcmF3cy4gIFRoaXMgbWVhbnMgd2UgbWlnaHQgZHJhdyBzdGFs ZSBmcmFtZXMgc29tZXRpbWVzLiAgSWRlYWxseSB0aGlzCi0gICAgLy8gd291bGQgaW5zZXJ0IGEg ZmVuY2UgaW50byB0aGUgY2hpbGQgY29tbWFuZCBzdHJlYW0gdGhhdCB0aGUgY29tcG9zaXRvciBj b3VsZCB3YWl0IGZvci4KKyAgICB1bnNpZ25lZCBwYXJlbnRUZXh0dXJlID0gbV9wbGF0Zm9ybUxh eWVyLT50ZXh0dXJlSWQoKTsKKyAgICAvLyBXZSBkbyB0aGUgY29weSBpbiB0aGUgY2FudmFzJyAo Y2hpbGQpIGNvbnRleHQgc28gdGhhdCBpdCBleGVjdXRlcyBpbiB0aGUgY29ycmVjdCBvcmRlciBy ZWxhdGl2ZSB0bworICAgIC8vIG90aGVyIGNvbW1hbmRzIGluIHRoZSBjaGlsZCBjb250ZXh0LiBU aGlzIGVuc3VyZXMgdGhhdCB0aGUgcGFyZW50IHRleHR1cmUgYWx3YXlzIGNvbnRhaW5zIGEgY29t cGxldGUKKyAgICAvLyBmcmFtZSBhbmQgbm90IHNvbWUgaW50ZXJtZWRpYXRlIHJlc3VsdC4gTGF5 ZXJSZW5kZXJlckNocm9taXVtIHVzZXMgZ2xTZXRMYXRjaCB0byBtYWtlIHN1cmUgdGhlIGNoaWxk CisgICAgLy8gY29udGV4dCBjb21wbGV0ZXMgYmVmb3JlIHRoZSBwYXJlbnQgY29udGV4dCBjb25z dW1lcyB0aGUgdGV4dHVyZS4KICAgICBtX2NvbnRleHQtPm1ha2VDb250ZXh0Q3VycmVudCgpOwog I2lmIFVTRShTS0lBKQogICAgIGlmIChtX2dyQ29udGV4dCkKQEAgLTE0NywxNyArMTQxLDE3IEBA IHZvaWQgRHJhd2luZ0J1ZmZlcjo6cHVibGlzaFRvUGxhdGZvcm1MYXllcigpCiB2b2lkIERyYXdp bmdCdWZmZXI6OmRpZFJlc2V0KCkKIHsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp Ci0gICAgaWYgKG1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXIpCi0gICAgICAgIG1faW50ZXJuYWwt PnBsYXRmb3JtTGF5ZXItPnNldFRleHR1cmVDaGFuZ2VkKCk7CisgICAgaWYgKG1fcGxhdGZvcm1M YXllcikKKyAgICAgICAgbV9wbGF0Zm9ybUxheWVyLT5zZXRUZXh0dXJlQ2hhbmdlZCgpOwogI2Vu ZGlmCiB9CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiBQbGF0Zm9ybUxheWVy KiBEcmF3aW5nQnVmZmVyOjpwbGF0Zm9ybUxheWVyKCkKIHsKLSAgICBpZiAoIW1faW50ZXJuYWwt PnBsYXRmb3JtTGF5ZXIpCi0gICAgICAgIG1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXIgPSBDYW52 YXMyRExheWVyQ2hyb21pdW06OmNyZWF0ZSh0aGlzLCAwKTsKLSAgICByZXR1cm4gbV9pbnRlcm5h bC0+cGxhdGZvcm1MYXllci5nZXQoKTsKKyAgICBpZiAoIW1fcGxhdGZvcm1MYXllcikKKyAgICAg ICAgbV9wbGF0Zm9ybUxheWVyID0gQ2FudmFzMkRMYXllckNocm9taXVtOjpjcmVhdGUodGhpcywg MCk7CisgICAgcmV0dXJuIG1fcGxhdGZvcm1MYXllci5nZXQoKTsKIH0KICNlbmRpZgogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZl ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIu aAppbmRleCAyMWE2YTQwM2FiMjBlZTczM2VhNmU2YTc4YWZmZTI4N2FkN2MzNDNjLi41ZDM5NWQ2 YWYxZjJhMDBmODBkMzZmYzc4N2EwZmVmMzA5NjQyZThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKQEAgLTUwLDcgKzUw LDcgQEAgc3RydWN0IEdyUGxhdGZvcm1TdXJmYWNlRGVzYzsKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogI2lmIFBMQVRGT1JNKENIUk9NSVVNKQotc3RydWN0IERyYXdpbmdCdWZmZXJJbnRlcm5hbDsK K2NsYXNzIENhbnZhczJETGF5ZXJDaHJvbWl1bTsKICNlbmRpZgogCiAvLyBNYW5hZ2VzIGEgcmVu ZGVyaW5nIHRhcmdldCAoZnJhbWVidWZmZXIgKyBhdHRhY2htZW50KSBmb3IgYSBjYW52YXMuICBD YW4gcHVibGlzaCBpdHMgcmVuZGVyaW5nCkBAIC0xMzgsNyArMTM4LDcgQEAgcHJpdmF0ZToKIAog I2lmIFBMQVRGT1JNKENIUk9NSVVNKQogICAgIE93blB0cjxXaWxsUHVibGlzaENhbGxiYWNrPiBt X2NhbGxiYWNrOwotICAgIE93blB0cjxEcmF3aW5nQnVmZmVySW50ZXJuYWw+IG1faW50ZXJuYWw7 CisgICAgUmVmUHRyPENhbnZhczJETGF5ZXJDaHJvbWl1bT4gbV9wbGF0Zm9ybUxheWVyOwogI2Vu ZGlmCiAKICNpZiBQTEFURk9STShNQUMpCg== 95804 2011-06-02 14:11:55 -0700 2011-06-02 15:27:08 -0700 Patch bug-61953-20110602141154.patch text/plain 5456 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogODc5MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MGYwNjIwODdhMDA5YTc0 NWZkNjZkODg1ZjRjN2JhOTUzZWIyNDU3Li4yMDU0MjM4NjBiMTIzZTJlNjRmYWM4ZWNkZWJlZDU5 N2JiYmVmOGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMDIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBEcmF3aW5nQnVmZmVyQ2hyb21pdW0gY2xlYW51cDoKKyAgICAg ICAgLSBDb3JyZWN0IEZJWE1FIGNvbW1lbnQgYWJvdXQgc3luY2hyb25pemF0aW9uLgorICAgICAg ICAtIFJlbW92ZSB1bm5lY2Vzc2FyeSBEcmF3aW5nQnVmZmVySW50ZXJuYWwgaW5kaXJlY3Rpb24g c3RydWN0CisgICAgICAgICAgYW5kIGl0cyB1bnVzZWQgb2Zmc2NyZWVuQ29sb3JUZXh0dXJlIG1l bWJlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYx OTUzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVy Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1 ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjp+RHJhd2luZ0J1ZmZlcik6 CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpwdWJsaXNoVG9QbGF0Zm9ybUxheWVy KToKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OmRpZFJlc2V0KToKKyAgICAgICAg KFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OnBsYXRmb3JtTGF5ZXIpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmg6CisKIDIwMTEtMDYtMDIgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHI4NzkyMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3Bw CmluZGV4IDhiMDQyZTNlMzBlMTQzZDlhZDkzYTZiZGJjZmJiM2M3MzI4MjgwOTIuLjQxMTRkM2M0 ZDNjYjUyNzIyOTNhOWFiM2ExYTQ5ODJhYzA4YmQwYTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1 ZmZlckNocm9taXVtLmNwcApAQCAtNDYsMTMgKzQ2LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCi1zdHJ1Y3QgRHJhd2luZ0J1ZmZlckludGVybmFsIHsKLSAgICB1bnNpZ25lZCBvZmZzY3Jl ZW5Db2xvclRleHR1cmU7Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIFJl ZlB0cjxDYW52YXMyRExheWVyQ2hyb21pdW0+IHBsYXRmb3JtTGF5ZXI7Ci0jZW5kaWYKLX07Ci0K IHN0YXRpYyB1bnNpZ25lZCBnZW5lcmF0ZUNvbG9yVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRCog Y29udGV4dCwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICB1bnNpZ25lZCBvZmZzY3JlZW5D b2xvclRleHR1cmUgPSBjb250ZXh0LT5jcmVhdGVUZXh0dXJlKCk7CkBAIC04Niw3ICs3OSw5IEBA IERyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQs CiAgICAgLCBtX3N0ZW5jaWxCdWZmZXIoMCkKICAgICAsIG1fbXVsdGlzYW1wbGVGQk8oMCkKICAg ICAsIG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlcigwKQotICAgICwgbV9pbnRlcm5hbChhZG9wdFB0 cihuZXcgRHJhd2luZ0J1ZmZlckludGVybmFsKSkKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCisgICAgLCBtX3BsYXRmb3JtTGF5ZXIoMCkKKyNlbmRpZgogI2lmIFVTRShTS0lBKQog ICAgICwgbV9nckNvbnRleHQoMCkKICNlbmRpZgpAQCAtMTA4LDggKzEwMyw4IEBAIERyYXdpbmdC dWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQsCiBEcmF3aW5n QnVmZmVyOjp+RHJhd2luZ0J1ZmZlcigpCiB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQotICAgIGlmIChtX2ludGVybmFsLT5wbGF0Zm9ybUxheWVyKQotICAgICAgICBtX2ludGVy bmFsLT5wbGF0Zm9ybUxheWVyLT5zZXREcmF3aW5nQnVmZmVyKDApOworICAgIGlmIChtX3BsYXRm b3JtTGF5ZXIpCisgICAgICAgIG1fcGxhdGZvcm1MYXllci0+c2V0RHJhd2luZ0J1ZmZlcigwKTsK ICNlbmRpZgogCiAgICAgaWYgKCFtX2NvbnRleHQpCkBAIC0xMjgsMTIgKzEyMywxMSBAQCB2b2lk IERyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRmb3JtTGF5ZXIoKQogICAgICAgICBtX2NhbGxi YWNrLT53aWxsUHVibGlzaCgpOwogICAgIGlmIChtdWx0aXNhbXBsZSgpKQogICAgICAgICBjb21t aXQoKTsKLSAgICB1bnNpZ25lZCBwYXJlbnRUZXh0dXJlID0gbV9pbnRlcm5hbC0+cGxhdGZvcm1M YXllci0+dGV4dHVyZUlkKCk7Ci0gICAgLy8gRklYTUU6IFdlIGRvIHRoZSBjb3B5IGluIHRoZSBj YW52YXMnIChjaGlsZCkgY29udGV4dCBzbyB0aGF0IGl0IGV4ZWN1dGVzIGluIHRoZSBjb3JyZWN0 IG9yZGVyIHJlbGF0aXZlIHRvCi0gICAgLy8gb3RoZXIgY29tbWFuZHMgaW4gdGhlIGNoaWxkIGNv bnRleHQuICBUaGlzIGVuc3VyZXMgdGhhdCB0aGUgcGFyZW50IHRleHR1cmUgYWx3YXlzIGNvbnRh aW5zIGEgY29tcGxldGUKLSAgICAvLyBmcmFtZSBhbmQgbm90IHNvbWUgaW50ZXJtZWRpYXRlIHJl c3VsdC4gIEhvd2V2ZXIsIHRoZXJlIGlzIG5vIHN5bmNocm9uaXphdGlvbiB0byBlbnN1cmUgdGhh dCB0aGlzIGNvcHkKLSAgICAvLyBoYXBwZW5zIGJlZm9yZSB0aGUgY29tcG9zaXRvciBkcmF3cy4g IFRoaXMgbWVhbnMgd2UgbWlnaHQgZHJhdyBzdGFsZSBmcmFtZXMgc29tZXRpbWVzLiAgSWRlYWxs eSB0aGlzCi0gICAgLy8gd291bGQgaW5zZXJ0IGEgZmVuY2UgaW50byB0aGUgY2hpbGQgY29tbWFu ZCBzdHJlYW0gdGhhdCB0aGUgY29tcG9zaXRvciBjb3VsZCB3YWl0IGZvci4KKyAgICB1bnNpZ25l ZCBwYXJlbnRUZXh0dXJlID0gbV9wbGF0Zm9ybUxheWVyLT50ZXh0dXJlSWQoKTsKKyAgICAvLyBX ZSBkbyB0aGUgY29weSBpbiB0aGUgY2FudmFzJyAoY2hpbGQpIGNvbnRleHQgc28gdGhhdCBpdCBl eGVjdXRlcyBpbiB0aGUgY29ycmVjdCBvcmRlciByZWxhdGl2ZSB0bworICAgIC8vIG90aGVyIGNv bW1hbmRzIGluIHRoZSBjaGlsZCBjb250ZXh0LiBUaGlzIGVuc3VyZXMgdGhhdCB0aGUgcGFyZW50 IHRleHR1cmUgYWx3YXlzIGNvbnRhaW5zIGEgY29tcGxldGUKKyAgICAvLyBmcmFtZSBhbmQgbm90 IHNvbWUgaW50ZXJtZWRpYXRlIHJlc3VsdC4gTGF5ZXJSZW5kZXJlckNocm9taXVtIHVzZXMgZ2xT ZXRMYXRjaCB0byBtYWtlIHN1cmUgdGhlIGNoaWxkCisgICAgLy8gY29udGV4dCBjb21wbGV0ZXMg YmVmb3JlIHRoZSBwYXJlbnQgY29udGV4dCBjb25zdW1lcyB0aGUgdGV4dHVyZS4KICAgICBtX2Nv bnRleHQtPm1ha2VDb250ZXh0Q3VycmVudCgpOwogI2lmIFVTRShTS0lBKQogICAgIGlmIChtX2dy Q29udGV4dCkKQEAgLTE0NywxNyArMTQxLDE3IEBAIHZvaWQgRHJhd2luZ0J1ZmZlcjo6cHVibGlz aFRvUGxhdGZvcm1MYXllcigpCiB2b2lkIERyYXdpbmdCdWZmZXI6OmRpZFJlc2V0KCkKIHsKICNp ZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgaWYgKG1faW50ZXJuYWwtPnBsYXRm b3JtTGF5ZXIpCi0gICAgICAgIG1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXItPnNldFRleHR1cmVD aGFuZ2VkKCk7CisgICAgaWYgKG1fcGxhdGZvcm1MYXllcikKKyAgICAgICAgbV9wbGF0Zm9ybUxh eWVyLT5zZXRUZXh0dXJlQ2hhbmdlZCgpOwogI2VuZGlmCiB9CiAKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiBQbGF0Zm9ybUxheWVyKiBEcmF3aW5nQnVmZmVyOjpwbGF0Zm9ybUxh eWVyKCkKIHsKLSAgICBpZiAoIW1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXIpCi0gICAgICAgIG1f aW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXIgPSBDYW52YXMyRExheWVyQ2hyb21pdW06OmNyZWF0ZSh0 aGlzLCAwKTsKLSAgICByZXR1cm4gbV9pbnRlcm5hbC0+cGxhdGZvcm1MYXllci5nZXQoKTsKKyAg ICBpZiAoIW1fcGxhdGZvcm1MYXllcikKKyAgICAgICAgbV9wbGF0Zm9ybUxheWVyID0gQ2FudmFz MkRMYXllckNocm9taXVtOjpjcmVhdGUodGhpcywgMCk7CisgICAgcmV0dXJuIG1fcGxhdGZvcm1M YXllci5nZXQoKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAppbmRleCAyMWE2YTQwM2FiMjBlZTczM2Vh NmU2YTc4YWZmZTI4N2FkN2MzNDNjLi42MzdkZjM3ZGIyYTlmNmE0NWNjYTdkMjZjMjc1YmE2MDhj MDE1ZjIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUv RHJhd2luZ0J1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dw dS9EcmF3aW5nQnVmZmVyLmgKQEAgLTQ5LDggKzQ5LDggQEAgc3RydWN0IEdyUGxhdGZvcm1TdXJm YWNlRGVzYzsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0jaWYgUExBVEZPUk0oQ0hST01JVU0p Ci1zdHJ1Y3QgRHJhd2luZ0J1ZmZlckludGVybmFsOworI2lmIFBMQVRGT1JNKENIUk9NSVVNKSAm JiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCitjbGFzcyBDYW52YXMyRExheWVyQ2hyb21p dW07CiAjZW5kaWYKIAogLy8gTWFuYWdlcyBhIHJlbmRlcmluZyB0YXJnZXQgKGZyYW1lYnVmZmVy ICsgYXR0YWNobWVudCkgZm9yIGEgY2FudmFzLiAgQ2FuIHB1Ymxpc2ggaXRzIHJlbmRlcmluZwpA QCAtMTM4LDcgKzEzOCw5IEBAIHByaXZhdGU6CiAKICNpZiBQTEFURk9STShDSFJPTUlVTSkKICAg ICBPd25QdHI8V2lsbFB1Ymxpc2hDYWxsYmFjaz4gbV9jYWxsYmFjazsKLSAgICBPd25QdHI8RHJh d2luZ0J1ZmZlckludGVybmFsPiBtX2ludGVybmFsOworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKKyAgICBSZWZQdHI8Q2FudmFzMkRMYXllckNocm9taXVtPiBtX3BsYXRmb3JtTGF5 ZXI7CisjZW5kaWYKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oTUFDKQo= 95823 2011-06-02 15:26:55 -0700 2011-06-02 19:11:00 -0700 Patch bug-61953-20110602152654.patch text/plain 5388 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogODc5MzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0MGYwNjIwODdhMDA5YTc0 NWZkNjZkODg1ZjRjN2JhOTUzZWIyNDU3Li4yMDU0MjM4NjBiMTIzZTJlNjRmYWM4ZWNkZWJlZDU5 N2JiYmVmOGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMDIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBEcmF3aW5nQnVmZmVyQ2hyb21pdW0gY2xlYW51cDoKKyAgICAg ICAgLSBDb3JyZWN0IEZJWE1FIGNvbW1lbnQgYWJvdXQgc3luY2hyb25pemF0aW9uLgorICAgICAg ICAtIFJlbW92ZSB1bm5lY2Vzc2FyeSBEcmF3aW5nQnVmZmVySW50ZXJuYWwgaW5kaXJlY3Rpb24g c3RydWN0CisgICAgICAgICAgYW5kIGl0cyB1bnVzZWQgb2Zmc2NyZWVuQ29sb3JUZXh0dXJlIG1l bWJlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYx OTUzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVy Q2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1ZmZlcjo6RHJhd2luZ0J1 ZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjp+RHJhd2luZ0J1ZmZlcik6 CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpwdWJsaXNoVG9QbGF0Zm9ybUxheWVy KToKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OmRpZFJlc2V0KToKKyAgICAgICAg KFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OnBsYXRmb3JtTGF5ZXIpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmg6CisKIDIwMTEtMDYtMDIgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHI4NzkyMC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3Bw CmluZGV4IDhiMDQyZTNlMzBlMTQzZDlhZDkzYTZiZGJjZmJiM2M3MzI4MjgwOTIuLjVkOTBhZDY4 NDJmYmNiOTJkZWZmNzA2YzlkOTZjNjUzNGE0NmU5ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1 ZmZlckNocm9taXVtLmNwcApAQCAtNDYsMTMgKzQ2LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCi1zdHJ1Y3QgRHJhd2luZ0J1ZmZlckludGVybmFsIHsKLSAgICB1bnNpZ25lZCBvZmZzY3Jl ZW5Db2xvclRleHR1cmU7Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIFJl ZlB0cjxDYW52YXMyRExheWVyQ2hyb21pdW0+IHBsYXRmb3JtTGF5ZXI7Ci0jZW5kaWYKLX07Ci0K IHN0YXRpYyB1bnNpZ25lZCBnZW5lcmF0ZUNvbG9yVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRCog Y29udGV4dCwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICB1bnNpZ25lZCBvZmZzY3JlZW5D b2xvclRleHR1cmUgPSBjb250ZXh0LT5jcmVhdGVUZXh0dXJlKCk7CkBAIC04Niw3ICs3OSw2IEBA IERyYXdpbmdCdWZmZXI6OkRyYXdpbmdCdWZmZXIoR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQs CiAgICAgLCBtX3N0ZW5jaWxCdWZmZXIoMCkKICAgICAsIG1fbXVsdGlzYW1wbGVGQk8oMCkKICAg ICAsIG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlcigwKQotICAgICwgbV9pbnRlcm5hbChhZG9wdFB0 cihuZXcgRHJhd2luZ0J1ZmZlckludGVybmFsKSkKICNpZiBVU0UoU0tJQSkKICAgICAsIG1fZ3JD b250ZXh0KDApCiAjZW5kaWYKQEAgLTEwOCw4ICsxMDAsOCBAQCBEcmF3aW5nQnVmZmVyOjpEcmF3 aW5nQnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LAogRHJhd2luZ0J1ZmZlcjo6fkRy YXdpbmdCdWZmZXIoKQogewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICBp ZiAobV9pbnRlcm5hbC0+cGxhdGZvcm1MYXllcikKLSAgICAgICAgbV9pbnRlcm5hbC0+cGxhdGZv cm1MYXllci0+c2V0RHJhd2luZ0J1ZmZlcigwKTsKKyAgICBpZiAobV9wbGF0Zm9ybUxheWVyKQor ICAgICAgICBtX3BsYXRmb3JtTGF5ZXItPnNldERyYXdpbmdCdWZmZXIoMCk7CiAjZW5kaWYKIAog ICAgIGlmICghbV9jb250ZXh0KQpAQCAtMTI4LDEyICsxMjAsMTEgQEAgdm9pZCBEcmF3aW5nQnVm ZmVyOjpwdWJsaXNoVG9QbGF0Zm9ybUxheWVyKCkKICAgICAgICAgbV9jYWxsYmFjay0+d2lsbFB1 Ymxpc2goKTsKICAgICBpZiAobXVsdGlzYW1wbGUoKSkKICAgICAgICAgY29tbWl0KCk7Ci0gICAg dW5zaWduZWQgcGFyZW50VGV4dHVyZSA9IG1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXItPnRleHR1 cmVJZCgpOwotICAgIC8vIEZJWE1FOiBXZSBkbyB0aGUgY29weSBpbiB0aGUgY2FudmFzJyAoY2hp bGQpIGNvbnRleHQgc28gdGhhdCBpdCBleGVjdXRlcyBpbiB0aGUgY29ycmVjdCBvcmRlciByZWxh dGl2ZSB0bwotICAgIC8vIG90aGVyIGNvbW1hbmRzIGluIHRoZSBjaGlsZCBjb250ZXh0LiAgVGhp cyBlbnN1cmVzIHRoYXQgdGhlIHBhcmVudCB0ZXh0dXJlIGFsd2F5cyBjb250YWlucyBhIGNvbXBs ZXRlCi0gICAgLy8gZnJhbWUgYW5kIG5vdCBzb21lIGludGVybWVkaWF0ZSByZXN1bHQuICBIb3dl dmVyLCB0aGVyZSBpcyBubyBzeW5jaHJvbml6YXRpb24gdG8gZW5zdXJlIHRoYXQgdGhpcyBjb3B5 Ci0gICAgLy8gaGFwcGVucyBiZWZvcmUgdGhlIGNvbXBvc2l0b3IgZHJhd3MuICBUaGlzIG1lYW5z IHdlIG1pZ2h0IGRyYXcgc3RhbGUgZnJhbWVzIHNvbWV0aW1lcy4gIElkZWFsbHkgdGhpcwotICAg IC8vIHdvdWxkIGluc2VydCBhIGZlbmNlIGludG8gdGhlIGNoaWxkIGNvbW1hbmQgc3RyZWFtIHRo YXQgdGhlIGNvbXBvc2l0b3IgY291bGQgd2FpdCBmb3IuCisgICAgdW5zaWduZWQgcGFyZW50VGV4 dHVyZSA9IG1fcGxhdGZvcm1MYXllci0+dGV4dHVyZUlkKCk7CisgICAgLy8gV2UgZG8gdGhlIGNv cHkgaW4gdGhlIGNhbnZhcycgKGNoaWxkKSBjb250ZXh0IHNvIHRoYXQgaXQgZXhlY3V0ZXMgaW4g dGhlIGNvcnJlY3Qgb3JkZXIgcmVsYXRpdmUgdG8KKyAgICAvLyBvdGhlciBjb21tYW5kcyBpbiB0 aGUgY2hpbGQgY29udGV4dC4gVGhpcyBlbnN1cmVzIHRoYXQgdGhlIHBhcmVudCB0ZXh0dXJlIGFs d2F5cyBjb250YWlucyBhIGNvbXBsZXRlCisgICAgLy8gZnJhbWUgYW5kIG5vdCBzb21lIGludGVy bWVkaWF0ZSByZXN1bHQuIExheWVyUmVuZGVyZXJDaHJvbWl1bSB1c2VzIGdsU2V0TGF0Y2ggdG8g bWFrZSBzdXJlIHRoZSBjaGlsZAorICAgIC8vIGNvbnRleHQgY29tcGxldGVzIGJlZm9yZSB0aGUg cGFyZW50IGNvbnRleHQgY29uc3VtZXMgdGhlIHRleHR1cmUuCiAgICAgbV9jb250ZXh0LT5tYWtl Q29udGV4dEN1cnJlbnQoKTsKICNpZiBVU0UoU0tJQSkKICAgICBpZiAobV9nckNvbnRleHQpCkBA IC0xNDcsMTcgKzEzOCwxNyBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OnB1Ymxpc2hUb1BsYXRmb3Jt TGF5ZXIoKQogdm9pZCBEcmF3aW5nQnVmZmVyOjpkaWRSZXNldCgpCiB7CiAjaWYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIGlmIChtX2ludGVybmFsLT5wbGF0Zm9ybUxheWVyKQot ICAgICAgICBtX2ludGVybmFsLT5wbGF0Zm9ybUxheWVyLT5zZXRUZXh0dXJlQ2hhbmdlZCgpOwor ICAgIGlmIChtX3BsYXRmb3JtTGF5ZXIpCisgICAgICAgIG1fcGxhdGZvcm1MYXllci0+c2V0VGV4 dHVyZUNoYW5nZWQoKTsKICNlbmRpZgogfQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lU SU5HKQogUGxhdGZvcm1MYXllciogRHJhd2luZ0J1ZmZlcjo6cGxhdGZvcm1MYXllcigpCiB7Ci0g ICAgaWYgKCFtX2ludGVybmFsLT5wbGF0Zm9ybUxheWVyKQotICAgICAgICBtX2ludGVybmFsLT5w bGF0Zm9ybUxheWVyID0gQ2FudmFzMkRMYXllckNocm9taXVtOjpjcmVhdGUodGhpcywgMCk7Ci0g ICAgcmV0dXJuIG1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXIuZ2V0KCk7CisgICAgaWYgKCFtX3Bs YXRmb3JtTGF5ZXIpCisgICAgICAgIG1fcGxhdGZvcm1MYXllciA9IENhbnZhczJETGF5ZXJDaHJv bWl1bTo6Y3JlYXRlKHRoaXMsIDApOworICAgIHJldHVybiBtX3BsYXRmb3JtTGF5ZXIuZ2V0KCk7 CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3B1L0RyYXdpbmdCdWZmZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dwdS9EcmF3aW5nQnVmZmVyLmgKaW5kZXggMjFhNmE0MDNhYjIwZWU3MzNlYTZlNmE3OGFmZmUy ODdhZDdjMzQzYy4uNjM3ZGYzN2RiMmE5ZjZhNDVjY2E3ZDI2YzI3NWJhNjA4YzAxNWYyMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZm ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1 ZmZlci5oCkBAIC00OSw4ICs0OSw4IEBAIHN0cnVjdCBHclBsYXRmb3JtU3VyZmFjZURlc2M7CiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotI2lmIFBMQVRGT1JNKENIUk9NSVVNKQotc3RydWN0IERy YXdpbmdCdWZmZXJJbnRlcm5hbDsKKyNpZiBQTEFURk9STShDSFJPTUlVTSkgJiYgVVNFKEFDQ0VM RVJBVEVEX0NPTVBPU0lUSU5HKQorY2xhc3MgQ2FudmFzMkRMYXllckNocm9taXVtOwogI2VuZGlm CiAKIC8vIE1hbmFnZXMgYSByZW5kZXJpbmcgdGFyZ2V0IChmcmFtZWJ1ZmZlciArIGF0dGFjaG1l bnQpIGZvciBhIGNhbnZhcy4gIENhbiBwdWJsaXNoIGl0cyByZW5kZXJpbmcKQEAgLTEzOCw3ICsx MzgsOSBAQCBwcml2YXRlOgogCiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgT3duUHRyPFdp bGxQdWJsaXNoQ2FsbGJhY2s+IG1fY2FsbGJhY2s7Ci0gICAgT3duUHRyPERyYXdpbmdCdWZmZXJJ bnRlcm5hbD4gbV9pbnRlcm5hbDsKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisg ICAgUmVmUHRyPENhbnZhczJETGF5ZXJDaHJvbWl1bT4gbV9wbGF0Zm9ybUxheWVyOworI2VuZGlm CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQykK