64224 2011-07-08 18:42:21 -0700 Move updateLayers call to WebViewImpl::layout so that we do not trigger redundant draws 2011-07-12 14:23:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbates jbates fishd jamesr nduca vangelis webkit.review.bot oldest_to_newest 434439 0 jbates 2011-07-08 18:42:21 -0700 Add popPendingUpdate method to chromium WebWidgetClient. 434440 1 100198 jbates 2011-07-08 18:46:46 -0700 Created attachment 100198 Patch 434447 2 jbates 2011-07-08 19:05:54 -0700 Associated with chromium patch: http://codereview.chromium.org/7327030/ Fixed bug that caused canvas updates to trigger two compositor paints. LayerRendererChromium::updateLayers was triggering a scheduleComposite because the paint aggregator in RenderWidget was emptied beforehand. This change (in combination with the chromium-side patch) delays the paint aggregator emptying until after updateLayers and before paint. This patch must land before the chromium patch above. 435203 3 jamesr 2011-07-11 14:15:29 -0700 popPendingUpdate() is not a very enlightening API name. I've looked at the chromium side and I'm still not completely sure what it is intended to mean. 435368 4 100401 jbates 2011-07-11 18:13:54 -0700 Created attachment 100401 Patch 435369 5 100401 jamesr 2011-07-11 18:16:04 -0700 Comment on attachment 100401 Patch Wait, it's not valid to call LayerRendererChromium::updateLayers() at this point. You want to just call WebViewImpl's updateLayers(), which does a different thing, and remove that call from LayerRendererChromium. Leave doComposite() alone. Also, this bug needs to be retitled. 435839 6 100536 jbates 2011-07-12 11:57:42 -0700 Created attachment 100536 Patch 435858 7 100536 jamesr 2011-07-12 12:24:08 -0700 Comment on attachment 100536 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100536&action=review Closer! Please also rename this bug, preferably to describe the problem this patch fixes (double frames on canvas). > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp:97 > -void CCLayerTreeHost::updateLayers() > +void CCLayerTreeHost::syncCompositingLayers() > { > - m_client->updateLayers(); > + m_client->syncCompositingLayers(); > } delete > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h:44 > + virtual void syncCompositingLayers() = 0; Just delete this (and the corresponding entry in CCLayerTreeHost), there aren't any callers of this any more. > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h:65 > + void syncCompositingLayers(); delete > Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImplProxy.cpp:153 > m_commitPending = false; > { > - TRACE_EVENT("CCLayerTreeHost::updateLayers", this, 0); > - m_layerTreeHost->updateLayers(); > + TRACE_EVENT("CCLayerTreeHost::syncCompositingLayers", this, 0); > + m_layerTreeHost->syncCompositingLayers(); > } You can delete this section completely, animateAndLayout() takes care of this now (since it calls WebViewImpl::layout()) 435885 8 100547 jbates 2011-07-12 12:59:00 -0700 Created attachment 100547 Patch 435891 9 100547 jamesr 2011-07-12 13:00:56 -0700 Comment on attachment 100547 Patch Cool. One more nit to consider before landing: Could you add a TRACE_EVENT() around syncCompositingLayers()? 435894 10 100549 jbates 2011-07-12 13:05:08 -0700 Created attachment 100549 Patch 435896 11 jbates 2011-07-12 13:06:41 -0700 (In reply to comment #9) > (From update of attachment 100547 [details]) > Cool. One more nit to consider before landing: Could you add a TRACE_EVENT() around syncCompositingLayers()? Done. 435918 12 100549 jamesr 2011-07-12 13:39:42 -0700 Comment on attachment 100549 Patch Flags away! 435948 13 100549 webkit.review.bot 2011-07-12 14:22:57 -0700 Comment on attachment 100549 Patch Clearing flags on attachment: 100549 Committed r90850: <http://trac.webkit.org/changeset/90850> 435949 14 webkit.review.bot 2011-07-12 14:23:02 -0700 All reviewed patches have been landed. Closing bug. 100198 2011-07-08 18:46:46 -0700 2011-07-11 18:13:51 -0700 Patch bug-64224-20110708184645.patch text/plain 2345 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2MjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg OWVmYjQ2M2ViZDEzMzY5MWQ5NjdlNDQ0MDU0Zjc1MjAwMmRiNWNhOC4uYzEwMjQ3MzVkMTY4ZTZj NDYxYzUzMWY4MGJmMjc1MWVmMGIwMjRiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0wNy0wOCAgSm9obiBCYXRlcyAgPGpiYXRlc0Bnb29nbGUuY29t PgorCisgICAgICAgIEFkZCBwb3BQZW5kaW5nVXBkYXRlIG1ldGhvZCB0byBjaHJvbWl1bSBXZWJX aWRnZXRDbGllbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD02NDIyNAorCisgICAgICAgIEFkZCBtZXRob2QgdG8gV2ViV2lkZ2V0Q2xpZW50IHRoYXQg YWxsb3dzIGNocm9taXVtIFJlbmRlcldpZGdldCB0byBkZWZlcgorICAgICAgICBwb3BwaW5nIHRo ZSBpbnZhbGlkYXRlZCByZWN0IHVudGlsIGFmdGVyIExheWVyUmVuZGVyQ2hyb21pdW0gdXBkYXRl TGF5ZXJzLgorICAgICAgICBUaGlzIHdpbGwgYWxsb3cgdXMgdG8gZml4IHRoZSBkb3VibGUgZnJh bWVzIGJ1ZyB3aGVuIGEgY2FudmFzIGlzIGRpcnRpZWQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViV2lkZ2V0Q2xpZW50Lmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYldpZGdldENsaWVudDo6cG9wUGVuZGluZ1VwZGF0ZSk6CisgICAg ICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6 OmRvQ29tcG9zaXRlKToKKwogMjAxMS0wNy0wNyAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgc3VwcG9ydCBmb3IgY2xl YXJpbmcgY2FjaGUgYW5kIGNvb2tpZXMgZnJvbSBuZXR3b3JrIHBhbmVsLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViV2lkZ2V0Q2xpZW50LmggYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJXaWRnZXRDbGllbnQuaAppbmRleCA2MGI0YWJmOTYx ZTY0ZTVhYzgxOTAzNTM4ZTFkZjBiNWE1MjJlYTA4Li45NTk2NDc5MzdmZTlkMTQwNjg3ZmFkYmUx YmJhOWE3MmI2NDhiY2U1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJXaWRnZXRDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJXaWRnZXRDbGllbnQuaApAQCAtNjAsNiArNjAsMTAgQEAgcHVibGljOgogICAgIC8vIENhbGxl ZCB3aGVuIGEgY2FsbCB0byBXZWJXaWRnZXQ6OmFuaW1hdGUgaXMgcmVxdWlyZWQKICAgICB2aXJ0 dWFsIHZvaWQgc2NoZWR1bGVBbmltYXRpb24oKSB7IH0KIAorICAgIC8vIENhbGxlZCBkdXJpbmcg V2ViV2lkZ2V0Ojpjb21wb3NpdGUgYWZ0ZXIgdXBkYXRlTGF5ZXJzLCBidXQgYmVmb3JlIHBhaW50 LgorICAgIC8vIFRoaXMgaXMgd2hlbiB0aGUgY2xpZW50IHNob3VsZCBzYXZlIG9mZiB0aGUgaW52 YWxpZGF0ZWQgcmVjdC4KKyAgICB2aXJ0dWFsIHZvaWQgcG9wUGVuZGluZ1VwZGF0ZSgpIHsgfQor CiAgICAgLy8gQ2FsbGVkIHdoZW4gdGhlIHdpZGdldCBhY3F1aXJlcyBvciBsb3NlcyBmb2N1cywg cmVzcGVjdGl2ZWx5LgogICAgIHZpcnR1YWwgdm9pZCBkaWRGb2N1cygpIHsgfQogICAgIHZpcnR1 YWwgdm9pZCBkaWRCbHVyKCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKaW5kZXggMjQ5NzMzNGI0OWE1MDI0YmU2NmViMGNiMjdiZGI2OWFjODFhZDQ1Mi4u YzcxMTg4YWFkNmUyNzRlZmUwNTM5MmEyYzhlNGNkNjA4Y2EyMmY5YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMjU1OSw2ICsyNTU5LDcgQEAgdm9p ZCBXZWJWaWV3SW1wbDo6ZG9Db21wb3NpdGUoKQogICAgICAgICBtX3BhZ2VPdmVybGF5LT51cGRh dGUoKTsKIAogICAgIG1fbGF5ZXJSZW5kZXJlci0+dXBkYXRlTGF5ZXJzKCk7CisgICAgbV9jbGll bnQtPnBvcFBlbmRpbmdVcGRhdGUoKTsKICAgICBtX2xheWVyUmVuZGVyZXItPmRyYXdMYXllcnMo KTsKIH0KIAo= 100401 2011-07-11 18:13:54 -0700 2011-07-12 11:57:39 -0700 Patch bug-64224-20110711181353.patch text/plain 1804 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogOTA3ODAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg OTA4MTAzYTRkODNmNjAyNTY4ZTY1NzBkYzQ2OWZiMjkxOGFjZWYxZC4uNTZmZGQ1ZDFmZDkwYmE4 YTg0ZGM2NjA4N2U1NDFjOTE2ODU4M2FjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMS0wNy0wOCAgSm9obiBCYXRlcyAgPGpiYXRlc0Bnb29nbGUuY29t PgorCisgICAgICAgIE1vdmUgY2FsbCB0byB1cGRhdGVMYXllcnMgc28gdGhhdCB3ZSBkbyBub3Qg dHJpZ2dlciByZWR1bmRhbnQgZHJhd3MuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NDIyNAorCisgICAgICAgIHVwZGF0ZUxheWVycyB3YXMgdHJpZ2dl cmluZyBjb21wb3NpdGVzIGV2ZXJ5IHRpbWUgYSBjYW52YXMgd2FzIGRpcnRpZWQuCisgICAgICAg IEJ5IG1vdmluZyB0aGUgY2FsbCB0byBsYXlvdXQsIHRoZSBjbGllbnQgY29kZSBjYW4gZHJhdyB3 aXRob3V0IHRyaWdnZXJpbmcKKyAgICAgICAgYSByZWR1bmRhbnQgZnJhbWUuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZG9Db21wb3NpdGUpOgorCiAyMDEx LTA3LTA4ICBOYXRlIENoYXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2hl Y2sgYWN0aXZlRG9jdW1lbnRMb2FkZXIoKSBpbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuY3BwCmluZGV4IDI0OTczMzRiNDlhNTAyNGJlNjZlYjBjYjI3YmRiNjlhYzgx YWQ0NTIuLjMzMGEwOTljNGI3Y2E4OGU2YjFjZTc1Mzk4ZDQ5OTQzNWNhNDFkOTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTEwNTksNiArMTA1OSwx MSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpsYXlvdXQoKQogICAgICAgICAvLyBsYXlvdXQgdG8gYmUg aW52YWxpZGF0ZWQsIHNvIGxheW91dCBuZWVkcyB0byBiZSBjYWxsZWQgbGFzdC4KIAogICAgICAg ICB3ZWJmcmFtZS0+bGF5b3V0KCk7CisKKyAgICAgICAgLy8gQ2FsbCB1cGRhdGVMYXllcnMgaGVy ZSBpbnN0ZWFkIG9mIGR1cmluZyBkb0NvbXBvc2l0ZSBzbyB0aGF0IHdlIGRvbid0CisgICAgICAg IC8vIHRyaWdnZXIgYW5vdGhlciByZWR1bmRhbnQgZnJhbWUgZHVyaW5nIGRvQ29tcG9zaXRlLgor ICAgICAgICBpZiAoaXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkgJiYgbV9sYXllclJl bmRlcmVyLmdldCgpKQorICAgICAgICAgICAgbV9sYXllclJlbmRlcmVyLT51cGRhdGVMYXllcnMo KTsKICAgICB9CiB9CiAKQEAgLTI1NTgsNyArMjU2Myw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OmRv Q29tcG9zaXRlKCkKICAgICBpZiAobV9wYWdlT3ZlcmxheSkKICAgICAgICAgbV9wYWdlT3Zlcmxh eS0+dXBkYXRlKCk7CiAKLSAgICBtX2xheWVyUmVuZGVyZXItPnVwZGF0ZUxheWVycygpOwogICAg IG1fbGF5ZXJSZW5kZXJlci0+ZHJhd0xheWVycygpOwogfQogCg== 100536 2011-07-12 11:57:42 -0700 2011-07-12 12:58:57 -0700 Patch bug-64224-20110712115741.patch text/plain 8028 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZWY0ODUyYTEwMjc3Nzdl NTY2NmU5M2E4NDA2ODg0NDAwNjBiMDc2Li5hMWNjZWFhZmIyMjM2OGIzYzdlY2FkYzk3YTBmNzMw YTY2OGUwNjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDctMTIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBNb3ZlIGNhbGwgdG8gc3luY0Nv bXBvc2l0aW5nTGF5ZXJzIHNvIHRoYXQgd2UgZG8gbm90IHRyaWdnZXIgcmVkdW5kYW50IGRyYXdz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQyMjQK KworICAgICAgICBkb0NvbXBvc2l0ZSB3YXMgdHJpZ2dlcmluZyB0d28gY29tcG9zaXRlcyBldmVy eSB0aW1lIGEgY2FudmFzIHdhcyBkaXJ0aWVkLgorICAgICAgICBCeSBtb3Zpbmcgc3luY0NvbXBv c2l0aW5nTGF5ZXJzIGNhbGwgdG8gbGF5b3V0LCB0aGUgY2xpZW50IGNvZGUgY2FuIGRyYXcgd2l0 aG91dCB0cmlnZ2VyaW5nCisgICAgICAgIGEgcmVkdW5kYW50IGZyYW1lLiBBbHNvIHJlbmFtZWQg V2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycyB0bworICAgICAgICBzeW5jQ29tcG9zaXRpbmdMYXll cnMsIGJlY2F1c2UgaXQgd2FzIGNvbmZ1c2luZy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy UmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVyQ2hy b21pdW06OnVwZGF0ZUxheWVycyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5 ZXJUcmVlSG9zdDo6c3luY0NvbXBvc2l0aW5nTGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsUHJveHkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0SW1wbFByb3h5OjpyZXF1ZXN0RnJhbWVBbmRD b21taXQpOgorCiAyMDExLTA3LTEyICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIG1vcmUgZGVhZCBjb2RlIGZyb20g dGhlIE5ldHdvcmsgcGFuZWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmlu ZGV4IDQ1YzAxNjI1MzIzYTNlMmNiMDhlNGI5NTkyZmQ0YTk2OWYzYzJkMzYuLjNlZjUyMjIxYThl MDE2OTljMmM5ZThlNzUxMTQ2M2VmZjgyMzUyMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJl ckNocm9taXVtLmNwcApAQCAtMjQ5LDcgKzI0OSw2IEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9t aXVtOjpzZXRWaWV3cG9ydChjb25zdCBJbnRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgSW50UmVj CiAKIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjp1cGRhdGVMYXllcnMoKQogewotICAgIEND TGF5ZXJUcmVlSG9zdDo6dXBkYXRlTGF5ZXJzKCk7CiAgICAgaWYgKG1fdmlld3BvcnRWaXNpYmxl UmVjdC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVy Q2hyb21pdW0uaAppbmRleCBhMGM4NWNiOGRmMzJiYWY4Mjc1NDA0MzRlYzQzNWNlZmFiN2NmMTdl Li45MzhlMDVmN2U0NmMwNDViOGI4OGZkM2U1ODY5NGZjNWIyNDk3OTY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uaApAQCAtOTAsNyArOTAsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzZXRWaWV3cG9ydChjb25zdCBJbnRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgSW50UmVjdCYg Y29udGVudFJlY3QsIGNvbnN0IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbik7CiAKICAgICAvLyB1 cGRhdGVzIGFuZCBkcmF3cyB0aGUgY3VycmVudCBsYXllcnMgb250byB0aGUgYmFja2J1ZmZlcgot ICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMYXllcnMoKTsKKyAgICB2b2lkIHVwZGF0ZUxheWVycygp OwogICAgIHZvaWQgZHJhd0xheWVycygpOwogCiAgICAgLy8gU2V0IGJ5IFdlYlZpZXdJbXBsIHdo ZW4gYW5pbWF0aW9uIGNhbGxiYWNrcyBhcmUgcnVubmluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJl ZUhvc3QuY3BwCmluZGV4IDUxOGE5MWVlNTE5YTc0OTUzYjMyMGQwMDhiOTg4YjNhMWU3ODgwYzAu LjdkNTUzNWE5MWIyODZjMDA0YzRmYjQ3NmRhMGVkMzViMzA1YTE1MjcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9z dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NMYXllclRyZWVIb3N0LmNwcApAQCAtOTEsOSArOTEsOSBAQCB2b2lkIENDTGF5ZXJUcmVlSG9z dDo6c2V0TmVlZHNSZWRyYXcoKQogI2VuZGlmCiB9CiAKLXZvaWQgQ0NMYXllclRyZWVIb3N0Ojp1 cGRhdGVMYXllcnMoKQordm9pZCBDQ0xheWVyVHJlZUhvc3Q6OnN5bmNDb21wb3NpdGluZ0xheWVy cygpCiB7Ci0gICAgbV9jbGllbnQtPnVwZGF0ZUxheWVycygpOworICAgIG1fY2xpZW50LT5zeW5j Q29tcG9zaXRpbmdMYXllcnMoKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaApp bmRleCA2NjhlOGJmOTJkODNhNzUwMWZiYzA1ZTQ2NjdmN2I3MDMxNjIxMTlmLi5iZmEzNGFlMGNh MzEyNDM1NmI4MDE1ZmMyYTNjN2M5N2M5YzE3OTM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhv c3QuaApAQCAtNDEsNyArNDEsNyBAQCBjbGFzcyBDQ0xheWVyVHJlZUhvc3RDbGllbnQgewogcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlQW5kTGF5b3V0KGRvdWJsZSBmcmFtZUJlZ2lu VGltZSkgPSAwOwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gY3Jl YXRlTGF5ZXJUcmVlSG9zdENvbnRleHQzRCgpID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl TGF5ZXJzKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzeW5jQ29tcG9zaXRpbmdMYXllcnMoKSA9 IDA7CiAKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIH5DQ0xheWVyVHJlZUhvc3RDbGllbnQoKSB7 IH0KQEAgLTYyLDggKzYyLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXROZWVkc0NvbW1pdEFu ZFJlZHJhdygpOwogICAgIHZvaWQgc2V0TmVlZHNSZWRyYXcoKTsKLQotICAgIHZpcnR1YWwgdm9p ZCB1cGRhdGVMYXllcnMoKTsKKyAgICB2b2lkIHN5bmNDb21wb3NpdGluZ0xheWVycygpOwogCiBw cm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBQYXNzT3duUHRyPENDTGF5ZXJUcmVlSG9zdEltcGxQcm94 eT4gY3JlYXRlTGF5ZXJUcmVlSG9zdEltcGxQcm94eSgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdElt cGxQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ0xheWVyVHJlZUhvc3RJbXBsUHJveHkuY3BwCmluZGV4IGZjMTcyZjJlZTA2MDBiNzhiODkz NjdhM2ZlNDRiYjg2Y2RjOWFiNmEuLjg0YzFhYjcyYTcwNzVhNzczZjliOWFiYmEwYmUyMjk4NTk1 YzRlMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGxQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbFByb3h5LmNw cApAQCAtMTQ4LDggKzE0OCw4IEBAIHZvaWQgQ0NMYXllclRyZWVIb3N0SW1wbFByb3h5OjpyZXF1 ZXN0RnJhbWVBbmRDb21taXQoZG91YmxlIGZyYW1lQmVnaW5UaW1lKQogCiAgICAgbV9jb21taXRQ ZW5kaW5nID0gZmFsc2U7CiAgICAgewotICAgICAgICBUUkFDRV9FVkVOVCgiQ0NMYXllclRyZWVI b3N0Ojp1cGRhdGVMYXllcnMiLCB0aGlzLCAwKTsKLSAgICAgICAgbV9sYXllclRyZWVIb3N0LT51 cGRhdGVMYXllcnMoKTsKKyAgICAgICAgVFJBQ0VfRVZFTlQoIkNDTGF5ZXJUcmVlSG9zdDo6c3lu Y0NvbXBvc2l0aW5nTGF5ZXJzIiwgdGhpcywgMCk7CisgICAgICAgIG1fbGF5ZXJUcmVlSG9zdC0+ c3luY0NvbXBvc2l0aW5nTGF5ZXJzKCk7CiAgICAgfQogCiAgICAgT3duUHRyPENDTGF5ZXJUcmVl SG9zdENvbW1pdHRlcj4gY29tbWl0dGVyID0gbV9sYXllclRyZWVIb3N0LT5jcmVhdGVMYXllclRy ZWVIb3N0Q29tbWl0dGVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDdjMDg2YWI2 ZjYzZmU0OWYyODJmZDE3YWI1YTg4ZTI3NTE3MGQyZTkuLmRkMDg3NGE3YWNhMWE4MGM3ZDkwZGY0 MWQ5Mzk0MGRiNDQwN2I1ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjAgQEAKKzIwMTEtMDctMTIgIEpvaG4gQmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAg ICAgICBNb3ZlIGNhbGwgdG8gc3luY0NvbXBvc2l0aW5nTGF5ZXJzIHNvIHRoYXQgd2UgZG8gbm90 IHRyaWdnZXIgcmVkdW5kYW50IGRyYXdzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjQyMjQKKworICAgICAgICBkb0NvbXBvc2l0ZSB3YXMgdHJpZ2dl cmluZyB0d28gY29tcG9zaXRlcyBldmVyeSB0aW1lIGEgY2FudmFzIHdhcyBkaXJ0aWVkLgorICAg ICAgICBCeSBtb3Zpbmcgc3luY0NvbXBvc2l0aW5nTGF5ZXJzIGNhbGwgdG8gbGF5b3V0LCB0aGUg Y2xpZW50IGNvZGUgY2FuIGRyYXcgd2l0aG91dCB0cmlnZ2VyaW5nCisgICAgICAgIGEgcmVkdW5k YW50IGZyYW1lLiBBbHNvIHJlbmFtZWQgV2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycyB0bworICAg ICAgICBzeW5jQ29tcG9zaXRpbmdMYXllcnMsIGJlY2F1c2UgaXQgd2FzIGNvbmZ1c2luZy4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9XZWJW aWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpsYXlvdXQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c3luY0NvbXBvc2l0aW5nTGF5ZXJzKToKKyAgICAg ICAgKiBzcmMvV2ViVmlld0ltcGwuaDoKKwogMjAxMS0wNy0xMSAgUnlvc3VrZSBOaXdhICA8cm5p d2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiAgUm9sbGVkIERFUFMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggMjQ5NzMzNGI0OWE1 MDI0YmU2NmViMGNiMjdiZGI2OWFjODFhZDQ1Mi4uNTE5ZjU4ZjJiZjg2Yzg5ZmZmZjkzMjAxODYy YWRlYjJhZWFjMzUyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcApAQCAtMTA1OSw2ICsxMDU5LDExIEBAIHZvaWQgV2ViVmlld0ltcGw6OmxheW91dCgpCiAg ICAgICAgIC8vIGxheW91dCB0byBiZSBpbnZhbGlkYXRlZCwgc28gbGF5b3V0IG5lZWRzIHRvIGJl IGNhbGxlZCBsYXN0LgogCiAgICAgICAgIHdlYmZyYW1lLT5sYXlvdXQoKTsKKworICAgICAgICAv LyBDYWxsIHVwZGF0ZUxheWVycyBoZXJlIGluc3RlYWQgb2YgZHVyaW5nIGRvQ29tcG9zaXRlIHNv IHRoYXQgd2UgZG9uJ3QKKyAgICAgICAgLy8gdHJpZ2dlciBhbm90aGVyIHJlZHVuZGFudCBmcmFt ZSBkdXJpbmcgZG9Db21wb3NpdGUuCisgICAgICAgIGlmIChpc0FjY2VsZXJhdGVkQ29tcG9zaXRp bmdBY3RpdmUoKSkKKyAgICAgICAgICAgIHN5bmNDb21wb3NpdGluZ0xheWVycygpOwogICAgIH0K IH0KIApAQCAtMTE0Myw3ICsxMTQ4LDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZUFuZExh eW91dChkb3VibGUgZnJhbWVCZWdpblRpbWUpCiAgICAgbGF5b3V0KCk7CiB9CiAKLXZvaWQgV2Vi Vmlld0ltcGw6OnVwZGF0ZUxheWVycygpCit2b2lkIFdlYlZpZXdJbXBsOjpzeW5jQ29tcG9zaXRp bmdMYXllcnMoKQogewogICAgIC8vIFVwZGF0ZSB0aGUgY29tcG9zaXRpbmcgcmVxdWlyZW1lbnRz IGZvciBhbGwgZnJhbWUgaW4gdGhlIHRyZWUgYmVmb3JlIGRvaW5nIGFueSBwYWludGluZwogICAg IC8vIGFzIHRoZSBjb21wb3NpdGluZyByZXF1aXJlbWVudHMgZm9yIGEgUmVuZGVyTGF5ZXIgd2l0 aGluIGEgc3ViZnJhbWUgbWlnaHQgY2hhbmdlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmgKaW5kZXggNjU1M2I1OGIwYzBkYzExYjBlMzAwNDEyMTg3NThkODNhOWRlZGY3 NC4uY2EyN2E2MjgwZDY1ZDZjN2U5MjhlZjM0OWMwZWIyMmY3ZjllNzIzMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0yMDYsNyArMjA2LDcgQEAgcHVibGlj OgogICAgIC8vIENDTGF5ZXJUcmVlSG9zdENsaWVudAogICAgIHZpcnR1YWwgdm9pZCBhbmltYXRl QW5kTGF5b3V0KGRvdWJsZSBmcmFtZUJlZ2luVGltZSk7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRy PFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEPiBjcmVhdGVMYXllclRyZWVIb3N0Q29udGV4dDNE KCk7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxheWVycygpOworICAgIHZpcnR1YWwgdm9pZCBz eW5jQ29tcG9zaXRpbmdMYXllcnMoKTsKIAogICAgIC8vIFdlYlZpZXdJbXBsCiAK 100547 2011-07-12 12:59:00 -0700 2011-07-12 13:05:04 -0700 Patch bug-64224-20110712125859.patch text/plain 8119 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZWY0ODUyYTEwMjc3Nzdl NTY2NmU5M2E4NDA2ODg0NDAwNjBiMDc2Li4yZTM3M2U2NmMwOTYzMzNhZjZkY2I3NmI4MGU5MWM2 MmM4MGQzYjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDctMTIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBNb3ZlIGNhbGwgdG8gc3luY0Nv bXBvc2l0aW5nTGF5ZXJzIHNvIHRoYXQgd2UgZG8gbm90IHRyaWdnZXIgcmVkdW5kYW50IGRyYXdz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQyMjQK KworICAgICAgICBkb0NvbXBvc2l0ZSB3YXMgdHJpZ2dlcmluZyB0d28gY29tcG9zaXRlcyBldmVy eSB0aW1lIGEgY2FudmFzIHdhcyBkaXJ0aWVkLgorICAgICAgICBCeSBtb3Zpbmcgc3luY0NvbXBv c2l0aW5nTGF5ZXJzIGNhbGwgdG8gbGF5b3V0LCB0aGUgY2xpZW50IGNvZGUgY2FuIGRyYXcgd2l0 aG91dCB0cmlnZ2VyaW5nCisgICAgICAgIGEgcmVkdW5kYW50IGZyYW1lLiBBbHNvIHJlbmFtZWQg V2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycyB0bworICAgICAgICBzeW5jQ29tcG9zaXRpbmdMYXll cnMsIGJlY2F1c2UgaXQgd2FzIGNvbmZ1c2luZy4gQ0NMYXllclRyZWVIb3N0SW1wbFByb3h5Ojp1 cGRhdGVMYXllcnMgd2FzCisgICAgICAgIG5vIGxvbmdlciBuZWVkZWQsIGJlY2F1c2UgYW5pbWF0 ZUFuZExheW91dCBjYWxscyBXZWJWaWV3SW1wbDo6bGF5b3V0LgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVu ZGVyZXJDaHJvbWl1bTo6dXBkYXRlTGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q0NMYXllclRyZWVIb3N0OjpzeW5jQ29tcG9zaXRpbmdMYXllcnMpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGxQcm94eS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsUHJveHk6OnJlcXVlc3RG cmFtZUFuZENvbW1pdCk6CisKIDIwMTEtMDctMTIgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgbW9yZSBkZWFkIGNv ZGUgZnJvbSB0aGUgTmV0d29yayBwYW5lbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1 bS5jcHAKaW5kZXggNDVjMDE2MjUzMjNhM2UyY2IwOGU0Yjk1OTJmZDRhOTY5ZjNjMmQzNi4uM2Vm NTIyMjFhOGUwMTY5OWMyYzllOGU3NTExNDYzZWZmODIzNTIxNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVt LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0yNDksNyArMjQ5LDYgQEAgdm9pZCBMYXllclJlbmRl cmVyQ2hyb21pdW06OnNldFZpZXdwb3J0KGNvbnN0IEludFJlY3QmIHZpc2libGVSZWN0LCBjb25z dCBJbnRSZWMKIAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZUxheWVycygpCiB7 Ci0gICAgQ0NMYXllclRyZWVIb3N0Ojp1cGRhdGVMYXllcnMoKTsKICAgICBpZiAobV92aWV3cG9y dFZpc2libGVSZWN0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy UmVuZGVyZXJDaHJvbWl1bS5oCmluZGV4IGEwYzg1Y2I4ZGYzMmJhZjgyNzU0MDQzNGVjNDM1Y2Vm YWI3Y2YxN2UuLjkzOGUwNWY3ZTQ2YzA0NWI4Yjg4ZmQzZTU4Njk0ZmM1YjI0OTc5NjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVu ZGVyZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5oCkBAIC05MCw3ICs5MCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldFZpZXdwb3J0KGNvbnN0IEludFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBJ bnRSZWN0JiBjb250ZW50UmVjdCwgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKTsKIAog ICAgIC8vIHVwZGF0ZXMgYW5kIGRyYXdzIHRoZSBjdXJyZW50IGxheWVycyBvbnRvIHRoZSBiYWNr YnVmZmVyCi0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxheWVycygpOworICAgIHZvaWQgdXBkYXRl TGF5ZXJzKCk7CiAgICAgdm9pZCBkcmF3TGF5ZXJzKCk7CiAKICAgICAvLyBTZXQgYnkgV2ViVmll d0ltcGwgd2hlbiBhbmltYXRpb24gY2FsbGJhY2tzIGFyZSBydW5uaW5nLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggNTE4YTkxZWU1MTlhNzQ5NTNiMzIwZDAwOGI5ODhiM2Ex ZTc4ODBjMC4uZDc3OTVjNzEwNDM5YzliMjE5Y2QwZjg0ZDkyMjRmZTNkYzU3YjIyZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC05MSw5ICs5MSw0IEBAIHZvaWQgQ0NMYXll clRyZWVIb3N0OjpzZXROZWVkc1JlZHJhdygpCiAjZW5kaWYKIH0KIAotdm9pZCBDQ0xheWVyVHJl ZUhvc3Q6OnVwZGF0ZUxheWVycygpCi17Ci0gICAgbV9jbGllbnQtPnVwZGF0ZUxheWVycygpOwot fQotCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oCmluZGV4IDY2OGU4YmY5MmQ4M2E3NTAx ZmJjMDVlNDY2N2Y3YjcwMzE2MjExOWYuLjI4ODk1MGVmZTEzYTc5NjBkNjAzZjdlYjNmN2UyMDFl Njc5NDZlYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oCkBAIC00MSw3ICs0MSw2IEBA IGNsYXNzIENDTGF5ZXJUcmVlSG9zdENsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IGFuaW1hdGVBbmRMYXlvdXQoZG91YmxlIGZyYW1lQmVnaW5UaW1lKSA9IDA7CiAgICAgdmlydHVh bCBQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBjcmVhdGVMYXllclRyZWVIb3N0Q29udGV4 dDNEKCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMYXllcnMoKSA9IDA7CiAKIHByb3Rl Y3RlZDoKICAgICB2aXJ0dWFsIH5DQ0xheWVyVHJlZUhvc3RDbGllbnQoKSB7IH0KQEAgLTYzLDgg KzYyLDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TmVlZHNDb21taXRBbmRSZWRyYXcoKTsKICAg ICB2b2lkIHNldE5lZWRzUmVkcmF3KCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTGF5ZXJz KCk7Ci0KIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q0NMYXllclRyZWVIb3N0 SW1wbFByb3h5PiBjcmVhdGVMYXllclRyZWVIb3N0SW1wbFByb3h5KCkgPSAwOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3RJbXBsUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbFByb3h5LmNwcAppbmRleCBmYzE3MmYyZWUw NjAwYjc4Yjg5MzY3YTNmZTQ0YmI4NmNkYzlhYjZhLi5jYWZlOTAxOWM5NzQwMTk4OTBkOWZjNjFj OTIxNDJkOTAxNzlmMzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdElt cGxQcm94eS5jcHAKQEAgLTE0NywxMCArMTQ3LDYgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBs UHJveHk6OnJlcXVlc3RGcmFtZUFuZENvbW1pdChkb3VibGUgZnJhbWVCZWdpblRpbWUpCiAgICAg fQogCiAgICAgbV9jb21taXRQZW5kaW5nID0gZmFsc2U7Ci0gICAgewotICAgICAgICBUUkFDRV9F VkVOVCgiQ0NMYXllclRyZWVIb3N0Ojp1cGRhdGVMYXllcnMiLCB0aGlzLCAwKTsKLSAgICAgICAg bV9sYXllclRyZWVIb3N0LT51cGRhdGVMYXllcnMoKTsKLSAgICB9CiAKICAgICBPd25QdHI8Q0NM YXllclRyZWVIb3N0Q29tbWl0dGVyPiBjb21taXR0ZXIgPSBtX2xheWVyVHJlZUhvc3QtPmNyZWF0 ZUxheWVyVHJlZUhvc3RDb21taXR0ZXIoKTsKICAgICBtX2xheWVyVHJlZUhvc3QtPmJlZ2luQ29t bWl0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDdjMDg2YWI2ZjYzZmU0OWYyODJm ZDE3YWI1YTg4ZTI3NTE3MGQyZTkuLmRkMDg3NGE3YWNhMWE4MGM3ZDkwZGY0MWQ5Mzk0MGRiNDQw N2I1ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEt MDctMTIgIEpvaG4gQmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBNb3ZlIGNh bGwgdG8gc3luY0NvbXBvc2l0aW5nTGF5ZXJzIHNvIHRoYXQgd2UgZG8gbm90IHRyaWdnZXIgcmVk dW5kYW50IGRyYXdzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyMjQKKworICAgICAgICBkb0NvbXBvc2l0ZSB3YXMgdHJpZ2dlcmluZyB0d28gY29t cG9zaXRlcyBldmVyeSB0aW1lIGEgY2FudmFzIHdhcyBkaXJ0aWVkLgorICAgICAgICBCeSBtb3Zp bmcgc3luY0NvbXBvc2l0aW5nTGF5ZXJzIGNhbGwgdG8gbGF5b3V0LCB0aGUgY2xpZW50IGNvZGUg Y2FuIGRyYXcgd2l0aG91dCB0cmlnZ2VyaW5nCisgICAgICAgIGEgcmVkdW5kYW50IGZyYW1lLiBB bHNvIHJlbmFtZWQgV2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycyB0bworICAgICAgICBzeW5jQ29t cG9zaXRpbmdMYXllcnMsIGJlY2F1c2UgaXQgd2FzIGNvbmZ1c2luZy4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpsYXlvdXQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6c3luY0NvbXBvc2l0aW5nTGF5ZXJzKToKKyAgICAgICAgKiBzcmMvV2Vi Vmlld0ltcGwuaDoKKwogMjAxMS0wNy0xMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLiAgUm9sbGVkIERFUFMuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggMjQ5NzMzNGI0OWE1MDI0YmU2NmViMGNi MjdiZGI2OWFjODFhZDQ1Mi4uNzIxZjQwNTU0OTI4Njk2YTJhNDFkZjE4MzViZTA5ZGRhMmE4YTFh MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTA1 OSw2ICsxMDU5LDEzIEBAIHZvaWQgV2ViVmlld0ltcGw6OmxheW91dCgpCiAgICAgICAgIC8vIGxh eW91dCB0byBiZSBpbnZhbGlkYXRlZCwgc28gbGF5b3V0IG5lZWRzIHRvIGJlIGNhbGxlZCBsYXN0 LgogCiAgICAgICAgIHdlYmZyYW1lLT5sYXlvdXQoKTsKKworI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykKKyAgICAgICAgLy8gQ2FsbCB1cGRhdGVMYXllcnMgaGVyZSBpbnN0ZWFkIG9m IGR1cmluZyBkb0NvbXBvc2l0ZSBzbyB0aGF0IHdlIGRvbid0CisgICAgICAgIC8vIHRyaWdnZXIg YW5vdGhlciByZWR1bmRhbnQgZnJhbWUgZHVyaW5nIGRvQ29tcG9zaXRlLgorICAgICAgICBpZiAo aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpCisgICAgICAgICAgICBzeW5jQ29tcG9z aXRpbmdMYXllcnMoKTsKKyNlbmRpZgogICAgIH0KIH0KIApAQCAtMTE0Myw3ICsxMTUwLDcgQEAg dm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZUFuZExheW91dChkb3VibGUgZnJhbWVCZWdpblRpbWUp CiAgICAgbGF5b3V0KCk7CiB9CiAKLXZvaWQgV2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycygpCit2 b2lkIFdlYlZpZXdJbXBsOjpzeW5jQ29tcG9zaXRpbmdMYXllcnMoKQogewogICAgIC8vIFVwZGF0 ZSB0aGUgY29tcG9zaXRpbmcgcmVxdWlyZW1lbnRzIGZvciBhbGwgZnJhbWUgaW4gdGhlIHRyZWUg YmVmb3JlIGRvaW5nIGFueSBwYWludGluZwogICAgIC8vIGFzIHRoZSBjb21wb3NpdGluZyByZXF1 aXJlbWVudHMgZm9yIGEgUmVuZGVyTGF5ZXIgd2l0aGluIGEgc3ViZnJhbWUgbWlnaHQgY2hhbmdl LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggNjU1M2I1OGIw YzBkYzExYjBlMzAwNDEyMTg3NThkODNhOWRlZGY3NC4uN2YwMzQ3NjlhNWM1YzE1Yzk3NDNmNTQy YWY0Yjg3YWZkZTBlMGJlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5oCkBAIC0yMDYsNyArMjA2LDYgQEAgcHVibGljOgogICAgIC8vIENDTGF5ZXJUcmVlSG9zdENs aWVudAogICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlQW5kTGF5b3V0KGRvdWJsZSBmcmFtZUJlZ2lu VGltZSk7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNE PiBjcmVhdGVMYXllclRyZWVIb3N0Q29udGV4dDNEKCk7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0 ZUxheWVycygpOwogCiAgICAgLy8gV2ViVmlld0ltcGwKIApAQCAtNDMyLDYgKzQzMSw3IEBAIHBy aXZhdGU6CiAgICAgdm9pZCByZWFsbG9jYXRlUmVuZGVyZXIoKTsKICAgICB2b2lkIHVwZGF0ZUxh eWVyUmVuZGVyZXJTZXR0aW5ncygpOwogICAgIHZvaWQgdXBkYXRlTGF5ZXJSZW5kZXJlclZpZXdw b3J0KCk7CisgICAgdm9pZCBzeW5jQ29tcG9zaXRpbmdMYXllcnMoKTsKICNlbmRpZgogCiAgICAg V2ViVmlld0NsaWVudCogbV9jbGllbnQ7Cg== 100549 2011-07-12 13:05:08 -0700 2011-07-12 14:22:57 -0700 Patch bug-64224-20110712130507.patch text/plain 8276 jbates U3VidmVyc2lvbiBSZXZpc2lvbjogOTA4MTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZWY0ODUyYTEwMjc3Nzdl NTY2NmU5M2E4NDA2ODg0NDAwNjBiMDc2Li4yZTM3M2U2NmMwOTYzMzNhZjZkY2I3NmI4MGU5MWM2 MmM4MGQzYjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDctMTIgIEpvaG4g QmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBNb3ZlIGNhbGwgdG8gc3luY0Nv bXBvc2l0aW5nTGF5ZXJzIHNvIHRoYXQgd2UgZG8gbm90IHRyaWdnZXIgcmVkdW5kYW50IGRyYXdz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQyMjQK KworICAgICAgICBkb0NvbXBvc2l0ZSB3YXMgdHJpZ2dlcmluZyB0d28gY29tcG9zaXRlcyBldmVy eSB0aW1lIGEgY2FudmFzIHdhcyBkaXJ0aWVkLgorICAgICAgICBCeSBtb3Zpbmcgc3luY0NvbXBv c2l0aW5nTGF5ZXJzIGNhbGwgdG8gbGF5b3V0LCB0aGUgY2xpZW50IGNvZGUgY2FuIGRyYXcgd2l0 aG91dCB0cmlnZ2VyaW5nCisgICAgICAgIGEgcmVkdW5kYW50IGZyYW1lLiBBbHNvIHJlbmFtZWQg V2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycyB0bworICAgICAgICBzeW5jQ29tcG9zaXRpbmdMYXll cnMsIGJlY2F1c2UgaXQgd2FzIGNvbmZ1c2luZy4gQ0NMYXllclRyZWVIb3N0SW1wbFByb3h5Ojp1 cGRhdGVMYXllcnMgd2FzCisgICAgICAgIG5vIGxvbmdlciBuZWVkZWQsIGJlY2F1c2UgYW5pbWF0 ZUFuZExheW91dCBjYWxscyBXZWJWaWV3SW1wbDo6bGF5b3V0LgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVu ZGVyZXJDaHJvbWl1bTo6dXBkYXRlTGF5ZXJzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q0NMYXllclRyZWVIb3N0OjpzeW5jQ29tcG9zaXRpbmdMYXllcnMpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdEltcGxQcm94eS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDQ0xheWVyVHJlZUhvc3RJbXBsUHJveHk6OnJlcXVlc3RG cmFtZUFuZENvbW1pdCk6CisKIDIwMTEtMDctMTIgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1vdmUgbW9yZSBkZWFkIGNv ZGUgZnJvbSB0aGUgTmV0d29yayBwYW5lbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1 bS5jcHAKaW5kZXggNDVjMDE2MjUzMjNhM2UyY2IwOGU0Yjk1OTJmZDRhOTY5ZjNjMmQzNi4uM2Vm NTIyMjFhOGUwMTY5OWMyYzllOGU3NTExNDYzZWZmODIzNTIxNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVt LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXll clJlbmRlcmVyQ2hyb21pdW0uY3BwCkBAIC0yNDksNyArMjQ5LDYgQEAgdm9pZCBMYXllclJlbmRl cmVyQ2hyb21pdW06OnNldFZpZXdwb3J0KGNvbnN0IEludFJlY3QmIHZpc2libGVSZWN0LCBjb25z dCBJbnRSZWMKIAogdm9pZCBMYXllclJlbmRlcmVyQ2hyb21pdW06OnVwZGF0ZUxheWVycygpCiB7 Ci0gICAgQ0NMYXllclRyZWVIb3N0Ojp1cGRhdGVMYXllcnMoKTsKICAgICBpZiAobV92aWV3cG9y dFZpc2libGVSZWN0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hy b21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy UmVuZGVyZXJDaHJvbWl1bS5oCmluZGV4IGEwYzg1Y2I4ZGYzMmJhZjgyNzU0MDQzNGVjNDM1Y2Vm YWI3Y2YxN2UuLjkzOGUwNWY3ZTQ2YzA0NWI4Yjg4ZmQzZTU4Njk0ZmM1YjI0OTc5NjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVu ZGVyZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5oCkBAIC05MCw3ICs5MCw3IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldFZpZXdwb3J0KGNvbnN0IEludFJlY3QmIHZpc2libGVSZWN0LCBjb25zdCBJ bnRSZWN0JiBjb250ZW50UmVjdCwgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKTsKIAog ICAgIC8vIHVwZGF0ZXMgYW5kIGRyYXdzIHRoZSBjdXJyZW50IGxheWVycyBvbnRvIHRoZSBiYWNr YnVmZmVyCi0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxheWVycygpOworICAgIHZvaWQgdXBkYXRl TGF5ZXJzKCk7CiAgICAgdm9pZCBkcmF3TGF5ZXJzKCk7CiAKICAgICAvLyBTZXQgYnkgV2ViVmll d0ltcGwgd2hlbiBhbmltYXRpb24gY2FsbGJhY2tzIGFyZSBydW5uaW5nLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVI b3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUcmVlSG9zdC5jcHAKaW5kZXggNTE4YTkxZWU1MTlhNzQ5NTNiMzIwZDAwOGI5ODhiM2Ex ZTc4ODBjMC4uZDc3OTVjNzEwNDM5YzliMjE5Y2QwZjg0ZDkyMjRmZTNkYzU3YjIyZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXll clRyZWVIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCkBAIC05MSw5ICs5MSw0IEBAIHZvaWQgQ0NMYXll clRyZWVIb3N0OjpzZXROZWVkc1JlZHJhdygpCiAjZW5kaWYKIH0KIAotdm9pZCBDQ0xheWVyVHJl ZUhvc3Q6OnVwZGF0ZUxheWVycygpCi17Ci0gICAgbV9jbGllbnQtPnVwZGF0ZUxheWVycygpOwot fQotCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oCmluZGV4IDY2OGU4YmY5MmQ4M2E3NTAx ZmJjMDVlNDY2N2Y3YjcwMzE2MjExOWYuLjI4ODk1MGVmZTEzYTc5NjBkNjAzZjdlYjNmN2UyMDFl Njc5NDZlYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5oCkBAIC00MSw3ICs0MSw2IEBA IGNsYXNzIENDTGF5ZXJUcmVlSG9zdENsaWVudCB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lk IGFuaW1hdGVBbmRMYXlvdXQoZG91YmxlIGZyYW1lQmVnaW5UaW1lKSA9IDA7CiAgICAgdmlydHVh bCBQYXNzUmVmUHRyPEdyYXBoaWNzQ29udGV4dDNEPiBjcmVhdGVMYXllclRyZWVIb3N0Q29udGV4 dDNEKCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMYXllcnMoKSA9IDA7CiAKIHByb3Rl Y3RlZDoKICAgICB2aXJ0dWFsIH5DQ0xheWVyVHJlZUhvc3RDbGllbnQoKSB7IH0KQEAgLTYzLDgg KzYyLDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TmVlZHNDb21taXRBbmRSZWRyYXcoKTsKICAg ICB2b2lkIHNldE5lZWRzUmVkcmF3KCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTGF5ZXJz KCk7Ci0KIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q0NMYXllclRyZWVIb3N0 SW1wbFByb3h5PiBjcmVhdGVMYXllclRyZWVIb3N0SW1wbFByb3h5KCkgPSAwOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3RJbXBsUHJveHkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0SW1wbFByb3h5LmNwcAppbmRleCBmYzE3MmYyZWUw NjAwYjc4Yjg5MzY3YTNmZTQ0YmI4NmNkYzlhYjZhLi5jYWZlOTAxOWM5NzQwMTk4OTBkOWZjNjFj OTIxNDJkOTAxNzlmMzNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3RJbXBsUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdElt cGxQcm94eS5jcHAKQEAgLTE0NywxMCArMTQ3LDYgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3RJbXBs UHJveHk6OnJlcXVlc3RGcmFtZUFuZENvbW1pdChkb3VibGUgZnJhbWVCZWdpblRpbWUpCiAgICAg fQogCiAgICAgbV9jb21taXRQZW5kaW5nID0gZmFsc2U7Ci0gICAgewotICAgICAgICBUUkFDRV9F VkVOVCgiQ0NMYXllclRyZWVIb3N0Ojp1cGRhdGVMYXllcnMiLCB0aGlzLCAwKTsKLSAgICAgICAg bV9sYXllclRyZWVIb3N0LT51cGRhdGVMYXllcnMoKTsKLSAgICB9CiAKICAgICBPd25QdHI8Q0NM YXllclRyZWVIb3N0Q29tbWl0dGVyPiBjb21taXR0ZXIgPSBtX2xheWVyVHJlZUhvc3QtPmNyZWF0 ZUxheWVyVHJlZUhvc3RDb21taXR0ZXIoKTsKICAgICBtX2xheWVyVHJlZUhvc3QtPmJlZ2luQ29t bWl0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDdjMDg2YWI2ZjYzZmU0OWYyODJm ZDE3YWI1YTg4ZTI3NTE3MGQyZTkuLmRkMDg3NGE3YWNhMWE4MGM3ZDkwZGY0MWQ5Mzk0MGRiNDQw N2I1ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEt MDctMTIgIEpvaG4gQmF0ZXMgIDxqYmF0ZXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBNb3ZlIGNh bGwgdG8gc3luY0NvbXBvc2l0aW5nTGF5ZXJzIHNvIHRoYXQgd2UgZG8gbm90IHRyaWdnZXIgcmVk dW5kYW50IGRyYXdzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQyMjQKKworICAgICAgICBkb0NvbXBvc2l0ZSB3YXMgdHJpZ2dlcmluZyB0d28gY29t cG9zaXRlcyBldmVyeSB0aW1lIGEgY2FudmFzIHdhcyBkaXJ0aWVkLgorICAgICAgICBCeSBtb3Zp bmcgc3luY0NvbXBvc2l0aW5nTGF5ZXJzIGNhbGwgdG8gbGF5b3V0LCB0aGUgY2xpZW50IGNvZGUg Y2FuIGRyYXcgd2l0aG91dCB0cmlnZ2VyaW5nCisgICAgICAgIGEgcmVkdW5kYW50IGZyYW1lLiBB bHNvIHJlbmFtZWQgV2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycyB0bworICAgICAgICBzeW5jQ29t cG9zaXRpbmdMYXllcnMsIGJlY2F1c2UgaXQgd2FzIGNvbmZ1c2luZy4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpsYXlvdXQpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6c3luY0NvbXBvc2l0aW5nTGF5ZXJzKToKKyAgICAgICAgKiBzcmMvV2Vi Vmlld0ltcGwuaDoKKwogMjAxMS0wNy0xMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9y Zz4KIAogICAgICAgICBVbnJldmlld2VkLiAgUm9sbGVkIERFUFMuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggMjQ5NzMzNGI0OWE1MDI0YmU2NmViMGNi MjdiZGI2OWFjODFhZDQ1Mi4uNzc0ODBjN2Y3NjMzMjY3YmY5MTc4NjVlZDE5NzE5OWUyMGYxODMx NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTA1 OSw2ICsxMDU5LDEzIEBAIHZvaWQgV2ViVmlld0ltcGw6OmxheW91dCgpCiAgICAgICAgIC8vIGxh eW91dCB0byBiZSBpbnZhbGlkYXRlZCwgc28gbGF5b3V0IG5lZWRzIHRvIGJlIGNhbGxlZCBsYXN0 LgogCiAgICAgICAgIHdlYmZyYW1lLT5sYXlvdXQoKTsKKworI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykKKyAgICAgICAgLy8gQ2FsbCB1cGRhdGVMYXllcnMgaGVyZSBpbnN0ZWFkIG9m IGR1cmluZyBkb0NvbXBvc2l0ZSBzbyB0aGF0IHdlIGRvbid0CisgICAgICAgIC8vIHRyaWdnZXIg YW5vdGhlciByZWR1bmRhbnQgZnJhbWUgZHVyaW5nIGRvQ29tcG9zaXRlLgorICAgICAgICBpZiAo aXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKCkpCisgICAgICAgICAgICBzeW5jQ29tcG9z aXRpbmdMYXllcnMoKTsKKyNlbmRpZgogICAgIH0KIH0KIApAQCAtMTE0Myw4ICsxMTUwLDkgQEAg dm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZUFuZExheW91dChkb3VibGUgZnJhbWVCZWdpblRpbWUp CiAgICAgbGF5b3V0KCk7CiB9CiAKLXZvaWQgV2ViVmlld0ltcGw6OnVwZGF0ZUxheWVycygpCit2 b2lkIFdlYlZpZXdJbXBsOjpzeW5jQ29tcG9zaXRpbmdMYXllcnMoKQogeworICAgIFRSQUNFX0VW RU5UKCJXZWJWaWV3SW1wbDo6c3luY0NvbXBvc2l0aW5nTGF5ZXJzIiwgdGhpcywgMCk7CiAgICAg Ly8gVXBkYXRlIHRoZSBjb21wb3NpdGluZyByZXF1aXJlbWVudHMgZm9yIGFsbCBmcmFtZSBpbiB0 aGUgdHJlZSBiZWZvcmUgZG9pbmcgYW55IHBhaW50aW5nCiAgICAgLy8gYXMgdGhlIGNvbXBvc2l0 aW5nIHJlcXVpcmVtZW50cyBmb3IgYSBSZW5kZXJMYXllciB3aXRoaW4gYSBzdWJmcmFtZSBtaWdo dCBjaGFuZ2UuCiAgICAgZm9yIChGcmFtZSogZnJhbWUgPSBwYWdlKCktPm1haW5GcmFtZSgpOyBm cmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQoKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDY1NTNiNThiMGMwZGMxMWIwZTMwMDQx MjE4NzU4ZDgzYTlkZWRmNzQuLjdmMDM0NzY5YTVjNWMxNWM5NzQzZjU0MmFmNGI4N2FmZGUwZTBi ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaApAQCAtMjA2LDcg KzIwNiw2IEBAIHB1YmxpYzoKICAgICAvLyBDQ0xheWVyVHJlZUhvc3RDbGllbnQKICAgICB2aXJ0 dWFsIHZvaWQgYW5pbWF0ZUFuZExheW91dChkb3VibGUgZnJhbWVCZWdpblRpbWUpOwogICAgIHZp cnR1YWwgUGFzc1JlZlB0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRD4gY3JlYXRlTGF5ZXJU cmVlSG9zdENvbnRleHQzRCgpOwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVMYXllcnMoKTsKIAog ICAgIC8vIFdlYlZpZXdJbXBsCiAKQEAgLTQzMiw2ICs0MzEsNyBAQCBwcml2YXRlOgogICAgIHZv aWQgcmVhbGxvY2F0ZVJlbmRlcmVyKCk7CiAgICAgdm9pZCB1cGRhdGVMYXllclJlbmRlcmVyU2V0 dGluZ3MoKTsKICAgICB2b2lkIHVwZGF0ZUxheWVyUmVuZGVyZXJWaWV3cG9ydCgpOworICAgIHZv aWQgc3luY0NvbXBvc2l0aW5nTGF5ZXJzKCk7CiAjZW5kaWYKIAogICAgIFdlYlZpZXdDbGllbnQq IG1fY2xpZW50Owo=