102599 2012-11-17 15:09:35 -0800 ASSERT loading Acid3 test in run-safari --debug (r135050) 2012-12-13 17:46:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED MakingBotsRed P2 Normal --- 1 eric bdakin bdakin d-r jamesr jknotten laszlo.gombos ojan.autocc pravind.2k4 simon.fraser tonikitoo vollick wangxianzhu webkit.review.bot oldest_to_newest 770019 0 eric 2012-11-17 15:09:35 -0800 ASSERT loading Acid3 test in run-safari --debug (r135050) ASSERTION FAILED: willBeComposited == needsToBeComposited(layer) /Users/eseidel/Projects/WebKit/Source/WebCore/rendering/RenderLayerCompositor.cpp(894) : void WebCore::RenderLayerCompositor::computeCompositingRequirements(WebCore::RenderLayer *, WebCore::RenderLayer *, WebCore::RenderLayerCompositor::OverlapMap *, WebCore::CompositingState &, bool &, bool &) 1 0x10e6db5e5 WebCore::RenderLayerCompositor::computeCompositingRequirements(WebCore::RenderLayer*, WebCore::RenderLayer*, WebCore::RenderLayerCompositor::OverlapMap*, WebCore::CompositingState&, bool&, bool&) 2 0x10e6db52d WebCore::RenderLayerCompositor::computeCompositingRequirements(WebCore::RenderLayer*, WebCore::RenderLayer*, WebCore::RenderLayerCompositor::OverlapMap*, WebCore::CompositingState&, bool&, bool&) 3 0x10e6db52d WebCore::RenderLayerCompositor::computeCompositingRequirements(WebCore::RenderLayer*, WebCore::RenderLayer*, WebCore::RenderLayerCompositor::OverlapMap*, WebCore::CompositingState&, bool&, bool&) 4 0x10e6daac3 WebCore::RenderLayerCompositor::updateCompositingLayers(WebCore::CompositingUpdateType, WebCore::RenderLayer*) 5 0x10da6d0cd WebCore::FrameView::updateCompositingLayersAfterLayout() 6 0x10da6ecb3 WebCore::FrameView::layout(bool) 7 0x10da6a830 WebCore::FrameView::layoutTimerFired(WebCore::Timer<WebCore::FrameView>*) 8 0x10da865d3 WebCore::Timer<WebCore::FrameView>::fired() 9 0x10ec46af6 WebCore::ThreadTimers::sharedTimerFiredInternal() 10 0x10ec46889 WebCore::ThreadTimers::sharedTimerFired() 11 0x10e96d933 WebCore::timerFired(__CFRunLoopTimer*, void*) 12 0x7fff91112da4 __CFRUNLOOP_IS_CALLING_OUT_TO_A_TIMER_CALLBACK_FUNCTION__ 773068 1 jknotten 2012-11-21 10:08:18 -0800 See also discussion in https://bugs.webkit.org/show_bug.cgi?id=101303 780507 2 simon.fraser 2012-11-30 15:59:10 -0800 Caused by http://trac.webkit.org/changeset/133807 788809 3 bdakin 2012-12-11 14:32:47 -0800 This is obviously contributing to the red WK2 bots. 790304 4 bdakin 2012-12-12 22:41:34 -0800 I've been investigating this today, and I looked at it a bit with Simon. The problem is that there is a bit of a circular dependency here. We're trying to figure out if we need to composite something that is positioned. But in the case where that positioned thing is out of view or has a size of (0,0), we don't really know if it needs to be composited until we have determined what's happening with its children. In this case, it seems like we probably hit this bug because there was a position:absolute box inside a position:fixed box. At first we thought the the position:fixed thing would be composited for the sake of the position:absolute thing. But then if the course of all of these calculations, it was determined that actually the position:absolute thing needs its own layer, so the position:fixed thing no longer needs to be composited for the sake of the position:absolute thing. Then we assert. Anyway, I have a patch for this that I will post shortly. 790307 5 179201 bdakin 2012-12-12 22:46:27 -0800 Created attachment 179201 Patch 790310 6 eric 2012-12-12 22:50:41 -0800 Thanks Beth. :) 790312 7 webkit.review.bot 2012-12-12 22:52:13 -0800 Attachment 179201 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/rendering/RenderLayerCompositor.cpp:2000: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 791142 8 179381 bdakin 2012-12-13 17:13:46 -0800 Created attachment 179381 Patch 791149 9 179381 simon.fraser 2012-12-13 17:19:52 -0800 Comment on attachment 179381 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179381&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:1999 > + LayoutRect layerBounds = canBeComposited(layer) ? layer->calculateLayerBounds(rootRenderLayer(), 0, RenderLayer::DefaultCalculateLayerBoundsFlags I don't think we need the canBeComposited() check, since needsToBeComposited() already bails on this. I don't really know why calculateCompositedBounds() had it. 791162 10 bdakin 2012-12-13 17:46:17 -0800 Thanks, Simon! http://trac.webkit.org/changeset/137690 179201 2012-12-12 22:46:27 -0800 2012-12-13 17:13:46 -0800 Patch for-review.txt text/plain 5377 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNzU2OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEyLTEyICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNTk5CisgICAgICAgIEFTU0VSVCBsb2FkaW5nIEFjaWQzIHRl c3QgaW4gcnVuLXNhZmFyaSAtLWRlYnVnIChyMTM1MDUwKQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyBmbGFnIEluY2x1ZGVDb21wb3NpdGVkRGVz Y2VuZGFudHMgd2lsbCBhbHdheXMgY2FsY3VsYXRlIHRoZSBsYXllciBib3VuZHMgZm9yIAorICAg ICAgICBkZXNjZW5kYW50cywgZXZlbiB3aGVuIHRoZSBhcmUgY29tcG9zaXRlZC4gCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjpjYWxjdWxhdGVMYXllckJvdW5kcyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyLmg6CisKKyAgICAgICAgY2FsY3VsYXRlQ29tcG9zaXRlZEJvdW5kcygpIHNob3VsZCBub3Qg aW5jbHVkZSB0aGlzIG5ldyBmbGFnLCBzbyBpbnN0ZWFkIG9mIAorICAgICAgICBjYWxsaW5nIHRo YXQsIGNhbGwgY2FsY3VsYXRlTGF5ZXJCb3VuZHMoKSBkaXJlY3RseSB3aXRoIHRoZSAKKyAgICAg ICAgSW5jbHVkZUNvbXBvc2l0ZWREZXNjZW5kYW50cyBmbGFnLiBUaGlzIHdpbGwgZ2V0IHVzIHRo ZSBpbmZvcm1hdGlvbiB3ZSBuZWVkIAorICAgICAgICB1cGZyb250IGFuZCBhdm9pZCB0aGUgdG9n Z2xpbmcgbGF0ZXIgb24uIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJl c0NvbXBvc2l0aW5nRm9yUG9zaXRpb24pOgorCiAyMDEyLTEyLTEyICBMdWtlIE1hY3BoZXJzb24g ICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIEFTU0VSVGlvbnMgdG8g ZW5zdXJlIHRoYXQgQ1NTUHJvcGVydHlzIHRoYXQgYXJlIHZhcmlhYmxlcyBvbmx5IGV2ZXIgcmVm ZXIgdG8gQ1NTVmFsdWVzIHRoYXQgYXJlIHZhcmlhYmxlcy4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gMTM3NTM5KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDU5OSw3 ICs0NTk5LDcgQEAgSW50UmVjdCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlTGF5ZXJCb3VuZAogICAg IH0KIAogICAgIC8vIEZJWE1FOiBzaG91bGQgcHJvYmFibHkganVzdCBwYXNzICdmbGFncycgZG93 biB0byBkZXNjZW5kYW50cy4KLSAgICBDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIGRlc2NlbmRh bnRGbGFncyA9IERlZmF1bHRDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIHwgKGZsYWdzICYgRXhj bHVkZUhpZGRlbkRlc2NlbmRhbnRzKTsKKyAgICBDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIGRl c2NlbmRhbnRGbGFncyA9IERlZmF1bHRDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIHwgKGZsYWdz ICYgRXhjbHVkZUhpZGRlbkRlc2NlbmRhbnRzKSB8IChmbGFncyAmIEluY2x1ZGVDb21wb3NpdGVk RGVzY2VuZGFudHMpOwogCiAgICAgY29uc3RfY2FzdDxSZW5kZXJMYXllcio+KHRoaXMpLT51cGRh dGVMYXllckxpc3RzSWZOZWVkZWQoKTsKIApAQCAtNDYyMCw3ICs0NjIwLDcgQEAgSW50UmVjdCBS ZW5kZXJMYXllcjo6Y2FsY3VsYXRlTGF5ZXJCb3VuZAogICAgICAgICBzaXplX3QgbGlzdFNpemUg PSBuZWdaT3JkZXJMaXN0LT5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg bGlzdFNpemU7ICsraSkgewogICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gbmVn Wk9yZGVyTGlzdC0+YXQoaSk7Ci0gICAgICAgICAgICBpZiAoIWN1ckxheWVyLT5pc0NvbXBvc2l0 ZWQoKSkgeworICAgICAgICAgICAgaWYgKGZsYWdzICYgSW5jbHVkZUNvbXBvc2l0ZWREZXNjZW5k YW50cyB8fCAhY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpKSB7CiAgICAgICAgICAgICAgICAgSW50 UmVjdCBjaGlsZFVuaW9uQm91bmRzID0gY3VyTGF5ZXItPmNhbGN1bGF0ZUxheWVyQm91bmRzKHRo aXMsIDAsIGRlc2NlbmRhbnRGbGFncyk7CiAgICAgICAgICAgICAgICAgdW5pb25Cb3VuZHMudW5p dGUoY2hpbGRVbmlvbkJvdW5kcyk7CiAgICAgICAgICAgICB9CkBAIC00NjMxLDcgKzQ2MzEsNyBA QCBJbnRSZWN0IFJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvdW5kCiAgICAgICAgIHNpemVf dCBsaXN0U2l6ZSA9IHBvc1pPcmRlckxpc3QtPnNpemUoKTsKICAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICBSZW5kZXJMYXllciogY3Vy TGF5ZXIgPSBwb3NaT3JkZXJMaXN0LT5hdChpKTsKLSAgICAgICAgICAgIGlmICghY3VyTGF5ZXIt PmlzQ29tcG9zaXRlZCgpKSB7CisgICAgICAgICAgICBpZiAoZmxhZ3MgJiBJbmNsdWRlQ29tcG9z aXRlZERlc2NlbmRhbnRzIHx8ICFjdXJMYXllci0+aXNDb21wb3NpdGVkKCkpIHsKICAgICAgICAg ICAgICAgICBJbnRSZWN0IGNoaWxkVW5pb25Cb3VuZHMgPSBjdXJMYXllci0+Y2FsY3VsYXRlTGF5 ZXJCb3VuZHModGhpcywgMCwgZGVzY2VuZGFudEZsYWdzKTsKICAgICAgICAgICAgICAgICB1bmlv bkJvdW5kcy51bml0ZShjaGlsZFVuaW9uQm91bmRzKTsKICAgICAgICAgICAgIH0KQEAgLTQ2NDIs NyArNDY0Miw3IEBAIEludFJlY3QgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUxheWVyQm91bmQKICAg ICAgICAgc2l6ZV90IGxpc3RTaXplID0gbm9ybWFsRmxvd0xpc3QtPnNpemUoKTsKICAgICAgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICBSZW5k ZXJMYXllciogY3VyTGF5ZXIgPSBub3JtYWxGbG93TGlzdC0+YXQoaSk7Ci0gICAgICAgICAgICBp ZiAoIWN1ckxheWVyLT5pc0NvbXBvc2l0ZWQoKSkgeworICAgICAgICAgICAgaWYgKGZsYWdzICYg SW5jbHVkZUNvbXBvc2l0ZWREZXNjZW5kYW50cyB8fCAhY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgp KSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCBjdXJBYnNCb3VuZHMgPSBjdXJMYXllci0+Y2Fs Y3VsYXRlTGF5ZXJCb3VuZHModGhpcywgMCwgZGVzY2VuZGFudEZsYWdzKTsKICAgICAgICAgICAg ICAgICB1bmlvbkJvdW5kcy51bml0ZShjdXJBYnNCb3VuZHMpOwogICAgICAgICAgICAgfQpJbmRl eDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHJldmlzaW9uIDEzNzUzOSkK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkp CkBAIC01NzksNiArNTc5LDcgQEAgcHVibGljOgogICAgICAgICBJbmNsdWRlTGF5ZXJGaWx0ZXJP dXRzZXRzID0gMSA8PCAyLAogICAgICAgICBFeGNsdWRlSGlkZGVuRGVzY2VuZGFudHMgPSAxIDw8 IDMsCiAgICAgICAgIERvbnRDb25zdHJhaW5Gb3JNYXNrID0gMSA8PCA0LAorICAgICAgICBJbmNs dWRlQ29tcG9zaXRlZERlc2NlbmRhbnRzID0gMSA8PCA1LAogICAgICAgICBEZWZhdWx0Q2FsY3Vs YXRlTGF5ZXJCb3VuZHNGbGFncyA9ICBJbmNsdWRlU2VsZlRyYW5zZm9ybSB8IFVzZUxvY2FsQ2xp cFJlY3RJZlBvc3NpYmxlIHwgSW5jbHVkZUxheWVyRmlsdGVyT3V0c2V0cwogICAgIH07CiAgICAg dHlwZWRlZiB1bnNpZ25lZCBDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzOwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAJKHJl dmlzaW9uIDEzNzUzOSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTk2LDcgKzE5OTYsOSBAQCBib29sIFJl bmRlckxheWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wCiAgICAgLy8gRml4ZWQgcG9zaXRpb24g ZWxlbWVudHMgdGhhdCBhcmUgaW52aXNpYmxlIGluIHRoZSBjdXJyZW50IHZpZXcgZG9uJ3QgZ2V0 IHRoZWlyIG93biBsYXllci4KICAgICBpZiAoRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX3JlbmRl clZpZXctPmZyYW1lVmlldygpKSB7CiAgICAgICAgIEludFJlY3Qgdmlld0JvdW5kcyA9IGZyYW1l Vmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KCk7Ci0gICAgICAgIExheW91dFJlY3QgbGF5ZXJCb3Vu ZHMgPSBjYWxjdWxhdGVDb21wb3NpdGVkQm91bmRzKGxheWVyLCByb290UmVuZGVyTGF5ZXIoKSk7 CisgICAgICAgIExheW91dFJlY3QgbGF5ZXJCb3VuZHMgPSBjYW5CZUNvbXBvc2l0ZWQobGF5ZXIp ID8gbGF5ZXItPmNhbGN1bGF0ZUxheWVyQm91bmRzKHJvb3RSZW5kZXJMYXllcigpLCAwLCBSZW5k ZXJMYXllcjo6RGVmYXVsdENhbGN1bGF0ZUxheWVyQm91bmRzRmxhZ3MKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCBSZW5kZXJMYXllcjo6RXhjbHVkZUhpZGRlbkRlc2NlbmRhbnRz IHwgUmVuZGVyTGF5ZXI6OkRvbnRDb25zdHJhaW5Gb3JNYXNrIHwgUmVuZGVyTGF5ZXI6OkluY2x1 ZGVDb21wb3NpdGVkRGVzY2VuZGFudHMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDogTGF5b3V0UmVjdCgpOwogICAgICAgICBsYXllckJvdW5kcy5zY2FsZShwYWdlU2NhbGVGYWN0 b3IoKSk7CiAgICAgICAgIGlmICghdmlld0JvdW5kcy5pbnRlcnNlY3RzKGVuY2xvc2luZ0ludFJl Y3QobGF5ZXJCb3VuZHMpKSkgewogICAgICAgICAgICAgaWYgKGZpeGVkUG9zaXRpb25MYXllck5v dENvbXBvc2l0ZWRSZWFzb24pCg== 179381 2012-12-13 17:13:46 -0800 2012-12-13 17:19:52 -0800 Patch for-review-2.txt text/plain 5274 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNzY4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEyLTEzICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAyNTk5CisgICAgICAgIEFTU0VSVCBsb2FkaW5nIEFjaWQzIHRl c3QgaW4gcnVuLXNhZmFyaSAtLWRlYnVnIChyMTM1MDUwKQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5ldyBmbGFnIEluY2x1ZGVDb21wb3NpdGVkRGVz Y2VuZGFudHMgd2lsbCBhbHdheXMgY2FsY3VsYXRlIHRoZSBsYXllciBib3VuZHMgZm9yIAorICAg ICAgICBkZXNjZW5kYW50cywgZXZlbiB3aGVuIHRoZSBhcmUgY29tcG9zaXRlZC4gCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjpjYWxjdWxhdGVMYXllckJvdW5kcyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyLmg6CisKKyAgICAgICAgY2FsY3VsYXRlQ29tcG9zaXRlZEJvdW5kcygpIHNob3VsZCBub3Qg aW5jbHVkZSB0aGlzIG5ldyBmbGFnLCBzbyBpbnN0ZWFkIG9mIAorICAgICAgICBjYWxsaW5nIHRo YXQsIGNhbGwgY2FsY3VsYXRlTGF5ZXJCb3VuZHMoKSBkaXJlY3RseSB3aXRoIHRoZSAKKyAgICAg ICAgSW5jbHVkZUNvbXBvc2l0ZWREZXNjZW5kYW50cyBmbGFnLiBUaGlzIHdpbGwgZ2V0IHVzIHRo ZSBpbmZvcm1hdGlvbiB3ZSBuZWVkIAorICAgICAgICB1cGZyb250IGFuZCBhdm9pZCB0aGUgdG9n Z2xpbmcgbGF0ZXIgb24uIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpyZXF1aXJl c0NvbXBvc2l0aW5nRm9yUG9zaXRpb24pOgorCiAyMDEyLTEyLTEzICBBZHJpZW5uZSBXYWxrZXIg IDxlbm5lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy MTM3NjQ1LCByMTM3NjQ2LCBhbmQgcjEzNzY2Ny4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcAkocmV2aXNpb24gMTM3Njg1KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDU5OSw3ICs0NTk5 LDcgQEAgSW50UmVjdCBSZW5kZXJMYXllcjo6Y2FsY3VsYXRlTGF5ZXJCb3VuZAogICAgIH0KIAog ICAgIC8vIEZJWE1FOiBzaG91bGQgcHJvYmFibHkganVzdCBwYXNzICdmbGFncycgZG93biB0byBk ZXNjZW5kYW50cy4KLSAgICBDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIGRlc2NlbmRhbnRGbGFn cyA9IERlZmF1bHRDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIHwgKGZsYWdzICYgRXhjbHVkZUhp ZGRlbkRlc2NlbmRhbnRzKTsKKyAgICBDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIGRlc2NlbmRh bnRGbGFncyA9IERlZmF1bHRDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzIHwgKGZsYWdzICYgRXhj bHVkZUhpZGRlbkRlc2NlbmRhbnRzKSB8IChmbGFncyAmIEluY2x1ZGVDb21wb3NpdGVkRGVzY2Vu ZGFudHMpOwogCiAgICAgY29uc3RfY2FzdDxSZW5kZXJMYXllcio+KHRoaXMpLT51cGRhdGVMYXll ckxpc3RzSWZOZWVkZWQoKTsKIApAQCAtNDYyMCw3ICs0NjIwLDcgQEAgSW50UmVjdCBSZW5kZXJM YXllcjo6Y2FsY3VsYXRlTGF5ZXJCb3VuZAogICAgICAgICBzaXplX3QgbGlzdFNpemUgPSBuZWda T3JkZXJMaXN0LT5zaXplKCk7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNp emU7ICsraSkgewogICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gbmVnWk9yZGVy TGlzdC0+YXQoaSk7Ci0gICAgICAgICAgICBpZiAoIWN1ckxheWVyLT5pc0NvbXBvc2l0ZWQoKSkg eworICAgICAgICAgICAgaWYgKGZsYWdzICYgSW5jbHVkZUNvbXBvc2l0ZWREZXNjZW5kYW50cyB8 fCAhY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpKSB7CiAgICAgICAgICAgICAgICAgSW50UmVjdCBj aGlsZFVuaW9uQm91bmRzID0gY3VyTGF5ZXItPmNhbGN1bGF0ZUxheWVyQm91bmRzKHRoaXMsIDAs IGRlc2NlbmRhbnRGbGFncyk7CiAgICAgICAgICAgICAgICAgdW5pb25Cb3VuZHMudW5pdGUoY2hp bGRVbmlvbkJvdW5kcyk7CiAgICAgICAgICAgICB9CkBAIC00NjMxLDcgKzQ2MzEsNyBAQCBJbnRS ZWN0IFJlbmRlckxheWVyOjpjYWxjdWxhdGVMYXllckJvdW5kCiAgICAgICAgIHNpemVfdCBsaXN0 U2l6ZSA9IHBvc1pPcmRlckxpc3QtPnNpemUoKTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIg PSBwb3NaT3JkZXJMaXN0LT5hdChpKTsKLSAgICAgICAgICAgIGlmICghY3VyTGF5ZXItPmlzQ29t cG9zaXRlZCgpKSB7CisgICAgICAgICAgICBpZiAoZmxhZ3MgJiBJbmNsdWRlQ29tcG9zaXRlZERl c2NlbmRhbnRzIHx8ICFjdXJMYXllci0+aXNDb21wb3NpdGVkKCkpIHsKICAgICAgICAgICAgICAg ICBJbnRSZWN0IGNoaWxkVW5pb25Cb3VuZHMgPSBjdXJMYXllci0+Y2FsY3VsYXRlTGF5ZXJCb3Vu ZHModGhpcywgMCwgZGVzY2VuZGFudEZsYWdzKTsKICAgICAgICAgICAgICAgICB1bmlvbkJvdW5k cy51bml0ZShjaGlsZFVuaW9uQm91bmRzKTsKICAgICAgICAgICAgIH0KQEAgLTQ2NDIsNyArNDY0 Miw3IEBAIEludFJlY3QgUmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUxheWVyQm91bmQKICAgICAgICAg c2l6ZV90IGxpc3RTaXplID0gbm9ybWFsRmxvd0xpc3QtPnNpemUoKTsKICAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICBSZW5kZXJMYXll ciogY3VyTGF5ZXIgPSBub3JtYWxGbG93TGlzdC0+YXQoaSk7Ci0gICAgICAgICAgICBpZiAoIWN1 ckxheWVyLT5pc0NvbXBvc2l0ZWQoKSkgeworICAgICAgICAgICAgaWYgKGZsYWdzICYgSW5jbHVk ZUNvbXBvc2l0ZWREZXNjZW5kYW50cyB8fCAhY3VyTGF5ZXItPmlzQ29tcG9zaXRlZCgpKSB7CiAg ICAgICAgICAgICAgICAgSW50UmVjdCBjdXJBYnNCb3VuZHMgPSBjdXJMYXllci0+Y2FsY3VsYXRl TGF5ZXJCb3VuZHModGhpcywgMCwgZGVzY2VuZGFudEZsYWdzKTsKICAgICAgICAgICAgICAgICB1 bmlvbkJvdW5kcy51bml0ZShjdXJBYnNCb3VuZHMpOwogICAgICAgICAgICAgfQpJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHJldmlzaW9uIDEzNzY4NSkKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC01 NzksNiArNTc5LDcgQEAgcHVibGljOgogICAgICAgICBJbmNsdWRlTGF5ZXJGaWx0ZXJPdXRzZXRz ID0gMSA8PCAyLAogICAgICAgICBFeGNsdWRlSGlkZGVuRGVzY2VuZGFudHMgPSAxIDw8IDMsCiAg ICAgICAgIERvbnRDb25zdHJhaW5Gb3JNYXNrID0gMSA8PCA0LAorICAgICAgICBJbmNsdWRlQ29t cG9zaXRlZERlc2NlbmRhbnRzID0gMSA8PCA1LAogICAgICAgICBEZWZhdWx0Q2FsY3VsYXRlTGF5 ZXJCb3VuZHNGbGFncyA9ICBJbmNsdWRlU2VsZlRyYW5zZm9ybSB8IFVzZUxvY2FsQ2xpcFJlY3RJ ZlBvc3NpYmxlIHwgSW5jbHVkZUxheWVyRmlsdGVyT3V0c2V0cwogICAgIH07CiAgICAgdHlwZWRl ZiB1bnNpZ25lZCBDYWxjdWxhdGVMYXllckJvdW5kc0ZsYWdzOwpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAJKHJldmlzaW9u IDEzNzY4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0 b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTk2LDcgKzE5OTYsOSBAQCBib29sIFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wCiAgICAgLy8gRml4ZWQgcG9zaXRpb24gZWxlbWVu dHMgdGhhdCBhcmUgaW52aXNpYmxlIGluIHRoZSBjdXJyZW50IHZpZXcgZG9uJ3QgZ2V0IHRoZWly IG93biBsYXllci4KICAgICBpZiAoRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtX3JlbmRlclZpZXct PmZyYW1lVmlldygpKSB7CiAgICAgICAgIEludFJlY3Qgdmlld0JvdW5kcyA9IGZyYW1lVmlldy0+ dmlzaWJsZUNvbnRlbnRSZWN0KCk7Ci0gICAgICAgIExheW91dFJlY3QgbGF5ZXJCb3VuZHMgPSBj YWxjdWxhdGVDb21wb3NpdGVkQm91bmRzKGxheWVyLCByb290UmVuZGVyTGF5ZXIoKSk7CisgICAg ICAgIExheW91dFJlY3QgbGF5ZXJCb3VuZHMgPSBjYW5CZUNvbXBvc2l0ZWQobGF5ZXIpID8gbGF5 ZXItPmNhbGN1bGF0ZUxheWVyQm91bmRzKHJvb3RSZW5kZXJMYXllcigpLCAwLCBSZW5kZXJMYXll cjo6RGVmYXVsdENhbGN1bGF0ZUxheWVyQm91bmRzRmxhZ3MKKyAgICAgICAgICAgIHwgUmVuZGVy TGF5ZXI6OkV4Y2x1ZGVIaWRkZW5EZXNjZW5kYW50cyB8IFJlbmRlckxheWVyOjpEb250Q29uc3Ry YWluRm9yTWFzayB8IFJlbmRlckxheWVyOjpJbmNsdWRlQ29tcG9zaXRlZERlc2NlbmRhbnRzKQor ICAgICAgICAgICAgOiBMYXlvdXRSZWN0KCk7CiAgICAgICAgIGxheWVyQm91bmRzLnNjYWxlKHBh Z2VTY2FsZUZhY3RvcigpKTsKICAgICAgICAgaWYgKCF2aWV3Qm91bmRzLmludGVyc2VjdHMoZW5j bG9zaW5nSW50UmVjdChsYXllckJvdW5kcykpKSB7CiAgICAgICAgICAgICBpZiAoZml4ZWRQb3Np dGlvbkxheWVyTm90Q29tcG9zaXRlZFJlYXNvbikK