50770 2010-12-09 11:05:21 -0800 [GStreamer] PlatformVideoWindowMac implementation 2011-01-12 01:10:40 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned eric.carlson webkit.review.bot oldest_to_newest 319601 0 pnormand 2010-12-09 11:05:21 -0800 A new PlatformVideoWindow implementation is needed for GStreamer-based fullscreen video display on Mac. 319603 1 76096 pnormand 2010-12-09 11:10:02 -0800 Created attachment 76096 Mac PlatformVideoWindow implementation 319605 2 pnormand 2010-12-09 11:11:25 -0800 Hum I just wondered, maybe PlatformVideoWindowCocoa would be a better name? 323208 3 76096 eric.carlson 2010-12-16 09:17:59 -0800 Comment on attachment 76096 Mac PlatformVideoWindow implementation View in context: https://bugs.webkit.org/attachment.cgi?id=76096&action=review I won't r+ this because I don't know enough about the gstreamer portion to tell if it is correct or not. > WebCore/ChangeLog:17 > + * platform/graphics/gstreamer/GStreamerGWorld.cpp: > + (WebCore::gstGWorldSyncMessageCallback): > + * platform/graphics/gstreamer/PlatformVideoWindowMac.mm: Added. > + (PlatformVideoWindow::PlatformVideoWindow): > + (PlatformVideoWindow::~PlatformVideoWindow): > + (PlatformVideoWindow::prepareForOverlay): > + Looks like you forgot to add PlatformVideoWindowMac.h > WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm:40 > +PlatformVideoWindow::PlatformVideoWindow() > +{ > + m_window = [[NSView alloc] init]; > + m_videoWindowId = reinterpret_cast<unsigned long>(m_window); > +} > + > +PlatformVideoWindow::~PlatformVideoWindow() > +{ > + [m_window release]; > + m_window = 0; > + m_videoWindowId = 0; > +} m_window should be a RetainPtr. 324341 4 pnormand 2010-12-20 05:34:59 -0800 (In reply to comment #3) > (From update of attachment 76096 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=76096&action=review > > I won't r+ this because I don't know enough about the gstreamer portion to tell if it is correct or not. > > > > WebCore/ChangeLog:17 > > + * platform/graphics/gstreamer/GStreamerGWorld.cpp: > > + (WebCore::gstGWorldSyncMessageCallback): > > + * platform/graphics/gstreamer/PlatformVideoWindowMac.mm: Added. > > + (PlatformVideoWindow::PlatformVideoWindow): > > + (PlatformVideoWindow::~PlatformVideoWindow): > > + (PlatformVideoWindow::prepareForOverlay): > > + > > Looks like you forgot to add PlatformVideoWindowMac.h > > The generic PlatformVideoWindow.h header can be used. This is just the platform-specific implementation. > > WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm:40 > > +PlatformVideoWindow::PlatformVideoWindow() > > +{ > > + m_window = [[NSView alloc] init]; > > + m_videoWindowId = reinterpret_cast<unsigned long>(m_window); > > +} > > + > > +PlatformVideoWindow::~PlatformVideoWindow() > > +{ > > + [m_window release]; > > + m_window = 0; > > + m_videoWindowId = 0; > > +} > > m_window should be a RetainPtr. Hum but that's specific to the mac platform. m_window is declared in the PlatformVideoWindow.h header, I could define it differently on mac I guess. 324933 5 76096 pnormand 2010-12-21 04:07:09 -0800 Comment on attachment 76096 Mac PlatformVideoWindow implementation Needs a little more work as per Eric's comment. 332242 6 78512 pnormand 2011-01-11 03:36:13 -0800 Created attachment 78512 updated patch 332243 7 webkit.review.bot 2011-01-11 03:37:17 -0800 Attachment 78512 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/gstreamer/PlatformVideoWindow.h:41: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 332245 8 78513 pnormand 2011-01-11 03:38:07 -0800 Created attachment 78513 updated patch 332377 9 78513 eric.carlson 2011-01-11 09:00:46 -0800 Comment on attachment 78513 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=78513&action=review r+ if you fix the RetainPtr assignment problem. > Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindow.h:48 > + PlatformWidget window() const > +{ > +#if !PLATFORM(MAC) > + return m_window; > +#else > + return m_window.get(); > +#endif > +} I know the style bot is happy with it, but this brace/#if indentation is strange. It might be easier to read if this function was moved to the .mm file. > Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm:2 > + * Copyright (C) 2010 Igalia S.L Probably want 2011 here. > Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm:31 > + m_window = [[NSView alloc] init]; This should be m_window.adoptNS([[NSView alloc] init]); > Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowMac.mm:44 > + m_videoWindow = static_cast<PlatformWidget>(g_value_get_pointer(gst_structure_get_value(message->structure, "nsview"))); > + [m_window.get() addSubview:m_videoWindow]; Might be worth ASSERT-ing m_videoWindow here. 332958 10 pnormand 2011-01-12 01:10:40 -0800 I tried moving the window() implementation to the .mm file but then I got a symbol lookup error when linking WebKit. So I kept the #if in the header but it's more readable now, imho Committed r75590: <http://trac.webkit.org/changeset/75590> 76096 2010-12-09 11:10:02 -0800 2011-01-11 03:38:07 -0800 Mac PlatformVideoWindow implementation Mac-PlatformVideoWindow-implementation.patch text/plain 4139 pnormand RnJvbSA4MTViODg3NTliNTk1NmJmOWIzNjkwN2I5MjUwM2ZlNGNmYTNhM2FiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDI3IFNlcCAyMDEwIDIwOjI1OjU5ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g TWFjIFBsYXRmb3JtVmlkZW9XaW5kb3cgaW1wbGVtZW50YXRpb24KCi0tLQogV2ViQ29yZS9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE3ICsrKysrKysKIC4u Li9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyR1dvcmxkLmNwcCAgICAgICAgIHwgICAgMyAr LQogLi4uL2dyYXBoaWNzL2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93TWFjLm1tICAgfCAg IDUwICsrKysrKysrKysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDY5IGluc2VydGlvbnMo KyksIDEgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvUGxhdGZvcm1WaWRlb1dpbmRvd01hYy5tbQoKZGlmZiAtLWdpdCBh L1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc1ODQ5YS4uYjY5 NzQ3ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0xMi0wOSAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3Jt YW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgW0dTdHJlYW1lcl0gUGxhdGZvcm1WaWRlb1dpbmRvd01hYyBpbXBsZW1lbnRhdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTA3NzAK KworICAgICAgICBUaGlzIG5ldyBpbXBsZW1lbnRhdGlvbiB3aWxsIGJlIHVzZWQgb24gTWFjIE9T IHRvIGRpc3BsYXkgdGhlCisgICAgICAgIGZ1bGxzY3JlZW4gdmlkZW8gd2luZG93IHdpdGggdGhl IEdTdHJlYW1lci1iYXNlZCBtZWRpYSBwbGF5ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyR1dvcmxkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omdz dEdXb3JsZFN5bmNNZXNzYWdlQ2FsbGJhY2spOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93TWFjLm1tOiBBZGRlZC4KKyAgICAgICAgKFBs YXRmb3JtVmlkZW9XaW5kb3c6OlBsYXRmb3JtVmlkZW9XaW5kb3cpOgorICAgICAgICAoUGxhdGZv cm1WaWRlb1dpbmRvdzo6flBsYXRmb3JtVmlkZW9XaW5kb3cpOgorICAgICAgICAoUGxhdGZvcm1W aWRlb1dpbmRvdzo6cHJlcGFyZUZvck92ZXJsYXkpOgorCiAyMDEwLTEyLTA5ICBBbnRvbmlvIEdv bWVzICA8YWdvbWVzQHJpbS5jb20+CiAKICAgICAgICAgUnViYmVyIHN0YW1wZWQgYnkgYnkgR3Vz dGF2byBOb3JvbmhhIFNpbHZhLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvR1N0cmVhbWVyR1dvcmxkLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL0dTdHJlYW1lckdXb3JsZC5jcHAKaW5kZXggZThjODdhYy4uMGQwNmYyYiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVy R1dvcmxkLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3Ry ZWFtZXJHV29ybGQuY3BwCkBAIC00Miw3ICs0Miw4IEBAIGdib29sZWFuIGdzdEdXb3JsZFN5bmNN ZXNzYWdlQ2FsbGJhY2soR3N0QnVzKiBidXMsIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIGdwb2ludGVy CiAKICAgICBHU3RyZWFtZXJHV29ybGQqIGdzdEdXb3JsZCA9IHN0YXRpY19jYXN0PEdTdHJlYW1l ckdXb3JsZCo+KGRhdGEpOwogCi0gICAgaWYgKGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUobWVzc2Fn ZS0+c3RydWN0dXJlLCAicHJlcGFyZS14d2luZG93LWlkIikpCisgICAgaWYgKGdzdF9zdHJ1Y3R1 cmVfaGFzX25hbWUobWVzc2FnZS0+c3RydWN0dXJlLCAicHJlcGFyZS14d2luZG93LWlkIikKKyAg ICAgICAgfHwgZ3N0X3N0cnVjdHVyZV9oYXNfbmFtZShtZXNzYWdlLT5zdHJ1Y3R1cmUsICJoYXZl LW5zLXZpZXciKSkKICAgICAgICAgZ3N0R1dvcmxkLT5zZXRXaW5kb3dPdmVybGF5KG1lc3NhZ2Up OwogICAgIHJldHVybiBUUlVFOwogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvUGxhdGZvcm1WaWRlb1dpbmRvd01hYy5tbSBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3dNYWMubW0KbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGMxZTBiZAotLS0gL2Rldi9udWxsCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3dNYWMu bW0KQEAgLTAsMCArMSw1MCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBJZ2FsaWEgUy5M CisgKgorICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vcgorICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExp YnJhcnkgR2VuZXJhbCBQdWJsaWMKKyAqIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVl IFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICogdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNl LCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqIFRoaXMgbGli cmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAor ICogYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2Fy cmFudHkgb2YKKyAqIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIg UFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2Ug Zm9yIG1vcmUgZGV0YWlscy4KKyAqCisgKiBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5 IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgKiBhbG9uZyB3aXRo IHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0 bworICogdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3Ry ZWV0LCBGaWZ0aCBGbG9vciwKKyAqIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorICovCisK KyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVZpZGVvV2luZG93LmgiCisK KyNpZiBVU0UoR1NUUkVBTUVSKQorCisjaW5jbHVkZSA8Z3N0L2dzdC5oPgorCit1c2luZyBuYW1l c3BhY2UgV2ViQ29yZTsKKworUGxhdGZvcm1WaWRlb1dpbmRvdzo6UGxhdGZvcm1WaWRlb1dpbmRv dygpCit7CisgICAgbV93aW5kb3cgPSBbW05TVmlldyBhbGxvY10gaW5pdF07CisgICAgbV92aWRl b1dpbmRvd0lkID0gcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZCBsb25nPihtX3dpbmRvdyk7Cit9 CisKK1BsYXRmb3JtVmlkZW9XaW5kb3c6On5QbGF0Zm9ybVZpZGVvV2luZG93KCkKK3sKKyAgICBb bV93aW5kb3cgcmVsZWFzZV07CisgICAgbV93aW5kb3cgPSAwOworICAgIG1fdmlkZW9XaW5kb3dJ ZCA9IDA7Cit9CisKK3ZvaWQgUGxhdGZvcm1WaWRlb1dpbmRvdzo6cHJlcGFyZUZvck92ZXJsYXko R3N0TWVzc2FnZSogbWVzc2FnZSkKK3sKKyAgICBpZiAoZ3N0X3N0cnVjdHVyZV9oYXNfbmFtZSht ZXNzYWdlLT5zdHJ1Y3R1cmUsICJoYXZlLW5zLXZpZXciKSkgeworICAgICAgICBtX3ZpZGVvV2lu ZG93ID0gc3RhdGljX2Nhc3Q8UGxhdGZvcm1XaWRnZXQ+KGdfdmFsdWVfZ2V0X3BvaW50ZXIoZ3N0 X3N0cnVjdHVyZV9nZXRfdmFsdWUobWVzc2FnZS0+c3RydWN0dXJlLCAibnN2aWV3IikpKTsKKyAg ICAgICAgW21fd2luZG93IGFkZFN1YnZpZXc6bV92aWRlb1dpbmRvd107CisgICAgfQorfQorCisj ZW5kaWYgLy8gVVNFKEdTVFJFQU1FUikKLS0gCjEuNy4zLjM= 78512 2011-01-11 03:36:13 -0800 2011-01-11 03:38:07 -0800 updated patch updated-patch.patch text/plain 5359 pnormand RnJvbSBkMDQ2MGMxZDY5NDExZDgzODUwZTNkNGFjOThlYjU5ZmNkZTdhZTllIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDEwIEphbiAyMDExIDE4OjUyOjA3ICswMTAwClN1YmplY3Q6IFtQQVRDSF0g dXBkYXRlZCBwYXRjaAoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKysKIC4uLi9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyR1dvcmxkLmNwcCAgICAgICAgIHwgICAgMyArLQogLi4uL2dyYXBoaWNzL2dzdHJlYW1l ci9QbGF0Zm9ybVZpZGVvV2luZG93LmggICAgICAgfCAgIDEzICsrKysrLQogLi4uL2dyYXBoaWNz L2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93TWFjLm1tICAgfCAgIDQ4ICsrKysrKysrKysr KysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDgxIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z KC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3dNYWMubW0KCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFhYzA0 YS4uOTZmZDhhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDExLTAxLTExICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1N0cmVhbWVyXSBQbGF0Zm9ybVZpZGVvV2lu ZG93TWFjIGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MDc3MAorCisgICAgICAgIFRoaXMgbmV3IGltcGxlbWVudGF0aW9uIHdp bGwgYmUgdXNlZCBvbiBNYWMgT1MgdG8gZGlzcGxheSB0aGUKKyAgICAgICAgZnVsbHNjcmVlbiB2 aWRlbyB3aW5kb3cgd2l0aCB0aGUgR1N0cmVhbWVyLWJhc2VkIG1lZGlhIHBsYXllci4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJHV29ybGQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Z3N0R1dvcmxkU3luY01lc3NhZ2VDYWxsYmFjayk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3cuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtVmlkZW9XaW5kb3c6OndpbmRvdyk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3dNYWMubW06IENv cGllZCBmcm9tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9QbGF0 Zm9ybVZpZGVvV2luZG93LmguCisgICAgICAgIChQbGF0Zm9ybVZpZGVvV2luZG93OjpQbGF0Zm9y bVZpZGVvV2luZG93KToKKyAgICAgICAgKFBsYXRmb3JtVmlkZW9XaW5kb3c6On5QbGF0Zm9ybVZp ZGVvV2luZG93KToKKyAgICAgICAgKFBsYXRmb3JtVmlkZW9XaW5kb3c6OnByZXBhcmVGb3JPdmVy bGF5KToKKwogMjAxMS0wMS0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckdX b3JsZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyR1dvcmxkLmNwcAppbmRleCBkMTc5NjAxLi5hNGIyMGJlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyR1dvcmxkLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVh bWVyR1dvcmxkLmNwcApAQCAtNDMsNyArNDMsOCBAQCBnYm9vbGVhbiBnc3RHV29ybGRTeW5jTWVz c2FnZUNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdlKiBtZXNzYWdlLCBncG9pbnRlcgog CiAgICAgR1N0cmVhbWVyR1dvcmxkKiBnc3RHV29ybGQgPSBzdGF0aWNfY2FzdDxHU3RyZWFtZXJH V29ybGQqPihkYXRhKTsKIAotICAgIGlmIChnc3Rfc3RydWN0dXJlX2hhc19uYW1lKG1lc3NhZ2Ut PnN0cnVjdHVyZSwgInByZXBhcmUteHdpbmRvdy1pZCIpKQorICAgIGlmIChnc3Rfc3RydWN0dXJl X2hhc19uYW1lKG1lc3NhZ2UtPnN0cnVjdHVyZSwgInByZXBhcmUteHdpbmRvdy1pZCIpCisgICAg ICAgIHx8IGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUobWVzc2FnZS0+c3RydWN0dXJlLCAiaGF2ZS1u cy12aWV3IikpCiAgICAgICAgIGdzdEdXb3JsZC0+c2V0V2luZG93T3ZlcmxheShtZXNzYWdlKTsK ICAgICByZXR1cm4gVFJVRTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvUGxhdGZvcm1WaWRlb1dpbmRvdy5oCmluZGV4 IGYyYTNmZjIuLjk5MDIwY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3cuaApAQCAt MzgsMTMgKzM4LDI0IEBAIGNsYXNzIFBsYXRmb3JtVmlkZW9XaW5kb3cgOiBwdWJsaWMgUmVmQ291 bnRlZDxQbGF0Zm9ybVZpZGVvV2luZG93PiB7CiAKIAogICAgICAgICB2b2lkIHByZXBhcmVGb3JP dmVybGF5KEdzdE1lc3NhZ2UqKTsKLSAgICAgICAgUGxhdGZvcm1XaWRnZXQgd2luZG93KCkgY29u c3QgeyByZXR1cm4gbV93aW5kb3c7IH0KKyAgICAgICAgUGxhdGZvcm1XaWRnZXQgd2luZG93KCkg Y29uc3QgeworI2lmICFQTEFURk9STShNQUMpCisgICAgICAgICAgIHJldHVybiBtX3dpbmRvdzsK KyNlbHNlCisgICAgICAgICAgIHJldHVybiBtX3dpbmRvdy5nZXQoKTsKKyNlbmRpZgorfQogICAg ICAgICB1bnNpZ25lZCBsb25nIHZpZGVvV2luZG93SWQoKSBjb25zdCB7IHJldHVybiBtX3ZpZGVv V2luZG93SWQ7IH0KIAogICAgIHByaXZhdGU6CiAgICAgICAgIHVuc2lnbmVkIGxvbmcgbV92aWRl b1dpbmRvd0lkOwogICAgICAgICBQbGF0Zm9ybVdpZGdldCBtX3ZpZGVvV2luZG93OworI2lmICFQ TEFURk9STShNQUMpCiAgICAgICAgIFBsYXRmb3JtV2lkZ2V0IG1fd2luZG93OworI2Vsc2UKKyAg ICAgICAgUmV0YWluUHRyPE5TVmlldz4gbV93aW5kb3c7CisjZW5kaWYKKwogICAgIH07CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9Q bGF0Zm9ybVZpZGVvV2luZG93TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3dNYWMubW0KbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMjQ5MzgzZQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93TWFjLm1t CkBAIC0wLDAgKzEsNDggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgSWdhbGlhIFMuTAor ICoKKyAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IKKyAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljCisgKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBT b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwg b3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiBUaGlzIGxpYnJh cnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAq IGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJh bnR5IG9mCisgKiBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UuICBTZWUgdGhlIEdOVQorICogTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv ciBtb3JlIGRldGFpbHMuCisgKgorICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBv ZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQorICogYWxvbmcgd2l0aCB0 aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8K KyAqIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVl dCwgRmlmdGggRmxvb3IsCisgKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1WaWRlb1dpbmRvdy5oIgorCisj aWYgVVNFKEdTVFJFQU1FUikKKworI2luY2x1ZGUgPGdzdC9nc3QuaD4KKwordXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CisKK1BsYXRmb3JtVmlkZW9XaW5kb3c6OlBsYXRmb3JtVmlkZW9XaW5kb3co KQoreworICAgIG1fd2luZG93ID0gW1tOU1ZpZXcgYWxsb2NdIGluaXRdOworICAgIG1fdmlkZW9X aW5kb3dJZCA9IHJlaW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQgbG9uZz4obV93aW5kb3cuZ2V0KCkp OworfQorCitQbGF0Zm9ybVZpZGVvV2luZG93Ojp+UGxhdGZvcm1WaWRlb1dpbmRvdygpCit7Cisg ICAgbV92aWRlb1dpbmRvd0lkID0gMDsKK30KKwordm9pZCBQbGF0Zm9ybVZpZGVvV2luZG93Ojpw cmVwYXJlRm9yT3ZlcmxheShHc3RNZXNzYWdlKiBtZXNzYWdlKQoreworICAgIGlmIChnc3Rfc3Ry dWN0dXJlX2hhc19uYW1lKG1lc3NhZ2UtPnN0cnVjdHVyZSwgImhhdmUtbnMtdmlldyIpKSB7Cisg ICAgICAgIG1fdmlkZW9XaW5kb3cgPSBzdGF0aWNfY2FzdDxQbGF0Zm9ybVdpZGdldD4oZ192YWx1 ZV9nZXRfcG9pbnRlcihnc3Rfc3RydWN0dXJlX2dldF92YWx1ZShtZXNzYWdlLT5zdHJ1Y3R1cmUs ICJuc3ZpZXciKSkpOworICAgICAgICBbbV93aW5kb3cuZ2V0KCkgYWRkU3VidmlldzptX3ZpZGVv V2luZG93XTsKKyAgICB9Cit9CisKKyNlbmRpZiAvLyBVU0UoR1NUUkVBTUVSKQotLSAKMS43LjIu Mw== 78513 2011-01-11 03:38:07 -0800 2011-01-11 09:00:46 -0800 updated patch updated-patch.patch text/plain 5360 pnormand RnJvbSA2YzFhMDE2NzA5MjBkYzhmMzEzNTc0MTA1YWY0ZDY5ZDU3OWU4NzFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBNb24sIDEwIEphbiAyMDExIDE4OjUyOjA3ICswMTAwClN1YmplY3Q6IFtQQVRDSF0g dXBkYXRlZCBwYXRjaAoKLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKysKIC4uLi9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyR1dvcmxkLmNwcCAgICAgICAgIHwgICAgMyArLQogLi4uL2dyYXBoaWNzL2dzdHJlYW1l ci9QbGF0Zm9ybVZpZGVvV2luZG93LmggICAgICAgfCAgIDE0ICsrKysrLQogLi4uL2dyYXBoaWNz L2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93TWFjLm1tICAgfCAgIDQ4ICsrKysrKysrKysr KysrKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDgyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z KC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3dNYWMubW0KCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFhYzA0 YS4uOTZmZDhhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDExLTAxLTExICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1N0cmVhbWVyXSBQbGF0Zm9ybVZpZGVvV2lu ZG93TWFjIGltcGxlbWVudGF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MDc3MAorCisgICAgICAgIFRoaXMgbmV3IGltcGxlbWVudGF0aW9uIHdp bGwgYmUgdXNlZCBvbiBNYWMgT1MgdG8gZGlzcGxheSB0aGUKKyAgICAgICAgZnVsbHNjcmVlbiB2 aWRlbyB3aW5kb3cgd2l0aCB0aGUgR1N0cmVhbWVyLWJhc2VkIG1lZGlhIHBsYXllci4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJHV29ybGQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Z3N0R1dvcmxkU3luY01lc3NhZ2VDYWxsYmFjayk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3cuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtVmlkZW9XaW5kb3c6OndpbmRvdyk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3dNYWMubW06IENv cGllZCBmcm9tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9QbGF0 Zm9ybVZpZGVvV2luZG93LmguCisgICAgICAgIChQbGF0Zm9ybVZpZGVvV2luZG93OjpQbGF0Zm9y bVZpZGVvV2luZG93KToKKyAgICAgICAgKFBsYXRmb3JtVmlkZW9XaW5kb3c6On5QbGF0Zm9ybVZp ZGVvV2luZG93KToKKyAgICAgICAgKFBsYXRmb3JtVmlkZW9XaW5kb3c6OnByZXBhcmVGb3JPdmVy bGF5KToKKwogMjAxMS0wMS0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckdX b3JsZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyR1dvcmxkLmNwcAppbmRleCBkMTc5NjAxLi5hNGIyMGJlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyR1dvcmxkLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVh bWVyR1dvcmxkLmNwcApAQCAtNDMsNyArNDMsOCBAQCBnYm9vbGVhbiBnc3RHV29ybGRTeW5jTWVz c2FnZUNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdlKiBtZXNzYWdlLCBncG9pbnRlcgog CiAgICAgR1N0cmVhbWVyR1dvcmxkKiBnc3RHV29ybGQgPSBzdGF0aWNfY2FzdDxHU3RyZWFtZXJH V29ybGQqPihkYXRhKTsKIAotICAgIGlmIChnc3Rfc3RydWN0dXJlX2hhc19uYW1lKG1lc3NhZ2Ut PnN0cnVjdHVyZSwgInByZXBhcmUteHdpbmRvdy1pZCIpKQorICAgIGlmIChnc3Rfc3RydWN0dXJl X2hhc19uYW1lKG1lc3NhZ2UtPnN0cnVjdHVyZSwgInByZXBhcmUteHdpbmRvdy1pZCIpCisgICAg ICAgIHx8IGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUobWVzc2FnZS0+c3RydWN0dXJlLCAiaGF2ZS1u cy12aWV3IikpCiAgICAgICAgIGdzdEdXb3JsZC0+c2V0V2luZG93T3ZlcmxheShtZXNzYWdlKTsK ICAgICByZXR1cm4gVFJVRTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvUGxhdGZvcm1WaWRlb1dpbmRvdy5oCmluZGV4 IGYyYTNmZjIuLmIzMmM4ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93LmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1BsYXRmb3JtVmlkZW9XaW5kb3cuaApAQCAt MzgsMTMgKzM4LDI1IEBAIGNsYXNzIFBsYXRmb3JtVmlkZW9XaW5kb3cgOiBwdWJsaWMgUmVmQ291 bnRlZDxQbGF0Zm9ybVZpZGVvV2luZG93PiB7CiAKIAogICAgICAgICB2b2lkIHByZXBhcmVGb3JP dmVybGF5KEdzdE1lc3NhZ2UqKTsKLSAgICAgICAgUGxhdGZvcm1XaWRnZXQgd2luZG93KCkgY29u c3QgeyByZXR1cm4gbV93aW5kb3c7IH0KKyAgICAgICAgUGxhdGZvcm1XaWRnZXQgd2luZG93KCkg Y29uc3QKK3sKKyNpZiAhUExBVEZPUk0oTUFDKQorICAgICAgICAgICByZXR1cm4gbV93aW5kb3c7 CisjZWxzZQorICAgICAgICAgICByZXR1cm4gbV93aW5kb3cuZ2V0KCk7CisjZW5kaWYKK30KICAg ICAgICAgdW5zaWduZWQgbG9uZyB2aWRlb1dpbmRvd0lkKCkgY29uc3QgeyByZXR1cm4gbV92aWRl b1dpbmRvd0lkOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICB1bnNpZ25lZCBsb25nIG1fdmlk ZW9XaW5kb3dJZDsKICAgICAgICAgUGxhdGZvcm1XaWRnZXQgbV92aWRlb1dpbmRvdzsKKyNpZiAh UExBVEZPUk0oTUFDKQogICAgICAgICBQbGF0Zm9ybVdpZGdldCBtX3dpbmRvdzsKKyNlbHNlCisg ICAgICAgIFJldGFpblB0cjxOU1ZpZXc+IG1fd2luZG93OworI2VuZGlmCisKICAgICB9OwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv UGxhdGZvcm1WaWRlb1dpbmRvd01hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9QbGF0Zm9ybVZpZGVvV2luZG93TWFjLm1tCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjI0OTM4M2UKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvUGxhdGZvcm1WaWRlb1dpbmRvd01hYy5t bQpAQCAtMCwwICsxLDQ4IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIElnYWxpYSBTLkwK KyAqCisgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCisgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYworICogTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUg U29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2Us IG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisgKgorICogVGhpcyBsaWJy YXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCisg KiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJy YW50eSBvZgorICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQ VVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBm b3IgbW9yZSBkZXRhaWxzLgorICoKKyAqIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkg b2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqIGFsb25nIHdpdGgg dGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBub3QsIHdyaXRlIHRv CisgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJl ZXQsIEZpZnRoIEZsb29yLAorICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisgKi8KKwor I2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIlBsYXRmb3JtVmlkZW9XaW5kb3cuaCIKKwor I2lmIFVTRShHU1RSRUFNRVIpCisKKyNpbmNsdWRlIDxnc3QvZ3N0Lmg+CisKK3VzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOworCitQbGF0Zm9ybVZpZGVvV2luZG93OjpQbGF0Zm9ybVZpZGVvV2luZG93 KCkKK3sKKyAgICBtX3dpbmRvdyA9IFtbTlNWaWV3IGFsbG9jXSBpbml0XTsKKyAgICBtX3ZpZGVv V2luZG93SWQgPSByZWludGVycHJldF9jYXN0PHVuc2lnbmVkIGxvbmc+KG1fd2luZG93LmdldCgp KTsKK30KKworUGxhdGZvcm1WaWRlb1dpbmRvdzo6flBsYXRmb3JtVmlkZW9XaW5kb3coKQorewor ICAgIG1fdmlkZW9XaW5kb3dJZCA9IDA7Cit9CisKK3ZvaWQgUGxhdGZvcm1WaWRlb1dpbmRvdzo6 cHJlcGFyZUZvck92ZXJsYXkoR3N0TWVzc2FnZSogbWVzc2FnZSkKK3sKKyAgICBpZiAoZ3N0X3N0 cnVjdHVyZV9oYXNfbmFtZShtZXNzYWdlLT5zdHJ1Y3R1cmUsICJoYXZlLW5zLXZpZXciKSkgewor ICAgICAgICBtX3ZpZGVvV2luZG93ID0gc3RhdGljX2Nhc3Q8UGxhdGZvcm1XaWRnZXQ+KGdfdmFs dWVfZ2V0X3BvaW50ZXIoZ3N0X3N0cnVjdHVyZV9nZXRfdmFsdWUobWVzc2FnZS0+c3RydWN0dXJl LCAibnN2aWV3IikpKTsKKyAgICAgICAgW21fd2luZG93LmdldCgpIGFkZFN1YnZpZXc6bV92aWRl b1dpbmRvd107CisgICAgfQorfQorCisjZW5kaWYgLy8gVVNFKEdTVFJFQU1FUikKLS0gCjEuNy4y LjM=