61925 2011-06-02 07:21:15 -0700 Add layer factory to GraphicsLayer for creating non-default layer type. 2011-06-13 09:17:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 47068 56935 1 ostap73 noam eric kenneth noam ossy simon.fraser webkit.review.bot yael oldest_to_newest 414095 0 ostap73 2011-06-02 07:21:15 -0700 Webkit2 Qt implementation will use this to create graphics layers. 414098 1 95761 ostap73 2011-06-02 07:28:18 -0700 Created attachment 95761 Layer factory method implementation. 414099 2 webkit.review.bot 2011-06-02 07:30:49 -0700 Attachment 95761 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h:94: The parameter name "factory" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:428: Missing space before ( in if( [whitespace/parens] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 414104 3 95762 ostap73 2011-06-02 07:38:29 -0700 Created attachment 95762 Fix style error 415608 4 kenneth 2011-06-05 09:06:54 -0700 As always would be nice with No'am's input 415610 5 95762 kenneth 2011-06-05 09:08:23 -0700 Comment on attachment 95762 Fix style error View in context: https://bugs.webkit.org/attachment.cgi?id=95762&action=review > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:421 > +void GraphicsLayerTextureMapper::setGraphicsLayerFactory(GraphicsLayerFactory factory) What is this set method needed for? 415611 6 noam 2011-06-05 09:12:49 -0700 (In reply to comment #4) > As always would be nice with No'am's input I'm working closely with Slava on all of these patches. 415612 7 kenneth 2011-06-05 09:14:10 -0700 (In reply to comment #6) > (In reply to comment #4) > > As always would be nice with No'am's input > > I'm working closely with Slava on all of these patches. Having noted in the bug report that you are ok with the change would be nice :-) 415613 8 noam 2011-06-05 09:15:56 -0700 (In reply to comment #5) > (From update of attachment 95762 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=95762&action=review > > > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:421 > > +void GraphicsLayerTextureMapper::setGraphicsLayerFactory(GraphicsLayerFactory factory) > > What is this set method needed for? The WebProcess uses a different GraphicsLayer implementation than the UI process or WebKit1. So the idea is that the WebProcess would call this function on its startup to override the default GraphicsLayer::create. 417752 9 noam 2011-06-08 19:19:41 -0700 I feel like the factory function should be in GraphicsLayer and not in GraphicsLayerTextureMapper. I'll post a patch soon. 417801 10 96543 noam 2011-06-08 21:42:06 -0700 Created attachment 96543 Patch Moved the implementation from GraphicsLayerTextureMapper to GraphicsLayer. This will allow other ports that want to use GraphicsLayer across processes to use this factory, without relying on TextureMapper. 417839 11 noam 2011-06-08 23:03:36 -0700 The build failure of windows is a problem with the test bot. 417846 12 96543 simon.fraser 2011-06-08 23:14:08 -0700 Comment on attachment 96543 Patch Can't you just declare a static GraphicsLayer::create() method, and have the implementation in each platform's impl file? 417849 13 noam 2011-06-08 23:20:24 -0700 (In reply to comment #12) > (From update of attachment 96543 [details]) > Can't you just declare a static GraphicsLayer::create() method, and have the implementation in each platform's impl file? It's a bit more complicated... We need a different implementation if we're in the web process vs. if we are in the UI process. 417850 14 noam 2011-06-08 23:22:06 -0700 (In reply to comment #13) > (In reply to comment #12) > > (From update of attachment 96543 [details] [details]) > > Can't you just declare a static GraphicsLayer::create() method, and have the implementation in each platform's impl file? > > It's a bit more complicated... > We need a different implementation if we're in the web process vs. if we are in the UI process. I mean, a different implementation if we're in the web process vs. if we're in WebKit1. This is the only way we can use GraphicsLayers in this way with WebCore being compiled once for WebKit2 and WebKit1. 417980 15 96543 simon.fraser 2011-06-09 06:45:10 -0700 Comment on attachment 96543 Patch Are you going to convert GraphicsLayer::create() to go through the factory for everyone, or just Qt? 418002 16 noam 2011-06-09 07:23:36 -0700 (In reply to comment #15) > (From update of attachment 96543 [details]) > Are you going to convert GraphicsLayer::create() to go through the factory for everyone, or just Qt? Just Qt. I considered doing that for everyone but it's too complicated, since people might call GraphicsLayer::create from within their code. 418006 17 96586 noam 2011-06-09 07:29:53 -0700 Created attachment 96586 Patch Revised the patch, added more information in the ChangeLog. 418133 18 simon.fraser 2011-06-09 11:27:08 -0700 I think the factory stuff should be #ifdeffed for Qt then. 418163 19 noam 2011-06-09 12:02:05 -0700 (In reply to comment #18) > I think the factory stuff should be #ifdeffed for Qt then. OK, I'll do that, and if other ports want to use the factory they can add it to the #ifdef. 418479 20 96693 noam 2011-06-09 20:22:24 -0700 Created attachment 96693 Patch based on smfr's comments 418584 21 96693 kenneth 2011-06-10 01:37:59 -0700 Comment on attachment 96693 Patch based on smfr's comments View in context: https://bugs.webkit.org/attachment.cgi?id=96693&action=review > Source/WebCore/platform/graphics/GraphicsLayer.h:372 > + typedef PassOwnPtr<GraphicsLayer> GraphicsLayerFactory(GraphicsLayerClient*); > + static void setGraphicsLayerFactory(GraphicsLayerFactory); We need a comment here explaining what it is for as that is not totally obvious - at least to me. 418656 22 96733 noam 2011-06-10 04:39:49 -0700 Created attachment 96733 Patch with an additional comment 418666 23 webkit.review.bot 2011-06-10 04:55:34 -0700 The commit-queue encountered the following flaky tests while processing attachment 96733: http/tests/local/stylesheet-and-script-load-order.html bug 62450 (author: koivisto@iki.fi) The commit-queue is continuing to process your patch. 418667 24 96733 webkit.review.bot 2011-06-10 04:56:48 -0700 Comment on attachment 96733 Patch with an additional comment Clearing flags on attachment: 96733 Committed r88541: <http://trac.webkit.org/changeset/88541> 418668 25 webkit.review.bot 2011-06-10 04:56:54 -0700 All reviewed patches have been landed. Closing bug. 419400 26 96911 noam 2011-06-12 20:00:47 -0700 Created attachment 96911 Patch: Use GraphicsLayerFactory in TextureMapper 419592 27 96911 webkit.review.bot 2011-06-13 09:17:07 -0700 Comment on attachment 96911 Patch: Use GraphicsLayerFactory in TextureMapper Clearing flags on attachment: 96911 Committed r88643: <http://trac.webkit.org/changeset/88643> 419593 28 webkit.review.bot 2011-06-13 09:17:13 -0700 All reviewed patches have been landed. Closing bug. 95761 2011-06-02 07:28:18 -0700 2011-06-02 07:39:14 -0700 Layer factory method implementation. wk2_layer_factory_01.diff text/plain 3037 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMzlkMTRjLi5kN2I4NzM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDYtMDIgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBbV0syXSBbVGV4bWFwXSBBZGQgbGF5ZXIgZmFjdG9yeSB0byBHcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlciBmb3IgY3JlYXRpbmcgbm9uLWRlZmF1bHQgbGF5ZXIgdHlwZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxOTI1CisK KyAgICAgICAgRmFjdG9yeSBmb3IgY3JlYXRpbmcgV2Via2l0MiBncmFwaGljcyBsYXllcnMgaW4g d2VicHJvY2Vzcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlcjo6c2V0R3JhcGhpY3NMYXllckZhY3RvcnkpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NMYXllcjo6Y3JlYXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaDoKKwogMjAxMS0wNi0wMiAgSmFtZXMg Um9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJy YWR5IEVpZHNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwCmlu ZGV4IGUxOGUzM2MuLjMzNDM5ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmNwcApAQCAtMzQ5LDExICszNDksNiBAQCBQbGF0Zm9ybUxheWVyKiBHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcjo6cGxhdGZvcm1MYXllcigpIGNvbnN0CiAgICAgcmV0dXJuIGNvbnN0 X2Nhc3Q8VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIqPihub2RlKCktPm1lZGlhKCkpOwogfQog Ci1QYXNzT3duUHRyPEdyYXBoaWNzTGF5ZXI+IEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZShHcmFwaGlj c0xheWVyQ2xpZW50KiBjbGllbnQpCi17Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBHcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlcihjbGllbnQpKTsKLX0KLQogYm9vbCBHcmFwaGljc0xheWVyVGV4 dHVyZU1hcHBlcjo6YWRkQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZUxp c3QsIGNvbnN0IEludFNpemUmIGJveFNpemUsIGNvbnN0IEFuaW1hdGlvbiogYW5pbSwgY29uc3Qg U3RyaW5nJiBrZXlmcmFtZXNOYW1lLCBkb3VibGUgdGltZU9mZnNldCkKIHsKICAgICBBU1NFUlQo IWtleWZyYW1lc05hbWUuaXNFbXB0eSgpKTsKQEAgLTQyMSw0ICs0MTYsMTkgQEAgdm9pZCBHcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlcjo6YW5pbWF0aW9uU3RhcnRlZFRpbWVyRmlyZWQoVGltZXI8 R3JhcGhpY3NMYXllclQKICAgICBjbGllbnQoKS0+bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCh0aGlz LCAvKiBET00gdGltZSAqLyBXVEY6OmN1cnJlbnRUaW1lKCkpOwogfQogCitHcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlcjo6R3JhcGhpY3NMYXllckZhY3Rvcnkgc19ncmFwaGljc0xheWVyRmFjdG9y eSA9IDA7CisKK3ZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldEdyYXBoaWNzTGF5 ZXJGYWN0b3J5KEdyYXBoaWNzTGF5ZXJGYWN0b3J5IGZhY3RvcnkpCit7CisgICAgc19ncmFwaGlj c0xheWVyRmFjdG9yeSA9IGZhY3Rvcnk7Cit9CisKK1Bhc3NPd25QdHI8R3JhcGhpY3NMYXllcj4g R3JhcGhpY3NMYXllcjo6Y3JlYXRlKEdyYXBoaWNzTGF5ZXJDbGllbnQqIGNsaWVudCkKK3sKKyAg ICBpZihzX2dyYXBoaWNzTGF5ZXJGYWN0b3J5KQorICAgICAgICByZXR1cm4gc19ncmFwaGljc0xh eWVyRmFjdG9yeShjbGllbnQpOworCisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcihjbGllbnQpKTsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIuaAppbmRleCBmNzIxYWY0Li45NTExZjA5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXIuaApAQCAtOTAsNiArOTAsOSBAQCBwdWJsaWM6CiAKICAg ICBUZXh0dXJlTWFwcGVyTm9kZSogbm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fbm9kZS5nZXQoKTsg fQogCisgICAgdHlwZWRlZiBQYXNzT3duUHRyPEdyYXBoaWNzTGF5ZXI+ICgqR3JhcGhpY3NMYXll ckZhY3RvcnkpKEdyYXBoaWNzTGF5ZXJDbGllbnQqIGNsaWVudCk7CisgICAgc3RhdGljIHZvaWQg c2V0R3JhcGhpY3NMYXllckZhY3RvcnkoR3JhcGhpY3NMYXllckZhY3RvcnkgZmFjdG9yeSk7CisK IHByaXZhdGU6CiAgICAgT3duUHRyPFRleHR1cmVNYXBwZXJOb2RlPiBtX25vZGU7CiAgICAgYm9v bCBtX3N5bmNRdWV1ZWQ7Cg== 95762 2011-06-02 07:38:29 -0700 2011-06-08 21:42:06 -0700 Fix style error wk2_layer_factory_02.diff text/plain 3030 ostap73 ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMzlkMTRjLi5kN2I4NzM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDYtMDIgIFZpYXRjaGVzbGF2IE9zdGFwZW5rbyAgPG9zdGFwZW5rby52aWF0Y2hl c2xhdkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW1F0XSBbV0syXSBbVGV4bWFwXSBBZGQgbGF5ZXIgZmFjdG9yeSB0byBHcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlciBmb3IgY3JlYXRpbmcgbm9uLWRlZmF1bHQgbGF5ZXIgdHlwZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxOTI1CisK KyAgICAgICAgRmFjdG9yeSBmb3IgY3JlYXRpbmcgV2Via2l0MiBncmFwaGljcyBsYXllcnMgaW4g d2VicHJvY2Vzcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlcjo6c2V0R3JhcGhpY3NMYXllckZhY3RvcnkpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NMYXllcjo6Y3JlYXRlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaDoKKwogMjAxMS0wNi0wMiAgSmFtZXMg Um9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEJy YWR5IEVpZHNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwCmlu ZGV4IGUxOGUzM2MuLjBlMjYyMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmNwcApAQCAtMzQ5LDExICszNDksNiBAQCBQbGF0Zm9ybUxheWVyKiBHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlcjo6cGxhdGZvcm1MYXllcigpIGNvbnN0CiAgICAgcmV0dXJuIGNvbnN0 X2Nhc3Q8VGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIqPihub2RlKCktPm1lZGlhKCkpOwogfQog Ci1QYXNzT3duUHRyPEdyYXBoaWNzTGF5ZXI+IEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZShHcmFwaGlj c0xheWVyQ2xpZW50KiBjbGllbnQpCi17Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBHcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlcihjbGllbnQpKTsKLX0KLQogYm9vbCBHcmFwaGljc0xheWVyVGV4 dHVyZU1hcHBlcjo6YWRkQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZUxp c3QsIGNvbnN0IEludFNpemUmIGJveFNpemUsIGNvbnN0IEFuaW1hdGlvbiogYW5pbSwgY29uc3Qg U3RyaW5nJiBrZXlmcmFtZXNOYW1lLCBkb3VibGUgdGltZU9mZnNldCkKIHsKICAgICBBU1NFUlQo IWtleWZyYW1lc05hbWUuaXNFbXB0eSgpKTsKQEAgLTQyMSw0ICs0MTYsMTkgQEAgdm9pZCBHcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlcjo6YW5pbWF0aW9uU3RhcnRlZFRpbWVyRmlyZWQoVGltZXI8 R3JhcGhpY3NMYXllclQKICAgICBjbGllbnQoKS0+bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCh0aGlz LCAvKiBET00gdGltZSAqLyBXVEY6OmN1cnJlbnRUaW1lKCkpOwogfQogCitHcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlcjo6R3JhcGhpY3NMYXllckZhY3Rvcnkgc19ncmFwaGljc0xheWVyRmFjdG9y eSA9IDA7CisKK3ZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldEdyYXBoaWNzTGF5 ZXJGYWN0b3J5KEdyYXBoaWNzTGF5ZXJGYWN0b3J5IGZhY3RvcnkpCit7CisgICAgc19ncmFwaGlj c0xheWVyRmFjdG9yeSA9IGZhY3Rvcnk7Cit9CisKK1Bhc3NPd25QdHI8R3JhcGhpY3NMYXllcj4g R3JhcGhpY3NMYXllcjo6Y3JlYXRlKEdyYXBoaWNzTGF5ZXJDbGllbnQqIGNsaWVudCkKK3sKKyAg ICBpZiAoc19ncmFwaGljc0xheWVyRmFjdG9yeSkKKyAgICAgICAgcmV0dXJuIHNfZ3JhcGhpY3NM YXllckZhY3RvcnkoY2xpZW50KTsKKworICAgIHJldHVybiBhZG9wdFB0cihuZXcgR3JhcGhpY3NM YXllclRleHR1cmVNYXBwZXIoY2xpZW50KSk7Cit9CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBl ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5 ZXJUZXh0dXJlTWFwcGVyLmgKaW5kZXggZjcyMWFmNC4uODM1ZWRlMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKQEAgLTkwLDYgKzkwLDkgQEAgcHVibGljOgogCiAg ICAgVGV4dHVyZU1hcHBlck5vZGUqIG5vZGUoKSBjb25zdCB7IHJldHVybiBtX25vZGUuZ2V0KCk7 IH0KIAorICAgIHR5cGVkZWYgUGFzc093blB0cjxHcmFwaGljc0xheWVyPiAoKkdyYXBoaWNzTGF5 ZXJGYWN0b3J5KShHcmFwaGljc0xheWVyQ2xpZW50KiBjbGllbnQpOworICAgIHN0YXRpYyB2b2lk IHNldEdyYXBoaWNzTGF5ZXJGYWN0b3J5KEdyYXBoaWNzTGF5ZXJGYWN0b3J5KTsKKwogcHJpdmF0 ZToKICAgICBPd25QdHI8VGV4dHVyZU1hcHBlck5vZGU+IG1fbm9kZTsKICAgICBib29sIG1fc3lu Y1F1ZXVlZDsK 96543 2011-06-08 21:42:06 -0700 2011-06-09 07:29:53 -0700 Patch patch.diff text/plain 2974 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NDE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMDggIE5vYW0gUm9z ZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPiBhbmQgVmlhdGNoZXNsYXYgT3N0YXBl bmtvIDxvc3RhcGVua28udmlhdGNoZXNsYXZAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBsYXllciBmYWN0b3J5IHRvIEdyYXBo aWNzTGF5ZXIgZm9yIGNyZWF0aW5nIG5vbi1kZWZhdWx0IGxheWVyIHR5cGUuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTkyNQorCisgICAgICAgIEFk ZGVkIGEgc3RhdGljIGZhY3RvcnkgcHJvdGVjdGVkIG1lbWJlciB0byBHcmFwaGljc0xheWVyLCB3 aGljaCBzaG91bGQgYmUgYWNjZXNzZWQgZnJvbQorICAgICAgICBhIHBvcnQtc3BlY2lmaWMgaW1w bGVtZW50YXRpb24gb2YgR3JhcGhpY3NMYXllcjo6Y3JlYXRlLgorCisgICAgICAgIE5vIG5ldyBm dW5jdGlvbmFsaXR5LCBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI6 OnNldEdyYXBoaWNzTGF5ZXJGYWN0b3J5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0xheWVyLmg6CisKIDIwMTEtMDYtMDggIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEhhamltZSBNb3JpdGEuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcAko cmV2aXNpb24gODg0MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0xheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEyLDYgKzMxMiwxMyBAQCB2b2lkIEdy YXBoaWNzTGF5ZXI6OmRpc3RyaWJ1dGVPcGFjaXR5KGZsCiAgICAgfQogfQogCitHcmFwaGljc0xh eWVyOjpHcmFwaGljc0xheWVyRmFjdG9yeSogc19ncmFwaGljc0xheWVyRmFjdG9yeSA9IDA7CisK K3ZvaWQgR3JhcGhpY3NMYXllcjo6c2V0R3JhcGhpY3NMYXllckZhY3RvcnkoR3JhcGhpY3NMYXll cjo6R3JhcGhpY3NMYXllckZhY3RvcnkgZmFjdG9yeSkKK3sKKyAgICBzX2dyYXBoaWNzTGF5ZXJG YWN0b3J5ID0gZmFjdG9yeTsKK30KKwogLy8gQW4gImludmFsaWQiIGxpc3QgaXMgb25lIHdob3Nl IGZ1bmN0aW9ucyBkb24ndCBtYXRjaCwgYW5kIHRoZXJlZm9yZSBoYXMgdG8gYmUgYW5pbWF0ZWQg YXMgYSBNYXRyaXgKIC8vIFRoZSBoYXNCaWdSb3RhdGlvbiBmbGFnIHdpbGwgYWx3YXlzIHJldHVy biBmYWxzZSBpZiBpc1ZhbGlkIGlzIGZhbHNlLiBPdGhlcndpc2UgaGFzQmlnUm90YXRpb24gaXMg CiAvLyB0cnVlIGlmIHRoZSByb3RhdGlvbiBiZXR3ZWVuIGFueSB0d28ga2V5ZnJhbWVzIGlzID49 IDE4MCBkZWdyZWVzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzTGF5ZXIuaAkocmV2aXNpb24gODg0MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2Nyw2 ICszNjcsOSBAQCBwdWJsaWM6CiAKICAgICBib29sIHVzaW5nVGlsZWRMYXllcigpIGNvbnN0IHsg cmV0dXJuIG1fdXNpbmdUaWxlZExheWVyOyB9CiAKKyAgICB0eXBlZGVmIFBhc3NPd25QdHI8R3Jh cGhpY3NMYXllcj4gR3JhcGhpY3NMYXllckZhY3RvcnkoR3JhcGhpY3NMYXllckNsaWVudCopOwor ICAgIHN0YXRpYyB2b2lkIHNldEdyYXBoaWNzTGF5ZXJGYWN0b3J5KEdyYXBoaWNzTGF5ZXJGYWN0 b3J5KTsKKwogcHJvdGVjdGVkOgogCiAgICAgdHlwZWRlZiBWZWN0b3I8VHJhbnNmb3JtT3BlcmF0 aW9uOjpPcGVyYXRpb25UeXBlPiBUcmFuc2Zvcm1PcGVyYXRpb25MaXN0OwpAQCAtMzc1LDcgKzM3 OCw3IEBAIHByb3RlY3RlZDoKICAgICBzdGF0aWMgdm9pZCBmZXRjaFRyYW5zZm9ybU9wZXJhdGlv bkxpc3QoY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmLCBUcmFuc2Zvcm1PcGVyYXRpb25MaXN0Jiwg Ym9vbCYgaXNWYWxpZCwgYm9vbCYgaGFzQmlnUm90YXRpb24pOwogCiAgICAgdmlydHVhbCB2b2lk IHNldE9wYWNpdHlJbnRlcm5hbChmbG9hdCkgeyB9Ci0gICAgCisKICAgICAvLyBUaGUgbGF5ZXIg YmVpbmcgcmVwbGljYXRlZC4KICAgICBHcmFwaGljc0xheWVyKiByZXBsaWNhdGVkTGF5ZXIoKSBj b25zdCB7IHJldHVybiBtX3JlcGxpY2F0ZWRMYXllcjsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRS ZXBsaWNhdGVkTGF5ZXIoR3JhcGhpY3NMYXllciogbGF5ZXIpIHsgbV9yZXBsaWNhdGVkTGF5ZXIg PSBsYXllcjsgfQpAQCAtNDI4LDYgKzQzMSw4IEBAIHByb3RlY3RlZDoKICAgICBJbnRSZWN0IG1f Y29udGVudHNSZWN0OwogCiAgICAgaW50IG1fcmVwYWludENvdW50OworCisgICAgc3RhdGljIEdy YXBoaWNzTGF5ZXI6OkdyYXBoaWNzTGF5ZXJGYWN0b3J5KiBzX2dyYXBoaWNzTGF5ZXJGYWN0b3J5 OwogfTsKIAogCg== 96586 2011-06-09 07:29:53 -0700 2011-06-09 20:22:24 -0700 Patch patch.diff text/plain 3542 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NDE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMDggIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4gYW5kIFZpYXRjaGVzbGF2IE9zdGFw ZW5rbyA8b3N0YXBlbmtvLnZpYXRjaGVzbGF2QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbGF5ZXIgZmFjdG9yeSB0byBHcmFw aGljc0xheWVyIGZvciBjcmVhdGluZyBub24tZGVmYXVsdCBsYXllciB0eXBlLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE5MjUKKworICAgICAgICBB ZGRlZCBhIHN0YXRpYyBmYWN0b3J5IHByb3RlY3RlZCBtZW1iZXIgdG8gR3JhcGhpY3NMYXllciwg d2hpY2ggc2hvdWxkIGJlIGFjY2Vzc2VkIGZyb20KKyAgICAgICAgYSBwb3J0LXNwZWNpZmljIGlt cGxlbWVudGF0aW9uIG9mIEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZS4KKworICAgICAgICBUaGlzIGlz IG5lZWRlZCBmb3IgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgYWNyb3NzIHByb2Nlc3NlcyBpbiBX ZWJLaXQyLCBzaW5jZSBXZWJDb3JlCisgICAgICAgIGRvZXNuJ3Qga25vdyBpbiBjb21waWxlIHRp bWUgd2hldGhlciBpdCdzIGluIFdlYktpdCBvciBXZWJLaXQyLCB3aGljaCBtYWtlcyBoYXZpbmcg dHdvCisgICAgICAgIGRpZmZlcmVudCBpbXBsZW1lbnRhdGlvbnMgb2YgR3JhcGhpY3NMYXllciBj b2V4aXN0IGltcG9zc2libGUgd2l0aG91dCBzb21lIHJ1bnRpbWUKKyAgICAgICAgZmFjdG9yeSB0 aGF0IGNhbiBiZSBvdmVycmlkZGVuIGJ5IHRoZSB3ZWIgcHJvY2Vzcy4KKworICAgICAgICBOb3Rl IHRoYXQgdGhlIHVzZSBvZiB0aGUgZmFjdG9yeSB3b3VsZCBiZSBvcHRpb25hbCwgYW5kIHRoZSBw b3J0LXNwZWNpZmljIEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZQorICAgICAgICB3b3VsZCBoYXZlIHRv IGV4cGxpY2l0bHkgY2FsbCBpdCwgaW4gb3JkZXIgdG8gYmUgdW5pbnRydXNpdmUgd2l0aCBjdXJy ZW50IGltcGxlbWVudGF0aW9ucy4KKworICAgICAgICBObyBuZXcgZnVuY3Rpb25hbGl0eSwgc28g bm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXll ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpzZXRHcmFwaGljc0xheWVy RmFjdG9yeSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oOgor CiAyMDExLTA2LTA4ICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBIYWppbWUgTW9yaXRhLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAJKHJldmlzaW9uIDg4NDE4KQor KysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTMxMiw2ICszMTIsMTMgQEAgdm9pZCBHcmFwaGljc0xheWVyOjpkaXN0 cmlidXRlT3BhY2l0eShmbAogICAgIH0KIH0KIAorR3JhcGhpY3NMYXllcjo6R3JhcGhpY3NMYXll ckZhY3RvcnkqIEdyYXBoaWNzTGF5ZXI6OnNfZ3JhcGhpY3NMYXllckZhY3RvcnkgPSAwOworCit2 b2lkIEdyYXBoaWNzTGF5ZXI6OnNldEdyYXBoaWNzTGF5ZXJGYWN0b3J5KEdyYXBoaWNzTGF5ZXI6 OkdyYXBoaWNzTGF5ZXJGYWN0b3J5IGZhY3RvcnkpCit7CisgICAgc19ncmFwaGljc0xheWVyRmFj dG9yeSA9IGZhY3Rvcnk7Cit9CisKIC8vIEFuICJpbnZhbGlkIiBsaXN0IGlzIG9uZSB3aG9zZSBm dW5jdGlvbnMgZG9uJ3QgbWF0Y2gsIGFuZCB0aGVyZWZvcmUgaGFzIHRvIGJlIGFuaW1hdGVkIGFz IGEgTWF0cml4CiAvLyBUaGUgaGFzQmlnUm90YXRpb24gZmxhZyB3aWxsIGFsd2F5cyByZXR1cm4g ZmFsc2UgaWYgaXNWYWxpZCBpcyBmYWxzZS4gT3RoZXJ3aXNlIGhhc0JpZ1JvdGF0aW9uIGlzIAog Ly8gdHJ1ZSBpZiB0aGUgcm90YXRpb24gYmV0d2VlbiBhbnkgdHdvIGtleWZyYW1lcyBpcyA+PSAx ODAgZGVncmVlcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzTGF5ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0xheWVyLmgJKHJldmlzaW9uIDg4NDE4KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNjcsNiAr MzY3LDkgQEAgcHVibGljOgogCiAgICAgYm9vbCB1c2luZ1RpbGVkTGF5ZXIoKSBjb25zdCB7IHJl dHVybiBtX3VzaW5nVGlsZWRMYXllcjsgfQogCisgICAgdHlwZWRlZiBQYXNzT3duUHRyPEdyYXBo aWNzTGF5ZXI+IEdyYXBoaWNzTGF5ZXJGYWN0b3J5KEdyYXBoaWNzTGF5ZXJDbGllbnQqKTsKKyAg ICBzdGF0aWMgdm9pZCBzZXRHcmFwaGljc0xheWVyRmFjdG9yeShHcmFwaGljc0xheWVyRmFjdG9y eSk7CisKIHByb3RlY3RlZDoKIAogICAgIHR5cGVkZWYgVmVjdG9yPFRyYW5zZm9ybU9wZXJhdGlv bjo6T3BlcmF0aW9uVHlwZT4gVHJhbnNmb3JtT3BlcmF0aW9uTGlzdDsKQEAgLTM3NSw3ICszNzgs NyBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RhdGljIHZvaWQgZmV0Y2hUcmFuc2Zvcm1PcGVyYXRpb25M aXN0KGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiwgVHJhbnNmb3JtT3BlcmF0aW9uTGlzdCYsIGJv b2wmIGlzVmFsaWQsIGJvb2wmIGhhc0JpZ1JvdGF0aW9uKTsKIAogICAgIHZpcnR1YWwgdm9pZCBz ZXRPcGFjaXR5SW50ZXJuYWwoZmxvYXQpIHsgfQotICAgIAorCiAgICAgLy8gVGhlIGxheWVyIGJl aW5nIHJlcGxpY2F0ZWQuCiAgICAgR3JhcGhpY3NMYXllciogcmVwbGljYXRlZExheWVyKCkgY29u c3QgeyByZXR1cm4gbV9yZXBsaWNhdGVkTGF5ZXI7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0UmVw bGljYXRlZExheWVyKEdyYXBoaWNzTGF5ZXIqIGxheWVyKSB7IG1fcmVwbGljYXRlZExheWVyID0g bGF5ZXI7IH0KQEAgLTQyOCw2ICs0MzEsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgSW50UmVjdCBtX2Nv bnRlbnRzUmVjdDsKIAogICAgIGludCBtX3JlcGFpbnRDb3VudDsKKworICAgIHN0YXRpYyBHcmFw aGljc0xheWVyOjpHcmFwaGljc0xheWVyRmFjdG9yeSogc19ncmFwaGljc0xheWVyRmFjdG9yeTsK IH07CiAKIAo= 96693 2011-06-09 20:22:24 -0700 2011-06-10 04:39:49 -0700 Patch based on smfr's comments patch.diff text/plain 3659 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NDE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMDggIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4gYW5kIFZpYXRjaGVzbGF2IE9zdGFw ZW5rbyA8b3N0YXBlbmtvLnZpYXRjaGVzbGF2QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbGF5ZXIgZmFjdG9yeSB0byBHcmFw aGljc0xheWVyIGZvciBjcmVhdGluZyBub24tZGVmYXVsdCBsYXllciB0eXBlLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE5MjUKKworICAgICAgICBB ZGRlZCBhIHN0YXRpYyBmYWN0b3J5IHByb3RlY3RlZCBtZW1iZXIgdG8gR3JhcGhpY3NMYXllciwg d2hpY2ggc2hvdWxkIGJlIGFjY2Vzc2VkIGZyb20KKyAgICAgICAgYSBwb3J0LXNwZWNpZmljIGlt cGxlbWVudGF0aW9uIG9mIEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZS4gRm9yIG5vdyB0aGlzIGlzIGVu YWJsZWQgZm9yIFF0IG9ubHkuCisKKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgZm9yIGFjY2VsZXJh dGVkIGNvbXBvc2l0aW5nIGFjcm9zcyBwcm9jZXNzZXMgaW4gV2ViS2l0Miwgc2luY2UgV2ViQ29y ZQorICAgICAgICBkb2Vzbid0IGtub3cgaW4gY29tcGlsZSB0aW1lIHdoZXRoZXIgaXQncyBpbiBX ZWJLaXQgb3IgV2ViS2l0Miwgd2hpY2ggbWFrZXMgaGF2aW5nIHR3bworICAgICAgICBkaWZmZXJl bnQgaW1wbGVtZW50YXRpb25zIG9mIEdyYXBoaWNzTGF5ZXIgY29leGlzdCBpbXBvc3NpYmxlIHdp dGhvdXQgc29tZSBydW50aW1lCisgICAgICAgIGZhY3RvcnkgdGhhdCBjYW4gYmUgb3ZlcnJpZGRl biBieSB0aGUgd2ViIHByb2Nlc3MuCisKKyAgICAgICAgTm90ZSB0aGF0IHRoZSB1c2Ugb2YgdGhl IGZhY3Rvcnkgd291bGQgYmUgb3B0aW9uYWwsIGFuZCB0aGUgcG9ydC1zcGVjaWZpYyBHcmFwaGlj c0xheWVyOjpjcmVhdGUKKyAgICAgICAgd291bGQgaGF2ZSB0byBleHBsaWNpdGx5IGNhbGwgaXQs IGluIG9yZGVyIHRvIGJlIHVuaW50cnVzaXZlIHdpdGggY3VycmVudCBpbXBsZW1lbnRhdGlvbnMu CisKKyAgICAgICAgTm8gbmV3IGZ1bmN0aW9uYWxpdHksIHNvIG5vIG5ldyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllcjo6c2V0R3JhcGhpY3NMYXllckZhY3RvcnkpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaDoKKwogMjAxMS0wNi0wOCAgSGF5YXRv IEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSGFqaW1l IE1vcml0YS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz TGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzTGF5ZXIuY3BwCShyZXZpc2lvbiA4ODQxOCkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTIs NiArMzEyLDE1IEBAIHZvaWQgR3JhcGhpY3NMYXllcjo6ZGlzdHJpYnV0ZU9wYWNpdHkoZmwKICAg ICB9CiB9CiAKKyNpZiBQTEFURk9STShRVCkKK0dyYXBoaWNzTGF5ZXI6OkdyYXBoaWNzTGF5ZXJG YWN0b3J5KiBHcmFwaGljc0xheWVyOjpzX2dyYXBoaWNzTGF5ZXJGYWN0b3J5ID0gMDsKKwordm9p ZCBHcmFwaGljc0xheWVyOjpzZXRHcmFwaGljc0xheWVyRmFjdG9yeShHcmFwaGljc0xheWVyOjpH cmFwaGljc0xheWVyRmFjdG9yeSBmYWN0b3J5KQoreworICAgIHNfZ3JhcGhpY3NMYXllckZhY3Rv cnkgPSBmYWN0b3J5OworfQorI2VuZGlmCisKIC8vIEFuICJpbnZhbGlkIiBsaXN0IGlzIG9uZSB3 aG9zZSBmdW5jdGlvbnMgZG9uJ3QgbWF0Y2gsIGFuZCB0aGVyZWZvcmUgaGFzIHRvIGJlIGFuaW1h dGVkIGFzIGEgTWF0cml4CiAvLyBUaGUgaGFzQmlnUm90YXRpb24gZmxhZyB3aWxsIGFsd2F5cyBy ZXR1cm4gZmFsc2UgaWYgaXNWYWxpZCBpcyBmYWxzZS4gT3RoZXJ3aXNlIGhhc0JpZ1JvdGF0aW9u IGlzIAogLy8gdHJ1ZSBpZiB0aGUgcm90YXRpb24gYmV0d2VlbiBhbnkgdHdvIGtleWZyYW1lcyBp cyA+PSAxODAgZGVncmVlcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzTGF5ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0xheWVyLmgJKHJldmlzaW9uIDg4NDE4KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC0z NjcsNiArMzY3LDExIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgdXNpbmdUaWxlZExheWVyKCkgY29u c3QgeyByZXR1cm4gbV91c2luZ1RpbGVkTGF5ZXI7IH0KIAorI2lmIFBMQVRGT1JNKFFUKQorICAg IHR5cGVkZWYgUGFzc093blB0cjxHcmFwaGljc0xheWVyPiBHcmFwaGljc0xheWVyRmFjdG9yeShH cmFwaGljc0xheWVyQ2xpZW50Kik7CisgICAgc3RhdGljIHZvaWQgc2V0R3JhcGhpY3NMYXllckZh Y3RvcnkoR3JhcGhpY3NMYXllckZhY3RvcnkpOworI2VuZGlmCisKIHByb3RlY3RlZDoKIAogICAg IHR5cGVkZWYgVmVjdG9yPFRyYW5zZm9ybU9wZXJhdGlvbjo6T3BlcmF0aW9uVHlwZT4gVHJhbnNm b3JtT3BlcmF0aW9uTGlzdDsKQEAgLTM3NSw3ICszODAsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgc3Rh dGljIHZvaWQgZmV0Y2hUcmFuc2Zvcm1PcGVyYXRpb25MaXN0KGNvbnN0IEtleWZyYW1lVmFsdWVM aXN0JiwgVHJhbnNmb3JtT3BlcmF0aW9uTGlzdCYsIGJvb2wmIGlzVmFsaWQsIGJvb2wmIGhhc0Jp Z1JvdGF0aW9uKTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRPcGFjaXR5SW50ZXJuYWwoZmxvYXQp IHsgfQotICAgIAorCiAgICAgLy8gVGhlIGxheWVyIGJlaW5nIHJlcGxpY2F0ZWQuCiAgICAgR3Jh cGhpY3NMYXllciogcmVwbGljYXRlZExheWVyKCkgY29uc3QgeyByZXR1cm4gbV9yZXBsaWNhdGVk TGF5ZXI7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0UmVwbGljYXRlZExheWVyKEdyYXBoaWNzTGF5 ZXIqIGxheWVyKSB7IG1fcmVwbGljYXRlZExheWVyID0gbGF5ZXI7IH0KQEAgLTQyOCw2ICs0MzMs MTAgQEAgcHJvdGVjdGVkOgogICAgIEludFJlY3QgbV9jb250ZW50c1JlY3Q7CiAKICAgICBpbnQg bV9yZXBhaW50Q291bnQ7CisKKyNpZiBQTEFURk9STShRVCkKKyAgICBzdGF0aWMgR3JhcGhpY3NM YXllcjo6R3JhcGhpY3NMYXllckZhY3RvcnkqIHNfZ3JhcGhpY3NMYXllckZhY3Rvcnk7CisjZW5k aWYKIH07CiAKIAo= 96733 2011-06-10 04:39:49 -0700 2011-06-10 04:56:48 -0700 Patch with an additional comment patch.diff text/plain 3850 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NDE4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDYtMDggIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4gYW5kIFZpYXRjaGVzbGF2IE9zdGFw ZW5rbyA8b3N0YXBlbmtvLnZpYXRjaGVzbGF2QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBBZGQgbGF5ZXIgZmFj dG9yeSB0byBHcmFwaGljc0xheWVyIGZvciBjcmVhdGluZyBub24tZGVmYXVsdCBsYXllciB0eXBl LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE5MjUK KworICAgICAgICBBZGRlZCBhIHN0YXRpYyBmYWN0b3J5IHByb3RlY3RlZCBtZW1iZXIgdG8gR3Jh cGhpY3NMYXllciwgd2hpY2ggc2hvdWxkIGJlIGFjY2Vzc2VkIGZyb20KKyAgICAgICAgYSBwb3J0 LXNwZWNpZmljIGltcGxlbWVudGF0aW9uIG9mIEdyYXBoaWNzTGF5ZXI6OmNyZWF0ZS4gRm9yIG5v dyB0aGlzIGlzIGVuYWJsZWQgZm9yIFF0IG9ubHkuCisKKyAgICAgICAgVGhpcyBpcyBuZWVkZWQg Zm9yIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGFjcm9zcyBwcm9jZXNzZXMgaW4gV2ViS2l0Miwg c2luY2UgV2ViQ29yZQorICAgICAgICBkb2Vzbid0IGtub3cgaW4gY29tcGlsZSB0aW1lIHdoZXRo ZXIgaXQncyBpbiBXZWJLaXQgb3IgV2ViS2l0Miwgd2hpY2ggbWFrZXMgaGF2aW5nIHR3bworICAg ICAgICBkaWZmZXJlbnQgaW1wbGVtZW50YXRpb25zIG9mIEdyYXBoaWNzTGF5ZXIgY29leGlzdCBp bXBvc3NpYmxlIHdpdGhvdXQgc29tZSBydW50aW1lCisgICAgICAgIGZhY3RvcnkgdGhhdCBjYW4g YmUgb3ZlcnJpZGRlbiBieSB0aGUgd2ViIHByb2Nlc3MuCisKKyAgICAgICAgTm90ZSB0aGF0IHRo ZSB1c2Ugb2YgdGhlIGZhY3Rvcnkgd291bGQgYmUgb3B0aW9uYWwsIGFuZCB0aGUgcG9ydC1zcGVj aWZpYyBHcmFwaGljc0xheWVyOjpjcmVhdGUKKyAgICAgICAgd291bGQgaGF2ZSB0byBleHBsaWNp dGx5IGNhbGwgaXQsIGluIG9yZGVyIHRvIGJlIHVuaW50cnVzaXZlIHdpdGggY3VycmVudCBpbXBs ZW1lbnRhdGlvbnMuCisKKyAgICAgICAgTm8gbmV3IGZ1bmN0aW9uYWxpdHksIHNvIG5vIG5ldyB0 ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6c2V0R3JhcGhpY3NMYXllckZhY3Rvcnkp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaDoKKwogMjAxMS0w Ni0wOCAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgSGFqaW1lIE1vcml0YS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCShyZXZpc2lvbiA4ODQxOCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMTIsNiArMzEyLDE1IEBAIHZvaWQgR3JhcGhpY3NMYXllcjo6ZGlzdHJpYnV0ZU9w YWNpdHkoZmwKICAgICB9CiB9CiAKKyNpZiBQTEFURk9STShRVCkKK0dyYXBoaWNzTGF5ZXI6Okdy YXBoaWNzTGF5ZXJGYWN0b3J5KiBHcmFwaGljc0xheWVyOjpzX2dyYXBoaWNzTGF5ZXJGYWN0b3J5 ID0gMDsKKwordm9pZCBHcmFwaGljc0xheWVyOjpzZXRHcmFwaGljc0xheWVyRmFjdG9yeShHcmFw aGljc0xheWVyOjpHcmFwaGljc0xheWVyRmFjdG9yeSBmYWN0b3J5KQoreworICAgIHNfZ3JhcGhp Y3NMYXllckZhY3RvcnkgPSBmYWN0b3J5OworfQorI2VuZGlmCisKIC8vIEFuICJpbnZhbGlkIiBs aXN0IGlzIG9uZSB3aG9zZSBmdW5jdGlvbnMgZG9uJ3QgbWF0Y2gsIGFuZCB0aGVyZWZvcmUgaGFz IHRvIGJlIGFuaW1hdGVkIGFzIGEgTWF0cml4CiAvLyBUaGUgaGFzQmlnUm90YXRpb24gZmxhZyB3 aWxsIGFsd2F5cyByZXR1cm4gZmFsc2UgaWYgaXNWYWxpZCBpcyBmYWxzZS4gT3RoZXJ3aXNlIGhh c0JpZ1JvdGF0aW9uIGlzIAogLy8gdHJ1ZSBpZiB0aGUgcm90YXRpb24gYmV0d2VlbiBhbnkgdHdv IGtleWZyYW1lcyBpcyA+PSAxODAgZGVncmVlcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgJKHJldmlzaW9uIDg4NDE4KQorKysg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNjcsNiArMzY3LDEzIEBAIHB1YmxpYzoKIAogICAgIGJvb2wgdXNpbmdUaWxl ZExheWVyKCkgY29uc3QgeyByZXR1cm4gbV91c2luZ1RpbGVkTGF5ZXI7IH0KIAorI2lmIFBMQVRG T1JNKFFUKQorICAgIC8vIFRoaXMgYWxsb3dzIHNldmVyYWwgYWx0ZXJuYXRpdmUgR3JhcGhpY3NM YXllciBpbXBsZW1lbnRhdGlvbnMgaW4gdGhlIHNhbWUgcG9ydCwKKyAgICAvLyBlLmcuIGlmIGEg ZGlmZmVyZW50IEdyYXBoaWNzTGF5ZXIgaW1wbGVtZW50YXRpb24gaXMgbmVlZGVkIGluIFdlYktp dDEgdnMuIFdlYktpdDIuCisgICAgdHlwZWRlZiBQYXNzT3duUHRyPEdyYXBoaWNzTGF5ZXI+IEdy YXBoaWNzTGF5ZXJGYWN0b3J5KEdyYXBoaWNzTGF5ZXJDbGllbnQqKTsKKyAgICBzdGF0aWMgdm9p ZCBzZXRHcmFwaGljc0xheWVyRmFjdG9yeShHcmFwaGljc0xheWVyRmFjdG9yeSk7CisjZW5kaWYK KwogcHJvdGVjdGVkOgogCiAgICAgdHlwZWRlZiBWZWN0b3I8VHJhbnNmb3JtT3BlcmF0aW9uOjpP cGVyYXRpb25UeXBlPiBUcmFuc2Zvcm1PcGVyYXRpb25MaXN0OwpAQCAtMzc1LDcgKzM4Miw3IEBA IHByb3RlY3RlZDoKICAgICBzdGF0aWMgdm9pZCBmZXRjaFRyYW5zZm9ybU9wZXJhdGlvbkxpc3Qo Y29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmLCBUcmFuc2Zvcm1PcGVyYXRpb25MaXN0JiwgYm9vbCYg aXNWYWxpZCwgYm9vbCYgaGFzQmlnUm90YXRpb24pOwogCiAgICAgdmlydHVhbCB2b2lkIHNldE9w YWNpdHlJbnRlcm5hbChmbG9hdCkgeyB9Ci0gICAgCisKICAgICAvLyBUaGUgbGF5ZXIgYmVpbmcg cmVwbGljYXRlZC4KICAgICBHcmFwaGljc0xheWVyKiByZXBsaWNhdGVkTGF5ZXIoKSBjb25zdCB7 IHJldHVybiBtX3JlcGxpY2F0ZWRMYXllcjsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRSZXBsaWNh dGVkTGF5ZXIoR3JhcGhpY3NMYXllciogbGF5ZXIpIHsgbV9yZXBsaWNhdGVkTGF5ZXIgPSBsYXll cjsgfQpAQCAtNDI4LDYgKzQzNSwxMCBAQCBwcm90ZWN0ZWQ6CiAgICAgSW50UmVjdCBtX2NvbnRl bnRzUmVjdDsKIAogICAgIGludCBtX3JlcGFpbnRDb3VudDsKKworI2lmIFBMQVRGT1JNKFFUKQor ICAgIHN0YXRpYyBHcmFwaGljc0xheWVyOjpHcmFwaGljc0xheWVyRmFjdG9yeSogc19ncmFwaGlj c0xheWVyRmFjdG9yeTsKKyNlbmRpZgogfTsKIAogCg== 96911 2011-06-12 20:00:47 -0700 2011-06-13 09:17:07 -0700 Patch: Use GraphicsLayerFactory in TextureMapper patch.diff text/plain 1958 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NjI0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMTIgIE5vYW0gUm9z ZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBsYXllciBmYWN0b3J5IHRvIEdyYXBoaWNz TGF5ZXIgZm9yIGNyZWF0aW5nIG5vbi1kZWZhdWx0IGxheWVyIHR5cGUuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTkyNQorCisgICAgICAgIFVzZSB0 aGUgbmV3IGZhY3RvcnkgZnVuY3Rpb24gaW4gVGV4dHVyZU1hcHBlci4KKworICAgICAgICBObyBu ZXcgZnVuY3Rpb25hbGl0eSBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6Y3JlYXRlKToKKwogMjAxMS0wNi0xMiAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNz TGF5ZXJUZXh0dXJlTWFwcGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwCShyZXZp c2lvbiA4ODYyMSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9H cmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0OSwxMSAr MzQ5LDYgQEAgUGxhdGZvcm1MYXllciogR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZQogICAgIHJl dHVybiBjb25zdF9jYXN0PFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyKj4obm9kZSgpLT5tZWRp YSgpKTsKIH0KIAotUGFzc093blB0cjxHcmFwaGljc0xheWVyPiBHcmFwaGljc0xheWVyOjpjcmVh dGUoR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQotewotICAgIHJldHVybiBhZG9wdFB0cihu ZXcgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIoY2xpZW50KSk7Ci19Ci0KIGJvb2wgR3JhcGhp Y3NMYXllclRleHR1cmVNYXBwZXI6OmFkZEFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlz dCYgdmFsdWVMaXN0LCBjb25zdCBJbnRTaXplJiBib3hTaXplLCBjb25zdCBBbmltYXRpb24qIGFu aW0sIGNvbnN0IFN0cmluZyYga2V5ZnJhbWVzTmFtZSwgZG91YmxlIHRpbWVPZmZzZXQpCiB7CiAg ICAgQVNTRVJUKCFrZXlmcmFtZXNOYW1lLmlzRW1wdHkoKSk7CkBAIC00MjEsNCArNDE2LDExIEBA IHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OmFuaW1hdGkKICAgICBjbGllbnQoKS0+ bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCh0aGlzLCAvKiBET00gdGltZSAqLyBXVEY6OmN1cnJlbnRU aW1lKCkpOwogfQogCitQYXNzT3duUHRyPEdyYXBoaWNzTGF5ZXI+IEdyYXBoaWNzTGF5ZXI6OmNy ZWF0ZShHcmFwaGljc0xheWVyQ2xpZW50KiBjbGllbnQpCit7CisgICAgaWYgKHNfZ3JhcGhpY3NM YXllckZhY3RvcnkpCisgICAgICAgIHJldHVybiAoKnNfZ3JhcGhpY3NMYXllckZhY3RvcnkpKGNs aWVudCk7CisgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBl cihjbGllbnQpKTsKK30KKwogfQo=