61444 2011-05-25 09:31:37 -0700 [chromium] Cannot create stencil render-buffer for accelerated drawing on desktop GL 2011-05-26 00:01:24 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 alokp alokp bsalomon commit-queue jamesr reed vangelis oldest_to_newest 409687 0 alokp 2011-05-25 09:31:37 -0700 LayerTextureUpdaterCanvas.cpp:137: ASSERT(context()->checkFramebufferStatus(GraphicsContext3D::FRAMEBUFFER) == GraphicsContext3D::FRAMEBUFFER_COMPLETE); This asserts for every composited page with desktop GL and --enable-accelerated-drawing. It basically fails to create a stencil render buffer. 409886 1 94849 alokp 2011-05-25 13:29:00 -0700 Created attachment 94849 proposed patch 409931 2 94849 jamesr 2011-05-25 14:35:16 -0700 Comment on attachment 94849 proposed patch This is partially duplicating even more code from DrawingBuffer :( 409934 3 alokp 2011-05-25 14:39:00 -0700 (In reply to comment #2) > (From update of attachment 94849 [details]) > This is partially duplicating even more code from DrawingBuffer :( All this code will go away once we delegate the creation of frame-buffer to SKIA. I have sent a proposal to skia team to make skia GrContext::createPlatformSurface more generic. 409940 4 94849 jamesr 2011-05-25 14:45:29 -0700 Comment on attachment 94849 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=94849&action=review As I'm sure you know, I'd much prefer that you reuse existing code and refactor it to meet your needs rather than partially reimplementing it. Do you want to try falling back to color+stencil if the packed extension is unavailable? I think that in practice color+stencil is very rare, and it only works in ANGLE because it's allocating a packed buffer behind the scenes, but it might be worth trying. > Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:163 > + if (m_stencilBuffer) { this member variable is now misnamed - it's really a depthStencilBuffer > Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:195 > + Extensions3D* extensions = context()->getExtensions(); > + if (!extensions->supports("GL_OES_packed_depth_stencil")) > + return false; > + extensions->ensureEnabled("GL_OES_packed_depth_stencil"); you should query+cached this once per context, not once per fbo 409947 5 jamesr 2011-05-25 14:49:45 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 94849 [details] [details]) > > This is partially duplicating even more code from DrawingBuffer :( > > All this code will go away once we delegate the creation of frame-buffer to SKIA. I have sent a proposal to skia team to make skia GrContext::createPlatformSurface more generic. Yes but currently you and I are both wasting time maintaining it. 409959 6 94849 alokp 2011-05-25 15:15:41 -0700 Comment on attachment 94849 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=94849&action=review Ideally you should try all the following configs: 1. STENCIL_INDEX8 2. DEPTH24_STENCIL8 3. STENCIL_INDEX4 4. STENCIL_INDEX16 5. STENCIL_INDEX 6. DEPTH_STENCIL Since we are not checking all the possible configs, I would rather keep it simple and just try the most common one. SKIA does a pretty good job of iterating through all configs. So once we delegate the creation of frame-buffer to SKIA, we would not need to worry about it. >> Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:163 >> + if (m_stencilBuffer) { > > this member variable is now misnamed - it's really a depthStencilBuffer Done. >> Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:195 >> + extensions->ensureEnabled("GL_OES_packed_depth_stencil"); > > you should query+cached this once per context, not once per fbo Caching (sort of) is already being done by Extensions3DChromium. It does not hit the IPC or command-buffer; just a hash-table look-up. 409961 7 94869 alokp 2011-05-25 15:18:14 -0700 Created attachment 94869 proposed patch renamed m_stencilBuffer to m_depthStencilBuffer 410244 8 commit-queue 2011-05-25 23:59:59 -0700 The commit-queue encountered the following flaky tests while processing attachment 94869: http/tests/websocket/tests/frame-length-overflow.html bug 61507 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 410245 9 94869 commit-queue 2011-05-26 00:01:19 -0700 Comment on attachment 94869 proposed patch Clearing flags on attachment: 94869 Committed r87365: <http://trac.webkit.org/changeset/87365> 410246 10 commit-queue 2011-05-26 00:01:24 -0700 All reviewed patches have been landed. Closing bug. 94849 2011-05-25 13:29:00 -0700 2011-05-25 15:18:14 -0700 proposed patch 61444.patch text/plain 4153 alokp SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MzE2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMjUgIEFsb2sgUHJp eWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBDYW5ub3QgY3JlYXRlIHN0ZW5jaWwg cmVuZGVyLWJ1ZmZlciBmb3IgYWNjZWxlcmF0ZWQgZHJhd2luZyBvbiBkZXNrdG9wIEdMCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTQ0NAorCisgICAg ICAgIFVzZWQgREVQVEgyNF9TVEVOQ0lMOCBmb3JtYXQgZm9yIHN0ZW5jaWwgYnVmZmVyIGluc3Rl YWQgb2YgU1RFTkNJTF9JTkRFWDguCisgICAgICAgIFBhY2tlZCBkZXB0aC1zdGVuY2lsIGJ1ZmZl ciBpcyB0aGUgbW9zdCBjb21tb24gZm9ybWF0IHN1cHBvcnRlZCBieSBncmFwaGljcyBjYXJkcy4K KyAgICAgICAgSXQgaXMgbm90IHZlcnkgcm9idXN0IHRvIHJlbHkgb24ganVzdCBvbmUgZm9ybWF0 IGJlaW5nIHN1cHBvcnRlZCwKKyAgICAgICAgc28gbG9uZyB0ZXJtIHRoZSB0YXNrIG9mIGNyZWF0 aW5nIEZCTyBzaG91bGQgYmUgZGVsZWdhdGVkIHRvIFNLSUEsCisgICAgICAgIHdoaWNoIGhhcyBu ZWNlc3NhcnkgY29kZSB0byBpdGVyYXRlIHRocm91Z2ggYWxsIHBvc3NpYmxlIGZvcm1hdHMuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVy Q2FudmFzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1 cmU6OmRlbGV0ZUZyYW1lQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVw ZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZUZyYW1lQnVmZmVyKToKKwogMjAxMS0wNS0yNSAgQ2FpbyBN YXJjZWxvIGRlIE9saXZlaXJhIEZpbGhvICA8Y2Fpby5vbGl2ZWlyYUBvcGVuYm9zc2Eub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmNwcAkocmV2aXNpb24gODcxODMpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVy Q2FudmFzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAi TGF5ZXJUZXh0dXJlVXBkYXRlckNhbnZhcy5oIgogCisjaW5jbHVkZSAiRXh0ZW5zaW9uczNELmgi CiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiTGF5ZXJQYWludGVyQ2hy b21pdW0uaCIKICNpbmNsdWRlICJMYXllclRleHR1cmUuaCIKQEAgLTE1OSwxMCArMTYwLDE0IEBA IHZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6ZGVsZXQKIHsKICAgICBtX2NhbnZh cy5jbGVhcigpOwogCi0gICAgaWYgKG1fc3RlbmNpbEJ1ZmZlcikKKyAgICBpZiAobV9zdGVuY2ls QnVmZmVyKSB7CiAgICAgICAgIGNvbnRleHQoKS0+ZGVsZXRlUmVuZGVyYnVmZmVyKG1fc3RlbmNp bEJ1ZmZlcik7Ci0gICAgaWYgKG1fZmJvKQorICAgICAgICBtX3N0ZW5jaWxCdWZmZXIgPSAwOwor ICAgIH0KKyAgICBpZiAobV9mYm8pIHsKICAgICAgICAgY29udGV4dCgpLT5kZWxldGVGcmFtZWJ1 ZmZlcihtX2Zibyk7CisgICAgICAgIG1fZmJvID0gMDsKKyAgICB9CiB9CiAKIGJvb2wgTGF5ZXJU ZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXRlRnJhbWVCdWZmZXIoKQpAQCAtMTc2LDYgKzE4 MSwxOSBAQCBib29sIExheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1cmU6OmNyZWF0CiAgICAgaWYg KCFjb250ZXh0QXR0cmlicy5zdGVuY2lsKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICAv LyBTS0lBIG9ubHkgbmVlZHMgY29sb3IgYW5kIHN0ZW5jaWwgYnVmZmVycywgbm90IGRlcHRoIGJ1 ZmZlci4KKyAgICAvLyBCdXQgaXQgaXMgdmVyeSB1bmNvbW1vbiBmb3IgY2FyZHMgdG8gc3VwcG9y dCBjb2xvciArIHN0ZW5jaWwgRkJPIGNvbmZpZy4KKyAgICAvLyBUaGUgbW9zdCBjb21tb24gY29u ZmlnIGlzIGNvbG9yICsgcGFja2VkLWRlcHRoLXN0ZW5jaWwuCisgICAgLy8gSW5zdGVhZCBvZiBp dGVyYXRpbmcgdGhyb3VnaCBhbGwgcG9zc2libGUgRkJPIGNvbmZpZ3MsIHdlIG9ubHkgdHJ5IHRo ZQorICAgIC8vIG1vc3QgY29tbW9uIG9uZSBoZXJlLgorICAgIC8vIEZJWE1FOiBEZWxlZ2F0ZSB0 aGUgdGFzayBvZiBjcmVhdGluZyBmcmFtZS1idWZmZXIgdG8gU0tJQS4KKyAgICAvLyBJdCBoYXMg YWxsIG5lY2Vzc2FyeSBjb2RlIHRvIGl0ZXJhdGUgdGhyb3VnaCBhbGwgcG9zc2libGUgY29uZmln cworICAgIC8vIGFuZCBjaG9vc2UgdGhlIG9uZSBtb3N0IHN1aXRhYmxlIGZvciBpdHMgcHVycG9z ZXMuCisgICAgRXh0ZW5zaW9uczNEKiBleHRlbnNpb25zID0gY29udGV4dCgpLT5nZXRFeHRlbnNp b25zKCk7CisgICAgaWYgKCFleHRlbnNpb25zLT5zdXBwb3J0cygiR0xfT0VTX3BhY2tlZF9kZXB0 aF9zdGVuY2lsIikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBleHRlbnNpb25zLT5lbnN1 cmVFbmFibGVkKCJHTF9PRVNfcGFja2VkX2RlcHRoX3N0ZW5jaWwiKTsKKwogICAgIC8vIENyZWF0 ZSBhbmQgYmluZCBhIGZyYW1lLWJ1ZmZlci1vYmplY3QuCiAgICAgbV9mYm8gPSBjb250ZXh0KCkt PmNyZWF0ZUZyYW1lYnVmZmVyKCk7CiAgICAgaWYgKCFtX2ZibykKQEAgLTE4NywxMyArMjA1LDEz IEBAIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXQKICAgICAvLyBTS0lB IGRvZXMgbm90IG5lZWQgZGVwdGggYnVmZmVyLgogICAgIG1fc3RlbmNpbEJ1ZmZlciA9IGNvbnRl eHQoKS0+Y3JlYXRlUmVuZGVyYnVmZmVyKCk7CiAgICAgaWYgKCFtX3N0ZW5jaWxCdWZmZXIpIHsK LSAgICAgICAgY29udGV4dCgpLT5kZWxldGVGcmFtZWJ1ZmZlcihtX2Zibyk7Ci0gICAgICAgIG1f ZmJvID0gMDsKKyAgICAgICAgZGVsZXRlRnJhbWVCdWZmZXIoKTsKICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KICAgICBjb250ZXh0KCktPmJpbmRSZW5kZXJidWZmZXIoR3JhcGhpY3NDb250 ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsKLSAgICBjb250ZXh0KCktPnJl bmRlcmJ1ZmZlclN0b3JhZ2UoR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgR3JhcGhp Y3NDb250ZXh0M0Q6OlNURU5DSUxfSU5ERVg4LCBtX2J1ZmZlclNpemUud2lkdGgoKSwgbV9idWZm ZXJTaXplLmhlaWdodCgpKTsKKyAgICBjb250ZXh0KCktPnJlbmRlcmJ1ZmZlclN0b3JhZ2UoR3Jh cGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgRXh0ZW5zaW9uczNEOjpERVBUSDI0X1NURU5D SUw4LCBtX2J1ZmZlclNpemUud2lkdGgoKSwgbV9idWZmZXJTaXplLmhlaWdodCgpKTsKICAgICBj b250ZXh0KCktPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFN RUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OlNURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhpY3ND b250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsKKyAgICBjb250ZXh0KCkt PmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwg R3JhcGhpY3NDb250ZXh0M0Q6OkRFUFRIX0FUVEFDSE1FTlQsIEdyYXBoaWNzQ29udGV4dDNEOjpS RU5ERVJCVUZGRVIsIG1fc3RlbmNpbEJ1ZmZlcik7CiAKICAgICAvLyBDcmVhdGUgYSBza2lhIGdw dSBjYW52YXMuCiAgICAgR3JQbGF0Zm9ybVN1cmZhY2VEZXNjIHRhcmdldERlc2M7Cg== 94869 2011-05-25 15:18:14 -0700 2011-05-26 00:01:19 -0700 proposed patch 61444.patch text/plain 5539 alokp SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MzE3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMjUgIEFsb2sgUHJp eWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW2Nocm9taXVtXSBDYW5ub3QgY3JlYXRlIHN0ZW5jaWwg cmVuZGVyLWJ1ZmZlciBmb3IgYWNjZWxlcmF0ZWQgZHJhd2luZyBvbiBkZXNrdG9wIEdMCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MTQ0NAorCisgICAg ICAgIFVzZWQgREVQVEgyNF9TVEVOQ0lMOCBmb3JtYXQgZm9yIHN0ZW5jaWwgYnVmZmVyIGluc3Rl YWQgb2YgU1RFTkNJTF9JTkRFWDguCisgICAgICAgIFBhY2tlZCBkZXB0aC1zdGVuY2lsIGJ1ZmZl ciBpcyB0aGUgbW9zdCBjb21tb24gZm9ybWF0IHN1cHBvcnRlZCBieSBncmFwaGljcyBjYXJkcy4K KyAgICAgICAgSXQgaXMgbm90IHZlcnkgcm9idXN0IHRvIHJlbHkgb24ganVzdCBvbmUgZm9ybWF0 IGJlaW5nIHN1cHBvcnRlZCwKKyAgICAgICAgc28gbG9uZyB0ZXJtIHRoZSB0YXNrIG9mIGNyZWF0 aW5nIEZCTyBzaG91bGQgYmUgZGVsZWdhdGVkIHRvIFNLSUEsCisgICAgICAgIHdoaWNoIGhhcyBu ZWNlc3NhcnkgY29kZSB0byBpdGVyYXRlIHRocm91Z2ggYWxsIHBvc3NpYmxlIGZvcm1hdHMuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVy Q2FudmFzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVwZGF0ZXJTa1BpY3R1 cmU6OmRlbGV0ZUZyYW1lQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGV4dHVyZVVw ZGF0ZXJTa1BpY3R1cmU6OmNyZWF0ZUZyYW1lQnVmZmVyKToKKwogMjAxMS0wNS0yNSAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBKYW1lcyBS b2JpbnNvbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMu Y3BwCShyZXZpc2lvbiA4NzMxNykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xheWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zMCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJMYXllclRleHR1cmVVcGRhdGVyQ2FudmFzLmgi CiAKKyNpbmNsdWRlICJFeHRlbnNpb25zM0QuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQu aCIKICNpbmNsdWRlICJMYXllclBhaW50ZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUgIkxheWVyVGV4 dHVyZS5oIgpAQCAtOTUsNyArOTYsNyBAQCBMYXllclRleHR1cmVVcGRhdGVyU2tQaWN0dXJlOjpM YXllclRleHR1CiAgICAgLCBtX3NraWFDb250ZXh0KHNraWFDb250ZXh0KQogICAgICwgbV9jcmVh dGVGcmFtZUJ1ZmZlcihmYWxzZSkKICAgICAsIG1fZmJvKDApCi0gICAgLCBtX3N0ZW5jaWxCdWZm ZXIoMCkKKyAgICAsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKDApCiB7CiB9CiAKQEAgLTE1OSwxMCAr MTYwLDE0IEBAIHZvaWQgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6ZGVsZXQKIHsKICAg ICBtX2NhbnZhcy5jbGVhcigpOwogCi0gICAgaWYgKG1fc3RlbmNpbEJ1ZmZlcikKLSAgICAgICAg Y29udGV4dCgpLT5kZWxldGVSZW5kZXJidWZmZXIobV9zdGVuY2lsQnVmZmVyKTsKLSAgICBpZiAo bV9mYm8pCisgICAgaWYgKG1fZGVwdGhTdGVuY2lsQnVmZmVyKSB7CisgICAgICAgIGNvbnRleHQo KS0+ZGVsZXRlUmVuZGVyYnVmZmVyKG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgbV9k ZXB0aFN0ZW5jaWxCdWZmZXIgPSAwOworICAgIH0KKyAgICBpZiAobV9mYm8pIHsKICAgICAgICAg Y29udGV4dCgpLT5kZWxldGVGcmFtZWJ1ZmZlcihtX2Zibyk7CisgICAgICAgIG1fZmJvID0gMDsK KyAgICB9CiB9CiAKIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGljdHVyZTo6Y3JlYXRlRnJh bWVCdWZmZXIoKQpAQCAtMTc2LDYgKzE4MSwxOSBAQCBib29sIExheWVyVGV4dHVyZVVwZGF0ZXJT a1BpY3R1cmU6OmNyZWF0CiAgICAgaWYgKCFjb250ZXh0QXR0cmlicy5zdGVuY2lsKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKKyAgICAvLyBTS0lBIG9ubHkgbmVlZHMgY29sb3IgYW5kIHN0ZW5j aWwgYnVmZmVycywgbm90IGRlcHRoIGJ1ZmZlci4KKyAgICAvLyBCdXQgaXQgaXMgdmVyeSB1bmNv bW1vbiBmb3IgY2FyZHMgdG8gc3VwcG9ydCBjb2xvciArIHN0ZW5jaWwgRkJPIGNvbmZpZy4KKyAg ICAvLyBUaGUgbW9zdCBjb21tb24gY29uZmlnIGlzIGNvbG9yICsgcGFja2VkLWRlcHRoLXN0ZW5j aWwuCisgICAgLy8gSW5zdGVhZCBvZiBpdGVyYXRpbmcgdGhyb3VnaCBhbGwgcG9zc2libGUgRkJP IGNvbmZpZ3MsIHdlIG9ubHkgdHJ5IHRoZQorICAgIC8vIG1vc3QgY29tbW9uIG9uZSBoZXJlLgor ICAgIC8vIEZJWE1FOiBEZWxlZ2F0ZSB0aGUgdGFzayBvZiBjcmVhdGluZyBmcmFtZS1idWZmZXIg dG8gU0tJQS4KKyAgICAvLyBJdCBoYXMgYWxsIG5lY2Vzc2FyeSBjb2RlIHRvIGl0ZXJhdGUgdGhy b3VnaCBhbGwgcG9zc2libGUgY29uZmlncworICAgIC8vIGFuZCBjaG9vc2UgdGhlIG9uZSBtb3N0 IHN1aXRhYmxlIGZvciBpdHMgcHVycG9zZXMuCisgICAgRXh0ZW5zaW9uczNEKiBleHRlbnNpb25z ID0gY29udGV4dCgpLT5nZXRFeHRlbnNpb25zKCk7CisgICAgaWYgKCFleHRlbnNpb25zLT5zdXBw b3J0cygiR0xfT0VTX3BhY2tlZF9kZXB0aF9zdGVuY2lsIikpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKyAgICBleHRlbnNpb25zLT5lbnN1cmVFbmFibGVkKCJHTF9PRVNfcGFja2VkX2RlcHRoX3N0 ZW5jaWwiKTsKKwogICAgIC8vIENyZWF0ZSBhbmQgYmluZCBhIGZyYW1lLWJ1ZmZlci1vYmplY3Qu CiAgICAgbV9mYm8gPSBjb250ZXh0KCktPmNyZWF0ZUZyYW1lYnVmZmVyKCk7CiAgICAgaWYgKCFt X2ZibykKQEAgLTE4NSwxNSArMjAzLDE1IEBAIGJvb2wgTGF5ZXJUZXh0dXJlVXBkYXRlclNrUGlj dHVyZTo6Y3JlYXQKICAgICAvLyBXZSBqdXN0IG5lZWQgdG8gY3JlYXRlIGEgc3RlbmNpbCBidWZm ZXIgZm9yIEZCTy4KICAgICAvLyBUaGUgY29sb3IgYnVmZmVyICh0ZXh0dXJlKSB3aWxsIGJlIHBy b3ZpZGVkIGJ5IHRpbGVzLgogICAgIC8vIFNLSUEgZG9lcyBub3QgbmVlZCBkZXB0aCBidWZmZXIu Ci0gICAgbV9zdGVuY2lsQnVmZmVyID0gY29udGV4dCgpLT5jcmVhdGVSZW5kZXJidWZmZXIoKTsK LSAgICBpZiAoIW1fc3RlbmNpbEJ1ZmZlcikgewotICAgICAgICBjb250ZXh0KCktPmRlbGV0ZUZy YW1lYnVmZmVyKG1fZmJvKTsKLSAgICAgICAgbV9mYm8gPSAwOworICAgIG1fZGVwdGhTdGVuY2ls QnVmZmVyID0gY29udGV4dCgpLT5jcmVhdGVSZW5kZXJidWZmZXIoKTsKKyAgICBpZiAoIW1fZGVw dGhTdGVuY2lsQnVmZmVyKSB7CisgICAgICAgIGRlbGV0ZUZyYW1lQnVmZmVyKCk7CiAgICAgICAg IHJldHVybiBmYWxzZTsKICAgICB9Ci0gICAgY29udGV4dCgpLT5iaW5kUmVuZGVyYnVmZmVyKEdy YXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fc3RlbmNpbEJ1ZmZlcik7Ci0gICAgY29u dGV4dCgpLT5yZW5kZXJidWZmZXJTdG9yYWdlKEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZG RVIsIEdyYXBoaWNzQ29udGV4dDNEOjpTVEVOQ0lMX0lOREVYOCwgbV9idWZmZXJTaXplLndpZHRo KCksIG1fYnVmZmVyU2l6ZS5oZWlnaHQoKSk7Ci0gICAgY29udGV4dCgpLT5mcmFtZWJ1ZmZlclJl bmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4 dDNEOjpTVEVOQ0lMX0FUVEFDSE1FTlQsIEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIs IG1fc3RlbmNpbEJ1ZmZlcik7CisgICAgY29udGV4dCgpLT5iaW5kUmVuZGVyYnVmZmVyKEdyYXBo aWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKKyAgICBj b250ZXh0KCktPnJlbmRlcmJ1ZmZlclN0b3JhZ2UoR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJV RkZFUiwgRXh0ZW5zaW9uczNEOjpERVBUSDI0X1NURU5DSUw4LCBtX2J1ZmZlclNpemUud2lkdGgo KSwgbV9idWZmZXJTaXplLmhlaWdodCgpKTsKKyAgICBjb250ZXh0KCktPmZyYW1lYnVmZmVyUmVu ZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0 M0Q6OlNURU5DSUxfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwg bV9kZXB0aFN0ZW5jaWxCdWZmZXIpOworICAgIGNvbnRleHQoKS0+ZnJhbWVidWZmZXJSZW5kZXJi dWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGljc0NvbnRleHQzRDo6 REVQVEhfQVRUQUNITUVOVCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9kZXB0 aFN0ZW5jaWxCdWZmZXIpOwogCiAgICAgLy8gQ3JlYXRlIGEgc2tpYSBncHUgY2FudmFzLgogICAg IEdyUGxhdGZvcm1TdXJmYWNlRGVzYyB0YXJnZXREZXNjOwpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUZXh0dXJlVXBkYXRlckNhbnZhcy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyVGV4dHVyZVVwZGF0ZXJDYW52YXMuaAkocmV2aXNpb24gODczMTcpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclRleHR1cmVVcGRhdGVyQ2FudmFz LmgJKHdvcmtpbmcgY29weSkKQEAgLTk5LDcgKzk5LDcgQEAgcHJpdmF0ZToKICAgICBTa1BpY3R1 cmUgbV9waWN0dXJlOyAvLyBSZWNvcmRpbmcgY2FudmFzLgogICAgIEludFNpemUgbV9idWZmZXJT aXplOyAvLyBGcmFtZSBidWZmZXIgc2l6ZS4KICAgICBQbGF0Zm9ybTNET2JqZWN0IG1fZmJvOyAv LyBGcmFtZSBidWZmZXIgaWQuCi0gICAgUGxhdGZvcm0zRE9iamVjdCBtX3N0ZW5jaWxCdWZmZXI7 CisgICAgUGxhdGZvcm0zRE9iamVjdCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcjsKICAgICBPd25QdHI8 U2tDYW52YXM+IG1fY2FudmFzOyAvLyBHUFUgYWNjZWxlcmF0ZWQgY2FudmFzLgogfTsKICNlbmRp ZiAvLyBTS0lBCg==