151605 2015-11-25 07:55:31 -0800 ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()->needsLayout() in WebCore::FrameView::scheduleRelayoutOfSubtree 2016-01-14 12:10:04 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116980 1 rhodovan.u-szeged zalan andersca commit-queue esprehn+autocc glenn hyatt kling kondapallykalyan simon.fraser WebkitBugTracker zalan oldest_to_newest 1144430 0 266164 rhodovan.u-szeged 2015-11-25 07:55:31 -0800 Created attachment 266164 Test Load the attached test with debug MiniBrowser: <script> window.onload = function() { window.scrollTo(0,document.body.scrollHeight); v_0 = document.getElementById('id_0'); v_0.removeChild(v_0.childNodes[0]); location.reload(); } </script> <style> *{ -webkit-columns: 55px 87; overflow-y: scroll; -webkit-background-composite: source-out; width: 0% } *|* { display: inline-flex; } </style> <summary id="id_0"> aa <progress></progress> </summary> OS: Ubuntu 15.10 x86_64 Checked build: debug EFL Checked version: 79922a5 Backtrace: ASSERTION FAILED: !newRelayoutRoot.container() || !newRelayoutRoot.container()->needsLayout() ../../Source/WebCore/page/FrameView.cpp(2660) : void WebCore::FrameView::scheduleRelayoutOfSubtree(WebCore::RenderElement&) 1 0x7f12d1d6982c WTFCrash 2 0x7f12d089fc42 WebCore::FrameView::scheduleRelayoutOfSubtree(WebCore::RenderElement&) 3 0x7f12d0c61f9c 4 0x7f12d0c6235c WebCore::RenderObject::markContainingBlocksForLayout(WebCore::ScheduleRelayout, WebCore::RenderElement*) 5 0x7f12d0209076 WebCore::RenderObject::setNeedsLayout(WebCore::MarkingBehavior) 6 0x7f12d030249f WebCore::RenderObject::setNeedsLayoutAndPrefWidthsRecalc() 7 0x7f12d0b6d1ca WebCore::RenderElement::removeChildInternal(WebCore::RenderObject&, WebCore::RenderElement::NotifyChildrenType) 8 0x7f12d0b6cc34 WebCore::RenderElement::removeChild(WebCore::RenderObject&) 9 0x7f12d0abda12 WebCore::RenderBlock::removeChild(WebCore::RenderObject&) 10 0x7f12d0afd091 WebCore::RenderBlockFlow::removeChild(WebCore::RenderObject&) 11 0x7f12d0c61755 WebCore::RenderObject::removeFromParent() 12 0x7f12d0c65d51 WebCore::RenderObject::willBeDestroyed() 13 0x7f12d0b6ee77 WebCore::RenderElement::willBeDestroyed() 14 0x7f12d0b495f9 WebCore::RenderBoxModelObject::willBeDestroyed() 15 0x7f12d0aeab0d WebCore::RenderBlockFlow::willBeDestroyed() 16 0x7f12d0c664ac WebCore::RenderObject::destroy() 17 0x7f12d0c6646f WebCore::RenderObject::destroyAndCleanupAnonymousWrappers() 18 0x7f12d0da1817 19 0x7f12d0da15af 20 0x7f12d0da17ed 21 0x7f12d0da15af 22 0x7f12d0da17ed 23 0x7f12d0da15af 24 0x7f12d0da15f0 25 0x7f12d0da17dc 26 0x7f12d0da16e1 27 0x7f12d0da17b2 28 0x7f12d0da15af 29 0x7f12d0da15f0 30 0x7f12d0da17dc 31 0x7f12d0da1d12 Aborted (core dumped) Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f12d1d69831 in WTFCrash () at ../../Source/WTF/wtf/Assertions.cpp:321 321 *(int *)(uintptr_t)0xbbadbeef = 0; [Current thread is 1 (Thread 0x7f12d58b6a80 (LWP 10734))] #0 0x00007f12d1d69831 in WTFCrash () at ../../Source/WTF/wtf/Assertions.cpp:321 #1 0x00007f12d089fc42 in WebCore::FrameView::scheduleRelayoutOfSubtree (this=0x7f12b140c000, newRelayoutRoot=...) at ../../Source/WebCore/page/FrameView.cpp:2660 #2 0x00007f12d0c61f9c in WebCore::scheduleRelayoutForSubtree (renderer=...) at ../../Source/WebCore/rendering/RenderObject.cpp:588 #3 0x00007f12d0c6235c in WebCore::RenderObject::markContainingBlocksForLayout (this=0x7f12b17b7a10, scheduleRelayout=WebCore::ScheduleRelayout::Yes, newRoot=0x0) at ../../Source/WebCore/rendering/RenderObject.cpp:645 #4 0x00007f12d0209076 in WebCore::RenderObject::setNeedsLayout (this=0x7f12b17b7a10, markParents=WebCore::MarkContainingBlockChain) at ../../Source/WebCore/rendering/RenderObject.h:1082 #5 0x00007f12d030249f in WebCore::RenderObject::setNeedsLayoutAndPrefWidthsRecalc (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderObject.h:585 #6 0x00007f12d0b6d1ca in WebCore::RenderElement::removeChildInternal (this=0x7f12b17b7958, oldChild=..., notifyChildren=WebCore::RenderElement::NotifyChildren) at ../../Source/WebCore/rendering/RenderElement.cpp:630 #7 0x00007f12d0b6cc34 in WebCore::RenderElement::removeChild (this=0x7f12b17b7958, oldChild=...) at ../../Source/WebCore/rendering/RenderElement.cpp:547 #8 0x00007f12d0abda12 in WebCore::RenderBlock::removeChild (this=0x7f12b17b7958, oldChild=...) at ../../Source/WebCore/rendering/RenderBlock.cpp:745 #9 0x00007f12d0afd091 in WebCore::RenderBlockFlow::removeChild (this=0x7f12b17b7958, oldChild=...) at ../../Source/WebCore/rendering/RenderBlockFlow.cpp:3806 #10 0x00007f12d0c61755 in WebCore::RenderObject::removeFromParent (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderObject.cpp:199 #11 0x00007f12d0c65d51 in WebCore::RenderObject::willBeDestroyed (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderObject.cpp:1527 #12 0x00007f12d0b6ee77 in WebCore::RenderElement::willBeDestroyed (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderElement.cpp:1114 #13 0x00007f12d0b495f9 in WebCore::RenderBoxModelObject::willBeDestroyed (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderBoxModelObject.cpp:198 #14 0x00007f12d0aeab0d in WebCore::RenderBlockFlow::willBeDestroyed (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderBlockFlow.cpp:178 #15 0x00007f12d0c664ac in WebCore::RenderObject::destroy (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderObject.cpp:1702 #16 0x00007f12d0c6646f in WebCore::RenderObject::destroyAndCleanupAnonymousWrappers (this=0x7f12b17b7a10) at ../../Source/WebCore/rendering/RenderObject.cpp:1689 #17 0x00007f12d0da1817 in WebCore::Style::detachRenderTree (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:574 #18 0x00007f12d0da15af in WebCore::Style::detachChildren (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:521 #19 0x00007f12d0da17ed in WebCore::Style::detachRenderTree (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:571 #20 0x00007f12d0da15af in WebCore::Style::detachChildren (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:521 #21 0x00007f12d0da17ed in WebCore::Style::detachRenderTree (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:571 #22 0x00007f12d0da15af in WebCore::Style::detachChildren (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:521 #23 0x00007f12d0da15f0 in WebCore::Style::detachShadowRoot (shadowRoot=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:528 #24 0x00007f12d0da17dc in WebCore::Style::detachRenderTree (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:569 #25 0x00007f12d0da16e1 in WebCore::Style::detachSlotAssignees (slot=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:540 #26 0x00007f12d0da17b2 in WebCore::Style::detachRenderTree (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:566 #27 0x00007f12d0da15af in WebCore::Style::detachChildren (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:521 #28 0x00007f12d0da15f0 in WebCore::Style::detachShadowRoot (shadowRoot=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:528 #29 0x00007f12d0da17dc in WebCore::Style::detachRenderTree (current=..., detachType=WebCore::Style::ReattachDetach) at ../../Source/WebCore/style/StyleResolveTree.cpp:569 #30 0x00007f12d0da1d12 in WebCore::Style::resolveLocal (current=..., inheritedStyle=..., renderTreePosition=..., inheritedChange=WebCore::Style::NoChange) at ../../Source/WebCore/style/StyleResolveTree.cpp:628 #31 0x00007f12d0da2832 in WebCore::Style::resolveTree (current=..., inheritedStyle=..., renderTreePosition=..., change=WebCore::Style::NoChange) at ../../Source/WebCore/style/StyleResolveTree.cpp:843 #32 0x00007f12d0da25e9 in WebCore::Style::resolveChildren (current=..., inheritedStyle=..., change=WebCore::Style::NoChange, childRenderTreePosition=...) at ../../Source/WebCore/style/StyleResolveTree.cpp:800 #33 0x00007f12d0da2925 in WebCore::Style::resolveTree (current=..., inheritedStyle=..., renderTreePosition=..., change=WebCore::Style::NoChange) at ../../Source/WebCore/style/StyleResolveTree.cpp:857 #34 0x00007f12d0da25e9 in WebCore::Style::resolveChildren (current=..., inheritedStyle=..., change=WebCore::Style::NoChange, childRenderTreePosition=...) at ../../Source/WebCore/style/StyleResolveTree.cpp:800 #35 0x00007f12d0da2925 in WebCore::Style::resolveTree (current=..., inheritedStyle=..., renderTreePosition=..., change=WebCore::Style::NoChange) at ../../Source/WebCore/style/StyleResolveTree.cpp:857 #36 0x00007f12d0da25e9 in WebCore::Style::resolveChildren (current=..., inheritedStyle=..., change=WebCore::Style::NoChange, childRenderTreePosition=...) at ../../Source/WebCore/style/StyleResolveTree.cpp:800 #37 0x00007f12d0da2925 in WebCore::Style::resolveTree (current=..., inheritedStyle=..., renderTreePosition=..., change=WebCore::Style::NoChange) at ../../Source/WebCore/style/StyleResolveTree.cpp:857 #38 0x00007f12d0da2bf5 in WebCore::Style::resolveTree (document=..., change=WebCore::Style::NoChange) at ../../Source/WebCore/style/StyleResolveTree.cpp:903 #39 0x00007f12d02ea87b in WebCore::Document::recalcStyle (this=0x7f12b141d900, change=WebCore::Style::NoChange) at ../../Source/WebCore/dom/Document.cpp:1841 #40 0x00007f12d02eabb7 in WebCore::Document::updateStyleIfNeeded (this=0x7f12b141d900) at ../../Source/WebCore/dom/Document.cpp:1892 #41 0x00007f12d02eda07 in WebCore::Document::implicitClose (this=0x7f12b141d900) at ../../Source/WebCore/dom/Document.cpp:2700 #42 0x00007f12d075be91 in WebCore::FrameLoader::checkCallImplicitClose (this=0x7f12b16e4098) at ../../Source/WebCore/loader/FrameLoader.cpp:861 #43 0x00007f12d075bbc1 in WebCore::FrameLoader::checkCompleted (this=0x7f12b16e4098) at ../../Source/WebCore/loader/FrameLoader.cpp:807 #44 0x00007f12d075b937 in WebCore::FrameLoader::finishedParsing (this=0x7f12b16e4098) at ../../Source/WebCore/loader/FrameLoader.cpp:728 #45 0x00007f12d02f7bb4 in WebCore::Document::finishedParsing (this=0x7f12b141d900) at ../../Source/WebCore/dom/Document.cpp:4897 #46 0x00007f12d16917ab in WebCore::HTMLConstructionSite::finishedParsing (this=0x7f12b16fe6e0) at ../../Source/WebCore/html/parser/HTMLConstructionSite.cpp:403 #47 0x00007f12d0651db2 in WebCore::HTMLTreeBuilder::finished (this=0x7f12b16fe6c0) at ../../Source/WebCore/html/parser/HTMLTreeBuilder.cpp:2937 #48 0x00007f12d06220a8 in WebCore::HTMLDocumentParser::end (this=0x7f12b1448cc0) at ../../Source/WebCore/html/parser/HTMLDocumentParser.cpp:393 #49 0x00007f12d0622176 in WebCore::HTMLDocumentParser::attemptToRunDeferredScriptsAndEnd (this=0x7f12b1448cc0) at ../../Source/WebCore/html/parser/HTMLDocumentParser.cpp:402 #50 0x00007f12d0620e6b in WebCore::HTMLDocumentParser::prepareToStopParsing (this=0x7f12b1448cc0) at ../../Source/WebCore/html/parser/HTMLDocumentParser.cpp:132 #51 0x00007f12d06221b1 in WebCore::HTMLDocumentParser::attemptToEnd (this=0x7f12b1448cc0) at ../../Source/WebCore/html/parser/HTMLDocumentParser.cpp:414 #52 0x00007f12d0622261 in WebCore::HTMLDocumentParser::finish (this=0x7f12b1448cc0) at ../../Source/WebCore/html/parser/HTMLDocumentParser.cpp:442 #53 0x00007f12d0747166 in WebCore::DocumentWriter::end (this=0x7f12b142ef20) at ../../Source/WebCore/loader/DocumentWriter.cpp:247 #54 0x00007f12d073060a in WebCore::DocumentLoader::finishedLoading (this=0x7f12b142ee80, finishTime=0) at ../../Source/WebCore/loader/DocumentLoader.cpp:437 #55 0x00007f12d0730364 in WebCore::DocumentLoader::notifyFinished (this=0x7f12b142ee80, resource=0x7f12b14261c0) at ../../Source/WebCore/loader/DocumentLoader.cpp:384 #56 0x00007f12d07dcd0d in WebCore::CachedResource::checkNotify (this=0x7f12b14261c0) at ../../Source/WebCore/loader/cache/CachedResource.cpp:297 #57 0x00007f12d07dce22 in WebCore::CachedResource::finishLoading (this=0x7f12b14261c0) at ../../Source/WebCore/loader/cache/CachedResource.cpp:313 #58 0x00007f12d07d9044 in WebCore::CachedRawResource::finishLoading (this=0x7f12b14261c0, data=0x7f12b17bf900) at ../../Source/WebCore/loader/cache/CachedRawResource.cpp:103 #59 0x00007f12d07a11a1 in WebCore::SubresourceLoader::didFinishLoading (this=0x7f12b142fa80, finishTime=0) at ../../Source/WebCore/loader/SubresourceLoader.cpp:372 #60 0x00007f12d079bbe7 in WebCore::ResourceLoader::didFinishLoading (this=0x7f12b142fa80, finishTime=0) at ../../Source/WebCore/loader/ResourceLoader.cpp:638 #61 0x00007f12d0fa5b45 in WebCore::readCallback (asyncResult=0xb681a0, data=0x7f12b17be740) at ../../Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:1341 #62 0x00007f12c8b684e6 in async_ready_callback_wrapper (source_object=0xa7c5b0, res=0xb681a0, user_data=0x7f12b17be740) at ginputstream.c:523 #63 0x00007f12c8b8ea04 in g_task_return_now (task=0xb681a0) at gtask.c:1077 #64 0x00007f12c8b8ea29 in complete_in_idle_cb (task=0xb681a0) at gtask.c:1086 #65 0x00007f12c85c472a in g_main_dispatch (context=0xa766a0) at gmain.c:3064 #66 g_main_context_dispatch (context=context@entry=0xa766a0) at gmain.c:3663 #67 0x00007f12c9f1bb50 in _ecore_glib_select__locked (ecore_timeout=<optimized out>, efds=0x7ffcdbb51070, wfds=0x7ffcdbb50ff0, rfds=0x7ffcdbb50f70, ecore_fds=<optimized out>, ctx=<optimized out>) at lib/ecore/ecore_glib.c:175 #68 _ecore_glib_select (ecore_fds=<optimized out>, rfds=0x7ffcdbb50f70, wfds=0x7ffcdbb50ff0, efds=0x7ffcdbb51070, ecore_timeout=<optimized out>) at lib/ecore/ecore_glib.c:208 #69 0x00007f12c9f1eb8c in _ecore_main_select (timeout=<optimized out>) at lib/ecore/ecore_main.c:1481 #70 0x00007f12c9f1f665 in _ecore_main_loop_iterate_internal (once_only=once_only@entry=0) at lib/ecore/ecore_main.c:1913 #71 0x00007f12c9f1f827 in ecore_main_loop_begin () at lib/ecore/ecore_main.c:988 #72 0x00007f12d1dc7ebb in WTF::RunLoop::run () at ../../Source/WTF/wtf/efl/RunLoopEfl.cpp:49 #73 0x00007f12d0068f7a in WebKit::ChildProcessMain<WebKit::WebProcess, WebKit::WebProcessMain> (argc=2, argv=0x7ffcdbb514d8) at ../../Source/WebKit2/Shared/unix/ChildProcessMain.h:61 #74 0x00007f12d0068b88 in WebKit::WebProcessMainUnix (argc=2, argv=0x7ffcdbb514d8) at ../../Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp:161 #75 0x000000000040089a in main (argc=2, argv=0x7ffcdbb514d8) at ../../Source/WebKit2/WebProcess/EntryPoint/unix/WebProcessMain.cpp:44 1155355 1 zalan 2016-01-13 21:19:07 -0800 B--AG-L- --* RenderView (0.00, 0.00) (1323.00, 720.00) renderer->(0x11ad6c2c0) B-----L- -- HTML RenderFlexibleBox (0.00, 0.00) (0.00, 736.00) renderer->(0x11adf7578) node->(0x11adf1410) B-O---L- -- HEAD RenderFlexibleBox (0.00, 0.00) (0.00, 736.00) renderer->(0x11adf7640) node->(0x11adf1478) B-O---L- -- STYLE RenderFlexibleBox (0.00, 0.00) (0.00, 736.00) renderer->(0x11adf7708) node->(0x11adec7b8) B--AG--- -- RenderBlock (0.00, 0.00) (80.86, 736.00) renderer->(0x11adee450) I------- -- #text RenderText renderer->(0x11ad955a0) node->(0x11adf2500) length->(153) "\n* {\n -webkit-columns: 55px 87;\n overflow-y: scroll;\n -webkit-backg"... B-O---L- DN- BODY RenderFlexibleBox (8.00, 8.00) (0.00, 704.00) renderer->(0x11adf77d0) node->(0x11adf1548) B-O---L- -- SUMMARY RenderBlock (0.00, 0.00) (0.00, 704.00) renderer->(0x11adee508) node->(0x11adf15b0) B--AG-L- -- RenderMultiColumnFlowThread (0.00, 0.00) (0.00, 16.00) renderer->(0x11ad29000) [Rs:0x11ad25640 Re:0x11ad25640] B-O---L- -- PROGRESS RenderFlexibleBox (0.00, 0.00) (0.00, 16.00) renderer->(0x11adf7898) node->(0x11adf0620) [Rs:0x11ad25640 Re:0x11ad25640] B------- -- DIV RenderProgress (0.00, 0.00) (0.00, 16.00) renderer->(0x11ad1b000) node->(0x11adf16e8) [Rs:0x11ad25640 Re:0x11ad25640] B------- -- DIV RenderBlock (0.00, 0.00) (0.00, 16.00) renderer->(0x11adee5c0) node->(0x11adf1750) [Rs:0x11ad25640 Re:0x11ad25640] B------- -- DIV RenderBlock (0.00, 0.00) (0.00, 16.00) renderer->(0x11adee678) node->(0x11adf17b8) [Rs:0x11ad25640 Re:0x11ad25640] B--AG--- -- RenderMultiColumnSet (0.00, 0.00) (0.00, 16.00) renderer->(0x11ad25640) B-O---L- -- SCRIPT RenderFlexibleBox (0.00, 0.00) (0.00, 704.00) renderer->(0x11adf7960) node->(0x11adecb48) B--AG--- -- RenderBlock (0.00, 0.00) (314.97, 704.00) renderer->(0x11adee730) I------- -- #text RenderText renderer->(0x11ad95e40) node->(0x11adf25f0) length->(192) "\nsetTimeout(function() {\n window.scrollTo(0,document.body.scrollHeight);\n "... BODY is stuck with dirty layout flag. When a descendant renderer is being removed, we try to ensures it is no longer a layoutroot by marking its ancestors dirty (and ofc the ancestor tree needs to know about this change in order to layout/repaint properly). However since BODY is already dirty, we end up not scheduling a new layout (and we don't change the layout root either) -> ASSERT. BODY is marked dirty while finishing up the layout on HTML. During post layout, we start updating the scrollbars for overflow content. SUMMARY is a candidate and while we try to contain the layout by marking only the current renderer (MarkThisOnly) before calling current.layoutBlock(), the RenderMultiColumnSet child ends up setting the dirty flag on the ancestors (including BODY). However no one issues layout on the BODY at this point. 1155514 2 268984 zalan 2016-01-14 12:04:45 -0800 Created attachment 268984 Patch 1155518 3 268984 hyatt 2016-01-14 12:06:51 -0800 Comment on attachment 268984 Patch r=me 1155519 4 zalan 2016-01-14 12:10:04 -0800 Committed r195069: <http://trac.webkit.org/changeset/195069> 266164 2015-11-25 07:55:31 -0800 2015-11-25 07:55:31 -0800 Test test.html text/html 440 rhodovan.u-szeged PHNjcmlwdD4Kd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewogICAgd2luZG93LnNjcm9sbFRv KDAsZG9jdW1lbnQuYm9keS5zY3JvbGxIZWlnaHQpOwogICAgdl8wID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ2lkXzAnKTsKICAgIHZfMC5yZW1vdmVDaGlsZCh2XzAuY2hpbGROb2Rlc1swXSk7 CiAgICBsb2NhdGlvbi5yZWxvYWQoKTsKfQo8L3NjcmlwdD4KPHN0eWxlPgoqewogICAgLXdlYmtp dC1jb2x1bW5zOiA1NXB4IDg3OwogICAgb3ZlcmZsb3cteTogc2Nyb2xsOwogICAgLXdlYmtpdC1i YWNrZ3JvdW5kLWNvbXBvc2l0ZTogc291cmNlLW91dDsKICAgIHdpZHRoOiAwJQp9Cip8KiB7CiAg ICBkaXNwbGF5OiBpbmxpbmUtZmxleDsKfQo8L3N0eWxlPgo8c3VtbWFyeSBpZD0iaWRfMCI+CiAg ICBhYQogICAgPHByb2dyZXNzPjwvcHJvZ3Jlc3M+Cjwvc3VtbWFyeT4= 268984 2016-01-14 12:04:45 -0800 2016-01-14 12:06:51 -0800 Patch bug-151605-20160114120414.patch text/plain 7507 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTQ3OWMyNzYxNTA4NDM0 ZDMzYWYxZWIwZmMwNDkwYTIyNDRiOGZkMC4uZGIyN2EyMmM5MjZkYzM3MWIyNDIwZTJmMzcyZDI0 ZjM1MzcxYTYyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTAxLTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDog IW5ld1JlbGF5b3V0Um9vdC5jb250YWluZXIoKSB8fCAhbmV3UmVsYXlvdXRSb290LmNvbnRhaW5l cigpLT5uZWVkc0xheW91dCgpIGluIFdlYkNvcmU6OkZyYW1lVmlldzo6c2NoZWR1bGVSZWxheW91 dE9mU3VidHJlZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTUxNjA1I2MxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgRG8gbm90IGxldCBSZW5kZXJNdWx0aUNvbHVtblNldC9SZW5kZXJGbG93VGhyZWFkIG1h cmsgYW5jZXN0b3JzIGRpcnR5IHdoaWxlIHVwZGF0aW5nIHNjcm9sbGJhcnMKKyAgICAgICAgZm9y IG92ZXJmbG93IGNvbnRlbnQuIFdoaWxlIHVwZGF0aW5nIHNjcm9sbGJhcnMsIHdlIG9ubHkgbGF5 b3V0IGRlc2NlbmRhbnRzIHNvIG1hcmtpbmcgcGFyZW50cyBkaXJ0eQorICAgICAgICBpcyB1bm5l Y2Vzc2FyeSBhbmQgY291bGQgbGVhZCB0byBhbiBpbnZhbGlkIGRpcnR5IHN0YXRlLiAtd2hpY2gg bWlnaHQgcHJldmVudCB1cyBmcm9tCisgICAgICAgIGhhbmRsaW5nIHN1YnRyZWUgbGF5b3V0IHNj aGVkdWxlcyBwcm9wZXJseS4gCisKKyAgICAgICAgVGVzdDogZmFzdC9tdWx0aWNvbC9ib2R5LXN0 dWNrLXdpdGgtZGlydHktYml0LXdpdGgtY29sdW1ucy5odG1sCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxv dzo6bGF5b3V0U3BlY2lhbEV4Y2x1ZGVkQ2hpbGQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJGbG93VGhyZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6Omlu dmFsaWRhdGVSZWdpb25zKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6cHJlcGFyZUZvckxheW91dCk6CisKIDIw MTYtMDEtMTMgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBHZXQg dGV4dCBkcmF3aW5nIHdvcmtpbmcgd2l0aCBkaXNwbGF5IGxpc3RzLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCBlMzViZGFiNjFhZDMxOTMyYmJk MTg4YzgyY2NiM2QzZDNhNmQ4YWFiLi4wM2Y3NTZjNTdkZDk5OTE3YTE3NGM1MjU3MzJmNmIyNTg4 YzBmZjIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNw cApAQCAtMzc2Niw3ICszNzY2LDcgQEAgUmVuZGVyT2JqZWN0KiBSZW5kZXJCbG9ja0Zsb3c6Omxh eW91dFNwZWNpYWxFeGNsdWRlZENoaWxkKGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAgICAg Zm9yIChSZW5kZXJNdWx0aUNvbHVtblNldCogY29sdW1uU2V0ID0gZmxvd1RocmVhZC0+Zmlyc3RN dWx0aUNvbHVtblNldCgpOyBjb2x1bW5TZXQ7IGNvbHVtblNldCA9IGNvbHVtblNldC0+bmV4dFNp YmxpbmdNdWx0aUNvbHVtblNldCgpKQogICAgICAgICAgICAgY29sdW1uU2V0LT5wcmVwYXJlRm9y TGF5b3V0KCFmbG93VGhyZWFkLT5pbkJhbGFuY2luZ1Bhc3MoKSk7CiAKLSAgICAgICAgZmxvd1Ro cmVhZC0+aW52YWxpZGF0ZVJlZ2lvbnMoKTsKKyAgICAgICAgZmxvd1RocmVhZC0+aW52YWxpZGF0 ZVJlZ2lvbnMoTWFya09ubHlUaGlzKTsKICAgICAgICAgZmxvd1RocmVhZC0+c2V0TmVlZHNIZWln aHRzUmVjYWxjdWxhdGlvbih0cnVlKTsKICAgICAgICAgZmxvd1RocmVhZC0+bGF5b3V0KCk7CiAg ICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bG93VGhyZWFkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFk LmNwcAppbmRleCBhOTc1OTU1ZDY4ODgyMTk5NjQ1MDRjOTVmODEyZDE0OWVlMzBkZjFkLi41ZDJk MDFiMzEwYzhmYWEzMDE1YzcyZDc0Y2NlYjRjMWM0OTM1ZmE1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCkBAIC0xMDYsNyArMTA2LDcgQEAgdm9p ZCBSZW5kZXJGbG93VGhyZWFkOjpyZW1vdmVSZWdpb25Gcm9tVGhyZWFkKFJlbmRlclJlZ2lvbiog cmVuZGVyUmVnaW9uKQogICAgIG1fcmVnaW9uTGlzdC5yZW1vdmUocmVuZGVyUmVnaW9uKTsKIH0K IAotdm9pZCBSZW5kZXJGbG93VGhyZWFkOjppbnZhbGlkYXRlUmVnaW9ucygpCit2b2lkIFJlbmRl ckZsb3dUaHJlYWQ6OmludmFsaWRhdGVSZWdpb25zKE1hcmtpbmdCZWhhdmlvciBtYXJraW5nUGFy ZW50cykKIHsKICAgICBBU1NFUlQoIWluRmluYWxMYXlvdXRQaGFzZSgpKTsKIApAQCAtMTI1LDcg KzEyNSw3IEBAIHZvaWQgUmVuZGVyRmxvd1RocmVhZDo6aW52YWxpZGF0ZVJlZ2lvbnMoKQogICAg IGlmIChtX2xpbmVUb1JlZ2lvbk1hcCkKICAgICAgICAgbV9saW5lVG9SZWdpb25NYXAtPmNsZWFy KCk7CiAgICAgbV9sYXllcnNUb1JlZ2lvbk1hcHBpbmdzRGlydHkgPSB0cnVlOwotICAgIHNldE5l ZWRzTGF5b3V0KCk7CisgICAgc2V0TmVlZHNMYXlvdXQobWFya2luZ1BhcmVudHMpOwogCiAgICAg bV9yZWdpb25zSW52YWxpZGF0ZWQgPSB0cnVlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJGbG93VGhyZWFkLmgKaW5kZXggODQ3MDRmZTE5MDYxMjQyNmVhZjA5YzA0NzVjY2Ew YTkwM2NhMGRjYi4uMmJlMTdkYmNlNjE3NmNjYjUzMTU3MjZkODI4YjE2ZTZiMjg3NjM2OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5oCkBAIC04NSw3ICs4 NSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcmVnaW9uQ2hhbmdlZFdyaXRpbmdNb2Rl KFJlbmRlclJlZ2lvbiopIHsgfQogCiAgICAgdm9pZCB2YWxpZGF0ZVJlZ2lvbnMoKTsKLSAgICB2 b2lkIGludmFsaWRhdGVSZWdpb25zKCk7CisgICAgdm9pZCBpbnZhbGlkYXRlUmVnaW9ucyhNYXJr aW5nQmVoYXZpb3IgPSBNYXJrQ29udGFpbmluZ0Jsb2NrQ2hhaW4pOwogICAgIGJvb2wgaGFzVmFs aWRSZWdpb25JbmZvKCkgY29uc3QgeyByZXR1cm4gIW1fcmVnaW9uc0ludmFsaWRhdGVkICYmICFt X3JlZ2lvbkxpc3QuaXNFbXB0eSgpOyB9CiAKICAgICAvLyBTb21lIHJlbmRlcmVycyAoY29sdW1u IHNwYW5uZXJzKSBhcmUgbW92ZWQgb3V0IG9mIHRoZSBmbG93IHRocmVhZCB0byBsaXZlIGFtb25n IGNvbHVtbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRp Q29sdW1uU2V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVt blNldC5jcHAKaW5kZXggMjhiNThhM2Q4NjY0MjM3ZmYyMTJmOTljOWIxN2EzNjQ5YTUxNTBhMi4u Zjk1YmZmOTYyYmEyN2U4MTgzZGJhZDJlMTlmZjA2NjcyZWUyMGUyZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCkBAIC0zNjIsNyAr MzYyLDcgQEAgdm9pZCBSZW5kZXJNdWx0aUNvbHVtblNldDo6cHJlcGFyZUZvckxheW91dChib29s IGluaXRpYWwpCiAgICAgLy8gU3RhcnQgd2l0aCAiaW5maW5pdGUiIGZsb3cgdGhyZWFkIHBvcnRp b24gaGVpZ2h0IHVudGlsIGhlaWdodCBpcyBrbm93bi4KICAgICBzZXRMb2dpY2FsQm90dG9tSW5G bG93VGhyZWFkKFJlbmRlckZsb3dUaHJlYWQ6Om1heExvZ2ljYWxIZWlnaHQoKSk7CiAKLSAgICBz ZXROZWVkc0xheW91dCgpOworICAgIHNldE5lZWRzTGF5b3V0KE1hcmtPbmx5VGhpcyk7CiB9CiAK IHZvaWQgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmJlZ2luRmxvdyhSZW5kZXJCbG9jayogY29udGFp bmVyKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IGQxNzk3NGYwMjExMWUyZDE1NWE5ZmRiNDcxYzNiOGRiZDlkNmJlODYuLmZk NjY0OTdjM2U3MDM3MDI0NTgwOGRiNDY3NGYxMzQ5ZjNkNGVlZjMgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAxNi0wMS0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAg ICAgIEFTU0VSVElPTiBGQUlMRUQ6ICFuZXdSZWxheW91dFJvb3QuY29udGFpbmVyKCkgfHwgIW5l d1JlbGF5b3V0Um9vdC5jb250YWluZXIoKS0+bmVlZHNMYXlvdXQoKSBpbiBXZWJDb3JlOjpGcmFt ZVZpZXc6OnNjaGVkdWxlUmVsYXlvdXRPZlN1YnRyZWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTYwNSNjMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvIG5vdCBsZXQgUmVuZGVyTXVsdGlDb2x1bW5T ZXQvUmVuZGVyRmxvd1RocmVhZCBtYXJrIGFuY2VzdG9ycyBkaXJ0eSB3aGlsZSB1cGRhdGluZyBz Y3JvbGxiYXJzCisgICAgICAgIGZvciBvdmVyZmxvdyBjb250ZW50LiBXaGlsZSB1cGRhdGluZyBz Y3JvbGxiYXJzLCB3ZSBvbmx5IGxheW91dCBkZXNjZW5kYW50cyBzbyBtYXJraW5nIHBhcmVudHMg ZGlydHkKKyAgICAgICAgaXMgdW5uZWNlc3NhcnkgYW5kIGNvdWxkIGxlYWQgdG8gYW4gaW52YWxp ZCBkaXJ0eSBzdGF0ZS4gLXdoaWNoIG1pZ2h0IHByZXZlbnQgdXMgZnJvbQorICAgICAgICBoYW5k bGluZyBzdWJ0cmVlIGxheW91dCBzY2hlZHVsZXMgcHJvcGVybHkuIAorCisgICAgICAgICogZmFz dC9tdWx0aWNvbC9ib2R5LXN0dWNrLXdpdGgtZGlydHktYml0LXdpdGgtY29sdW1ucy1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbXVsdGljb2wvYm9keS1zdHVjay13aXRoLWRp cnR5LWJpdC13aXRoLWNvbHVtbnMuaHRtbDogQWRkZWQuCisKIDIwMTYtMDEtMTMgIE1hcmlvIFNh bmNoZXogUHJhZGEgIDxtYXJpb0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3 ZWQgZ2FyZGVuaW5nLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9ib2R5 LXN0dWNrLXdpdGgtZGlydHktYml0LXdpdGgtY29sdW1ucy1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9mYXN0L211bHRpY29sL2JvZHktc3R1Y2std2l0aC1kaXJ0eS1iaXQtd2l0aC1jb2x1bW5z LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44YjEzNzg5MTc5MWZlOTY5MjdhZDc4ZTY0YjBhYWQ3 YmRlZDA4YmRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9i b2R5LXN0dWNrLXdpdGgtZGlydHktYml0LXdpdGgtY29sdW1ucy1leHBlY3RlZC50eHQKQEAgLTAs MCArMSBAQAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2JvZHktc3R1 Y2std2l0aC1kaXJ0eS1iaXQtd2l0aC1jb2x1bW5zLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L211 bHRpY29sL2JvZHktc3R1Y2std2l0aC1kaXJ0eS1iaXQtd2l0aC1jb2x1bW5zLmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uNzBlMzZkNGQ1Mzc1M2U2NjcwNWRhYmNhY2E5ZjFlZTVlMDBlNjczZgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvYm9keS1zdHVjay13aXRoLWRpcnR5 LWJpdC13aXRoLWNvbHVtbnMuaHRtbApAQCAtMCwwICsxLDM5IEBACis8dGl0bGU+VGhpcyB0ZXN0 cyB0aGF0IHdlIGRvbid0IGxlYXZlIGFueSByZW5kZXJlciBkaXJ0eSB3aGVuIGxheW91dCBpcyBk b25lLiBQQVNTIGlmIG5vIGNyYXNoIG9yIGFzc2VydCBpbiBkZWJ1Zy48L3RpdGxlPgorPHN0eWxl PgorKnsKKyAgICAtd2Via2l0LWNvbHVtbnM6IDU1cHggODc7CisgICAgb3ZlcmZsb3cteTogc2Ny b2xsOworICAgIC13ZWJraXQtYmFja2dyb3VuZC1jb21wb3NpdGU6IHNvdXJjZS1vdXQ7CisgICAg d2lkdGg6IDAlOworfQorKnwqIHsKKyAgICBkaXNwbGF5OiBpbmxpbmUtZmxleDsKK30KKzwvc3R5 bGU+Cis8c3VtbWFyeSBpZD0iaWRfMCI+CisgICAgYWEKKyAgICA8cHJvZ3Jlc3M+PC9wcm9ncmVz cz4KKzwvc3VtbWFyeT4KKzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVz dFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisKK3NldFRpbWVvdXQoZnVuY3Rpb24oKSB7CisgICAg aWYgKHdpbmRvdy5sb2NhbFN0b3JhZ2Uuc3RhZ2UgPT0gMykgeworICAgICAgICBkZWxldGUgd2lu ZG93LmxvY2FsU3RvcmFnZS5zdGFnZTsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7 CisgICAgICAgICAgICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIHRlc3RS dW5uZXIubm90aWZ5RG9uZSgpOworICAgICAgICB9CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYg KHdpbmRvdy5sb2NhbFN0b3JhZ2Uuc3RhZ2UpCisgICAgICAgIAl3aW5kb3cubG9jYWxTdG9yYWdl LnN0YWdlKys7CisgICAgICAgIGVsc2UKKyAgICAgICAgCXdpbmRvdy5sb2NhbFN0b3JhZ2Uuc3Rh Z2UgPSAxOworICAgICAgICB3aW5kb3cuc2Nyb2xsVG8oMCxkb2N1bWVudC5ib2R5LnNjcm9sbEhl aWdodCk7CisgICAgICAgIHZfMCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpZF8wJyk7Cisg ICAgICAgIHZfMC5yZW1vdmVDaGlsZCh2XzAuY2hpbGROb2Rlc1swXSk7CisgICAgICAgIGxvY2F0 aW9uLnJlbG9hZCgpOworICAgIH0KK30sIDApOworPC9zY3JpcHQ+Cg==