108034 2013-01-27 10:47:08 -0800 [EFL][WebGL] Add proper checks to enable GraphicsSurface usage on EGL without XCompositeWindow. 2013-03-04 10:56:12 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 105286 105659 1 kalyan.kondapally kalyan.kondapally buildbot cmarcelo dino gyuyoung.kim laszlo.gombos lucas.de.marchi luiz noam ostap73 rakuco rniwa webkit.review.bot zeno oldest_to_newest 817382 0 kalyan.kondapally 2013-01-27 10:47:08 -0800 Currently, we set GRAPHICS_SURFACE to true if support for XCompositeWindow is identified during compile time. This is ok, when using GLX. With EGL and GLES2.0 we want to use XPixmap or some kind of Drm Buffer(if supported) instead of XCompositeWindow. We could support both Window and Pixmap for EGL but I think it is unnecessary overhead and we could just use XPixmap for both desktop and when using GLES2.0. Thus, it would be be better to introduce a new macro to identify XCompsiteWindow support and alwayse set GraphicsSurface. 840856 1 190030 kalyan.kondapally 2013-02-25 04:06:44 -0800 Created attachment 190030 Patch 844239 2 190030 laszlo.gombos 2013-02-28 11:06:29 -0800 Comment on attachment 190030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190030&action=review For now we should assume XCompositeWindow for USE(GLX). I would not yet expose the guard for XCOMPOSITE to the common code. > Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp:31 > -#if HAVE(GLX) > +#if USE(GLX) I do not think the name change here is necessary. I would remove this change. > Source/WebCore/platform/graphics/surfaces/glx/GLXConfigSelector.h:154 > -#if USE(GRAPHICS_SURFACE) > +#if USE(XCOMPOSITE) || (PLATFORM(QT) && USE(GRAPHICS_SURFACE)) I would just use USE(GRAPHICS_SURFACE) && USE(GLX) as a guard and set WTF_USE_GLX for Qt (perhaps in Platform.h or in the Qt build system). > Source/WebCore/platform/graphics/surfaces/glx/X11Helper.cpp:186 > -#if USE(GRAPHICS_SURFACE) > +#if USE(XCOMPOSITE) || (PLATFORM(QT) && USE(GRAPHICS_SURFACE)) Ditto. > Source/WebCore/platform/graphics/surfaces/glx/X11Helper.h:36 > +#if USE(XCOMPOSITE) || (PLATFORM(QT) && USE(GRAPHICS_SURFACE)) USE(GLX) > Source/cmake/OptionsEfl.cmake:189 > + set(USE_GRAPHICS_SURFACE 1) I think we should move this rule out from the build system into Platform.h. > Source/cmake/OptionsEfl.cmake:205 > + set(USE_GRAPHICS_SURFACE 1) Ditto we should remove this line and move the rule to Platform.h. Would the following work in Platform.h ? #if (USE(EGL) && PLATFORM(EFL)) || (USE(GLX) && (PLATFORM(EFL) || PLATFORM(QT))) #define WTF_USE_GRAPHICS_SURFACE 1 #endif Fail the build if there is no Xcomposite and add a FIXME to add support for it later. # FIXME: Add support for NOT X11_Xcomposite for GLX if (NOT X11_Xcomposite_FOUND OR NOT X11_Xrender_FOUND) message( FATAL_ERROR "GLX support requires X11_Xcomposite.") endif () > ChangeLog:8 > + Add a macro to identify XComposite ext support. Let's delay adding the macro until we have code supporting the !USE(XCOMPOSITE) case. 844749 3 kalyan.kondapally 2013-02-28 20:10:24 -0800 updated the bug title to reflect the changes. 844788 4 190879 kalyan.kondapally 2013-02-28 21:21:16 -0800 Created attachment 190879 patchv2 844790 5 kalyan.kondapally 2013-02-28 21:25:05 -0800 (In reply to comment #2) > (From update of attachment 190030 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190030&action=review > > For now we should assume XCompositeWindow for USE(GLX). I would not yet expose the guard for XCOMPOSITE to the common code. > > > Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp:31 > > -#if HAVE(GLX) > > +#if USE(GLX) > I would prefer to change it to USE as even though we have the support for GLX we dont use it if one builds with EGL support during compile time. This would also sync in with other places with similar checks(i.e our own code and also on GTK side). Any thoughts? > > Let's delay adding the macro until we have code supporting the !USE(XCOMPOSITE) case. Done. 844861 6 190879 buildbot 2013-02-28 23:43:30 -0800 Comment on attachment 190879 patchv2 Attachment 190879 did not pass mac-ews (mac): Output: http://webkit-commit-queue.appspot.com/results/16763197 New failing tests: editing/selection/selection-invalid-offset.html 845442 7 laszlo.gombos 2013-03-01 13:05:45 -0800 (In reply to comment #5) > (In reply to comment #2) > > (From update of attachment 190030 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=190030&action=review > > > > For now we should assume XCompositeWindow for USE(GLX). I would not yet expose the guard for XCOMPOSITE to the common code. > > > > > Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp:31 > > > -#if HAVE(GLX) > > > +#if USE(GLX) > > > > I would prefer to change it to USE as even though we have the support for GLX we dont use it if one builds with EGL support during compile time. This would also sync in with other places with similar checks(i.e our own code and also on GTK side). Any thoughts? Ok, I have not realized that we're already using _both_ HAVE(GLX) and USE(GLX) in the code. Standardizing on USE(GLX) make sense to me. 845448 8 190879 laszlo.gombos 2013-03-01 13:12:04 -0800 Comment on attachment 190879 patchv2 r=me. We should move X11Helper our form the glx directory as well, I find it a bit confusing. Can you file a bug for that ? 846125 9 191156 kalyan.kondapally 2013-03-03 17:30:07 -0800 Created attachment 191156 patchforlanding 846181 10 191156 webkit.review.bot 2013-03-03 23:59:47 -0800 Comment on attachment 191156 patchforlanding Clearing flags on attachment: 191156 Committed r144602: <http://trac.webkit.org/changeset/144602> 846182 11 webkit.review.bot 2013-03-03 23:59:53 -0800 All reviewed patches have been landed. Closing bug. 846636 12 kalyan.kondapally 2013-03-04 10:56:12 -0800 (In reply to comment #8) > (From update of attachment 190879 [details]) > r=me. > > We should move X11Helper our form the glx directory as well, I find it a bit confusing. Can you file a bug for that ? Created a new issue for this: https://bugs.webkit.org/show_bug.cgi?id=111347 190030 2013-02-25 04:06:44 -0800 2013-02-28 21:21:16 -0800 Patch bug-108034-20130225140304.patch text/plain 6731 kalyan.kondapally U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzOTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg1NTJhZmIxMjRlNmVi ZTFiNzU1NTMzZTU2YmIxZjYyNGE5OTdhYS4uYWNlOTRlYWUyNDVmODI3OTc5YWQ2OTkwNzJkYTVl ZDY5ZWFjOGQ4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAyLTI1ICBLb25k YXBhbGx5IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4KKworICAgICAgICBb RUZMXVtXZWJHTF0gRGVmaW5lIG5ldyBtYWNybyB0byBpZGVudGlmeSBzdXBwb3J0IGZvciBYQ29t cG9zaXRlV2luZG93LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA4MDM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQ3VycmVudGx5LCB3ZSBzZXQgR1JBUEhJQ1NfU1VSRkFDRSB0byB0cnVlCisgICAgICAg IGlmIHN1cHBvcnQgZm9yIFhDb21wb3NpdGVXaW5kb3cgaXMgaWRlbnRpZmllZAorICAgICAgICBk dXJpbmcgY29tcGlsZSB0aW1lLiBUaGlzIGlzIG9rLCB3aGVuIHVzaW5nIEdMWC4KKyAgICAgICAg V2l0aCBFR0wgYW5kIEdMRVMyLjAsIHdlIHdvdWxkIHVzZSBYUGl4bWFwIHRvCisgICAgICAgIGFj aGlldmUgdGhlIHNhbWUuIEFsc28gbm90ZSB0aGF0IHNvbWUgb2YgdGhlCisgICAgICAgIGVudmly b25tZW50cyBtaWdodCBub3QgZXZlbiBoYXZlIHN1cHBvcnQgZm9yCisgICAgICAgIFhDb21wb3Np dGUgZXh0ZW5zaW9uLiBUaGlzIHBhdGNoIHRyaWVzIHRvIHNlcGFyYXRlIHRoZQorICAgICAgICBp ZGVudGlmaWNhdGlvbiBvZiBYQ29tcG9zaXRlIGV4dCBzdXBwb3J0IGZyb20KKyAgICAgICAgR3Jh cGhpY3NTdXJmYWNlIHVzYWdlIGFuZCBsZWF2ZXMgaXQgdG8gdGhlIGltcGxlbWVudGF0aW9uCisg ICAgICAgIHRvIGhhbmRsZSB0aGUgY2FzZSB3aGVuIHN1cHBvcnQgZm9yIFhDb21wb3NpdGUKKyAg ICAgICAgZXh0ZW5zaW9uIGlzIGFic2VudCB3aXRoIEVHTCBhbmQgR0xFUzIuMC4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HTFBsYXRmb3JtU3VyZmFjZS5jcHA6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZ2x4L0dMWENvbmZpZ1NlbGVjdG9yLmg6 CisgICAgICAgIChXZWJDb3JlOjpHTFhDb25maWdTZWxlY3Rvcjo6ZmluZE1hdGNoaW5nQ29uZmln KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlgxMUhlbHBlcjo6Y3JlYXRlT2ZmU2NyZWVuV2luZG93KToK KyAgICAgICAgKFdlYkNvcmU6OlgxMUhlbHBlcjo6aXNYUmVuZGVyRXh0ZW5zaW9uU3VwcG9ydGVk KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmg6 CisKIDIwMTMtMDItMjUgIEFsZXhlaSBGaWxpcHBvdiAgPGFscGhAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgcHJvZmlsZSB0eXBlIHNwZWNpZmljIGNvZGUgb3V0 IG9mIFByb2ZpbGVzUGFuZWwgKHJlZmFjdG9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HTFBsYXRmb3JtU3VyZmFjZS5jcHAKaW5k ZXggODRiNGZlODZkZmQ4ZmJjYjY0NDY0YzQ2NjViMTgzNDFiMTNkN2IxZi4uYjUwMzIyMTA4NGIw YzYyOGFiMzQ4ZjkzMjAwMWEyMGRkNjZlNDA3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR0xQbGF0Zm9ybVN1cmZhY2UuY3Bw CkBAIC0yOCw3ICsyOCw3IEBACiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAK LSNpZiBIQVZFKEdMWCkKKyNpZiBVU0UoR0xYKQogI2luY2x1ZGUgIkdMWFN1cmZhY2UuaCIKICNl bmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJm YWNlcy9nbHgvR0xYQ29uZmlnU2VsZWN0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3N1cmZhY2VzL2dseC9HTFhDb25maWdTZWxlY3Rvci5oCmluZGV4IGYzMmMyYWZmOTdj Yjc4N2EwNjcyNzU0N2UyMGJmYjAzNjk3MjQxNTIuLjg0MzE2MGU3YjFlMzEyY2IxOGJkNWNjODk5 MDExYjZlNDQ0YmM1ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3N1cmZhY2VzL2dseC9HTFhDb25maWdTZWxlY3Rvci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9HTFhDb25maWdTZWxlY3Rvci5oCkBAIC0x NTEsNyArMTUxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIGlmICghc2NvcGVkVmlzdWFsSW5m by5nZXQoKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotI2lmIFVTRShHUkFQSElDU19T VVJGQUNFKQorI2lmIFVTRShYQ09NUE9TSVRFKSB8fCAoUExBVEZPUk0oUVQpICYmIFVTRShHUkFQ SElDU19TVVJGQUNFKSkKICAgICAgICAgICAgIGlmIChYMTFIZWxwZXI6OmlzWFJlbmRlckV4dGVu c2lvblN1cHBvcnRlZCgpKSB7CiAgICAgICAgICAgICAgICAgWFJlbmRlclBpY3RGb3JtYXQqIGZv cm1hdCA9IFhSZW5kZXJGaW5kVmlzdWFsRm9ybWF0KFgxMUhlbHBlcjo6bmF0aXZlRGlzcGxheSgp LCBzY29wZWRWaXN1YWxJbmZvLT52aXN1YWwpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuY3BwCmluZGV4 IGNlZGQ0NTNmMjlhODMwYjIzNzk2ZWU1OTU3ZjM4N2FmZGRlYjc1MTguLmQ0ZTg4NzFkNzk1NDBk YmMzNTMxYjdhNGYwYWIxNmVkN2YxOTkxMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuY3BwCkBAIC0x ODMsNyArMTgzLDcgQEAgdm9pZCBYMTFIZWxwZXI6OmRlc3Ryb3lQaXhtYXAoY29uc3QgdWludDMy X3QgcGl4bWFwSWQpCiAKIHZvaWQgWDExSGVscGVyOjpjcmVhdGVPZmZTY3JlZW5XaW5kb3codWlu dDMyX3QqIGhhbmRsZUlkLCBjb25zdCBYVmlzdWFsSW5mbyYgdmlzSW5mbywgY29uc3QgSW50U2l6 ZSYgc2l6ZSkKIHsKLSNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKKyNpZiBVU0UoWENPTVBPU0lU RSkgfHwgKFBMQVRGT1JNKFFUKSAmJiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkpCiAgICAgRGlzcGxh eSogZGlzcGxheSA9IG5hdGl2ZURpc3BsYXkoKTsKICAgICBpZiAoIWRpc3BsYXkpCiAgICAgICAg IHJldHVybjsKQEAgLTIyNCw3ICsyMjQsNyBAQCB2b2lkIFgxMUhlbHBlcjo6Y3JlYXRlT2ZmU2Ny ZWVuV2luZG93KHVpbnQzMl90KiBoYW5kbGVJZCwgY29uc3QgWFZpc3VhbEluZm8mIHZpcwogI2lm IFVTRShFR0wpCiB2b2lkIFgxMUhlbHBlcjo6Y3JlYXRlT2ZmU2NyZWVuV2luZG93KHVpbnQzMl90 KiBoYW5kbGVJZCwgY29uc3QgRUdMaW50IGlkLCBib29sIHN1cHBvcnRzQWxwaGEsIGNvbnN0IElu dFNpemUmIHNpemUpCiB7Ci0jaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCisjaWYgVVNFKFhDT01Q T1NJVEUpIHx8IChQTEFURk9STShRVCkgJiYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpKQogICAgIFZp c3VhbElEIHZpc3VhbElkID0gc3RhdGljX2Nhc3Q8VmlzdWFsSUQ+KGlkKTsKIAogICAgIGlmICgh dmlzdWFsSWQpCkBAIC0yOTUsNyArMjk1LDcgQEAgYm9vbCBYMTFIZWxwZXI6OmlzWFJlbmRlckV4 dGVuc2lvblN1cHBvcnRlZCgpCiAKICAgICBpZiAoIXF1ZXJ5RG9uZSkgewogICAgICAgICBxdWVy eURvbmUgPSB0cnVlOwotI2lmIFVTRShHUkFQSElDU19TVVJGQUNFKQorI2lmIFVTRShYQ09NUE9T SVRFKSB8fCAoUExBVEZPUk0oUVQpICYmIFVTRShHUkFQSElDU19TVVJGQUNFKSkKICAgICAgICAg RGlzcGxheSogZGlzcGxheSA9IG5hdGl2ZURpc3BsYXkoKTsKIAogICAgICAgICBpZiAoZGlzcGxh eSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFj ZXMvZ2x4L1gxMUhlbHBlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3Vy ZmFjZXMvZ2x4L1gxMUhlbHBlci5oCmluZGV4IDdkM2ViYWUzZTIzZWQ5NmU3ZjAzMmQwYTIwNjBl NWE5MTg5YjYyOWIuLjhmZDJiNzhjNTAxYzc3YmNiY2NlNDUxZjg3ZmU1NWVlYzFhMzc0MTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9Y MTFIZWxwZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNl cy9nbHgvWDExSGVscGVyLmgKQEAgLTI5LDE3ICsyOSwxNyBAQAogI2luY2x1ZGUgIkludFJlY3Qu aCIKICNpbmNsdWRlICJPd25QdHJYMTEuaCIKIAotI2lmIFVTRShHUkFQSElDU19TVVJGQUNFKQot CiAjaWYgVVNFKEVHTCkKICNpbmNsdWRlIDxvcGVuZ2wvR0xEZWZzLmg+CiAjZW5kaWYKIAorI2lm IFVTRShYQ09NUE9TSVRFKSB8fCAoUExBVEZPUk0oUVQpICYmIFVTRShHUkFQSElDU19TVVJGQUNF KSkKICNpbmNsdWRlIDxYMTEvZXh0ZW5zaW9ucy9YY29tcG9zaXRlLmg+CiAjaW5jbHVkZSA8WDEx L2V4dGVuc2lvbnMvWHJlbmRlci5oPgotI2VuZGlmCi0KKyNlbHNlCiAjaW5jbHVkZSA8WDExL1hs aWIuaD4KKyNpbmNsdWRlIDxYMTEvWHV0aWwuaD4KKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zRWZsLmNtYWtlIGIvU291cmNl L2NtYWtlL09wdGlvbnNFZmwuY21ha2UKaW5kZXggOTAyMTVlMmVjMWMwZDQ4ZDBjZTdmMjNiZTBi YzcwYTA5OTdmMmI1ZC4uMTFkM2JkNjllZDc3MjhhYzIyYWVhMzNmMWM0ZDRiOTU0OTg4ZjkwOCAx MDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNFZmwuY21ha2UKKysrIGIvU291cmNlL2Nt YWtlL09wdGlvbnNFZmwuY21ha2UKQEAgLTE4Niw2ICsxODYsNyBAQCBpZiAoRU5BQkxFX1dFQkdM IE9SIFdURl9VU0VfVElMRURfQkFDS0lOR19TVE9SRSkKIAogICAgIGlmIChFR0xfRk9VTkQpCiAg ICAgICAgIHNldChXVEZfVVNFX0VHTCAxKQorICAgICAgICBzZXQoVVNFX0dSQVBISUNTX1NVUkZB Q0UgMSkKICAgICAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1VTRV9FR0w9MSkKICAgICAgICAg b3B0aW9uKEVOQUJMRV9HTEVTMiBPTikKIApAQCAtMTk5LDExICsyMDAsMTIgQEAgaWYgKEVOQUJM RV9XRUJHTCBPUiBXVEZfVVNFX1RJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgICAgIGVuZGlmICgp CiAgICAgIGVsc2VpZiAoT1BFTkdMWF9GT1VORCkKICAgICAgICAgIGFkZF9kZWZpbml0aW9ucygt RFdURl9VU0VfR0xYPTEpCi0gICAgZW5kaWYgKCkKIAotICAgICBpZiAoKE9QRU5HTFhfRk9VTkQg T1IgRUdMX0ZPVU5EKSBBTkQgWDExX1hjb21wb3NpdGVfRk9VTkQgQU5EIFgxMV9YcmVuZGVyX0ZP VU5EKQotICAgICAgICAgc2V0KFVTRV9HUkFQSElDU19TVVJGQUNFIDEpCi0gICAgIGVuZGlmICgp CisgICAgICAgICBpZiAoWDExX1hjb21wb3NpdGVfRk9VTkQgQU5EIFgxMV9YcmVuZGVyX0ZPVU5E KQorICAgICAgICAgICAgIHNldChVU0VfR1JBUEhJQ1NfU1VSRkFDRSAxKQorICAgICAgICAgICAg IGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfWENPTVBPU0lURT0xKQorICAgICAgICAgZW5kaWYg KCkKKyAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAogaWYgKEVOQUJMRV9JTlNQRUNUT1IpCmRpZmYg LS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXggYmY5ZjJiN2QxMmJmMjJkYmZiZTA1 MGE1YjJmMjg0Y2YyN2I4MTAzYS4uMGFlZjg2MmMxMTIzNzdhYjIxMjkxYmQ0MWQxY2JkYjYwMGNm ZWM1NiAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEzLTAyLTI1ICBLb25kYXBhbGx5IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGlu dGVsLmNvbT4KKworICAgICAgICBbRUZMXVtXZWJHTF0gRGVmaW5lIG5ldyBtYWNybyB0byBpZGVu dGlmeSBzdXBwb3J0IGZvciBYQ29tcG9zaXRlV2luZG93LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MDM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbWFjcm8gdG8gaWRlbnRpZnkgWENvbXBv c2l0ZSBleHQgc3VwcG9ydC4KKworICAgICAgICAqIFNvdXJjZS9jbWFrZS9PcHRpb25zRWZsLmNt YWtlOgorCiAyMDEzLTAyLTI0ICBMYXN6bG8gR29tYm9zICA8bC5nb21ib3NAc2Ftc3VuZy5jb20+ CiAKICAgICAgICAgW0VGTF0gUmVuYW1lIEVOQUJMRV9SRUdJT05TIHRvIEVOQUJMRV9DU1NfUkVH SU9OUwo= 190879 2013-02-28 21:21:16 -0800 2013-03-03 17:30:07 -0800 patchv2 x11helperreview.patch text/plain 5245 kalyan.kondapally ZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDU2OTk5ZGYuLjY3NTJlMTAgMTAwNjQ0Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEz LTAyLTI4ICBLb25kYXBhbGx5IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4K KworICAgICAgICBbRUZMXVtXZWJHTF0gQWRkIHByb3BlciBjaGVja3MgdG8gZW5hYmxlIEdyYXBo aWNzU3VyZmFjZSB1c2FnZSBvbiBFR0wgd2l0aG91dCBYQ29tcG9zaXRlV2luZG93LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MDM0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlz dGluZyBXZWJHTCB0ZXN0cy4KKworICAgICAgICBDdXJyZW50bHksIHdlIHNldCBHUkFQSElDU19T VVJGQUNFIHRvIHRydWUgaWYgc3VwcG9ydCBmb3IgWENvbXBvc2l0ZVdpbmRvdworICAgICAgICBp cyBpZGVudGlmaWVkIGR1cmluZyBjb21waWxlIHRpbWUuIFRoaXMgaXMgb2ssIHdoZW4gdXNpbmcg R0xYLiBXZSBtaWdodCBub3QKKyAgICAgICAgaGF2ZSBzdXBwb3J0IGZvciBYQ29tcG9zaXRlV2lu ZG93IHdoZW4gdXNpbmcgRUdMIGFuZCBHTEVTMi4wLiBUaGlzIHBhdGNoCisgICAgICAgIG1ha2Vz IGNoYW5nZXMgc28gdGhhdCBHUkFQSElDU19TVVJGQUNFIGlzIGFsd2F5cyBlbmFibGVkIHdpdGgg RUdMIGFuZCBhZGRzCisgICAgICAgIEdMWCBndWFyZCB0byB0aGUgcGFydHMgb2YgY29kZSBkZXBl bmRlbnQgb24gWENvbXBvc2l0ZVdpbmRvdyBzdXBwb3J0LgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvR0xYQ29uZmlnU2VsZWN0b3IuaDoKKyAgICAgICAgKFdl YkNvcmU6OkdMWENvbmZpZ1NlbGVjdG9yOjpmaW5kTWF0Y2hpbmdDb25maWcpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6WDExSGVscGVyOjpjcmVhdGVPZmZTY3JlZW5XaW5kb3cpOgorICAgICAgICAoV2Vi Q29yZTo6WDExSGVscGVyOjppc1hSZW5kZXJFeHRlbnNpb25TdXBwb3J0ZWQpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuaDoKKwogMjAxMy0wMi0y OCAgQ29ucmFkIFNodWx0eiAgPGNvbnJhZF9zaHVsdHpAYXBwbGUuY29tPgogCiAgICAgICAgIE5l ZWQgQVBJIHRvIGNvbnRyb2wgcGFnZSB1bmRlcmxheSBjb2xvcgpkaWZmIC0tZ2l0IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HTFBsYXRmb3JtU3VyZmFjZS5jcHAgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNw cAppbmRleCA4NGI0ZmU4Li5iNTAzMjIxIDEwMDY0NAotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcAorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcApAQCAtMjgs NyArMjgsNyBAQAogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogCi0jaWYgSEFW RShHTFgpCisjaWYgVVNFKEdMWCkKICNpbmNsdWRlICJHTFhTdXJmYWNlLmgiCiAjZW5kaWYKIApk aWZmIC0tZ2l0IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9H TFhDb25maWdTZWxlY3Rvci5oIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZh Y2VzL2dseC9HTFhDb25maWdTZWxlY3Rvci5oCmluZGV4IGYzMmMyYWYuLjJmZWE3YjAgMTAwNjQ0 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvR0xYQ29u ZmlnU2VsZWN0b3IuaAorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFj ZXMvZ2x4L0dMWENvbmZpZ1NlbGVjdG9yLmgKQEAgLTE1MSw3ICsxNTEsNyBAQCBwcml2YXRlOgog ICAgICAgICAgICAgaWYgKCFzY29wZWRWaXN1YWxJbmZvLmdldCgpKQogICAgICAgICAgICAgICAg IGNvbnRpbnVlOwogCi0jaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCisjaWYgVVNFKEdSQVBISUNT X1NVUkZBQ0UpICYmIFVTRShHTFgpCiAgICAgICAgICAgICBpZiAoWDExSGVscGVyOjppc1hSZW5k ZXJFeHRlbnNpb25TdXBwb3J0ZWQoKSkgewogICAgICAgICAgICAgICAgIFhSZW5kZXJQaWN0Rm9y bWF0KiBmb3JtYXQgPSBYUmVuZGVyRmluZFZpc3VhbEZvcm1hdChYMTFIZWxwZXI6Om5hdGl2ZURp c3BsYXkoKSwgc2NvcGVkVmlzdWFsSW5mby0+dmlzdWFsKTsKIApAQCAtMjA4LDMgKzIwOCw0IEBA IHByaXZhdGU6CiAjZW5kaWYKIAogI2VuZGlmCisKZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmNwcCBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmNwcAppbmRleCBjZWRk NDUzLi42NzQzZjFkIDEwMDY0NAotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c3VyZmFjZXMvZ2x4L1gxMUhlbHBlci5jcHAKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuY3BwCkBAIC0xODMsNyArMTgzLDcgQEAgdm9p ZCBYMTFIZWxwZXI6OmRlc3Ryb3lQaXhtYXAoY29uc3QgdWludDMyX3QgcGl4bWFwSWQpCiAKIHZv aWQgWDExSGVscGVyOjpjcmVhdGVPZmZTY3JlZW5XaW5kb3codWludDMyX3QqIGhhbmRsZUlkLCBj b25zdCBYVmlzdWFsSW5mbyYgdmlzSW5mbywgY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKLSNpZiBV U0UoR1JBUEhJQ1NfU1VSRkFDRSkKKyNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkgJiYgVVNFKEdM WCkKICAgICBEaXNwbGF5KiBkaXNwbGF5ID0gbmF0aXZlRGlzcGxheSgpOwogICAgIGlmICghZGlz cGxheSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjk1LDcgKzI5NSw3IEBAIGJvb2wgWDExSGVscGVy Ojppc1hSZW5kZXJFeHRlbnNpb25TdXBwb3J0ZWQoKQogCiAgICAgaWYgKCFxdWVyeURvbmUpIHsK ICAgICAgICAgcXVlcnlEb25lID0gdHJ1ZTsKLSNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKKyNp ZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkgJiYgVVNFKEdMWCkKICAgICAgICAgRGlzcGxheSogZGlz cGxheSA9IG5hdGl2ZURpc3BsYXkoKTsKIAogICAgICAgICBpZiAoZGlzcGxheSkgewpAQCAtMzIy LDMgKzMyMiw0IEBAIFdpbmRvdyBYMTFIZWxwZXI6Om9mZnNjcmVlblJvb3RXaW5kb3coKQogfQog CiB9CisKZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNl cy9nbHgvWDExSGVscGVyLmggU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFj ZXMvZ2x4L1gxMUhlbHBlci5oCmluZGV4IDdkM2ViYWUuLjFjMTRkMjIgMTAwNjQ0Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmgKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIu aApAQCAtMjksMTcgKzI5LDE3IEBACiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1ZGUgIk93 blB0clgxMS5oIgogCi0jaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCi0KICNpZiBVU0UoRUdMKQog I2luY2x1ZGUgPG9wZW5nbC9HTERlZnMuaD4KICNlbmRpZgogCisjaWYgVVNFKEdSQVBISUNTX1NV UkZBQ0UpICYmIFVTRShHTFgpCiAjaW5jbHVkZSA8WDExL2V4dGVuc2lvbnMvWGNvbXBvc2l0ZS5o PgogI2luY2x1ZGUgPFgxMS9leHRlbnNpb25zL1hyZW5kZXIuaD4KLSNlbmRpZgotCisjZWxzZQog I2luY2x1ZGUgPFgxMS9YbGliLmg+CisjaW5jbHVkZSA8WDExL1h1dGlsLmg+CisjZW5kaWYKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC03MywzICs3Myw0IEBAIHByaXZhdGU6CiB9CiAKICNl bmRpZgorCmRpZmYgLS1naXQgU291cmNlL2NtYWtlL09wdGlvbnNFZmwuY21ha2UgU291cmNlL2Nt YWtlL09wdGlvbnNFZmwuY21ha2UKaW5kZXggOTAyMTVlMi4uZjg2NWJiZiAxMDA2NDQKLS0tIFNv dXJjZS9jbWFrZS9PcHRpb25zRWZsLmNtYWtlCisrKyBTb3VyY2UvY21ha2UvT3B0aW9uc0VmbC5j bWFrZQpAQCAtMTg2LDYgKzE4Niw3IEBAIGlmIChFTkFCTEVfV0VCR0wgT1IgV1RGX1VTRV9USUxF RF9CQUNLSU5HX1NUT1JFKQogCiAgICAgaWYgKEVHTF9GT1VORCkKICAgICAgICAgc2V0KFdURl9V U0VfRUdMIDEpCisgICAgICAgIHNldChVU0VfR1JBUEhJQ1NfU1VSRkFDRSAxKQogICAgICAgICBh ZGRfZGVmaW5pdGlvbnMoLURXVEZfVVNFX0VHTD0xKQogICAgICAgICBvcHRpb24oRU5BQkxFX0dM RVMyIE9OKQogCkBAIC0xOTksMTEgKzIwMCwxNCBAQCBpZiAoRU5BQkxFX1dFQkdMIE9SIFdURl9V U0VfVElMRURfQkFDS0lOR19TVE9SRSkKICAgICAgICAgZW5kaWYgKCkKICAgICAgZWxzZWlmIChP UEVOR0xYX0ZPVU5EKQogICAgICAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1VTRV9HTFg9MSkK LSAgICBlbmRpZiAoKQogCi0gICAgIGlmICgoT1BFTkdMWF9GT1VORCBPUiBFR0xfRk9VTkQpIEFO RCBYMTFfWGNvbXBvc2l0ZV9GT1VORCBBTkQgWDExX1hyZW5kZXJfRk9VTkQpCi0gICAgICAgICBz ZXQoVVNFX0dSQVBISUNTX1NVUkZBQ0UgMSkKLSAgICAgZW5kaWYgKCkKKyAgICAgICAgIGlmIChY MTFfWGNvbXBvc2l0ZV9GT1VORCBBTkQgWDExX1hyZW5kZXJfRk9VTkQpCisgICAgICAgICAgICAg c2V0KFVTRV9HUkFQSElDU19TVVJGQUNFIDEpCisgICAgICAgICBlbHNlaWYgKEVOQUJMRV9XRUJH TCkKKyAgICAgICAgICAgICAjIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgTk9UIFgxMV9YY29tcG9z aXRlIGZvciBHTFgKKyAgICAgICAgICAgICBtZXNzYWdlKEZBVEFMX0VSUk9SICJUbyB1c2UgV2Vi R0wgd2l0aCBHTFggc3VwcG9ydCByZXF1aXJlcyBYMTFfWGNvbXBvc2l0ZS4iKQorICAgICAgICAg ZW5kaWYgKCkKKyAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAogaWYgKEVOQUJMRV9JTlNQRUNUT1Ip Cg== 191156 2013-03-03 17:30:07 -0800 2013-03-03 23:59:47 -0800 patchforlanding x11helper.patch text/plain 6151 kalyan.kondapally ZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDhmYzU4YjEuLjc0YjQ4ZjYgMTAwNjQ0Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEz LTAzLTAzICBLb25kYXBhbGx5IEthbHlhbiAgPGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4K KworICAgICAgICBbRUZMXVtXZWJHTF0gQWRkIHByb3BlciBjaGVja3MgdG8gZW5hYmxlIEdyYXBo aWNzU3VyZmFjZSB1c2FnZSBvbiBFR0wgd2l0aG91dCBYQ29tcG9zaXRlV2luZG93LgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MDM0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTGFzemxvIEdvbWJvcy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0 aW5nIFdlYkdMIHRlc3RzLgorCisgICAgICAgIEN1cnJlbnRseSwgd2Ugc2V0IEdSQVBISUNTX1NV UkZBQ0UgdG8gdHJ1ZSBpZiBzdXBwb3J0IGZvciBYQ29tcG9zaXRlV2luZG93CisgICAgICAgIGlz IGlkZW50aWZpZWQgZHVyaW5nIGNvbXBpbGUgdGltZS4gVGhpcyBpcyBvaywgd2hlbiB1c2luZyBH TFguIFdlIG1pZ2h0IG5vdAorICAgICAgICBoYXZlIHN1cHBvcnQgZm9yIFhDb21wb3NpdGVXaW5k b3cgd2hlbiB1c2luZyBFR0wgYW5kIEdMRVMyLjAuIFRoaXMgcGF0Y2gKKyAgICAgICAgbWFrZXMg Y2hhbmdlcyBzbyB0aGF0IEdSQVBISUNTX1NVUkZBQ0UgaXMgYWx3YXlzIGVuYWJsZWQgd2l0aCBF R0wgYW5kIGFkZHMKKyAgICAgICAgR0xYIGd1YXJkIHRvIHRoZSBwYXJ0cyBvZiBjb2RlIGRlcGVu ZGVudCBvbiBYQ29tcG9zaXRlV2luZG93IHN1cHBvcnQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvR0xQbGF0Zm9ybVN1cmZhY2UuY3BwOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3N1cmZhY2VzL2dseC9HTFhDb25maWdTZWxlY3Rvci5oOgorICAgICAgICAoV2Vi Q29yZTo6R0xYQ29uZmlnU2VsZWN0b3I6OmZpbmRNYXRjaGluZ0NvbmZpZyk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZ2x4L1gxMUhlbHBlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpYMTFIZWxwZXI6OmNyZWF0ZU9mZlNjcmVlbldpbmRvdyk6CisgICAgICAgIChXZWJD b3JlOjpYMTFIZWxwZXI6OmlzWFJlbmRlckV4dGVuc2lvblN1cHBvcnRlZCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZ2x4L1gxMUhlbHBlci5oOgorCiAyMDEzLTAzLTAx ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbVjhdIEhU TUxEb2N1bWVudC5hbGwgc2hvdWxkIGhhdmUgW1JlcGxhY2VhYmxlXQpkaWZmIC0tZ2l0IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HTFBsYXRmb3JtU3VyZmFjZS5jcHAg U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNl LmNwcAppbmRleCA4NGI0ZmU4Li5iNTAzMjIxIDEwMDY0NAotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcAorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dMUGxhdGZvcm1TdXJmYWNlLmNwcApAQCAt MjgsNyArMjgsNyBAQAogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogCi0jaWYg SEFWRShHTFgpCisjaWYgVVNFKEdMWCkKICNpbmNsdWRlICJHTFhTdXJmYWNlLmgiCiAjZW5kaWYK IApkaWZmIC0tZ2l0IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2ds eC9HTFhDb25maWdTZWxlY3Rvci5oIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1 cmZhY2VzL2dseC9HTFhDb25maWdTZWxlY3Rvci5oCmluZGV4IGYzMmMyYWYuLjJmZWE3YjAgMTAw NjQ0Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvR0xY Q29uZmlnU2VsZWN0b3IuaAorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3Vy ZmFjZXMvZ2x4L0dMWENvbmZpZ1NlbGVjdG9yLmgKQEAgLTE1MSw3ICsxNTEsNyBAQCBwcml2YXRl OgogICAgICAgICAgICAgaWYgKCFzY29wZWRWaXN1YWxJbmZvLmdldCgpKQogICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogCi0jaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCisjaWYgVVNFKEdSQVBI SUNTX1NVUkZBQ0UpICYmIFVTRShHTFgpCiAgICAgICAgICAgICBpZiAoWDExSGVscGVyOjppc1hS ZW5kZXJFeHRlbnNpb25TdXBwb3J0ZWQoKSkgewogICAgICAgICAgICAgICAgIFhSZW5kZXJQaWN0 Rm9ybWF0KiBmb3JtYXQgPSBYUmVuZGVyRmluZFZpc3VhbEZvcm1hdChYMTFIZWxwZXI6Om5hdGl2 ZURpc3BsYXkoKSwgc2NvcGVkVmlzdWFsSW5mby0+dmlzdWFsKTsKIApAQCAtMjA4LDMgKzIwOCw0 IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogI2VuZGlmCisKZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmNwcCBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmNwcAppbmRleCBj ZWRkNDUzLi5jMzY2YmRmIDEwMDY0NAotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc3VyZmFjZXMvZ2x4L1gxMUhlbHBlci5jcHAKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuY3BwCkBAIC0xODMsNyArMTgzLDcgQEAg dm9pZCBYMTFIZWxwZXI6OmRlc3Ryb3lQaXhtYXAoY29uc3QgdWludDMyX3QgcGl4bWFwSWQpCiAK IHZvaWQgWDExSGVscGVyOjpjcmVhdGVPZmZTY3JlZW5XaW5kb3codWludDMyX3QqIGhhbmRsZUlk LCBjb25zdCBYVmlzdWFsSW5mbyYgdmlzSW5mbywgY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKLSNp ZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKKyNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkgJiYgVVNF KEdMWCkKICAgICBEaXNwbGF5KiBkaXNwbGF5ID0gbmF0aXZlRGlzcGxheSgpOwogICAgIGlmICgh ZGlzcGxheSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjQxLDIyICsyNDEsNiBAQCB2b2lkIFgxMUhl bHBlcjo6Y3JlYXRlT2ZmU2NyZWVuV2luZG93KHVpbnQzMl90KiBoYW5kbGVJZCwgY29uc3QgRUdM aW50IGlkLCBib29sCiAgICAgaWYgKG1hdGNoaW5nVmlzdWFscykgewogICAgICAgICBmb3IgKGlu dCBpID0gMDsgaTwgbWF0Y2hpbmdDb3VudDsgaSsrKSB7CiAgICAgICAgICAgICBYVmlzdWFsSW5m byogdGVtcCA9ICZtYXRjaGluZ1Zpc3VhbHNbaV07Ci0KLSAgICAgICAgICAgIGlmIChpc1hSZW5k ZXJFeHRlbnNpb25TdXBwb3J0ZWQoKSkgewotICAgICAgICAgICAgICAgIFhSZW5kZXJQaWN0Rm9y bWF0KiBmb3JtYXQgPSBYUmVuZGVyRmluZFZpc3VhbEZvcm1hdChuYXRpdmVEaXNwbGF5KCksIHRl bXAtPnZpc3VhbCk7Ci0KLSAgICAgICAgICAgICAgICBpZiAoZm9ybWF0KSB7Ci0gICAgICAgICAg ICAgICAgICAgIGlmIChzdXBwb3J0c0FscGhhKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBp ZiAodGVtcC0+ZGVwdGggPT0gMzIgJiYgZm9ybWF0LT5kaXJlY3QuYWxwaGFNYXNrID4gMCkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmb3VuZFZpc3VhbCA9IHRlbXA7Ci0gICAgICAgICAg ICAgICAgICAgIH0gZWxzZSBpZiAoIWZvcm1hdC0+ZGlyZWN0LmFscGhhTWFzaykKLSAgICAgICAg ICAgICAgICAgICAgICAgIGZvdW5kVmlzdWFsID0gdGVtcDsKLSAgICAgICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgICAgICBpZiAoZm91bmRWaXN1YWwpCi0gICAgICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgfQotCiAgICAgICAgICAgICBpbnQgbWF0Y2hpbmdkZXB0aCA9IHN1 cHBvcnRzQWxwaGEgPyAzMiA6IDI0OwogCiAgICAgICAgICAgICBpZiAodGVtcC0+ZGVwdGggPT0g bWF0Y2hpbmdkZXB0aCkgewpAQCAtMjk1LDcgKzI3OSw3IEBAIGJvb2wgWDExSGVscGVyOjppc1hS ZW5kZXJFeHRlbnNpb25TdXBwb3J0ZWQoKQogCiAgICAgaWYgKCFxdWVyeURvbmUpIHsKICAgICAg ICAgcXVlcnlEb25lID0gdHJ1ZTsKLSNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKKyNpZiBVU0Uo R1JBUEhJQ1NfU1VSRkFDRSkgJiYgVVNFKEdMWCkKICAgICAgICAgRGlzcGxheSogZGlzcGxheSA9 IG5hdGl2ZURpc3BsYXkoKTsKIAogICAgICAgICBpZiAoZGlzcGxheSkgewpAQCAtMzIyLDMgKzMw Niw0IEBAIFdpbmRvdyBYMTFIZWxwZXI6Om9mZnNjcmVlblJvb3RXaW5kb3coKQogfQogCiB9CisK ZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgv WDExSGVscGVyLmggU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvZ2x4 L1gxMUhlbHBlci5oCmluZGV4IDdkM2ViYWUuLjFjMTRkMjIgMTAwNjQ0Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdXJmYWNlcy9nbHgvWDExSGVscGVyLmgKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1cmZhY2VzL2dseC9YMTFIZWxwZXIuaApAQCAt MjksMTcgKzI5LDE3IEBACiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1ZGUgIk93blB0clgx MS5oIgogCi0jaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCi0KICNpZiBVU0UoRUdMKQogI2luY2x1 ZGUgPG9wZW5nbC9HTERlZnMuaD4KICNlbmRpZgogCisjaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0Up ICYmIFVTRShHTFgpCiAjaW5jbHVkZSA8WDExL2V4dGVuc2lvbnMvWGNvbXBvc2l0ZS5oPgogI2lu Y2x1ZGUgPFgxMS9leHRlbnNpb25zL1hyZW5kZXIuaD4KLSNlbmRpZgotCisjZWxzZQogI2luY2x1 ZGUgPFgxMS9YbGliLmg+CisjaW5jbHVkZSA8WDExL1h1dGlsLmg+CisjZW5kaWYKIAogbmFtZXNw YWNlIFdlYkNvcmUgewogCkBAIC03MywzICs3Myw0IEBAIHByaXZhdGU6CiB9CiAKICNlbmRpZgor CmRpZmYgLS1naXQgU291cmNlL2NtYWtlL09wdGlvbnNFZmwuY21ha2UgU291cmNlL2NtYWtlL09w dGlvbnNFZmwuY21ha2UKaW5kZXggOTAyMTVlMi4uZjg2NWJiZiAxMDA2NDQKLS0tIFNvdXJjZS9j bWFrZS9PcHRpb25zRWZsLmNtYWtlCisrKyBTb3VyY2UvY21ha2UvT3B0aW9uc0VmbC5jbWFrZQpA QCAtMTg2LDYgKzE4Niw3IEBAIGlmIChFTkFCTEVfV0VCR0wgT1IgV1RGX1VTRV9USUxFRF9CQUNL SU5HX1NUT1JFKQogCiAgICAgaWYgKEVHTF9GT1VORCkKICAgICAgICAgc2V0KFdURl9VU0VfRUdM IDEpCisgICAgICAgIHNldChVU0VfR1JBUEhJQ1NfU1VSRkFDRSAxKQogICAgICAgICBhZGRfZGVm aW5pdGlvbnMoLURXVEZfVVNFX0VHTD0xKQogICAgICAgICBvcHRpb24oRU5BQkxFX0dMRVMyIE9O KQogCkBAIC0xOTksMTEgKzIwMCwxNCBAQCBpZiAoRU5BQkxFX1dFQkdMIE9SIFdURl9VU0VfVElM RURfQkFDS0lOR19TVE9SRSkKICAgICAgICAgZW5kaWYgKCkKICAgICAgZWxzZWlmIChPUEVOR0xY X0ZPVU5EKQogICAgICAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1VTRV9HTFg9MSkKLSAgICBl bmRpZiAoKQogCi0gICAgIGlmICgoT1BFTkdMWF9GT1VORCBPUiBFR0xfRk9VTkQpIEFORCBYMTFf WGNvbXBvc2l0ZV9GT1VORCBBTkQgWDExX1hyZW5kZXJfRk9VTkQpCi0gICAgICAgICBzZXQoVVNF X0dSQVBISUNTX1NVUkZBQ0UgMSkKLSAgICAgZW5kaWYgKCkKKyAgICAgICAgIGlmIChYMTFfWGNv bXBvc2l0ZV9GT1VORCBBTkQgWDExX1hyZW5kZXJfRk9VTkQpCisgICAgICAgICAgICAgc2V0KFVT RV9HUkFQSElDU19TVVJGQUNFIDEpCisgICAgICAgICBlbHNlaWYgKEVOQUJMRV9XRUJHTCkKKyAg ICAgICAgICAgICAjIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgTk9UIFgxMV9YY29tcG9zaXRlIGZv ciBHTFgKKyAgICAgICAgICAgICBtZXNzYWdlKEZBVEFMX0VSUk9SICJUbyB1c2UgV2ViR0wgd2l0 aCBHTFggc3VwcG9ydCByZXF1aXJlcyBYMTFfWGNvbXBvc2l0ZS4iKQorICAgICAgICAgZW5kaWYg KCkKKyAgICBlbmRpZiAoKQogZW5kaWYgKCkKIAogaWYgKEVOQUJMRV9JTlNQRUNUT1IpCg==