14118 2007-06-13 06:17:03 -0700 ASSERTION FAILED: !needsLayout() seen again 2007-06-28 19:47:26 -0700 1 1 1 Unclassified WebKit Layout and Rendering 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED http://www.eharmony.com/ NeedsReduction P2 Normal --- 1 ddkilzer webkit-unassigned ap bdakin hyatt mitz oldest_to_newest 7707 0 ddkilzer 2007-06-13 06:17:03 -0700 * SUMMARY I hit an assertion failure logging into eHarmony.com last night. It's the same assertion failure as the one from Bug 13155. I was running Safari 3.0 beta with a local debug build of WebKit r22098 on Mac OS X 10.4.9 (8P135). * STEPS TO REPRODUCE 1. Launch Safari/WebKit. 2. Go to URL: http://www.eharmony.com/ 3. Enter username and password, then click Submit. NOTE: These steps are in theory; I haven't tried yet! * NOTES Console output: ASSERTION FAILED: !needsLayout() (/path/to/WebKit/WebCore/rendering/RenderView.cpp:139 virtual void WebCore::RenderView::paint(WebCore::RenderObject::PaintInfo&, int, int)) Segmentation fault Stack trace: Version: 3.0 (522.11) Build Version: 2 Project Name: WebBrowser Source Version: 45221100 PID: 731 Thread: 0 Exception: EXC_BAD_ACCESS (0x0001) Codes: KERN_INVALID_ADDRESS (0x0001) at 0xbbadbeef Thread 0 Crashed: 0 com.apple.WebCore 0x011ad64c WebCore::RenderView::paint(WebCore::RenderObject::PaintInfo&, int, int) + 112 (RenderView.cpp:139) 1 com.apple.WebCore 0x011d0438 WebCore::RenderLayer::paintLayer(WebCore::RenderLayer*, WebCore::GraphicsContext*, WebCore::IntRect const&, bool, WebCore::PaintRestriction, WebCore::RenderObject*) + 1092 (RenderLayer.cpp:1474) 2 com.apple.WebCore 0x011d0998 WebCore::RenderLayer::paint(WebCore::GraphicsContext*, WebCore::IntRect const&, WebCore::PaintRestriction, WebCore::RenderObject*) + 72 (RenderLayer.cpp:1394) 3 com.apple.WebCore 0x010f2690 WebCore::Frame::paint(WebCore::GraphicsContext*, WebCore::IntRect const&) + 800 (Frame.cpp:1273) 4 com.apple.WebCore 0x0111f548 -[WebCoreFrameBridge drawRect:] + 372 (WebCoreFrameBridge.mm:409) 5 com.apple.WebKit 0x003513d0 -[WebHTMLView drawSingleRect:] + 760 (WebHTMLView.mm:2638) 6 com.apple.WebKit 0x0035187c -[WebHTMLView drawRect:] + 540 (WebHTMLView.mm:2693) 7 com.apple.AppKit 0x937e7858 -[NSView _drawRect:clip:] + 2128 8 com.apple.AppKit 0x937e6e18 -[NSView _recursiveDisplayAllDirtyWithLockFocus:visRect:] + 404 9 com.apple.WebKit 0x00348398 -[WebHTMLView(WebPrivate) _recursiveDisplayAllDirtyWithLockFocus:visRect:] + 796 (WebHTMLView.mm:900) 10 com.apple.AppKit 0x937e9b60 _recursiveDisplayInRect2 + 84 11 com.apple.CoreFoundation 0x907ee3ec CFArrayApplyFunction + 416 12 com.apple.AppKit 0x937e6f2c -[NSView _recursiveDisplayAllDirtyWithLockFocus:visRect:] + 680 13 com.apple.AppKit 0x937e9b60 _recursiveDisplayInRect2 + 84 14 com.apple.CoreFoundation 0x907ee3ec CFArrayApplyFunction + 416 15 com.apple.AppKit 0x937e6f2c -[NSView _recursiveDisplayAllDirtyWithLockFocus:visRect:] + 680 16 com.apple.AppKit 0x937e9b60 _recursiveDisplayInRect2 + 84 17 com.apple.CoreFoundation 0x907ee3ec CFArrayApplyFunction + 416 18 com.apple.AppKit 0x937e6f2c -[NSView _recursiveDisplayAllDirtyWithLockFocus:visRect:] + 680 19 com.apple.AppKit 0x937e63e0 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 196 20 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 21 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 22 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 23 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 24 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 25 com.apple.AppKit 0x93807044 -[NSThemeFrame _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 192 26 com.apple.AppKit 0x937e0054 -[NSView _displayRectIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:] + 384 27 com.apple.AppKit 0x937d5348 -[NSView displayIfNeeded] + 248 28 com.apple.AppKit 0x937d51b8 -[NSWindow displayIfNeeded] + 180 29 com.apple.Safari 0x000133d4 0x1000 + 74708 30 com.apple.AppKit 0x937d5064 _handleWindowNeedsDisplay + 200 31 com.apple.CoreFoundation 0x907de76c __CFRunLoopDoObservers + 352 32 com.apple.CoreFoundation 0x907dea0c __CFRunLoopRun + 420 33 com.apple.CoreFoundation 0x907de4ac CFRunLoopRunSpecific + 268 34 com.apple.HIToolbox 0x9329bb20 RunCurrentEventLoopInMode + 264 35 com.apple.HIToolbox 0x9329b1b4 ReceiveNextEventCommon + 380 36 com.apple.HIToolbox 0x9329b020 BlockUntilNextEventMatchingListInMode + 96 37 com.apple.AppKit 0x937a1ae4 _DPSNextEvent + 384 38 com.apple.AppKit 0x937a17a8 -[NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 116 39 com.apple.Safari 0x00006770 0x1000 + 22384 40 com.apple.AppKit 0x9379dcec -[NSApplication run] + 472 41 com.apple.AppKit 0x9388e87c NSApplicationMain + 452 42 com.apple.Safari 0x0000244c 0x1000 + 5196 43 com.apple.Safari 0x0004f1b0 0x1000 + 319920 7700 1 ddkilzer 2007-06-13 06:17:38 -0700 Copying Beth since she fixed Bug 13155. 7675 2 ddkilzer 2007-06-13 10:31:25 -0700 Hmm...I may have been loading a message on Yahoo! Mail at the time as well. Need to try to reproduce the Yahoo! bug on the Safari 3 beta to see if it's present. 7559 3 ddkilzer 2007-06-14 10:53:14 -0700 I saw this again, but was loading bugzilla.mozilla.org (along with some other pages, possibly). Still haven't figured out the trigger or how to reproduce it. Reproduced with Safari 3.0 Beta with a local debug build of WebKit r23502 with Mac OS X 10.4.9 (8P135). Console output: ASSERTION FAILED: !needsLayout() (/path/to/WebKit/WebCore/rendering/RenderView.cpp:139 virtual void WebCore::RenderView::paint(WebCore::RenderObject::PaintInfo&, int, int)) Segmentation fault Stack trace: Version: 3.0 (522.11) Build Version: 2 Project Name: WebBrowser Source Version: 45221100 PID: 643 Thread: 0 Exception: EXC_BAD_ACCESS (0x0001) Codes: KERN_INVALID_ADDRESS (0x0001) at 0xbbadbeef Thread 0 Crashed: 0 com.apple.WebCore 0x011ad42c WebCore::RenderView::paint(WebCore::RenderObject::PaintInfo&, int, int) + 112 (RenderView.cpp:139) 1 com.apple.WebCore 0x011d0218 WebCore::RenderLayer::paintLayer(WebCore::RenderLayer*, WebCore::GraphicsContext*, WebCore::IntRect const&, bool, WebCore::PaintRestriction, WebCore::RenderObject*) + 1092 (RenderLayer.cpp:1474) 2 com.apple.WebCore 0x011d0778 WebCore::RenderLayer::paint(WebCore::GraphicsContext*, WebCore::IntRect const&, WebCore::PaintRestriction, WebCore::RenderObject*) + 72 (RenderLayer.cpp:1394) 3 com.apple.WebCore 0x010f2470 WebCore::Frame::paint(WebCore::GraphicsContext*, WebCore::IntRect const&) + 800 (Frame.cpp:1273) 4 com.apple.WebCore 0x0111f328 -[WebCoreFrameBridge drawRect:] + 372 (WebCoreFrameBridge.mm:409) 5 com.apple.WebKit 0x003513d0 -[WebHTMLView drawSingleRect:] + 760 (WebHTMLView.mm:2638) 6 com.apple.WebKit 0x0035187c -[WebHTMLView drawRect:] + 540 (WebHTMLView.mm:2693) 7 com.apple.AppKit 0x937e7858 -[NSView _drawRect:clip:] + 2128 8 com.apple.AppKit 0x937e6e18 -[NSView _recursiveDisplayAllDirtyWithLockFocus:visRect:] + 404 9 com.apple.WebKit 0x00348398 -[WebHTMLView(WebPrivate) _recursiveDisplayAllDirtyWithLockFocus:visRect:] + 796 (WebHTMLView.mm:900) 10 com.apple.AppKit 0x937e63e0 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 196 11 com.apple.WebKit 0x00347fe8 -[WebHTMLView(WebPrivate) _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 520 (WebHTMLView.mm:854) 12 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 13 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 14 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 15 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 16 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 17 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 18 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 19 com.apple.AppKit 0x937e69a8 -[NSView _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 1676 20 com.apple.AppKit 0x93807044 -[NSThemeFrame _recursiveDisplayRectIfNeededIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:topView:] + 192 21 com.apple.AppKit 0x937e0054 -[NSView _displayRectIgnoringOpacity:isVisibleRect:rectIsVisibleRectForView:] + 384 22 com.apple.AppKit 0x937d5348 -[NSView displayIfNeeded] + 248 23 com.apple.AppKit 0x937d51b8 -[NSWindow displayIfNeeded] + 180 24 com.apple.Safari 0x000133d4 0x1000 + 74708 25 com.apple.AppKit 0x937d5064 _handleWindowNeedsDisplay + 200 26 com.apple.CoreFoundation 0x907de76c __CFRunLoopDoObservers + 352 27 com.apple.CoreFoundation 0x907dea0c __CFRunLoopRun + 420 28 com.apple.CoreFoundation 0x907de4ac CFRunLoopRunSpecific + 268 29 com.apple.HIToolbox 0x9329bb20 RunCurrentEventLoopInMode + 264 30 com.apple.HIToolbox 0x9329b12c ReceiveNextEventCommon + 244 31 com.apple.HIToolbox 0x9329b020 BlockUntilNextEventMatchingListInMode + 96 32 com.apple.AppKit 0x937a1ae4 _DPSNextEvent + 384 33 com.apple.AppKit 0x937a17a8 -[NSApplication nextEventMatchingMask:untilDate:inMode:dequeue:] + 116 34 com.apple.Safari 0x00006770 0x1000 + 22384 35 com.apple.AppKit 0x9379dcec -[NSApplication run] + 472 36 com.apple.AppKit 0x9388e87c NSApplicationMain + 452 37 com.apple.Safari 0x0000244c 0x1000 + 5196 38 com.apple.Safari 0x0004f1b0 0x1000 + 319920 7555 4 ddkilzer 2007-06-14 11:18:29 -0700 (In reply to comment #3) > I saw this again, but was loading bugzilla.mozilla.org (along with some other > pages, possibly). Still haven't figured out the trigger or how to reproduce > it. Saw this logging into usps.com web site when trying to reproduce Bug 4151 with a local debug build of WebKit r23502 with Safari 3.0 (522.11) on Mac OS X 10.4.9 (8P135). 7406 5 ddkilzer 2007-06-15 11:10:23 -0700 (In reply to comment #4) > Saw this logging into usps.com web site when trying to reproduce Bug 4151 with > a local debug build of WebKit r23502 with Safari 3.0 (522.11) on Mac OS X > 10.4.9 (8P135). NOTE: This doesn't produce a crash every time--only when I don't want it to crash. * STEPS TO REPRODUCE 1. Open Safari/WebKit. 2. Go to URL: https://sss-web.usps.com/ 3. Click the "Sign In" button. As I mentioned above, this doesn't happen every time, but I think it usually happens in a tab (that's not the left-most tab) more often than not. 7407 6 ddkilzer 2007-06-15 11:14:57 -0700 (In reply to comment #5) > * STEPS TO REPRODUCE > 1. Open Safari/WebKit. > 2. Go to URL: https://sss-web.usps.com/ > 3. Click the "Sign In" button. > > As I mentioned above, this doesn't happen every time, but I think it usually > happens in a tab (that's not the left-most tab) more often than not. If this doesn't crash the first time you hit it, try hitting Reload. 7304 7 grhowes 2007-06-16 19:21:01 -0700 I'm seeing the same thing on the main http://yahoo.com page 6054 8 mitz 2007-06-27 16:22:07 -0700 At least on Yahoo, the bug seems to be due to the midLayout guards around the call to invalidateSelection() in FrameView::layout(). Those guards prevent layout from happening, and there's no guarantee that it will happen later before returning from FrameView::layout() (there is a call to scheduleRelayout near the end, but that call is: never supposed to be reached anyway, doesn't always guarantee a relayout, and the early return after it messes up the suspend/resume scheduled events mechanism). I think the same applies to the guards around updateWidgetPositions(). If I remember correctly. both of the above were added on a speculative basis. I don't think they're needed. 6056 9 mitz 2007-06-27 16:37:24 -0700 See bug 13455 comment #3 regarding the scheduleRelayout and early return being not supposed to be reached. 6057 10 15282 mitz 2007-06-27 16:43:43 -0700 Created attachment 15282 Possible fix 6009 11 ap 2007-06-27 22:15:28 -0700 Opening maps.google.com causes this assertion failure for me each time today. I haven't tried applying the patch. 6029 12 15289 mitz 2007-06-28 06:49:25 -0700 Created attachment 15289 Test case (will ASSERT) The beloved updateLayoutIgnorePendingStylesheets() is involved in this case. It is called under invalidateSelection and -- since there are pending stylesheets -- it calls updateStyleSelector() which dirties the root. Normally the root gets a layout after that, but now because of the guard around invalidateSelection it doesn't. I'm going to add this test case to the patch an submit for review. 6031 13 15290 mitz 2007-06-28 07:10:04 -0700 Created attachment 15290 Remove midLayout guards around non-layout calls 5971 14 15290 bdakin 2007-06-28 13:28:42 -0700 Comment on attachment 15290 Remove midLayout guards around non-layout calls This looks good to me. 5921 15 sam 2007-06-28 19:47:26 -0700 Landed in r23866. 15282 2007-06-27 16:43:43 -0700 2007-06-27 16:43:43 -0700 Possible fix 14118_r0.patch text/plain 1316 mitz SW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAyMzgyOCkKKysrIFdlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjcsOSArNDI3LDcgQEAgdm9pZCBGcmFtZVZp ZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZQogICAgICAgICByb290LT52aWV3KCktPnBvcExh eW91dFN0YXRlKCk7CiAgICAgZC0+bGF5b3V0Um9vdCA9IDA7CiAKLSAgICBkLT5taWRMYXlvdXQg PSB0cnVlOwogICAgIG1fZnJhbWUtPmludmFsaWRhdGVTZWxlY3Rpb24oKTsKLSAgICBkLT5taWRM YXlvdXQgPSBmYWxzZTsKICAgIAogICAgIGQtPmxheW91dFNjaGVkdWxpbmdFbmFibGVkPXRydWU7 CiAKQEAgLTQ0MCwxMSArNDM4LDggQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93 U3VidHJlZQogICAgIGxheWVyLT51cGRhdGVMYXllclBvc2l0aW9ucyhkLT5kb0Z1bGxSZXBhaW50 KTsKIAogICAgIC8vIFdlIHVwZGF0ZSBvdXIgd2lkZ2V0IHBvc2l0aW9ucyByaWdodCBhZnRlciBk b2luZyBhIGxheW91dC4KLSAgICBpZiAoIXN1YnRyZWUpIHsKLSAgICAgICAgZC0+bWlkTGF5b3V0 ID0gdHJ1ZTsKKyAgICBpZiAoIXN1YnRyZWUpCiAgICAgICAgIHN0YXRpY19jYXN0PFJlbmRlclZp ZXcqPihyb290KS0+dXBkYXRlV2lkZ2V0UG9zaXRpb25zKCk7Ci0gICAgICAgIGQtPm1pZExheW91 dCA9IGZhbHNlOwotICAgIH0KICAgICAKICAgICAvLyBGSVhNRTogQ291bGQgb3B0aW1pemUgdGhp cyBhbmQgaGF2ZSBvYmplY3RzIHJlbW92ZWQgZnJvbSB0aGlzIGxpc3QKICAgICAvLyBpZiB0aGV5 IGV2ZXIgZG8gZnVsbCByZXBhaW50cy4KQEAgLTQ2NCwxMCArNDU5LDggQEAgdm9pZCBGcmFtZVZp ZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZQogICAgIGlmIChkaWRGaXJzdExheW91dCkKICAg ICAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmRpZEZpcnN0TGF5b3V0KCk7CiAgICAgCi0gICAgaWYg KHJvb3QtPm5lZWRzTGF5b3V0KCkpIHsKLSAgICAgICAgc2NoZWR1bGVSZWxheW91dCgpOwotICAg ICAgICByZXR1cm47Ci0gICAgfQorICAgIEFTU0VSVCghcm9vdC0+bmVlZHNMYXlvdXQoKSk7CisK ICAgICBzZXRTdGF0aWNCYWNrZ3JvdW5kKHVzZVNsb3dSZXBhaW50cygpKTsKIAogICAgIGlmIChk b2N1bWVudC0+aGFzTGlzdGVuZXJUeXBlKERvY3VtZW50OjpPVkVSRkxPV0NIQU5HRURfTElTVEVO RVIpKQo= 15289 2007-06-28 06:49:25 -0700 2007-06-28 06:49:25 -0700 Test case (will ASSERT) 14118 test case.html text/html 785 mitz PGh0bWw+CjxoZWFkIGlkPSJoZWFkIj4KICAgIDxzY3JpcHQ+CiAgICAgICAgZnVuY3Rpb24gdGVz dCgpCiAgICAgICAgewogICAgICAgICAgICB2YXIgdGFyZ2V0ID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoInRhcmdldCIpOwogICAgICAgICAgICBnZXRTZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0 ZW50KHRhcmdldCwgMCwgdGFyZ2V0LCAwKTsKICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZz ZXRUb3A7CgogICAgICAgICAgICB2YXIgaGVhZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJo ZWFkIik7CiAgICAgICAgICAgIHZhciBsaW5rID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgibGlu ayIpOwogICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgiaHJlZiIsICJkYXRhOnRleHQvY3Nz LCIpOwogICAgICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgicmVsIiwgInN0eWxlc2hlZXQiKTsK ICAgICAgICAgICAgLy8gVGhpcyB3aWxsIGluY3JlYXNlIHRoZSBwZW5kaW5nIHN0eWxlc2hlZXQg Y291bnQKICAgICAgICAgICAgaGVhZC5hcHBlbmRDaGlsZChsaW5rKTsKICAgICAgICAgICAgLy8g VGhpcyB3aWxsIHJlcXVpcmUgbGF5b3V0CiAgICAgICAgICAgIGZvby5zdHlsZS53aWR0aCA9ICIx MDBweCI7CiAgICAgICAgfQogICAgPC9zY3JpcHQ+CjwvaGVhZD4KPGJvZHkgb25sb2FkPSJ0ZXN0 KCkiPgogICAgPGRpdiBpZD0idGFyZ2V0Ij5UaGlzIGlzIHNvbWV0aGluZyB0byBzZWxlY3Q8L2Rp dj4KICAgIDxkaXYgaWQ9ImZvbyI+PC9kaXY+CjwvYm9keT4KPC9odG1sPgo= 15290 2007-06-28 07:10:04 -0700 2007-06-28 13:28:42 -0700 Remove midLayout guards around non-layout calls 14118_r1.patch text/plain 4749 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzg1MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDctMDYtMjggIE1pdHogUGV0dGVsICA8bWl0ekB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTE4CisgICAgICAgICAg QVNTRVJUSU9OIEZBSUxFRDogIW5lZWRzTGF5b3V0KCkgc2VlbiBhZ2FpbgorCisgICAgICAgIFRl c3Q6IGZhc3QvZHluYW1pYy9yZWN1cnNpdmUtbGF5b3V0Lmh0bWwKKworICAgICAgICAqIHBhZ2Uv RnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0KTogUmVt b3ZlZCB0aGUgbWlkTGF5b3V0IGd1YXJkcyBhcm91bmQKKyAgICAgICAgdGhlIGNhbGxzIHRvIGlu dmFsaWRhdGVTZWxlY3Rpb24oKSBhbmQgdXBkYXRlV2lkZ2V0UG9zaXRpb25zKCkuIFRob3NlCisg ICAgICAgIGNhbGxzIG1heSBkaXJ0eSB0aGUgbGF5b3V0LCBidXQgaW4gdGhhdCBjYXNlIHRoZXkg YWxzbyB1cGRhdGUgaXQsIHNvCisgICAgICAgIHRoZXkgc2hvdWxkIGJlIGFsbG93ZWQgdG8gZG8g aXQuIEFkZGVkIGFuIEFTU0VSVCB0byBtYWtlIHN1cmUgdGhhdCB3aGVuCisgICAgICAgIHRoZXkg cmV0dXJuLCB0aGUgcm9vdCBpcyBub3QgbWFya2VkIGZvciBsYXlvdXQuCisKIDIwMDctMDYtMjgg IEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE1pdHouCkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMjM4NDkpCisrKyBXZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDI3LDkgKzQyNyw3IEBAIHZvaWQg RnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUKICAgICAgICAgcm9vdC0+dmlldygp LT5wb3BMYXlvdXRTdGF0ZSgpOwogICAgIGQtPmxheW91dFJvb3QgPSAwOwogCi0gICAgZC0+bWlk TGF5b3V0ID0gdHJ1ZTsKICAgICBtX2ZyYW1lLT5pbnZhbGlkYXRlU2VsZWN0aW9uKCk7Ci0gICAg ZC0+bWlkTGF5b3V0ID0gZmFsc2U7CiAgICAKICAgICBkLT5sYXlvdXRTY2hlZHVsaW5nRW5hYmxl ZD10cnVlOwogCkBAIC00NDAsMTEgKzQzOCw4IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9v bCBhbGxvd1N1YnRyZWUKICAgICBsYXllci0+dXBkYXRlTGF5ZXJQb3NpdGlvbnMoZC0+ZG9GdWxs UmVwYWludCk7CiAKICAgICAvLyBXZSB1cGRhdGUgb3VyIHdpZGdldCBwb3NpdGlvbnMgcmlnaHQg YWZ0ZXIgZG9pbmcgYSBsYXlvdXQuCi0gICAgaWYgKCFzdWJ0cmVlKSB7Ci0gICAgICAgIGQtPm1p ZExheW91dCA9IHRydWU7CisgICAgaWYgKCFzdWJ0cmVlKQogICAgICAgICBzdGF0aWNfY2FzdDxS ZW5kZXJWaWV3Kj4ocm9vdCktPnVwZGF0ZVdpZGdldFBvc2l0aW9ucygpOwotICAgICAgICBkLT5t aWRMYXlvdXQgPSBmYWxzZTsKLSAgICB9CiAgICAgCiAgICAgLy8gRklYTUU6IENvdWxkIG9wdGlt aXplIHRoaXMgYW5kIGhhdmUgb2JqZWN0cyByZW1vdmVkIGZyb20gdGhpcyBsaXN0CiAgICAgLy8g aWYgdGhleSBldmVyIGRvIGZ1bGwgcmVwYWludHMuCkBAIC00NjQsMTAgKzQ1OSw4IEBAIHZvaWQg RnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUKICAgICBpZiAoZGlkRmlyc3RMYXlv dXQpCiAgICAgICAgIG1fZnJhbWUtPmxvYWRlcigpLT5kaWRGaXJzdExheW91dCgpOwogICAgIAot ICAgIGlmIChyb290LT5uZWVkc0xheW91dCgpKSB7Ci0gICAgICAgIHNjaGVkdWxlUmVsYXlvdXQo KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KKyAgICBBU1NFUlQoIXJvb3QtPm5lZWRzTGF5b3V0 KCkpOworCiAgICAgc2V0U3RhdGljQmFja2dyb3VuZCh1c2VTbG93UmVwYWludHMoKSk7CiAKICAg ICBpZiAoZG9jdW1lbnQtPmhhc0xpc3RlbmVyVHlwZShEb2N1bWVudDo6T1ZFUkZMT1dDSEFOR0VE X0xJU1RFTkVSKSkKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzODUwKQorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDctMDYtMjggIE1pdHog UGV0dGVsICA8bWl0ekB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIC0gdGVzdCBmb3IgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQxMTgKKyAgICAgICAgICBBU1NFUlRJT04gRkFJTEVEOiAhbmVlZHNMYXlv dXQoKSBzZWVuIGFnYWluCisKKyAgICAgICAgKiBmYXN0L2R5bmFtaWMvcmVjdXJzaXZlLWxheW91 dC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZHluYW1pYy9yZWN1cnNpdmUt bGF5b3V0Lmh0bWw6IEFkZGVkLgorCiAyMDA3LTA2LTI4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRp QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNaXR6LgpJbmRleDogTGF5b3V0VGVz dHMvZmFzdC9keW5hbWljL3JlY3Vyc2l2ZS1sYXlvdXQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2Zhc3QvZHluYW1pYy9yZWN1cnNpdmUtbGF5b3V0LWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZHluYW1pYy9yZWN1cnNpdmUtbGF5 b3V0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw2IEBACitUZXN0IGZvciBo dHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDExOCBBU1NFUlRJT04gRkFJ TEVEOiAhbmVlZHNMYXlvdXQoKSBzZWVuIGFnYWluLgorCitObyBhc3NlcnRpb24gZmFpbHVyZSBo ZXJlIG1lYW5zIFNVQ0NFU1MuCisKK1RoaXMgaXMgc29tZXRoaW5nIHRvIHNlbGVjdAorCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvcmVjdXJzaXZlLWxheW91dC5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZHluYW1pYy9yZWN1cnNpdmUtbGF5b3V0Lmh0bWwJKHJl dmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2R5bmFtaWMvcmVjdXJzaXZlLWxheW91dC5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM1IEBACis8aHRtbD4KKzxoZWFkIGlkPSJoZWFk Ij4KKyAgICA8c2NyaXB0PgorICAgICAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICAgICAgeworICAg ICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAgICAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICAgICAgICAgIHZhciB0 YXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGFyZ2V0Iik7CisgICAgICAgICAgICBn ZXRTZWxlY3Rpb24oKS5zZXRCYXNlQW5kRXh0ZW50KHRhcmdldCwgMCwgdGFyZ2V0LCAwKTsKKyAg ICAgICAgICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOworCisgICAgICAgICAgICB2YXIgaGVh ZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJoZWFkIik7CisgICAgICAgICAgICB2YXIgbGlu ayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImxpbmsiKTsKKyAgICAgICAgICAgIGxpbmsuc2V0 QXR0cmlidXRlKCJocmVmIiwgImRhdGE6dGV4dC9jc3MsIik7CisgICAgICAgICAgICBsaW5rLnNl dEF0dHJpYnV0ZSgicmVsIiwgInN0eWxlc2hlZXQiKTsKKyAgICAgICAgICAgIC8vIFRoaXMgd2ls bCBpbmNyZWFzZSB0aGUgcGVuZGluZyBzdHlsZXNoZWV0IGNvdW50CisgICAgICAgICAgICBoZWFk LmFwcGVuZENoaWxkKGxpbmspOworICAgICAgICAgICAgLy8gVGhpcyB3aWxsIHJlcXVpcmUgbGF5 b3V0CisgICAgICAgICAgICBmb28uc3R5bGUud2lkdGggPSAiMTAwcHgiOworICAgICAgICB9Cisg ICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InRlc3QoKSI+CisgICAgPHA+Cisg ICAgICAgIFRlc3QgZm9yIDxpPjxhIGhyZWY9Imh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0MTE4Ij5odHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDExODwvYT4KKyAgICAgICAgQVNTRVJUSU9OIEZBSUxFRDogIW5lZWRzTGF5b3V0KCkgc2VlbiBh Z2FpbjwvaT4uCisgICAgPC9wPgorICAgIDxwPgorICAgICAgICBObyBhc3NlcnRpb24gZmFpbHVy ZSBoZXJlIG1lYW5zIFNVQ0NFU1MuCisgICAgPC9wPgorICAgIDxkaXYgaWQ9InRhcmdldCI+VGhp cyBpcyBzb21ldGhpbmcgdG8gc2VsZWN0PC9kaXY+CisgICAgPGRpdiBpZD0iZm9vIj48L2Rpdj4K KzwvYm9keT4KKzwvaHRtbD4K