104535 2012-12-10 04:19:10 -0800 [EFL [WebGL] [Wk2] Resizing the canvas breaks WebGL 2012-12-12 07:56:52 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 104532 1 kalyan.kondapally kalyan.kondapally hausmann kenneth lucas.de.marchi noam webkit.review.bot zeno oldest_to_newest 787190 0 kalyan.kondapally 2012-12-10 04:19:10 -0800 Try https://www.khronos.org/registry/webgl/sdk/demos/webkit/SpiritBox.html in MiniBrowser. Resize the view. Expected Result: View is resized properly with blue background and the cube is spinning. Actual Result: View is resized but we dont see any blue background or spinning cube. 789317 1 178995 kalyan.kondapally 2012-12-12 01:19:21 -0800 Created attachment 178995 WIP This fixes the bug. There is not flickering while resizing though especially when trying to make the window smaller. 789329 2 178995 zeno 2012-12-12 01:38:00 -0800 Comment on attachment 178995 WIP View in context: https://bugs.webkit.org/attachment.cgi?id=178995&action=review > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:227 > ::glFlush(); // Make sure all GL calls have been committed before resizing. Are you sure that EFL does not need to flush here? > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:326 > +#if (!PLATFORM(EFL)) I think we could unify this whole hunk for Qt and EFL. > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:332 > + else if (m_canvasSize != platformLayer->platformLayerSize()) { I am not convinced this is completely correct. The canvas could theoretically change (different token) but have the same size, couldn't it? On the other hand it can never change size, but keep the same token. Or am i missing something the EFL port does? So may be we should check for both? > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:348 > + m_canvasSize = m_canvasPlatformLayer ? m_canvasPlatformLayer->platformLayerSize() : IntSize(); Same here. If you update the size, don't you need to update the token as well? 789342 3 kalyan.kondapally 2012-12-12 01:49:44 -0800 (In reply to comment #2) > (From update of attachment 178995 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=178995&action=review > > > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:227 > > ::glFlush(); // Make sure all GL calls have been committed before resizing. > > Are you sure that EFL does not need to flush here? > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:326 > > +#if (!PLATFORM(EFL)) > > I think we could unify this whole hunk for Qt and EFL. > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:332 > > + else if (m_canvasSize != platformLayer->platformLayerSize()) { > > I am not convinced this is completely correct. The canvas could theoretically change (different token) but have the same size, couldn't it? > On the other hand it can never change size, but keep the same token. Or am i missing something the EFL port does? > So may be we should check for both? > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:348 > > + m_canvasSize = m_canvasPlatformLayer ? m_canvasPlatformLayer->platformLayerSize() : IntSize(); > > Same here. If you update the size, don't you need to update the token as well? One main difference is that in EFL port, we dont actually recreate the surface for every resize( or delete any associated GL resources). We only resize the window. On Efl port Token never changes. I will remove the ifdefs in the coordinatedgraphicslayer 789439 4 hausmann 2012-12-12 04:02:43 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 178995 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=178995&action=review > > > > > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:227 > > > ::glFlush(); // Make sure all GL calls have been committed before resizing. > > > > Are you sure that EFL does not need to flush here? > > > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:326 > > > +#if (!PLATFORM(EFL)) > > > > I think we could unify this whole hunk for Qt and EFL. > > > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:332 > > > + else if (m_canvasSize != platformLayer->platformLayerSize()) { > > > > I am not convinced this is completely correct. The canvas could theoretically change (different token) but have the same size, couldn't it? > > On the other hand it can never change size, but keep the same token. Or am i missing something the EFL port does? > > So may be we should check for both? > > > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:348 > > > + m_canvasSize = m_canvasPlatformLayer ? m_canvasPlatformLayer->platformLayerSize() : IntSize(); > > > > Same here. If you update the size, don't you need to update the token as well? > > One main difference is that in EFL port, we dont actually recreate the surface for every resize( or delete any associated GL resources). We only resize the window. > On Efl port Token never changes. I will remove the ifdefs in the coordinatedgraphicslayer The GraphicsSurface API is the lowest common denominator between different platforms. On Mac OS X re-sizing requires re-creating the underlying surface and therefore triggers a token change. As the lowest common denominator that behaviour has become part of the GraphicsSurface API contract, even if some platforms don't actually _do_ require a token change / surface re-creation. Therefore I think we should write code that _uses_ GraphicsSurface based on the API assumptions that hold for all platforms, given that resizing the GL canvas is a case that I would qualify as happening rarely and not worth the optimization, compared to the benefit of less #ifdefs in WebKit code and more code sharing across ports. 789505 5 179031 kalyan.kondapally 2012-12-12 07:02:37 -0800 Created attachment 179031 patch 789550 6 179031 webkit.review.bot 2012-12-12 07:56:47 -0800 Comment on attachment 179031 patch Clearing flags on attachment: 179031 Committed r137467: <http://trac.webkit.org/changeset/137467> 789551 7 webkit.review.bot 2012-12-12 07:56:52 -0800 All reviewed patches have been landed. Closing bug. 178995 2012-12-12 01:19:21 -0800 2012-12-12 07:02:37 -0800 WIP WIP.patch text/plain 5723 kalyan.kondapally ZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvR3JhcGhpY3ND b250ZXh0M0RFZmwuY3BwIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9HcmFw aGljc0NvbnRleHQzREVmbC5jcHAKaW5kZXggMGEwNTM1YS4uZTQxNjNiYiAxMDA2NDQKLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9HcmFwaGljc0NvbnRleHQzREVmbC5j cHAKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9HcmFwaGljc0NvbnRl eHQzREVmbC5jcHAKQEAgLTIzMSw5ICsyMzEsOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpw YWludFRvQ2FudmFzKGNvbnN0IHVuc2lnbmVkIGNoYXIqIGltYWdlUGl4ZWxzLCBpbnQgaW1hZwog fQogCiAjaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCi12b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpj cmVhdGVHcmFwaGljc1N1cmZhY2VzKGNvbnN0IEludFNpemUmKQordm9pZCBHcmFwaGljc0NvbnRl eHQzRDo6Y3JlYXRlR3JhcGhpY3NTdXJmYWNlcyhjb25zdCBJbnRTaXplJiBzaXplKQogewotICAg IG1fcHJpdmF0ZS0+ZGlkUmVzaXplQ2FudmFzKCk7CisgICAgbV9wcml2YXRlLT5kaWRSZXNpemVD YW52YXMoc2l6ZSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2VmbC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwCmlu ZGV4IDNkNjg2NmYuLjMxNTM3OTcgMTAwNjQ0Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9lZmwvR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmNwcAorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5jcHAKQEAg LTEyMyw5ICsxMjMsMTAgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRFByaXZhdGU6OnBhaW50VG9U ZXh0dXJlTWFwcGVyKFRleHR1cmVNYXBwZXIqLCBjb25zdCBGbG9hdFIKICNlbmRpZgogCiAjaWYg VVNFKEdSQVBISUNTX1NVUkZBQ0UpCi12b2lkIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6ZGlk UmVzaXplQ2FudmFzKCkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpkaWRSZXNpemVD YW52YXMoY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICBtX3BlbmRpbmdTdXJmYWNlUmVzaXpl ID0gdHJ1ZTsKKyAgICBtX3NpemUgPSBzaXplOwogfQogCiB1aW50MzJfdCBHcmFwaGljc0NvbnRl eHQzRFByaXZhdGU6OmNvcHlUb0dyYXBoaWNzU3VyZmFjZSgpCkBAIC0xNzAsNiArMTcxLDEyIEBA IEdyYXBoaWNzU3VyZmFjZVRva2VuIEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6Z3JhcGhpY3NT dXJmYWNlVG9rZW4oKSBjb25zdAogewogICAgIHJldHVybiBtX3N1cmZhY2VIYW5kbGU7CiB9CisK K0ludFNpemUgR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlOjpwbGF0Zm9ybUxheWVyU2l6ZSgpIGNv bnN0Cit7CisgICAgcmV0dXJuIG1fc2l6ZTsKK30KKwogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwv R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmggU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZWZsL0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5oCmluZGV4IGM2NWI2N2UuLmQ2ZTcyMjgg MTAwNjQ0Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvR3JhcGhpY3ND b250ZXh0M0RQcml2YXRlLmgKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Vm bC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaApAQCAtNTYsNyArNTYsOCBAQCBwdWJsaWM6CiAj aWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCiAgICAgdmlydHVhbCB1aW50MzJfdCBjb3B5VG9HcmFw aGljc1N1cmZhY2UoKTsKICAgICB2aXJ0dWFsIEdyYXBoaWNzU3VyZmFjZVRva2VuIGdyYXBoaWNz U3VyZmFjZVRva2VuKCkgY29uc3Q7Ci0gICAgdm9pZCBkaWRSZXNpemVDYW52YXMoKTsKKyAgICB2 b2lkIGRpZFJlc2l6ZUNhbnZhcyhjb25zdCBJbnRTaXplJiBzaXplKTsKKyAgICBJbnRTaXplIHBs YXRmb3JtTGF5ZXJTaXplKCkgY29uc3Q7CiAjZW5kaWYKICAgICBib29sIG1ha2VDb250ZXh0Q3Vy cmVudCgpOwogICAgIHZvaWQgcmVsZWFzZVJlc291cmNlcygpOwpAQCAtNzEsNiArNzIsNyBAQCBw dWJsaWM6CiAgICAgT3duUHRyPEdyYXBoaWNzQ29udGV4dDNEOjpDb250ZXh0TG9zdENhbGxiYWNr PiBtX2NvbnRleHRMb3N0Q2FsbGJhY2s7CiAgICAgTGlzdEhhc2hTZXQ8R0MzRGVudW0+IG1fc3lu dGhldGljRXJyb3JzOwogICAgIGJvb2wgbV9wZW5kaW5nU3VyZmFjZVJlc2l6ZTsKKyAgICBJbnRT aXplIG1fc2l6ZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVu R0xDb21tb24uY3BwIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFw aGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAKaW5kZXggNThjZmQ3Zi4uYWE3ZGUxZCAxMDA2 NDQKLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0Nv bnRleHQzRE9wZW5HTENvbW1vbi5jcHAKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAKQEAgLTIyMyw3ICsy MjMsOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpyZXNoYXBlKGludCB3aWR0aCwgaW50IGhl aWdodCkKICAgICAgICAgcmV0dXJuOwogCiAjaWYgKFBMQVRGT1JNKFFUKSB8fCBQTEFURk9STShF RkwpKSAmJiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKKyNpZiAoUExBVEZPUk0oUVQpKQogICAgIDo6 Z2xGbHVzaCgpOyAvLyBNYWtlIHN1cmUgYWxsIEdMIGNhbGxzIGhhdmUgYmVlbiBjb21taXR0ZWQg YmVmb3JlIHJlc2l6aW5nLgorI2VuZGlmCiAgICAgY3JlYXRlR3JhcGhpY3NTdXJmYWNlcyhJbnRT aXplKHdpZHRoLCBoZWlnaHQpKTsKICNlbmRpZgogCmRpZmYgLS1naXQgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyLmNwcCBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRH cmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCmluZGV4IGQ2YWQ3N2EuLjU1ZjM0 ZWYgMTAwNjQ0Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0 ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBo aWNzTGF5ZXIuY3BwCkBAIC0zMjMsMTAgKzMyMywxNiBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhp Y3NMYXllcjo6c2V0Q29udGVudHNUb0NhbnZhcyhQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVy KQogewogI2lmIFVTRShHUkFQSElDU19TVVJGQUNFKQogICAgIGlmIChtX2NhbnZhc1BsYXRmb3Jt TGF5ZXIpIHsKKyNpZiAoIVBMQVRGT1JNKEVGTCkpCiAgICAgICAgIEFTU0VSVChtX2NhbnZhc1Rv a2VuLmlzVmFsaWQoKSk7CisjZW5kaWYKICAgICAgICAgaWYgKCFwbGF0Zm9ybUxheWVyKQogICAg ICAgICAgICAgbV9jYW52YXNOZWVkc0Rlc3Ryb3kgPSB0cnVlOworI2lmIChQTEFURk9STShFRkwp KQorICAgICAgICBlbHNlIGlmIChtX2NhbnZhc1NpemUgIT0gcGxhdGZvcm1MYXllci0+cGxhdGZv cm1MYXllclNpemUoKSkgeworI2Vsc2UKICAgICAgICAgZWxzZSBpZiAobV9jYW52YXNUb2tlbiAh PSBwbGF0Zm9ybUxheWVyLT5ncmFwaGljc1N1cmZhY2VUb2tlbigpKSB7CisjZW5kaWYKICAgICAg ICAgICAgIC8vIG1fY2FudmFzVG9rZW4gY2FuIGJlIGRpZmZlcmVudCB0byBwbGF0Zm9ybUxheWVy LT5ncmFwaGljc1N1cmZhY2VUb2tlbigpLCBldmVuIGlmIG1fY2FudmFzUGxhdGZvcm1MYXllciBl cXVhbHMgcGxhdGZvcm1MYXllci4KICAgICAgICAgICAgIG1fY2FudmFzTmVlZHNEZXN0cm95ID0g dHJ1ZTsKICAgICAgICAgICAgIG1fY2FudmFzTmVlZHNDcmVhdGUgPSB0cnVlOwpAQCAtMzM4LDgg KzM0NCwxMiBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNUb0Nh bnZhcyhQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKQogCiAgICAgbV9jYW52YXNQbGF0Zm9y bUxheWVyID0gcGxhdGZvcm1MYXllcjsKICAgICAvLyBtX2NhbnZhc1Rva2VuIGlzIHVwZGF0ZWQg b25seSBoZXJlLiBJbiBkZXRhaWwsIHdoZW4gR3JhcGhpY3NDb250ZXh0M0QgaXMgY2hhbmdlZCBv ciByZXNoYXBlZCwgbV9jYW52YXNUb2tlbiBpcyBjaGFuZ2VkIGFuZCBzZXRDb250ZW50c1RvQ2Fu dmFzKCkgaXMgYWx3YXlzIGNhbGxlZC4KKyNpZiAoUExBVEZPUk0oRUZMKSkKKyAgICBtX2NhbnZh c1NpemUgPSBtX2NhbnZhc1BsYXRmb3JtTGF5ZXIgPyBtX2NhbnZhc1BsYXRmb3JtTGF5ZXItPnBs YXRmb3JtTGF5ZXJTaXplKCkgOiBJbnRTaXplKCk7CisjZWxzZQogICAgIG1fY2FudmFzVG9rZW4g PSBtX2NhbnZhc1BsYXRmb3JtTGF5ZXIgPyBtX2NhbnZhc1BsYXRmb3JtTGF5ZXItPmdyYXBoaWNz U3VyZmFjZVRva2VuKCkgOiBHcmFwaGljc1N1cmZhY2VUb2tlbigpOwogICAgIEFTU0VSVCghKCFt X2NhbnZhc1Rva2VuLmlzVmFsaWQoKSAmJiBtX2NhbnZhc1BsYXRmb3JtTGF5ZXIpKTsKKyNlbmRp ZgogICAgIGlmIChtX2NhbnZhc1BsYXRmb3JtTGF5ZXIpCiAgICAgICAgIG1fY2FudmFzTmVlZHNE aXNwbGF5ID0gdHJ1ZTsKICAgICBpZiAoY2xpZW50KCkpCmRpZmYgLS1naXQgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyLmggU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVk R3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKaW5kZXggNTY0YTk3NC4uZjI2YTI5 YyAxMDA2NDQKLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRl ZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNz TGF5ZXIuaApAQCAtMjMzLDggKzIzMywxMiBAQCBwcml2YXRlOgogCiAgICAgUGxhdGZvcm1MYXll ciogbV9jYW52YXNQbGF0Zm9ybUxheWVyOwogI2lmIFVTRShHUkFQSElDU19TVVJGQUNFKQorI2lm IChQTEFURk9STShFRkwpKQorICAgIEludFNpemUgbV9jYW52YXNTaXplOworI2Vsc2UKICAgICBH cmFwaGljc1N1cmZhY2VUb2tlbiBtX2NhbnZhc1Rva2VuOwogI2VuZGlmCisjZW5kaWYKICAgICBU aW1lcjxDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI+IG1fYW5pbWF0aW9uU3RhcnRlZFRpbWVyOwog ICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb25zIG1fYW5pbWF0aW9uczsKICAgICBkb3VibGUgbV9s YXN0QW5pbWF0aW9uU3RhcnRUaW1lOwo= 179031 2012-12-12 07:02:37 -0800 2012-12-12 07:56:47 -0800 patch review.patch text/plain 7209 kalyan.kondapally ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyNWZhODEwLi42NWE5NzNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMTItMTIgIEtvbmRhcGFsbHkgS2FseWFuICA8a2FseWFuLmtvbmRhcGFsbHlAaW50 ZWwuY29tPgorCisgICAgICAgIFtFRkwgW1dlYkdMXSBbV2syXSBSZXNpemluZyB0aGUgY2FudmFz IGJyZWFrcyBXZWJHTC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwNDUzNS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBHcmFwaGljc0NvbnRleHQzREVmbCBkb2VzIG5vdCByZS1jcmVhdGUgdGhlIHN1cmZh Y2Ugb24gY2FudmFzIHJlc2l6ZSwgdGhpcworICAgICAgICBjb25mbGljdGVkIHdpdGggdGhlIGxv Z2ljIGluIGNvb3JkaW5hdGVkIGdyYXBoaWNzIExheWVyLgorICAgICAgICBDb29yZGluYXRlZEdy YXBoaWNzTGF5ZXIgY2hlY2tzIGZvciBHcmFwaGljc1N1cmZhY2VUb2tlbiB0byBkZWNpZGUgaWYg dGhlIHN1cmZhY2UKKyAgICAgICAgaW4gVUktUHJvY2VzcyBzaG91bGQgYmUgcmVjcmVhdGVkIG9y IG5vdC4gV2l0aCB0aGlzCisgICAgICAgIHBhdGNoIHdlIGFsc28gY2hlY2sgZm9yIHNpemUgb2Yg dGhlIHBsYXRmb3JtIExheWVyLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0dy YXBoaWNzQ29udGV4dDNERWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEOjpjcmVhdGVHcmFwaGljc1N1cmZhY2VzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9lZmwvR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmNwcDoKKyAgICAgICAgKEdyYXBoaWNzQ29u dGV4dDNEUHJpdmF0ZTo6ZGlkUmVzaXplQ2FudmFzKToKKyAgICAgICAgKEdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZTo6cGxhdGZvcm1MYXllclNpemUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2VmbC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaDoKKyAgICAgICAgKEdyYXBoaWNzQ29u dGV4dDNEUHJpdmF0ZSk6CisKIDIwMTItMTItMTIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmll dy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMzc0 MzguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvR3Jh cGhpY3NDb250ZXh0M0RFZmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZWZsL0dyYXBoaWNzQ29udGV4dDNERWZsLmNwcAppbmRleCAwYTA1MzVhLi5lNDE2M2JiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvR3JhcGhpY3NDb250 ZXh0M0RFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VmbC9H cmFwaGljc0NvbnRleHQzREVmbC5jcHAKQEAgLTIzMSw5ICsyMzEsOSBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDNEOjpwYWludFRvQ2FudmFzKGNvbnN0IHVuc2lnbmVkIGNoYXIqIGltYWdlUGl4ZWxz LCBpbnQgaW1hZwogfQogCiAjaWYgVVNFKEdSQVBISUNTX1NVUkZBQ0UpCi12b2lkIEdyYXBoaWNz Q29udGV4dDNEOjpjcmVhdGVHcmFwaGljc1N1cmZhY2VzKGNvbnN0IEludFNpemUmKQordm9pZCBH cmFwaGljc0NvbnRleHQzRDo6Y3JlYXRlR3JhcGhpY3NTdXJmYWNlcyhjb25zdCBJbnRTaXplJiBz aXplKQogewotICAgIG1fcHJpdmF0ZS0+ZGlkUmVzaXplQ2FudmFzKCk7CisgICAgbV9wcml2YXRl LT5kaWRSZXNpemVDYW52YXMoc2l6ZSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWZsL0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvR3JhcGhpY3NDb250ZXh0 M0RQcml2YXRlLmNwcAppbmRleCA3MWY5YjEzLi4zMTUzNzk3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvR3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwvR3JhcGhpY3NDb250 ZXh0M0RQcml2YXRlLmNwcApAQCAtMTIzLDkgKzEyMywxMCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4 dDNEUHJpdmF0ZTo6cGFpbnRUb1RleHR1cmVNYXBwZXIoVGV4dHVyZU1hcHBlciosIGNvbnN0IEZs b2F0UgogI2VuZGlmCiAKICNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFDRSkKLXZvaWQgR3JhcGhpY3ND b250ZXh0M0RQcml2YXRlOjpkaWRSZXNpemVDYW52YXMoKQordm9pZCBHcmFwaGljc0NvbnRleHQz RFByaXZhdGU6OmRpZFJlc2l6ZUNhbnZhcyhjb25zdCBJbnRTaXplJiBzaXplKQogewogICAgIG1f cGVuZGluZ1N1cmZhY2VSZXNpemUgPSB0cnVlOworICAgIG1fc2l6ZSA9IHNpemU7CiB9CiAKIHVp bnQzMl90IEdyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZTo6Y29weVRvR3JhcGhpY3NTdXJmYWNlKCkK QEAgLTE3Myw4ICsxNzQsOSBAQCBHcmFwaGljc1N1cmZhY2VUb2tlbiBHcmFwaGljc0NvbnRleHQz RFByaXZhdGU6OmdyYXBoaWNzU3VyZmFjZVRva2VuKCkgY29uc3QKIAogSW50U2l6ZSBHcmFwaGlj c0NvbnRleHQzRFByaXZhdGU6OnBsYXRmb3JtTGF5ZXJTaXplKCkgY29uc3QKIHsKLSAgICByZXR1 cm4gSW50U2l6ZShtX2NvbnRleHQtPm1fY3VycmVudFdpZHRoLCBtX2NvbnRleHQtPm1fY3VycmVu dEhlaWdodCk7CisgICAgcmV0dXJuIG1fc2l6ZTsKIH0KKwogI2VuZGlmCiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2VmbC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2VmbC9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuaAppbmRleCBmMjFmMWUwLi4y ZWIyZjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZmwv R3JhcGhpY3NDb250ZXh0M0RQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZWZsL0dyYXBoaWNzQ29udGV4dDNEUHJpdmF0ZS5oCkBAIC01Nyw3ICs1Nyw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFNpemUgcGxhdGZvcm1MYXllclNpemUoKSBjb25zdDsK ICAgICB2aXJ0dWFsIHVpbnQzMl90IGNvcHlUb0dyYXBoaWNzU3VyZmFjZSgpOwogICAgIHZpcnR1 YWwgR3JhcGhpY3NTdXJmYWNlVG9rZW4gZ3JhcGhpY3NTdXJmYWNlVG9rZW4oKSBjb25zdDsKLSAg ICB2b2lkIGRpZFJlc2l6ZUNhbnZhcygpOworICAgIHZvaWQgZGlkUmVzaXplQ2FudmFzKGNvbnN0 IEludFNpemUmKTsKICNlbmRpZgogICAgIGJvb2wgbWFrZUNvbnRleHRDdXJyZW50KCk7CiAgICAg dm9pZCByZWxlYXNlUmVzb3VyY2VzKCk7CkBAIC03Miw2ICs3Miw3IEBAIHB1YmxpYzoKICAgICBP d25QdHI8R3JhcGhpY3NDb250ZXh0M0Q6OkNvbnRleHRMb3N0Q2FsbGJhY2s+IG1fY29udGV4dExv c3RDYWxsYmFjazsKICAgICBMaXN0SGFzaFNldDxHQzNEZW51bT4gbV9zeW50aGV0aWNFcnJvcnM7 CiAgICAgYm9vbCBtX3BlbmRpbmdTdXJmYWNlUmVzaXplOworICAgIEludFNpemUgbV9zaXplOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDc0YmFkODIuLjRhMjE0 MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0xMi0xMiAgS29uZGFwYWxseSBL YWx5YW4gIDxrYWx5YW4ua29uZGFwYWxseUBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTCBbV2Vi R0xdIFtXazJdIFJlc2l6aW5nIHRoZSBjYW52YXMgYnJlYWtzIFdlYkdMLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NTM1LgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNzQ29udGV4dDNERWZs IGRvZXMgbm90IHJlLWNyZWF0ZSB0aGUgc3VyZmFjZSBvbiBjYW52YXMgcmVzaXplLCB0aGlzCisg ICAgICAgIGNvbmZsaWN0ZWQgd2l0aCB0aGUgbG9naWMgaW4gY29vcmRpbmF0ZWQgZ3JhcGhpY3Mg TGF5ZXIuCisgICAgICAgIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciBjaGVja3MgZm9yIEdyYXBo aWNzU3VyZmFjZVRva2VuIHRvIGRlY2lkZSBpZiB0aGUgc3VyZmFjZQorICAgICAgICBpbiBVSS1Q cm9jZXNzIHNob3VsZCBiZSByZWNyZWF0ZWQgb3Igbm90LiBXaXRoIHRoaXMKKyAgICAgICAgcGF0 Y2ggd2UgYWxzbyBjaGVjayBmb3Igc2l6ZSBvZiB0aGUgcGxhdGZvcm0gTGF5ZXIuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdy YXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyOjpzZXRDb250ZW50c1RvQ2FudmFzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv Q29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuaDoKKyAgICAgICAg KENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcik6CisKIDIwMTItMTItMTIgIFNoZXJpZmYgQm90ICA8 d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxp bmcgb3V0IHIxMzc0MzguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAppbmRleCBiM2JlODQwLi40ZTQ0YzJhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXll ci5jcHAKQEAgLTMyOCw3ICszMjgsNyBAQCB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6 c2V0Q29udGVudHNUb0NhbnZhcyhQbGF0Zm9ybUxheWVyKiBwbGF0Zm9ybUxheWVyKQogICAgICAg ICBBU1NFUlQobV9jYW52YXNUb2tlbi5pc1ZhbGlkKCkpOwogICAgICAgICBpZiAoIXBsYXRmb3Jt TGF5ZXIpCiAgICAgICAgICAgICBtX2NhbnZhc05lZWRzRGVzdHJveSA9IHRydWU7Ci0gICAgICAg IGVsc2UgaWYgKG1fY2FudmFzVG9rZW4gIT0gcGxhdGZvcm1MYXllci0+Z3JhcGhpY3NTdXJmYWNl VG9rZW4oKSkgeworICAgICAgICBlbHNlIGlmICgobV9jYW52YXNTaXplICE9IHBsYXRmb3JtTGF5 ZXItPnBsYXRmb3JtTGF5ZXJTaXplKCkpIHx8IChtX2NhbnZhc1Rva2VuICE9IHBsYXRmb3JtTGF5 ZXItPmdyYXBoaWNzU3VyZmFjZVRva2VuKCkpKSB7CiAgICAgICAgICAgICAvLyBtX2NhbnZhc1Rv a2VuIGNhbiBiZSBkaWZmZXJlbnQgdG8gcGxhdGZvcm1MYXllci0+Z3JhcGhpY3NTdXJmYWNlVG9r ZW4oKSwgZXZlbiBpZiBtX2NhbnZhc1BsYXRmb3JtTGF5ZXIgZXF1YWxzIHBsYXRmb3JtTGF5ZXIu CiAgICAgICAgICAgICBtX2NhbnZhc05lZWRzRGVzdHJveSA9IHRydWU7CiAgICAgICAgICAgICBt X2NhbnZhc05lZWRzQ3JlYXRlID0gdHJ1ZTsKQEAgLTM0MCw2ICszNDAsNyBAQCB2b2lkIENvb3Jk aW5hdGVkR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNUb0NhbnZhcyhQbGF0Zm9ybUxheWVyKiBw bGF0Zm9ybUxheWVyKQogCiAgICAgbV9jYW52YXNQbGF0Zm9ybUxheWVyID0gcGxhdGZvcm1MYXll cjsKICAgICAvLyBtX2NhbnZhc1Rva2VuIGlzIHVwZGF0ZWQgb25seSBoZXJlLiBJbiBkZXRhaWws IHdoZW4gR3JhcGhpY3NDb250ZXh0M0QgaXMgY2hhbmdlZCBvciByZXNoYXBlZCwgbV9jYW52YXNU b2tlbiBpcyBjaGFuZ2VkIGFuZCBzZXRDb250ZW50c1RvQ2FudmFzKCkgaXMgYWx3YXlzIGNhbGxl ZC4KKyAgICBtX2NhbnZhc1NpemUgPSBtX2NhbnZhc1BsYXRmb3JtTGF5ZXIgPyBtX2NhbnZhc1Bs YXRmb3JtTGF5ZXItPnBsYXRmb3JtTGF5ZXJTaXplKCkgOiBJbnRTaXplKCk7CiAgICAgbV9jYW52 YXNUb2tlbiA9IG1fY2FudmFzUGxhdGZvcm1MYXllciA/IG1fY2FudmFzUGxhdGZvcm1MYXllci0+ Z3JhcGhpY3NTdXJmYWNlVG9rZW4oKSA6IEdyYXBoaWNzU3VyZmFjZVRva2VuKCk7CiAgICAgQVNT RVJUKCEoIW1fY2FudmFzVG9rZW4uaXNWYWxpZCgpICYmIG1fY2FudmFzUGxhdGZvcm1MYXllcikp OwogICAgIGlmIChtX2NhbnZhc1BsYXRmb3JtTGF5ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdy YXBoaWNzTGF5ZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGlu YXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oCmluZGV4IDMyMGRjMjQuLjU2 YmZiYjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29y ZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVk R3JhcGhpY3NMYXllci5oCkBAIC0yNDAsNiArMjQwLDcgQEAgcHJpdmF0ZToKIAogICAgIFBsYXRm b3JtTGF5ZXIqIG1fY2FudmFzUGxhdGZvcm1MYXllcjsKICNpZiBVU0UoR1JBUEhJQ1NfU1VSRkFD RSkKKyAgICBJbnRTaXplIG1fY2FudmFzU2l6ZTsKICAgICBHcmFwaGljc1N1cmZhY2VUb2tlbiBt X2NhbnZhc1Rva2VuOwogI2VuZGlmCiAgICAgVGltZXI8Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVy PiBtX2FuaW1hdGlvblN0YXJ0ZWRUaW1lcjsK