123397 2013-10-27 09:21:55 -0700 [EFL] ASSERTION FAILED: !m_flushingLayers in several tests 2017-03-11 10:34:12 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 sergio webkit-unassigned cmarcelo commit-queue gyuyoung.kim kondapallykalyan luiz mcatanzaro noam ossy tonikitoo oldest_to_newest 943960 0 sergio 2013-10-27 09:21:55 -0700 [CoordinatedGraphics] ASSERTION FAILED: !m_flushingLayers in several tests 943961 1 sergio 2013-10-27 09:24:47 -0700 In CompositingCoordinator::flushPendingLayerChanges() we indicate we are in the middle of a flush, to prevent calling scheduleLayerFlush() inside flushCompositingState(), but in some code paths we don't go through it and end up calling scheduleLayerFlush() when we shouldn't. This causes several layout tests (approx. 1.7K on Nix, probably a similar amount on EFL, but I wasn't able to finish running the layout tests due to technical problems) to crash hitting this assert. 943962 2 215272 sergio 2013-10-27 09:27:31 -0700 Created attachment 215272 RFC patch RFC patch indicating we are in the middle of a flush in flushCompositingState() as well. 943975 3 215272 noam 2013-10-27 11:55:05 -0700 Comment on attachment 215272 RFC patch View in context: https://bugs.webkit.org/attachment.cgi?id=215272&action=review > Source/WebCore/ChangeLog:11 > + flushCompositingState(), but in some code paths we don't go through it > + and end up calling scheduleLayerFlush() when we shouldn't. What code paths? Seems like this patch works around a problem which we need to understand better. > Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:93 > + startedFlushingLayerChanges(); willFlushLayerChanges > Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:122 > + finishedFlushingLayerChanges(); didFlushLayerChanges 943984 4 215272 sergio 2013-10-27 12:35:44 -0700 Comment on attachment 215272 RFC patch View in context: https://bugs.webkit.org/attachment.cgi?id=215272&action=review >> Source/WebCore/ChangeLog:11 >> + and end up calling scheduleLayerFlush() when we shouldn't. > > What code paths? Seems like this patch works around a problem which we need to understand better. Here's the backtrace from fast/shapes/shape-inside/shape-inside-rounded-rectangle-004.html on EFL: STDERR: ASSERTION FAILED: !m_flushingLayers STDERR: /home/sergio/projects/webkit/Source/WebCore/rendering/RenderLayerCompositor.cpp(356) : void WebCore::RenderLayerCompositor::scheduleLayerFlush(bool) STDERR: 1 0x7f86e3bfa8b3 WTFCrash STDERR: 2 0x7f86dfe138ae WebCore::RenderLayerCompositor::scheduleLayerFlush(bool) STDERR: 3 0x7f86dfe13812 WebCore::RenderLayerCompositor::notifyFlushRequired(WebCore::GraphicsLayer const*) STDERR: 4 0x7f86dfc04f03 WebCore::CoordinatedGraphicsLayer::notifyFlushRequired() STDERR: 5 0x7f86dfc06b7a WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 6 0x7f86dfe13add WebCore::RenderLayerCompositor::flushPendingLayerChanges(bool) STDERR: 7 0x7f86dfa75a81 WebCore::FrameView::flushCompositingStateForThisFrame(WebCore::Frame*) STDERR: 8 0x7f86dfa7e64f WebCore::FrameView::paintContents(WebCore::GraphicsContext*, WebCore::IntRect const&) STDERR: 9 0x7f86dfb21e13 WebCore::ScrollView::paint(WebCore::GraphicsContext*, WebCore::IntRect const&) STDERR: 10 0x7f86dfa7eb45 WebCore::FrameView::paintContentsForSnapshot(WebCore::GraphicsContext*, WebCore::IntRect const&, WebCore::FrameView::SelectionInSnapshot, WebCore::FrameView::CoordinateSpaceForSnapshot) STDERR: 11 0x7f86dc2ab3d5 WebKit::WebPage::scaledSnapshotWithOptions(WebCore::IntRect const&, double, unsigned int) STDERR: 12 0x7f86dc2109d9 WKBundlePageCreateSnapshotWithOptions STDERR: 13 0x7f868d2963e6 WTR::InjectedBundlePage::dump() STDERR: 14 0x7f868d29b85f WTR::InjectedBundlePage::frameDidChangeLocation(OpaqueWKBundleFrame const*, bool) STDERR: 15 0x7f868d296696 WTR::InjectedBundlePage::didFinishLoadForFrame(OpaqueWKBundleFrame const*) STDERR: 16 0x7f868d295043 WTR::InjectedBundlePage::didFinishLoadForFrame(OpaqueWKBundlePage const*, OpaqueWKBundleFrame const*, void const**, void const*) STDERR: 17 0x7f86dc206db2 WebKit::InjectedBundlePageLoaderClient::didFinishLoadForFrame(WebKit::WebPage*, WebKit::WebFrame*, WTF::RefPtr<WebKit::APIObject>&) STDERR: 18 0x7f86dc27ad9c WebKit::WebFrameLoaderClient::dispatchDidFinishLoad() STDERR: 19 0x7f86df96c501 WebCore::FrameLoader::checkLoadCompleteForThisFrame() STDERR: 20 0x7f86df96d039 WebCore::FrameLoader::checkLoadComplete() STDERR: 21 0x7f86df965fc2 WebCore::FrameLoader::checkCompleted() STDERR: 22 0x7f86df965d4e WebCore::FrameLoader::loadDone() STDERR: 23 0x7f86df9e6be8 WebCore::CachedResourceLoader::loadDone(WebCore::CachedResource*) STDERR: 24 0x7f86df99735b WebCore::SubresourceLoader::notifyDone() STDERR: 25 0x7f86df996e8f WebCore::SubresourceLoader::didFinishLoading(double) STDERR: 26 0x7f86df992f8b WebCore::ResourceLoader::didFinishLoading(WebCore::ResourceHandle*, double) STDERR: 27 0x7f86e06471c6 STDERR: 28 0x7f86d89b754a STDERR: 29 0x7f86d89d68bb STDERR: 30 0x7f86d89d68d9 STDERR: 31 0x7f86d882f396 g_main_context_dispatch In https://bugs.webkit.org/show_bug.cgi?id=122016#c0, as in here, we were calling notifyFlushRequired, which would call scheduleLayerFlush. In the prevoius bug we checked whether we were flushing, so and in that case, we wouldn't call notifyFlushRequired. The inconsistency seems to be that inside RenderLayerCompositor::flushPendingLayerChanges() it considers we are in the middle of a flush when we are calling rootLayer->flushCompositingState(visibleRect), however in Coordinated Graphics, who tells us that we are flushing is CompositingCoordinator::flushPendingLayerChanges(), which in this case, doesn't get called -- maybe the problem is here?. This idea in this patch was to indicate that we are in the middle of a flush in flushCompositingState(), to be more consistent with RenderLayerCompositor::flushPendingLayerChanges(). Maybe you have some insights to help here :) 1081945 5 ossy 2015-04-01 02:23:12 -0700 It is still valid on EFL (now only EFL uses Coordinated Graphics) and it makes impossible to debug bug143214. 1286236 6 mcatanzaro 2017-03-11 10:34:12 -0800 Closing this bug because the EFL port has been removed from trunk. If you feel this bug applies to a different upstream WebKit port and was closed in error, please either update the title and reopen the bug, or leave a comment to request this. 215272 2013-10-27 09:27:31 -0700 2013-10-27 12:35:44 -0700 RFC patch bug-123397-20131027132715.patch text/plain 8302 sergio U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjczMWNmNjMxOGNiMjc1 NGI5OTZkOTY5ZGVjOTFlMDE3Yzk5NmNiZC4uMjliZGIxZGI2YWExNDk5MmFhZTk2MTM4NzhhYzc0 NmZiMTI5ZTI2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEzLTEwLTI3ICBTZXJn aW8gQ29ycmVpYSAgPHNlcmdpby5jb3JyZWlhQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW0Nv b3JkaW5hdGVkR3JhcGhpY3NdIEFTU0VSVElPTiBGQUlMRUQ6ICFtX2ZsdXNoaW5nTGF5ZXJzIGlu IHNldmVyYWwgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyMzM5NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIENvbXBvc2l0aW5nQ29vcmRpbmF0b3I6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdl cygpIHdlIGluZGljYXRlIHdlIGFyZQorICAgICAgICBpbiB0aGUgbWlkZGxlIG9mIGEgZmx1c2gs IHRvIHByZXZlbnQgY2FsbGluZyBzY2hlZHVsZUxheWVyRmx1c2goKSBpbnNpZGUKKyAgICAgICAg Zmx1c2hDb21wb3NpdGluZ1N0YXRlKCksIGJ1dCBpbiBzb21lIGNvZGUgcGF0aHMgd2UgZG9uJ3Qg Z28gdGhyb3VnaCBpdAorICAgICAgICBhbmQgZW5kIHVwIGNhbGxpbmcgc2NoZWR1bGVMYXllckZs dXNoKCkgd2hlbiB3ZSBzaG91bGRuJ3QuCisKKyAgICAgICAgV2Ugbm93IGluZGljYXRlIHdlIGFy ZSBpbiB0aGUgbWlkZGxlIG9mIGEgZmx1c2ggaW4gZmx1c2hDb21wb3NpdGluZ1N0YXRlKCkKKyAg ICAgICAgYXMgd2VsbC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3Rp bmcgb25lcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRl ZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0 aW5nQ29vcmRpbmF0b3I6OkNvbXBvc2l0aW5nQ29vcmRpbmF0b3IpOiBJbml0aWFsaXplCisgICAg ICAgIG1fZmx1c2hpbmdMYXllckNoYW5nZXNDb3VudGVyIHdpdGggemVyby4KKyAgICAgICAgKFdl YkNvcmU6OkNvbXBvc2l0aW5nQ29vcmRpbmF0b3I6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6 IFVzZSB0aGUKKyAgICAgICAgKHN0YXJ0ZWR8ZmluaXNoZWQpRmx1c2hpbmdMYXllckNoYW5nZXMo KSBwYWlyIHRvIGluZGljYXRlIHdlIGFyZSBpbiB0aGUKKyAgICAgICAgbWlkZGxlIG9mIGEgZmx1 c2guCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0NvbXBv c2l0aW5nQ29vcmRpbmF0b3IuaDogQWRkCisgICAgICAgIChzdGFydGVkfGZpbmlzaGVkKUZsdXNo aW5nTGF5ZXJDaGFuZ2VzKCkgYW5kIG1fZmx1c2hpbmdMYXllckNoYW5nZXNDb3VudGVyOworICAg ICAgICBVcGRhdGUgaXNGbHVzaGluZ0xheWVyQ2hhbmdlcygpIHRvIHVzZSBpdC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6 bm90aWZ5Rmx1c2hSZXF1aXJlZCk6IE1ha2UgaXQKKyAgICAgICAgdm9pZCwgc2luY2Ugd2UgZG9u J3QgbmVlZCB0byBrbm93IGFueW1vcmUgd2hldGhlciBpdCBub3RpZmllZCBvZiBhCisgICAgICAg IGZsdXNoIGJlaW5nIHJlcXVpcmVkIG9yIG5vdC4KKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5h dGVkR3JhcGhpY3NMYXllcjo6Zmx1c2hDb21wb3NpdGluZ1N0YXRlKTogUmVtb3ZlCisgICAgICAg IGNhbGwgdG8gbm90aWZ5Rmx1c2hSZXF1aXJlZCgpLCBzaW5jZSB3ZSBhcmUgaW4gdGhlIG1pZGRs ZSBvZiBhIGZsdXNoCisgICAgICAgIGFuZCBpdCBzaG91bGRuJ3QgZXZlciBiZSBjYWxsZWQuIFVz ZSBzdGFydGVkfGZpbmlzaGVkKUZsdXNoaW5nTGF5ZXJjaGFuZ2VzKCkKKyAgICAgICAgdG8gaW5k aWNhdGUgd2UgYXJlIGluIHRoZSBtaWRkbGUgb2YgYSBmbHVzaC4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmg6 IEFkZAorICAgICAgICAoc3RhcnRlZHxmaW5pc2hlZClGbHVzaGluZ0xheWVyQ2hhbmdlcygpIHRv IENvb3JkaW5hdGVkR3JhcGhpY3NMYXllckNsaWVudDsKKyAgICAgICAgQ2hhbmdlIG5vdGlmeUZs dXNoUmVxdWlyZWQoKSB0byByZXR1cm4gdm9pZCBpbnN0ZWFkIG9mIGJvb2wuCisKIDIwMTMtMTAt MjYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21h Y10gUmVtb3ZlIFdlYlRpbGVkTGF5ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9D b21wb3NpdGluZ0Nvb3JkaW5hdG9yLmNwcAppbmRleCA4MGMyZDM4OTQzY2MxMWI2ZmRhNjk3ZGMx MTgyNTE0ZTM5MmJjOWNmLi5jNGJkZjM1ZWU1OGFjYzk0NmMwMzc0ZTE0MTAxN2JmMjkxOTMwNTM4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29tcG9zaXRpbmdDb29yZGluYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0NvbXBvc2l0aW5nQ29vcmRpbmF0 b3IuY3BwCkBAIC01Nyw3ICs1Nyw3IEBAIENvbXBvc2l0aW5nQ29vcmRpbmF0b3I6OkNvbXBvc2l0 aW5nQ29vcmRpbmF0b3IoUGFnZSogcGFnZSwgQ29tcG9zaXRpbmdDb29yZGluYXRvCiAgICAgLCBt X2NsaWVudChjbGllbnQpCiAgICAgLCBtX3Jvb3RDb21wb3NpdGluZ0xheWVyKDApCiAgICAgLCBt X2lzUHVyZ2luZyhmYWxzZSkKLSAgICAsIG1faXNGbHVzaGluZ0xheWVyQ2hhbmdlcyhmYWxzZSkK KyAgICAsIG1fZmx1c2hpbmdMYXllckNoYW5nZXNDb3VudGVyKDApCiAgICAgLCBtX3Nob3VsZFN5 bmNGcmFtZShmYWxzZSkKICAgICAsIG1fZGlkSW5pdGlhbGl6ZVJvb3RDb21wb3NpdGluZ0xheWVy KGZhbHNlKQogICAgICwgbV9yZWxlYXNlSW5hY3RpdmVBdGxhc2VzVGltZXIodGhpcywgJkNvbXBv c2l0aW5nQ29vcmRpbmF0b3I6OnJlbGVhc2VJbmFjdGl2ZUF0bGFzZXNUaW1lckZpcmVkKQpAQCAt OTAsOCArOTAsNyBAQCB2b2lkIENvbXBvc2l0aW5nQ29vcmRpbmF0b3I6OnNpemVEaWRDaGFuZ2Uo Y29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIAogYm9vbCBDb21wb3NpdGluZ0Nvb3JkaW5hdG9yOjpm bHVzaFBlbmRpbmdMYXllckNoYW5nZXMoKQogewotICAgIFRlbXBvcmFyeUNoYW5nZTxib29sPiBw cm90ZWN0b3IobV9pc0ZsdXNoaW5nTGF5ZXJDaGFuZ2VzLCB0cnVlKTsKLQorICAgIHN0YXJ0ZWRG bHVzaGluZ0xheWVyQ2hhbmdlcygpOwogICAgIGluaXRpYWxpemVSb290Q29tcG9zaXRpbmdMYXll cklmTmVlZGVkKCk7CiAKICAgICBtX3Jvb3RMYXllci0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlRm9y VGhpc0xheWVyT25seSgpOwpAQCAtMTIwLDYgKzExOSw3IEBAIGJvb2wgQ29tcG9zaXRpbmdDb29y ZGluYXRvcjo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCkKICAgICAgICAgbV9zaG91bGRTeW5j RnJhbWUgPSBmYWxzZTsKICAgICB9CiAKKyAgICBmaW5pc2hlZEZsdXNoaW5nTGF5ZXJDaGFuZ2Vz KCk7CiAgICAgcmV0dXJuIGRpZFN5bmM7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db21wb3NpdGluZ0Nvb3JkaW5h dG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0 ZWQvQ29tcG9zaXRpbmdDb29yZGluYXRvci5oCmluZGV4IGM2Y2VjMzUzMjUyMTU0MjRjNTk2NmZh ZTcyOGIwZmNmNWNjYWM2NTEuLmNmNjY3ZTU2NzgzOTdmMDA2Y2ZhZWJkMGIwNGRkMGVkNjAyM2Q4 YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9j b29yZGluYXRlZC9Db21wb3NpdGluZ0Nvb3JkaW5hdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0NvbXBvc2l0aW5nQ29vcmRpbmF0 b3IuaApAQCAtMTA3LDcgKzEwNyw5IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHJlbW92 ZUltYWdlQmFja2luZyhDb29yZGluYXRlZEltYWdlQmFja2luZ0lEKSBPVkVSUklERTsKIAogICAg IC8vIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllckNsaWVudAotICAgIHZpcnR1YWwgYm9vbCBpc0Zs dXNoaW5nTGF5ZXJDaGFuZ2VzKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV9pc0ZsdXNoaW5n TGF5ZXJDaGFuZ2VzOyB9CisgICAgdmlydHVhbCB2b2lkIHN0YXJ0ZWRGbHVzaGluZ0xheWVyQ2hh bmdlcygpIE9WRVJSSURFIHsgbV9mbHVzaGluZ0xheWVyQ2hhbmdlc0NvdW50ZXIrKzsgfQorICAg IHZpcnR1YWwgdm9pZCBmaW5pc2hlZEZsdXNoaW5nTGF5ZXJDaGFuZ2VzKCkgT1ZFUlJJREUgeyBt X2ZsdXNoaW5nTGF5ZXJDaGFuZ2VzQ291bnRlci0tOyB9CisgICAgdmlydHVhbCBib29sIGlzRmx1 c2hpbmdMYXllckNoYW5nZXMoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiAhIW1fZmx1c2hpbmdM YXllckNoYW5nZXNDb3VudGVyOyB9CiAgICAgdmlydHVhbCBGbG9hdFJlY3QgdmlzaWJsZUNvbnRl bnRzUmVjdCgpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxDb29yZGlu YXRlZEltYWdlQmFja2luZz4gY3JlYXRlSW1hZ2VCYWNraW5nSWZOZWVkZWQoSW1hZ2UqKSBPVkVS UklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoTGF5ZXIoQ29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyKikgT1ZFUlJJREU7CkBAIC0xNDUsNyArMTQ3LDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIFdl IGRvbid0IHNlbmQgdGhlIG1lc3NhZ2VzIHJlbGF0ZWQgdG8gcmVsZWFzaW5nIHJlc291cmNlcyB0 byByZW5kZXJlciBkdXJpbmcgcHVyZ2luZywgYmVjYXVzZSByZW5kZXJlciBhbHJlYWR5IGhhZCBy ZW1vdmVkIGFsbCByZXNvdXJjZXMuCiAgICAgYm9vbCBtX2lzUHVyZ2luZzsKLSAgICBib29sIG1f aXNGbHVzaGluZ0xheWVyQ2hhbmdlczsKKyAgICBpbnQgbV9mbHVzaGluZ0xheWVyQ2hhbmdlc0Nv dW50ZXI7CiAKICAgICBGbG9hdFJlY3QgbV92aXNpYmxlQ29udGVudHNSZWN0OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29vcmRpbmF0ZWQv Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCmlu ZGV4IDczMmJmZjA2ZGM0NDRjOWU2MTliN2MwNTg1ODlmZDc1NjQ1ZmVlNmUuLjliNWJhNjZkYTdh NmJmMWFmZWIxNjJhY2E3OGEwNWRkMmNiYzUzNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNz TGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9j b29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCkBAIC00OCwxNCArNDgsMTEg QEAgc3RhdGljIENvb3JkaW5hdGVkTGF5ZXJJRCB0b0Nvb3JkaW5hdGVkTGF5ZXJJRChHcmFwaGlj c0xheWVyKiBsYXllcikKICAgICByZXR1cm4gbGF5ZXIgPyB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NM YXllcihsYXllciktPmlkKCkgOiAwOwogfQogCi1ib29sIENvb3JkaW5hdGVkR3JhcGhpY3NMYXll cjo6bm90aWZ5Rmx1c2hSZXF1aXJlZCgpCit2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6 bm90aWZ5Rmx1c2hSZXF1aXJlZCgpCiB7CiAgICAgQVNTRVJUKG1fY29vcmRpbmF0b3IpOwotICAg IGlmIChjbGllbnQoKSAmJiAhbV9jb29yZGluYXRvci0+aXNGbHVzaGluZ0xheWVyQ2hhbmdlcygp KSB7CisgICAgaWYgKGNsaWVudCgpICYmICFtX2Nvb3JkaW5hdG9yLT5pc0ZsdXNoaW5nTGF5ZXJD aGFuZ2VzKCkpCiAgICAgICAgIGNsaWVudCgpLT5ub3RpZnlGbHVzaFJlcXVpcmVkKHRoaXMpOwot ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwogfQogCiB2b2lk IENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6ZGlkQ2hhbmdlTGF5ZXJTdGF0ZSgpCkBAIC01OTAs OCArNTg3LDggQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldEZpeGVkVG9WaWV3 cG9ydChib29sIGlzRml4ZWQpCiAKIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpmbHVz aENvbXBvc2l0aW5nU3RhdGUoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewotICAgIGlmIChub3Rp ZnlGbHVzaFJlcXVpcmVkKCkpCi0gICAgICAgIHJldHVybjsKKyAgICBBU1NFUlQobV9jb29yZGlu YXRvcik7CisgICAgbV9jb29yZGluYXRvci0+c3RhcnRlZEZsdXNoaW5nTGF5ZXJDaGFuZ2VzKCk7 CiAKICAgICBpZiAoQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKiBtYXNrID0gdG9Db29yZGluYXRl ZEdyYXBoaWNzTGF5ZXIobWFza0xheWVyKCkpKQogICAgICAgICBtYXNrLT5mbHVzaENvbXBvc2l0 aW5nU3RhdGVGb3JUaGlzTGF5ZXJPbmx5KCk7CkBAIC02MDMsNiArNjAwLDggQEAgdm9pZCBDb29y ZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmZsdXNoQ29tcG9zaXRpbmdTdGF0ZShjb25zdCBGbG9hdFJl Y3QmIHJlY3QpCiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGNoaWxkcmVuKCkuc2l6ZSgp OyArK2kpCiAgICAgICAgIGNoaWxkcmVuKClbaV0tPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZShyZWN0 KTsKKworICAgIG1fY29vcmRpbmF0b3ItPmZpbmlzaGVkRmx1c2hpbmdMYXllckNoYW5nZXMoKTsK IH0KIAogQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyKiB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXll cihHcmFwaGljc0xheWVyKiBsYXllcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9jb29yZGluYXRlZC9D b29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuaAppbmRleCBiNDU2ZDRmNWZlYWViMGNmNjRlY2ZlYjc2 OTAwNGJlNWU3Nzc4YWFiLi5lODRiODhkZmJlNGRiZTBjMTQ4MjcwMzQ5MzZlMjc3MDg4MmVjMDFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvY29v cmRpbmF0ZWQvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL2Nvb3JkaW5hdGVkL0Nvb3JkaW5hdGVkR3JhcGhpY3NM YXllci5oCkBAIC00OCw2ICs0OCw4IEBAIGNsYXNzIFNjcm9sbGFibGVBcmVhOwogCiBjbGFzcyBD b29yZGluYXRlZEdyYXBoaWNzTGF5ZXJDbGllbnQgewogcHVibGljOgorICAgIHZpcnR1YWwgdm9p ZCBzdGFydGVkRmx1c2hpbmdMYXllckNoYW5nZXMoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGZp bmlzaGVkRmx1c2hpbmdMYXllckNoYW5nZXMoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzRmx1 c2hpbmdMYXllckNoYW5nZXMoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBGbG9hdFJlY3Qgdmlz aWJsZUNvbnRlbnRzUmVjdCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8Q29v cmRpbmF0ZWRJbWFnZUJhY2tpbmc+IGNyZWF0ZUltYWdlQmFja2luZ0lmTmVlZGVkKEltYWdlKikg PSAwOwpAQCAtMTk2LDcgKzE5OCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjcmVhdGVCYWNraW5n U3RvcmUoKTsKICAgICB2b2lkIHJlbGVhc2VJbWFnZUJhY2tpbmdJZk5lZWRlZCgpOwogCi0gICAg Ym9vbCBub3RpZnlGbHVzaFJlcXVpcmVkKCk7CisgICAgdm9pZCBub3RpZnlGbHVzaFJlcXVpcmVk KCk7CiAKICAgICAvLyBDb29yZGluYXRlZEltYWdlQmFja2luZzo6SG9zdAogICAgIHZpcnR1YWwg Ym9vbCBpbWFnZUJhY2tpbmdWaXNpYmxlKCkgT1ZFUlJJREU7Cg==