68212 2011-09-15 19:31:57 -0700 re-name LayerChromium border functions to reflect that they are only for debug use 2011-10-11 16:49:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 shawnsingh shawnsingh enne jamesr nduca piman webkit.review.bot oldest_to_newest 468250 0 shawnsingh 2011-09-15 19:31:57 -0700 Also re-named the corresponding functions in GraphicsLayerChromium. In fact, is that level of indirection through static functions necessary? 468261 1 107589 shawnsingh 2011-09-15 20:09:37 -0700 Created attachment 107589 Patch 468339 2 107589 jamesr 2011-09-15 23:49:40 -0700 Comment on attachment 107589 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107589&action=review > Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp:74 > -static void setLayerBorderColor(LayerChromium& layer, const Color& color) > +static void setLayerDebugBorderColor(LayerChromium& layer, const Color& color) > { > - layer.setBorderColor(color); > + layer.setDebugBorderColor(color); > } > > -static void clearBorderColor(LayerChromium& layer) > +static void clearDebugBorderColor(LayerChromium& layer) > { > - layer.setBorderColor(static_cast<RGBA32>(0)); > + layer.setDebugBorderColor(static_cast<RGBA32>(0)); > } I'm really deeply confused about why these functions exist - they seem pretty silly. Why aren't we just calling the functions right on the layers? 468340 3 jamesr 2011-09-15 23:50:00 -0700 (In reply to comment #0) > Also re-named the corresponding functions in GraphicsLayerChromium. In fact, is that level of indirection through static functions necessary? I think they shouldn't, IMO. I'm not sure why they are there. 468571 4 107676 shawnsingh 2011-09-16 10:18:28 -0700 Created attachment 107676 Patch 468577 5 shawnsingh 2011-09-16 10:22:49 -0700 I also removed the background color static functions. 469011 6 107676 webkit.review.bot 2011-09-16 21:15:22 -0700 Comment on attachment 107676 Patch Rejecting attachment 107676 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: graphics/chromium/GraphicsLayerChromium.cpp patching file Source/WebCore/platform/graphics/chromium/LayerChromium.cpp Hunk #1 succeeded at 326 (offset -55 lines). patching file Source/WebCore/platform/graphics/chromium/LayerChromium.h Hunk #1 FAILED at 176. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/chromium/LayerChromium.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'James Robinson', u'--f..." exit_code: 1 Full output: http://queues.webkit.org/results/9729267 469239 7 107805 shawnsingh 2011-09-18 22:25:14 -0700 Created attachment 107805 Patch 469241 8 shawnsingh 2011-09-18 22:27:17 -0700 Previous patch had a merge conflict. This patch is essentially the same, made from a more. recent base 469293 9 107805 webkit.review.bot 2011-09-19 02:18:40 -0700 Comment on attachment 107805 Patch Clearing flags on attachment: 107805 Committed r95406: <http://trac.webkit.org/changeset/95406> 469294 10 webkit.review.bot 2011-09-19 02:18:44 -0700 All reviewed patches have been landed. Closing bug. 107589 2011-09-15 20:09:37 -0700 2011-09-16 10:18:23 -0700 Patch bug-68212-20110915200936.patch text/plain 5217 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogOTUxODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmM1YWQ2MWIxODg0OThi MzIwZWU3YTkzMjgxZWFiMTRiZmYzYjFkLi42YmY1ODQwNzNjNjYwMTExZTNmZjg0YWY1MWFjYTUw ZTg4NDJjMDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDktMTUgIFNoYXdu IFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmUtbmFtZSBMYXll ckNocm9taXVtIGJvcmRlciBmdW5jdGlvbnMgdG8gcmVmbGVjdCB0aGF0CisgICAgICAgIHRoZXkg YXJlIG9ubHkgZm9yIGRlYnVnIHVzZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY4MjEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2xlYW51cCB0b3dhcmRzIG1ha2luZyB1bml0IHRlc3RpbmcKKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpzZXRMYXllckRlYnVnQm9yZGVyQ29sb3IpOgorICAgICAg ICAoV2ViQ29yZTo6Y2xlYXJEZWJ1Z0JvcmRlckNvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0RGVidWdCb3JkZXIpOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJDaHJvbWl1bTo6c2V0RGVidWdCb3JkZXJDb2xvcik6CisgICAgICAgIChXZWJD b3JlOjpMYXllckNocm9taXVtOjpzZXREZWJ1Z0JvcmRlcldpZHRoKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmg6CisKIDIwMTEtMDktMTUgIFBl dGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0g TWFrZSBzdXJlIHRoYXQgdGhlIEFSTSBORU9OIGZpbGVzIGJ1aWxkIHdpdGggLW1hcm0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNz TGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IGY0NjcxZjlmM2YxNDE3YmVkYWFi M2RkZjIwOWUxZjYwODEyYzU4ZTEuLjVmMDFhMWQwYTQxY2UzNjdhZTI2NTdkZjdlODkzODM5OWMw YjZiMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcApAQCAtNjMsMTQg KzYzLDE0IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot c3RhdGljIHZvaWQgc2V0TGF5ZXJCb3JkZXJDb2xvcihMYXllckNocm9taXVtJiBsYXllciwgY29u c3QgQ29sb3ImIGNvbG9yKQorc3RhdGljIHZvaWQgc2V0TGF5ZXJEZWJ1Z0JvcmRlckNvbG9yKExh eWVyQ2hyb21pdW0mIGxheWVyLCBjb25zdCBDb2xvciYgY29sb3IpCiB7Ci0gICAgbGF5ZXIuc2V0 Qm9yZGVyQ29sb3IoY29sb3IpOworICAgIGxheWVyLnNldERlYnVnQm9yZGVyQ29sb3IoY29sb3Ip OwogfQogCi1zdGF0aWMgdm9pZCBjbGVhckJvcmRlckNvbG9yKExheWVyQ2hyb21pdW0mIGxheWVy KQorc3RhdGljIHZvaWQgY2xlYXJEZWJ1Z0JvcmRlckNvbG9yKExheWVyQ2hyb21pdW0mIGxheWVy KQogewotICAgIGxheWVyLnNldEJvcmRlckNvbG9yKHN0YXRpY19jYXN0PFJHQkEzMj4oMCkpOwor ICAgIGxheWVyLnNldERlYnVnQm9yZGVyQ29sb3Ioc3RhdGljX2Nhc3Q8UkdCQTMyPigwKSk7CiB9 CiAKIHN0YXRpYyB2b2lkIHNldExheWVyQmFja2dyb3VuZENvbG9yKExheWVyQ2hyb21pdW0mIGxh eWVyLCBjb25zdCBDb2xvciYgY29sb3IpCkBAIC00NTcsMTEgKzQ1NywxMSBAQCB2b2lkIEdyYXBo aWNzTGF5ZXJDaHJvbWl1bTo6c2V0RGVidWdCYWNrZ3JvdW5kQ29sb3IoY29uc3QgQ29sb3ImIGNv bG9yKQogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldERlYnVnQm9yZGVyKGNvbnN0IENv bG9yJiBjb2xvciwgZmxvYXQgYm9yZGVyV2lkdGgpCiB7CiAgICAgaWYgKGNvbG9yLmlzVmFsaWQo KSkgewotICAgICAgICBzZXRMYXllckJvcmRlckNvbG9yKCptX2xheWVyLCBjb2xvcik7Ci0gICAg ICAgIG1fbGF5ZXItPnNldEJvcmRlcldpZHRoKGJvcmRlcldpZHRoKTsKKyAgICAgICAgc2V0TGF5 ZXJEZWJ1Z0JvcmRlckNvbG9yKCptX2xheWVyLCBjb2xvcik7CisgICAgICAgIG1fbGF5ZXItPnNl dERlYnVnQm9yZGVyV2lkdGgoYm9yZGVyV2lkdGgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGNs ZWFyQm9yZGVyQ29sb3IoKm1fbGF5ZXIpOwotICAgICAgICBtX2xheWVyLT5zZXRCb3JkZXJXaWR0 aCgwKTsKKyAgICAgICAgY2xlYXJEZWJ1Z0JvcmRlckNvbG9yKCptX2xheWVyKTsKKyAgICAgICAg bV9sYXllci0+c2V0RGVidWdCb3JkZXJXaWR0aCgwKTsKICAgICB9CiB9CiAKQEAgLTY3Miw4ICs2 NzIsOCBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVyKExh eWVyQ2hyb21pdW0qIGNvbnRlbnRzTGF5ZXIpCiAgICAgICAgIHVwZGF0ZUNvbnRlbnRzUmVjdCgp OwogCiAgICAgICAgIGlmIChzaG93RGVidWdCb3JkZXJzKCkpIHsKLSAgICAgICAgICAgIHNldExh eWVyQm9yZGVyQ29sb3IoKm1fY29udGVudHNMYXllciwgQ29sb3IoMCwgMCwgMTI4LCAxODApKTsK LSAgICAgICAgICAgIG1fY29udGVudHNMYXllci0+c2V0Qm9yZGVyV2lkdGgoMSk7CisgICAgICAg ICAgICBzZXRMYXllckRlYnVnQm9yZGVyQ29sb3IoKm1fY29udGVudHNMYXllciwgQ29sb3IoMCwg MCwgMTI4LCAxODApKTsKKyAgICAgICAgICAgIG1fY29udGVudHNMYXllci0+c2V0RGVidWdCb3Jk ZXJXaWR0aCgxKTsKICAgICAgICAgfQogICAgIH0KICAgICB1cGRhdGVEZWJ1Z0luZGljYXRvcnMo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggM2U5ZGUwZGJjYWZhZTE1NjNlNTA2ODM5YzE0 YWM0ZDg0YTM5NGZmYS4uMTYwOWRmNGVkZGFiNmZlMmU3NjMwZTM5YzJlZmM1ZDFjM2JmYmIxNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTM4MSwxMyArMzgxLDEzIEBAIFBhc3NSZWZQdHI8 Q0NMYXllckltcGw+IExheWVyQ2hyb21pdW06OmNyZWF0ZUNDTGF5ZXJJbXBsKCkKICAgICByZXR1 cm4gQ0NMYXllckltcGw6OmNyZWF0ZShtX2xheWVySWQpOwogfQogCi12b2lkIExheWVyQ2hyb21p dW06OnNldEJvcmRlckNvbG9yKGNvbnN0IENvbG9yJiBjb2xvcikKK3ZvaWQgTGF5ZXJDaHJvbWl1 bTo6c2V0RGVidWdCb3JkZXJDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCiB7CiAgICAgbV9kZWJ1 Z0JvcmRlckNvbG9yID0gY29sb3I7CiAgICAgc2V0TmVlZHNDb21taXQoKTsKIH0KIAotdm9pZCBM YXllckNocm9taXVtOjpzZXRCb3JkZXJXaWR0aChmbG9hdCB3aWR0aCkKK3ZvaWQgTGF5ZXJDaHJv bWl1bTo6c2V0RGVidWdCb3JkZXJXaWR0aChmbG9hdCB3aWR0aCkKIHsKICAgICBtX2RlYnVnQm9y ZGVyV2lkdGggPSB3aWR0aDsKICAgICBzZXROZWVkc0NvbW1pdCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5o CmluZGV4IDkwZGY2OGQ1ZGM5ZWJhYzkyODJmNzAzOTk1ZWJmMDUwOGVjYmU3OWEuLmE0YTQwNmU3 MWQ3MTJlYmQ0NmQ3MWUxMDUxYmQ3YjYyYmU1ZTNiMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKQEAg LTE3NiwxMyArMTc2LDExIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgYmluZENvbnRlbnRz VGV4dHVyZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBwcm90ZWN0VmlzaWJsZVRpbGVUZXh0dXJl cygpIHsgfQogCi0gICAgLy8gVGhlc2UgZXhpc3RzIGp1c3QgZm9yIGRlYnVnZ2luZyAodmlhIGRy YXdEZWJ1Z0JvcmRlcigpKS4KLSAgICB2b2lkIHNldEJvcmRlckNvbG9yKGNvbnN0IENvbG9yJik7 Ci0KKyAgICAvLyBUaGVzZSBleGlzdCBqdXN0IGZvciBkZWJ1Z2dpbmcgKHZpYSBkcmF3RGVidWdC b3JkZXIoKSkuCisgICAgdm9pZCBzZXREZWJ1Z0JvcmRlckNvbG9yKGNvbnN0IENvbG9yJik7Cisg ICAgdm9pZCBzZXREZWJ1Z0JvcmRlcldpZHRoKGZsb2F0KTsKICAgICB2b2lkIGRyYXdEZWJ1Z0Jv cmRlcigpOwogCi0gICAgdm9pZCBzZXRCb3JkZXJXaWR0aChmbG9hdCk7Ci0KICAgICBzdGF0aWMg dm9pZCBkcmF3VGV4dHVyZWRRdWFkKEdyYXBoaWNzQ29udGV4dDNEKiwgY29uc3QgVHJhbnNmb3Jt YXRpb25NYXRyaXgmIHByb2plY3Rpb25NYXRyaXgsIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4 JiBsYXllck1hdHJpeCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsb2F0IHdp ZHRoLCBmbG9hdCBoZWlnaHQsIGZsb2F0IG9wYWNpdHksIGNvbnN0IEZsb2F0UXVhZCYsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgbWF0cml4TG9jYXRpb24sIGludCBhbHBo YUxvY2F0aW9uLCBpbnQgcXVhZExvY2F0aW9uKTsK 107676 2011-09-16 10:18:28 -0700 2011-09-18 22:25:10 -0700 Patch bug-68212-20110916101827.patch text/plain 6550 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogOTUxODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkZmM1YWQ2MWIxODg0OThi MzIwZWU3YTkzMjgxZWFiMTRiZmYzYjFkLi4xOTE0ZTY1M2E3ZDViYzA4NTZhNTQ4OGQ5ZTZkZmNk MjA3MDExNDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDktMTYgIFNoYXdu IFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmUtbmFtZSBMYXll ckNocm9taXVtIGJvcmRlciBmdW5jdGlvbnMgdG8gcmVmbGVjdCB0aGF0CisgICAgICAgIHRoZXkg YXJlIG9ubHkgZm9yIGRlYnVnIHVzZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY4MjEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2xlYW51cCB0b3dhcmRzIG1ha2luZyB1bml0IHRlc3RpbmcKKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hyb21pdW06OmNsZWFyQmFja2dy b3VuZENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0 RGVidWdCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNo cm9taXVtOjpzZXREZWJ1Z0JvcmRlcik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy Q2hyb21pdW06OnVwZGF0ZUxheWVyQmFja2dyb3VuZENvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0dXBDb250ZW50c0xheWVyKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheWVyQ2hyb21pdW06OnNldERlYnVnQm9yZGVyQ29sb3IpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJDaHJvbWl1bTo6c2V0RGVidWdCb3JkZXJXaWR0aCk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oOgorCiAyMDExLTA5LTE1ICBQ ZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1d IE1ha2Ugc3VyZSB0aGF0IHRoZSBBUk0gTkVPTiBmaWxlcyBidWlsZCB3aXRoIC1tYXJtCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGlj c0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAppbmRleCBmNDY3MWY5ZjNmMTQxN2JlZGFh YjNkZGYyMDllMWY2MDgxMmM1OGUxLi40YTUyMmY3NzA2ZGE0YjBiZjk5MTk4OWZhZDRkMzM0MGVl M2E0YWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTYzLDI2 ICs2Myw2IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot c3RhdGljIHZvaWQgc2V0TGF5ZXJCb3JkZXJDb2xvcihMYXllckNocm9taXVtJiBsYXllciwgY29u c3QgQ29sb3ImIGNvbG9yKQotewotICAgIGxheWVyLnNldEJvcmRlckNvbG9yKGNvbG9yKTsKLX0K LQotc3RhdGljIHZvaWQgY2xlYXJCb3JkZXJDb2xvcihMYXllckNocm9taXVtJiBsYXllcikKLXsK LSAgICBsYXllci5zZXRCb3JkZXJDb2xvcihzdGF0aWNfY2FzdDxSR0JBMzI+KDApKTsKLX0KLQot c3RhdGljIHZvaWQgc2V0TGF5ZXJCYWNrZ3JvdW5kQ29sb3IoTGF5ZXJDaHJvbWl1bSYgbGF5ZXIs IGNvbnN0IENvbG9yJiBjb2xvcikKLXsKLSAgICBsYXllci5zZXRCYWNrZ3JvdW5kQ29sb3IoY29s b3IpOwotfQotCi1zdGF0aWMgdm9pZCBjbGVhckxheWVyQmFja2dyb3VuZENvbG9yKExheWVyQ2hy b21pdW0mIGxheWVyKQotewotICAgIGxheWVyLnNldEJhY2tncm91bmRDb2xvcihzdGF0aWNfY2Fz dDxSR0JBMzI+KDApKTsKLX0KLQogUGFzc093blB0cjxHcmFwaGljc0xheWVyPiBHcmFwaGljc0xh eWVyOjpjcmVhdGUoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogewogICAgIHJldHVybiBh ZG9wdFB0cihuZXcgR3JhcGhpY3NMYXllckNocm9taXVtKGNsaWVudCkpOwpAQCAtMjcxLDcgKzI1 MSw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpjbGVhckJhY2tncm91bmRDb2xvcigp CiAgICAgICAgIHJldHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6OmNsZWFyQmFja2dyb3VuZENv bG9yKCk7Ci0gICAgY2xlYXJMYXllckJhY2tncm91bmRDb2xvcigqbV9jb250ZW50c0xheWVyKTsK KyAgICBtX2NvbnRlbnRzTGF5ZXItPnNldEJhY2tncm91bmRDb2xvcihzdGF0aWNfY2FzdDxSR0JB MzI+KDApKTsKIH0KIAogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzT3Bh cXVlKGJvb2wgb3BhcXVlKQpAQCAtNDQ5LDE5ICs0MjksMTkgQEAgUGxhdGZvcm1MYXllciogR3Jh cGhpY3NMYXllckNocm9taXVtOjpwbGF0Zm9ybUxheWVyKCkgY29uc3QKIHZvaWQgR3JhcGhpY3NM YXllckNocm9taXVtOjpzZXREZWJ1Z0JhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYgY29sb3Ip CiB7CiAgICAgaWYgKGNvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgc2V0TGF5ZXJCYWNrZ3JvdW5k Q29sb3IoKm1fbGF5ZXIsIGNvbG9yKTsKKyAgICAgICAgbV9sYXllci0+c2V0QmFja2dyb3VuZENv bG9yKGNvbG9yKTsKICAgICBlbHNlCi0gICAgICAgIGNsZWFyTGF5ZXJCYWNrZ3JvdW5kQ29sb3Io Km1fbGF5ZXIpOworICAgICAgICBtX2xheWVyLT5zZXRCYWNrZ3JvdW5kQ29sb3Ioc3RhdGljX2Nh c3Q8UkdCQTMyPigwKSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXREZWJ1 Z0JvcmRlcihjb25zdCBDb2xvciYgY29sb3IsIGZsb2F0IGJvcmRlcldpZHRoKQogewogICAgIGlm IChjb2xvci5pc1ZhbGlkKCkpIHsKLSAgICAgICAgc2V0TGF5ZXJCb3JkZXJDb2xvcigqbV9sYXll ciwgY29sb3IpOwotICAgICAgICBtX2xheWVyLT5zZXRCb3JkZXJXaWR0aChib3JkZXJXaWR0aCk7 CisgICAgICAgIG1fbGF5ZXItPnNldERlYnVnQm9yZGVyQ29sb3IoY29sb3IpOworICAgICAgICBt X2xheWVyLT5zZXREZWJ1Z0JvcmRlcldpZHRoKGJvcmRlcldpZHRoKTsKICAgICB9IGVsc2Ugewot ICAgICAgICBjbGVhckJvcmRlckNvbG9yKCptX2xheWVyKTsKLSAgICAgICAgbV9sYXllci0+c2V0 Qm9yZGVyV2lkdGgoMCk7CisgICAgICAgIG1fbGF5ZXItPnNldERlYnVnQm9yZGVyQ29sb3Ioc3Rh dGljX2Nhc3Q8UkdCQTMyPigwKSk7CisgICAgICAgIG1fbGF5ZXItPnNldERlYnVnQm9yZGVyV2lk dGgoMCk7CiAgICAgfQogfQogCkBAIC02MzEsOSArNjExLDkgQEAgdm9pZCBHcmFwaGljc0xheWVy Q2hyb21pdW06OnVwZGF0ZUxheWVyQmFja2dyb3VuZENvbG9yKCkKIAogICAgIC8vIFdlIG5ldmVy IGNyZWF0ZSB0aGUgY29udGVudHMgbGF5ZXIganVzdCBmb3IgYmFja2dyb3VuZCBjb2xvciB5ZXQu CiAgICAgaWYgKG1fYmFja2dyb3VuZENvbG9yU2V0KQotICAgICAgICBzZXRMYXllckJhY2tncm91 bmRDb2xvcigqbV9jb250ZW50c0xheWVyLCBtX2JhY2tncm91bmRDb2xvcik7CisgICAgICAgIG1f Y29udGVudHNMYXllci0+c2V0QmFja2dyb3VuZENvbG9yKG1fYmFja2dyb3VuZENvbG9yKTsKICAg ICBlbHNlCi0gICAgICAgIGNsZWFyTGF5ZXJCYWNrZ3JvdW5kQ29sb3IoKm1fY29udGVudHNMYXll cik7CisgICAgICAgIG1fY29udGVudHNMYXllci0+c2V0QmFja2dyb3VuZENvbG9yKHN0YXRpY19j YXN0PFJHQkEzMj4oMCkpOwogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRl Q29udGVudHNWaWRlbygpCkBAIC02NzIsOCArNjUyLDggQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hy b21pdW06OnNldHVwQ29udGVudHNMYXllcihMYXllckNocm9taXVtKiBjb250ZW50c0xheWVyKQog ICAgICAgICB1cGRhdGVDb250ZW50c1JlY3QoKTsKIAogICAgICAgICBpZiAoc2hvd0RlYnVnQm9y ZGVycygpKSB7Ci0gICAgICAgICAgICBzZXRMYXllckJvcmRlckNvbG9yKCptX2NvbnRlbnRzTGF5 ZXIsIENvbG9yKDAsIDAsIDEyOCwgMTgwKSk7Ci0gICAgICAgICAgICBtX2NvbnRlbnRzTGF5ZXIt PnNldEJvcmRlcldpZHRoKDEpOworICAgICAgICAgICAgbV9jb250ZW50c0xheWVyLT5zZXREZWJ1 Z0JvcmRlckNvbG9yKENvbG9yKDAsIDAsIDEyOCwgMTgwKSk7CisgICAgICAgICAgICBtX2NvbnRl bnRzTGF5ZXItPnNldERlYnVnQm9yZGVyV2lkdGgoMSk7CiAgICAgICAgIH0KICAgICB9CiAgICAg dXBkYXRlRGVidWdJbmRpY2F0b3JzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IDNlOWRl MGRiY2FmYWUxNTYzZTUwNjgzOWMxNGFjNGQ4NGEzOTRmZmEuLjE2MDlkZjRlZGRhYjZmZTJlNzYz MGUzOWMyZWZjNWQxYzNiZmJiMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCkBAIC0zODEsMTMg KzM4MSwxMyBAQCBQYXNzUmVmUHRyPENDTGF5ZXJJbXBsPiBMYXllckNocm9taXVtOjpjcmVhdGVD Q0xheWVySW1wbCgpCiAgICAgcmV0dXJuIENDTGF5ZXJJbXBsOjpjcmVhdGUobV9sYXllcklkKTsK IH0KIAotdm9pZCBMYXllckNocm9taXVtOjpzZXRCb3JkZXJDb2xvcihjb25zdCBDb2xvciYgY29s b3IpCit2b2lkIExheWVyQ2hyb21pdW06OnNldERlYnVnQm9yZGVyQ29sb3IoY29uc3QgQ29sb3Im IGNvbG9yKQogewogICAgIG1fZGVidWdCb3JkZXJDb2xvciA9IGNvbG9yOwogICAgIHNldE5lZWRz Q29tbWl0KCk7CiB9CiAKLXZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0Qm9yZGVyV2lkdGgoZmxvYXQg d2lkdGgpCit2b2lkIExheWVyQ2hyb21pdW06OnNldERlYnVnQm9yZGVyV2lkdGgoZmxvYXQgd2lk dGgpCiB7CiAgICAgbV9kZWJ1Z0JvcmRlcldpZHRoID0gd2lkdGg7CiAgICAgc2V0TmVlZHNDb21t aXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyQ2hyb21pdW0uaAppbmRleCA5MGRmNjhkNWRjOWViYWM5MjgyZjcwMzk5NWVi ZjA1MDhlY2JlNzlhLi5hNGE0MDZlNzFkNzEyZWJkNDZkNzFlMTA1MWJkN2I2MmJlNWUzYjFmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll ckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJDaHJvbWl1bS5oCkBAIC0xNzYsMTMgKzE3NiwxMSBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIGJpbmRDb250ZW50c1RleHR1cmUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcHJv dGVjdFZpc2libGVUaWxlVGV4dHVyZXMoKSB7IH0KIAotICAgIC8vIFRoZXNlIGV4aXN0cyBqdXN0 IGZvciBkZWJ1Z2dpbmcgKHZpYSBkcmF3RGVidWdCb3JkZXIoKSkuCi0gICAgdm9pZCBzZXRCb3Jk ZXJDb2xvcihjb25zdCBDb2xvciYpOwotCisgICAgLy8gVGhlc2UgZXhpc3QganVzdCBmb3IgZGVi dWdnaW5nICh2aWEgZHJhd0RlYnVnQm9yZGVyKCkpLgorICAgIHZvaWQgc2V0RGVidWdCb3JkZXJD b2xvcihjb25zdCBDb2xvciYpOworICAgIHZvaWQgc2V0RGVidWdCb3JkZXJXaWR0aChmbG9hdCk7 CiAgICAgdm9pZCBkcmF3RGVidWdCb3JkZXIoKTsKIAotICAgIHZvaWQgc2V0Qm9yZGVyV2lkdGgo ZmxvYXQpOwotCiAgICAgc3RhdGljIHZvaWQgZHJhd1RleHR1cmVkUXVhZChHcmFwaGljc0NvbnRl eHQzRCosIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBwcm9qZWN0aW9uTWF0cml4LCBjb25z dCBUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgbGF5ZXJNYXRyaXgsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBmbG9hdCB3aWR0aCwgZmxvYXQgaGVpZ2h0LCBmbG9hdCBvcGFjaXR5LCBj b25zdCBGbG9hdFF1YWQmLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IG1h dHJpeExvY2F0aW9uLCBpbnQgYWxwaGFMb2NhdGlvbiwgaW50IHF1YWRMb2NhdGlvbik7Cg== 107805 2011-09-18 22:25:14 -0700 2011-09-19 02:18:40 -0700 Patch bug-68212-20110918222513.patch text/plain 6344 shawnsingh U3VidmVyc2lvbiBSZXZpc2lvbjogOTUzODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyZTkwYWY0ODBhMjA2ZjU2 YzE1NjU2MGI4Zjg2ZGRlZGZlOTA0N2I2Li5iZGYzNjUwODVhMDE1OTdlNGQ0NzdlMmQ0NzVjNzgz YjU5MmQwZjQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDktMTggIFNoYXdu IFNpbmdoICA8c2hhd25zaW5naEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmUtbmFtZSBMYXll ckNocm9taXVtIGJvcmRlciBmdW5jdGlvbnMgdG8gcmVmbGVjdCB0aGF0CisgICAgICAgIHRoZXkg YXJlIG9ubHkgZm9yIGRlYnVnIHVzZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY4MjEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ29kZSBjbGVhbnVwIHRvd2FyZHMgdW5pdCB0ZXN0aW5nLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6Y2xlYXJCYWNrZ3Jv dW5kQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXRE ZWJ1Z0JhY2tncm91bmRDb2xvcik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ2hy b21pdW06OnNldERlYnVnQm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJD aHJvbWl1bTo6dXBkYXRlTGF5ZXJCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NMYXllckNocm9taXVtOjpzZXR1cENvbnRlbnRzTGF5ZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJDaHJvbWl1bTo6c2V0RGVidWdCb3JkZXJDb2xvcik6CisgICAgICAgIChXZWJD b3JlOjpMYXllckNocm9taXVtOjpzZXREZWJ1Z0JvcmRlcldpZHRoKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmg6CisKIDIwMTEtMDktMTcgIERl ZXBhayBTaGVydmVnaGFyICA8YnB3djY0QG1vdG9yb2xhLmNvbT4KIAogICAgICAgICBPdmVycmlk ZSBzdXBwb3J0c0ZvY3VzKCkgZm9yIEhUTUxNZWRpYUVsZW1lbnQuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21p dW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhp Y3NMYXllckNocm9taXVtLmNwcAppbmRleCBmNDY3MWY5ZjNmMTQxN2JlZGFhYjNkZGYyMDllMWY2 MDgxMmM1OGUxLi40YTUyMmY3NzA2ZGE0YjBiZjk5MTk4OWZhZDRkMzM0MGVlM2E0YWNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGlj c0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTYzLDI2ICs2Myw2IEBAIHVz aW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIHZvaWQg c2V0TGF5ZXJCb3JkZXJDb2xvcihMYXllckNocm9taXVtJiBsYXllciwgY29uc3QgQ29sb3ImIGNv bG9yKQotewotICAgIGxheWVyLnNldEJvcmRlckNvbG9yKGNvbG9yKTsKLX0KLQotc3RhdGljIHZv aWQgY2xlYXJCb3JkZXJDb2xvcihMYXllckNocm9taXVtJiBsYXllcikKLXsKLSAgICBsYXllci5z ZXRCb3JkZXJDb2xvcihzdGF0aWNfY2FzdDxSR0JBMzI+KDApKTsKLX0KLQotc3RhdGljIHZvaWQg c2V0TGF5ZXJCYWNrZ3JvdW5kQ29sb3IoTGF5ZXJDaHJvbWl1bSYgbGF5ZXIsIGNvbnN0IENvbG9y JiBjb2xvcikKLXsKLSAgICBsYXllci5zZXRCYWNrZ3JvdW5kQ29sb3IoY29sb3IpOwotfQotCi1z dGF0aWMgdm9pZCBjbGVhckxheWVyQmFja2dyb3VuZENvbG9yKExheWVyQ2hyb21pdW0mIGxheWVy KQotewotICAgIGxheWVyLnNldEJhY2tncm91bmRDb2xvcihzdGF0aWNfY2FzdDxSR0JBMzI+KDAp KTsKLX0KLQogUGFzc093blB0cjxHcmFwaGljc0xheWVyPiBHcmFwaGljc0xheWVyOjpjcmVhdGUo R3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogewogICAgIHJldHVybiBhZG9wdFB0cihuZXcg R3JhcGhpY3NMYXllckNocm9taXVtKGNsaWVudCkpOwpAQCAtMjcxLDcgKzI1MSw3IEBAIHZvaWQg R3JhcGhpY3NMYXllckNocm9taXVtOjpjbGVhckJhY2tncm91bmRDb2xvcigpCiAgICAgICAgIHJl dHVybjsKIAogICAgIEdyYXBoaWNzTGF5ZXI6OmNsZWFyQmFja2dyb3VuZENvbG9yKCk7Ci0gICAg Y2xlYXJMYXllckJhY2tncm91bmRDb2xvcigqbV9jb250ZW50c0xheWVyKTsKKyAgICBtX2NvbnRl bnRzTGF5ZXItPnNldEJhY2tncm91bmRDb2xvcihzdGF0aWNfY2FzdDxSR0JBMzI+KDApKTsKIH0K IAogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRlbnRzT3BhcXVlKGJvb2wgb3Bh cXVlKQpAQCAtNDQ5LDE5ICs0MjksMTkgQEAgUGxhdGZvcm1MYXllciogR3JhcGhpY3NMYXllckNo cm9taXVtOjpwbGF0Zm9ybUxheWVyKCkgY29uc3QKIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVt OjpzZXREZWJ1Z0JhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCiB7CiAgICAgaWYg KGNvbG9yLmlzVmFsaWQoKSkKLSAgICAgICAgc2V0TGF5ZXJCYWNrZ3JvdW5kQ29sb3IoKm1fbGF5 ZXIsIGNvbG9yKTsKKyAgICAgICAgbV9sYXllci0+c2V0QmFja2dyb3VuZENvbG9yKGNvbG9yKTsK ICAgICBlbHNlCi0gICAgICAgIGNsZWFyTGF5ZXJCYWNrZ3JvdW5kQ29sb3IoKm1fbGF5ZXIpOwor ICAgICAgICBtX2xheWVyLT5zZXRCYWNrZ3JvdW5kQ29sb3Ioc3RhdGljX2Nhc3Q8UkdCQTMyPigw KSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckNocm9taXVtOjpzZXREZWJ1Z0JvcmRlcihjb25z dCBDb2xvciYgY29sb3IsIGZsb2F0IGJvcmRlcldpZHRoKQogewogICAgIGlmIChjb2xvci5pc1Zh bGlkKCkpIHsKLSAgICAgICAgc2V0TGF5ZXJCb3JkZXJDb2xvcigqbV9sYXllciwgY29sb3IpOwot ICAgICAgICBtX2xheWVyLT5zZXRCb3JkZXJXaWR0aChib3JkZXJXaWR0aCk7CisgICAgICAgIG1f bGF5ZXItPnNldERlYnVnQm9yZGVyQ29sb3IoY29sb3IpOworICAgICAgICBtX2xheWVyLT5zZXRE ZWJ1Z0JvcmRlcldpZHRoKGJvcmRlcldpZHRoKTsKICAgICB9IGVsc2UgewotICAgICAgICBjbGVh ckJvcmRlckNvbG9yKCptX2xheWVyKTsKLSAgICAgICAgbV9sYXllci0+c2V0Qm9yZGVyV2lkdGgo MCk7CisgICAgICAgIG1fbGF5ZXItPnNldERlYnVnQm9yZGVyQ29sb3Ioc3RhdGljX2Nhc3Q8UkdC QTMyPigwKSk7CisgICAgICAgIG1fbGF5ZXItPnNldERlYnVnQm9yZGVyV2lkdGgoMCk7CiAgICAg fQogfQogCkBAIC02MzEsOSArNjExLDkgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnVw ZGF0ZUxheWVyQmFja2dyb3VuZENvbG9yKCkKIAogICAgIC8vIFdlIG5ldmVyIGNyZWF0ZSB0aGUg Y29udGVudHMgbGF5ZXIganVzdCBmb3IgYmFja2dyb3VuZCBjb2xvciB5ZXQuCiAgICAgaWYgKG1f YmFja2dyb3VuZENvbG9yU2V0KQotICAgICAgICBzZXRMYXllckJhY2tncm91bmRDb2xvcigqbV9j b250ZW50c0xheWVyLCBtX2JhY2tncm91bmRDb2xvcik7CisgICAgICAgIG1fY29udGVudHNMYXll ci0+c2V0QmFja2dyb3VuZENvbG9yKG1fYmFja2dyb3VuZENvbG9yKTsKICAgICBlbHNlCi0gICAg ICAgIGNsZWFyTGF5ZXJCYWNrZ3JvdW5kQ29sb3IoKm1fY29udGVudHNMYXllcik7CisgICAgICAg IG1fY29udGVudHNMYXllci0+c2V0QmFja2dyb3VuZENvbG9yKHN0YXRpY19jYXN0PFJHQkEzMj4o MCkpOwogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlQ29udGVudHNWaWRl bygpCkBAIC02NzIsOCArNjUyLDggQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldHVw Q29udGVudHNMYXllcihMYXllckNocm9taXVtKiBjb250ZW50c0xheWVyKQogICAgICAgICB1cGRh dGVDb250ZW50c1JlY3QoKTsKIAogICAgICAgICBpZiAoc2hvd0RlYnVnQm9yZGVycygpKSB7Ci0g ICAgICAgICAgICBzZXRMYXllckJvcmRlckNvbG9yKCptX2NvbnRlbnRzTGF5ZXIsIENvbG9yKDAs IDAsIDEyOCwgMTgwKSk7Ci0gICAgICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNldEJvcmRlcldp ZHRoKDEpOworICAgICAgICAgICAgbV9jb250ZW50c0xheWVyLT5zZXREZWJ1Z0JvcmRlckNvbG9y KENvbG9yKDAsIDAsIDEyOCwgMTgwKSk7CisgICAgICAgICAgICBtX2NvbnRlbnRzTGF5ZXItPnNl dERlYnVnQm9yZGVyV2lkdGgoMSk7CiAgICAgICAgIH0KICAgICB9CiAgICAgdXBkYXRlRGVidWdJ bmRpY2F0b3JzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCmluZGV4IGU0MzU0Njc3Yzg2NzkyNDg0 Yzk0ZWY0NzQ0Yzk2OWU5YTc5MGUzNzUuLjEzYWQ3MjQ4MjU3N2MwNTdiODI1MTMyOGJiOGQ2YzMw M2ViY2U2NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCkBAIC0zMjEsMTMgKzMyMSwxMyBAQCBQ YXNzUmVmUHRyPENDTGF5ZXJJbXBsPiBMYXllckNocm9taXVtOjpjcmVhdGVDQ0xheWVySW1wbCgp CiAgICAgcmV0dXJuIENDTGF5ZXJJbXBsOjpjcmVhdGUobV9sYXllcklkKTsKIH0KIAotdm9pZCBM YXllckNocm9taXVtOjpzZXRCb3JkZXJDb2xvcihjb25zdCBDb2xvciYgY29sb3IpCit2b2lkIExh eWVyQ2hyb21pdW06OnNldERlYnVnQm9yZGVyQ29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQogewog ICAgIG1fZGVidWdCb3JkZXJDb2xvciA9IGNvbG9yOwogICAgIHNldE5lZWRzQ29tbWl0KCk7CiB9 CiAKLXZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0Qm9yZGVyV2lkdGgoZmxvYXQgd2lkdGgpCit2b2lk IExheWVyQ2hyb21pdW06OnNldERlYnVnQm9yZGVyV2lkdGgoZmxvYXQgd2lkdGgpCiB7CiAgICAg bV9kZWJ1Z0JvcmRlcldpZHRoID0gd2lkdGg7CiAgICAgc2V0TmVlZHNDb21taXQoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hy b21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy Q2hyb21pdW0uaAppbmRleCA0OWQ1N2FhMmM5NjA5YWQxYzc1NzExYzFiM2EwODFjM2RjZjg1NDgx Li43MDVlMDVmNjAzMTc1OTZiOTNiODA3MDBiM2E4ZWIzYmY1YTYzZDI4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJv bWl1bS5oCkBAIC0xNzYsMTMgKzE3NiwxMSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGJp bmRDb250ZW50c1RleHR1cmUoKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcHJvdGVjdFZpc2libGVU aWxlVGV4dHVyZXMoKSB7IH0KIAotICAgIC8vIFRoZXNlIGV4aXN0cyBqdXN0IGZvciBkZWJ1Z2dp bmcgKHZpYSBkcmF3RGVidWdCb3JkZXIoKSkuCi0gICAgdm9pZCBzZXRCb3JkZXJDb2xvcihjb25z dCBDb2xvciYpOwotCisgICAgLy8gVGhlc2UgZXhpc3QganVzdCBmb3IgZGVidWdnaW5nICh2aWEg ZHJhd0RlYnVnQm9yZGVyKCkpLgorICAgIHZvaWQgc2V0RGVidWdCb3JkZXJDb2xvcihjb25zdCBD b2xvciYpOworICAgIHZvaWQgc2V0RGVidWdCb3JkZXJXaWR0aChmbG9hdCk7CiAgICAgdm9pZCBk cmF3RGVidWdCb3JkZXIoKTsKIAotICAgIHZvaWQgc2V0Qm9yZGVyV2lkdGgoZmxvYXQpOwotCiAg ICAgdmlydHVhbCB2b2lkIHB1c2hQcm9wZXJ0aWVzVG8oQ0NMYXllckltcGwqKTsKIAogICAgIHR5 cGVkZWYgUHJvZ3JhbUJpbmRpbmc8VmVydGV4U2hhZGVyUG9zLCBGcmFnbWVudFNoYWRlckNvbG9y PiBCb3JkZXJQcm9ncmFtOwo=