44287 2010-08-19 12:18:54 -0700 Assertion failure in FrameView::layout when clicking on a YouTube video on youtube.com front page 2010-11-01 16:42:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED http://youtube.com/ InRadar P2 Normal --- 1 aroben simon.fraser andersca ap hyatt mitz sam simon.fraser oldest_to_newest 266889 0 aroben 2010-08-19 12:18:54 -0700 To reproduce: 1. Go to http://youtube.com/ 2. Click on a video You'll hit this assertion in FrameView::layout: ASSERT(m_frame->view() == this); The code bails out at this point in a Release build. Continuing past the assertion shows that the page seems to load OK (though it uses a windowed plugin which we don't yet support, so it's hard to say for sure). I don't know if this can be reproduced on Mac; I haven't been able to get plugins to work at all in WebKit2 on Mac so far. Here's the backtrace: > WebKit.dll!WebCore::FrameView::layout(bool allowSubtree=true) Line 635 + 0x36 bytes C++ WebKit.dll!WebCore::RenderWidget::updateWidgetPosition() Line 355 C++ WebKit.dll!WebCore::RenderView::updateWidgetPositions() Line 588 + 0x13 bytes C++ WebKit.dll!WebCore::FrameView::performPostLayoutTasks() Line 1611 C++ WebKit.dll!WebCore::FrameView::layout(bool allowSubtree=true) Line 833 C++ WebKit.dll!WebCore::Document::updateLayout() Line 1519 C++ WebKit.dll!WebCore::Document::updateLayoutIgnorePendingStylesheets() Line 1551 C++ WebKit.dll!WebCore::HTMLEmbedElement::renderWidgetForJSBindings() Line 73 C++ WebKit.dll!WebCore::HTMLPlugInElement::pluginWidget() Line 103 + 0x12 bytes C++ WebKit.dll!WebCore::pluginScriptObjectFromPluginViewBase(WebCore::HTMLPlugInElement * pluginElement=0x049def58, JSC::JSGlobalObject * globalObject=0x04208fc0) Line 60 + 0x8 bytes C++ WebKit.dll!WebCore::pluginScriptObject(JSC::ExecState * exec=0x03dd0528, WebCore::JSHTMLElement * jsHTMLElement=0x04a9cc40) Line 90 + 0x12 bytes C++ WebKit.dll!WebCore::runtimeObjectCustomGetOwnPropertySlot(JSC::ExecState * exec=0x03dd0528, const JSC::Identifier & propertyName={...}, JSC::PropertySlot & slot={...}, WebCore::JSHTMLElement * element=0x04a9cc40) Line 115 + 0xd bytes C++ WebKit.dll!WebCore::JSHTMLEmbedElement::getOwnPropertySlotDelegate(JSC::ExecState * exec=0x03dd0528, const JSC::Identifier & propertyName={...}, JSC::PropertySlot & slot={...}) Line 38 + 0x15 bytes C++ WebKit.dll!WebCore::JSHTMLEmbedElement::getOwnPropertySlot(JSC::ExecState * exec=0x03dd0528, const JSC::Identifier & propertyName={...}, JSC::PropertySlot & slot={...}) Line 157 + 0x14 bytes C++ JavaScriptCore.dll!JSC::JSCell::fastGetOwnPropertySlot(JSC::ExecState * exec=0x03dd0528, const JSC::Identifier & propertyName={...}, JSC::PropertySlot & slot={...}) Line 404 + 0x1b bytes C++ JavaScriptCore.dll!JSC::JSValue::get(JSC::ExecState * exec=0x03dd0528, const JSC::Identifier & propertyName={...}, JSC::PropertySlot & slot={...}) Line 658 + 0x14 bytes C++ JavaScriptCore.dll!cti_op_get_by_id_proto_list(void * * args=0x0012f080) Line 1649 C++ JavaScriptCore.dll!@cti_op_create_this@4() + 0x1ef bytes C++ JavaScriptCore.dll!JSC::JITCode::execute(JSC::RegisterFile * registerFile=0x01e70fcc, JSC::ExecState * callFrame=0x03dd0048, JSC::JSGlobalData * globalData=0x01e65c50, JSC::JSValue * exception=0x01e66b88) Line 77 + 0x24 bytes C++ JavaScriptCore.dll!JSC::Interpreter::executeCall(JSC::ExecState * callFrame=0x04929768, JSC::JSObject * function=0x04225280, JSC::CallType callType=CallTypeJS, const JSC::CallData & callData={...}, JSC::JSValue thisValue={...}, const JSC::ArgList & args={...}, JSC::JSValue * exception=0x01e66b88) Line 780 + 0x2e bytes C++ JavaScriptCore.dll!JSC::call(JSC::ExecState * exec=0x04929768, JSC::JSValue functionObject={...}, JSC::CallType callType=CallTypeJS, const JSC::CallData & callData={...}, JSC::JSValue thisValue={...}, const JSC::ArgList & args={...}) Line 38 + 0x45 bytes C++ WebKit.dll!WebCore::JSMainThreadExecState::call(JSC::ExecState * exec=0x04929768, JSC::JSValue functionObject={...}, JSC::CallType callType=CallTypeJS, const JSC::CallData & callData={...}, JSC::JSValue thisValue={...}, const JSC::ArgList & args={...}) Line 48 + 0x29 bytes C++ WebKit.dll!WebCore::JSEventListener::handleEvent(WebCore::ScriptExecutionContext * scriptExecutionContext=, WebCore::Event * event=) Line 124 + 0x6a bytes C++ WebKit.dll!WebCore::EventTarget::fireEventListeners(WebCore::Event * event=0x04754ee0, WebCore::EventTargetData * d=0x048dd644, WTF::Vector<WebCore::RegisteredEventListener,1> & entry=[1]({listener=0x0493e7c8 {m_jsFunction=0x04225280 m_wrapper={...} m_isAttribute=false ...} useCapture=true })) Line 339 + 0x35 bytes C++ WebKit.dll!WebCore::EventTarget::fireEventListeners(WebCore::Event * event=0x04754ee0) Line 305 C++ WebKit.dll!WebCore::DOMWindow::dispatchEvent(WTF::PassRefPtr<WebCore::Event> prpEvent={...}, WTF::PassRefPtr<WebCore::EventTarget> prpTarget={...}) Line 1522 + 0x11 bytes C++ WebKit.dll!WebCore::FrameLoader::stopLoading(WebCore::UnloadEventPolicy unloadEventPolicy=UnloadEventPolicyUnloadAndPageHide, WebCore::DatabasePolicy databasePolicy=DatabasePolicyStop) Line 388 C++ WebKit.dll!WebCore::FrameLoader::closeURL() Line 464 C++ WebKit.dll!WebCore::FrameLoader::detachFromParent() Line 2575 C++ WebKit.dll!WebCore::FrameLoader::detachChildren() Line 2492 + 0xf bytes C++ WebKit.dll!WebCore::FrameLoader::detachFromParent() Line 2580 C++ WebKit.dll!WebCore::FrameLoader::detachChildren() Line 2492 + 0xf bytes C++ WebKit.dll!WebCore::FrameLoader::setDocumentLoader(WebCore::DocumentLoader * loader=0x049cd518) Line 1757 C++ WebKit.dll!WebCore::FrameLoader::transitionToCommitted(WTF::PassRefPtr<WebCore::CachedPage> cachedPage={...}) Line 1929 C++ WebKit.dll!WebCore::FrameLoader::commitProvisionalLoad() Line 1848 C++ WebKit.dll!WebCore::DocumentLoader::commitIfReady() Line 261 C++ WebKit.dll!WebCore::DocumentLoader::commitLoad(const char * data=0x05e33b20, int length=1623) Line 280 C++ WebKit.dll!WebCore::DocumentLoader::receivedData(const char * data=0x05e33b20, int length=1623) Line 294 C++ WebKit.dll!WebCore::FrameLoader::receivedData(const char * data=0x05e33b20, int length=1623) Line 1498 C++ WebKit.dll!WebCore::MainResourceLoader::addData(const char * data=0x05e33b20, int length=1623, bool allAtOnce=false) Line 150 C++ WebKit.dll!WebCore::ResourceLoader::didReceiveData(const char * data=0x05e33b20, int length=1623, __int64 lengthReceived=1623, bool allAtOnce=false) Line 260 + 0x1b bytes C++ WebKit.dll!WebCore::MainResourceLoader::didReceiveData(const char * data=0x05e33b20, int length=1623, __int64 lengthReceived=1623, bool allAtOnce=false) Line 421 C++ WebKit.dll!WebCore::ResourceLoader::didReceiveData(WebCore::ResourceHandle * __formal=0x05e32020, const char * data=0x05e33b20, int length=1623, int lengthReceived=1623) Line 431 + 0x1f bytes C++ WebKit.dll!WebCore::didReceiveData(_CFURLConnection * conn=0x042d3850, const __CFData * data=0x05e62770, long originalLength=1623, const void * clientInfo=0x05e32020) Line 214 + 0x2a bytes C++ 266890 1 aroben 2010-08-19 12:19:34 -0700 <rdar://problem/8330881> 266893 2 simon.fraser 2010-08-19 12:27:12 -0700 Bug 43152 is about this same assertion. 266894 3 aroben 2010-08-19 12:29:20 -0700 It looks like m_frame->view() is null when the assertion fails. 266981 4 simon.fraser 2010-08-19 14:57:00 -0700 It seems bad that renderWidgetForJSBindings() causes layout to happen. 267000 5 ap 2010-08-19 15:26:21 -0700 Bug 36675 sounded remotely related, FWIW. 278294 6 simon.fraser 2010-09-13 10:28:26 -0700 I see this on Mac too, also in old WebKit. 303016 7 72583 simon.fraser 2010-11-01 16:01:50 -0700 Created attachment 72583 Patch 303068 8 simon.fraser 2010-11-01 16:42:49 -0700 http://trac.webkit.org/changeset/71074 72583 2010-11-01 16:01:50 -0700 2010-11-01 16:10:28 -0700 Patch bug-44287-20101101160148.patch text/plain 5423 simon.fraser ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4ZWYxNDQwOWFlOWVhZWRlMjZmOTBiNWY0ZWRjYmNiYzMxMWU2NWMxLi5hMjg3Y2Y5 NWNhNzc1ODg2NDgzYWE2NmU5YjQyNDI4MWY1MzEwZjY1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAK IDIwMTAtMTEtMDEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXNzZXJ0aW9uIGZh aWx1cmUgaW4gRnJhbWVWaWV3OjpsYXlvdXQgd2hlbiBjbGlja2luZyBvbiBhIFlvdVR1YmUgdmlk ZW8gb24geW91dHViZS5jb20gZnJvbnQgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQyODcKKyAgICAgICAgCisgICAgICAgIFRlc3RjYXNlIHRo YXQgcmVsb2FkcyBhIGZyYW1lc2V0LCB3aXRoIGEgc3ViZnJhbWUgdGhhdCBmb3JjZXMgbGF5b3V0 IGZyb20KKyAgICAgICAgYW4gb251bmxvYWQgaGFuZGxlci4KKworICAgICAgICAqIGZhc3QvZnJh bWVzL2xheW91dC1hZnRlci1kZXN0cnVjdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvZnJhbWVzL2xheW91dC1hZnRlci1kZXN0cnVjdGlvbi5odG1sOiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbGF5b3V0LWFmdGVyLWRlc3RydWN0aW9uLXN1 YmZyYW1lLmh0bWw6IEFkZGVkLgorCisyMDEwLTExLTAxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5m cmFzZXJAYXBwbGUuY29tPgorCiAgICAgICAgIEZpeCB0ZXN0IGZhaWx1cmVzIG9uIFF0IGJ5IGF2 b2lkaW5nIHJlZmVyZW5jZXMgdG8gZXh0ZXJuYWwgaW1hZ2UgZmlsZXMuCiAgICAgICAgIAogICAg ICAgICAqIGZhc3QvYmFja2dyb3VuZHMvbXVsdGlwbGUtYmFja2dyb3VuZHMtY29tcHV0ZWQtc3R5 bGUtZXhwZWN0ZWQudHh0OgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvbGF5 b3V0LWFmdGVyLWRlc3RydWN0aW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZnJh bWVzL2xheW91dC1hZnRlci1kZXN0cnVjdGlvbi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODgx MDk1NTU2OTU0MTU2MGYyY2FmOWU5NDA4ZWQ0N2QwNzViNzAyMAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2xheW91dC1hZnRlci1kZXN0cnVjdGlvbi1leHBlY3Rl ZC50eHQKQEAgLTAsMCArMSw2IEBACitmcmFtZSAiPCEtLWZyYW1lUGF0aCAvLzwhLS1mcmFtZTAt LT4tLT4iIC0gaGFzIDEgb251bmxvYWQgaGFuZGxlcihzKQorZnJhbWUgIjwhLS1mcmFtZVBhdGgg Ly88IS0tZnJhbWUwLS0+LS0+IiAtIGhhcyAxIG9udW5sb2FkIGhhbmRsZXIocykKK1RoaXMgdGVz dCBzaG91bGQgbm90IGFzc2VydCBvbiByZWxvYWQgaW4gYSBkZWJ1ZyBidWlsZC4KKworRWxlbWVu dCBpbiB0b3AgZnJhbWUKKyAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2xh eW91dC1hZnRlci1kZXN0cnVjdGlvbi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvbGF5 b3V0LWFmdGVyLWRlc3RydWN0aW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2UxYzgzZjUwZGNjYmIyMWM3 ZGUxZmQ3YTRjMTI2OWZkMDRhMzc1ZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZnJhbWVzL2xheW91dC1hZnRlci1kZXN0cnVjdGlvbi5odG1sCkBAIC0wLDAgKzEsMjcgQEAK KzxzY3JpcHQ+CitmdW5jdGlvbiBydW5UZXN0KCkKK3sKKyAgICBpZiAoIXdpbmRvdy5zZXNzaW9u U3RvcmFnZSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIGlmICh3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpIHsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9u ZSgpOworICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgfQor CisgICAgaWYgKHNlc3Npb25TdG9yYWdlLnRlc3RDb21wbGV0ZWQpIHsKKyAgICAgICAgZGVsZXRl IHNlc3Npb25TdG9yYWdlLnRlc3RDb21wbGV0ZWQ7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlE b25lKCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc2Vzc2lvblN0b3JhZ2UudGVzdENvbXBsZXRl ZCA9IHRydWU7CisgICAgICAgIGRvY3VtZW50LmxvY2F0aW9uLnJlbG9hZCh0cnVlKTsKKyAgICB9 Cit9CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgcnVuVGVzdCwgZmFsc2UpOwor PC9zY3JpcHQ+Cis8cD5UaGlzIHRlc3Qgc2hvdWxkIG5vdCBhc3NlcnQgb24gcmVsb2FkIGluIGEg ZGVidWcgYnVpbGQuPC9wPgorPGRpdiBpZD0iZWxlbWVudCI+RWxlbWVudCBpbiB0b3AgZnJhbWU8 L2Rpdj4KKzxpZnJhbWUgc3JjPSJyZXNvdXJjZXMvbGF5b3V0LWFmdGVyLWRlc3RydWN0aW9uLXN1 YmZyYW1lLmh0bWwiPjwvaWZyYW1lPgorPGlmcmFtZSA+PC9pZnJhbWU+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbGF5b3V0LWFmdGVyLWRlc3RydWN0aW9u LXN1YmZyYW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJjZXMvbGF5b3V0 LWFmdGVyLWRlc3RydWN0aW9uLXN1YmZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGFlNWRmMTBlMDVk MmNiMzM5MGEyNjMzNTIyN2U1ZTA1ZmVmYTAxYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy9sYXlvdXQtYWZ0ZXItZGVzdHJ1Y3Rpb24tc3ViZnJh bWUuaHRtbApAQCAtMCwwICsxLDEwIEBACis8c2NyaXB0PgorZnVuY3Rpb24gdW5sb2FkSGFuZGxl cigpCit7CisgICAgdmFyIGVsZW1lbnQgPSBwYXJlbnQuZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo ImVsZW1lbnQiKTsKKyAgICBlbGVtZW50LnNldEF0dHJpYnV0ZSgic3R5bGUiLCAiaGVpZ2h0OiAx MDBweCIpOworICAgIGVsZW1lbnQub2Zmc2V0VG9wOworfQorPC9zY3JpcHQ+Cis8Ym9keSBvbnVu bG9hZD0idW5sb2FkSGFuZGxlcigpIj4KK1RoaXMgaXMgZnJhbWUgRC4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzhiMmYzZDI3OTFlZjc0 MWVjOTMxZjQzY2IwYTg5OTg4YzQ0ZDhmNy4uMjljOTg4YzRkZTEyMzhiZjMxOWE5ZTAyYzdiZjJi YzhkY2Q0YjQ0ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0xMS0wMSAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSBpbiBGcmFtZVZpZXc6OmxheW91dCB3aGVu IGNsaWNraW5nIG9uIGEgWW91VHViZSB2aWRlbyBvbiB5b3V0dWJlLmNvbSBmcm9udCBwYWdlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDI4NworICAg ICAgICAKKyAgICAgICAgV2hlbiByZW1vdmluZyBzdWJmcmFtZXMsIGl0J3MgcG9zc2libGUgZm9y IGxheW91dCgpIHRvIGdldCBjYWxsZWQgb24gYSBGcmFtZVZpZXcKKyAgICAgICAgZm9yIGEgRnJh bWUgdGhhdCBoYXMgYmVlbiByZW1vdmVkIGZyb20gdGhlIGZyYW1lIHRyZWUuIFRoaXMgY2FuIGhh cHBlbiBpZiB0aGUgcGFyZW50CisgICAgICAgIGRvY3VtZW50IGhhcHBlbnMgdG8gZG8gYSBsYXlv dXQoKSB3aGlsZSBSZW5kZXJWaWV3IHN0aWxsIGhhcyBhIHJlZmVyZW5jZSB0byB0aGUgd2lkZ2V0 CisgICAgICAgIGZvciB0aGUgcmVtb3ZlZCBmcmFtZTsgdXBkYXRlV2lkZ2V0UG9zaXRpb24oKSB3 aWxsIHRyeSB0byBmb3JjZSBhIGxheW91dCgpIG9uIHRoZSAKKyAgICAgICAgc3ViZnJhbWUuCisg ICAgICAgIAorICAgICAgICBGaXggYnkgY2hlY2tpbmcgdGhhdCB0aGUgRnJhbWVWaWV3J3MgRnJh bWUgc3RpbGwgaGFzIGEgcmVmZXJlbmNlIHRvIHRoZSBwYWdlIGJlZm9yZQorICAgICAgICBjYWxs aW5nIGxheW91dCgpIG9uIHRoZSBzdWJmcmFtZS4KKworICAgICAgICBUZXN0OiBmYXN0L2ZyYW1l cy9sYXlvdXQtYWZ0ZXItZGVzdHJ1Y3Rpb24uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlcldpZGdldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJXaWRnZXQ6OnVwZGF0ZVdp ZGdldFBvc2l0aW9uKToKKwogMjAxMC0xMS0wMSAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJXaWRnZXQuY3BwCmluZGV4IDZlYzViNzA4ZDRlMjQ5MDc2ZWYyOWM4NjFjNjNkZTY1YzBmMzIx NzMuLjFhNDkxOTlkOTUyZmMzMDFlMDY0M2JmMzlhZGQ2ZWMwODMxMjcyODEgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcldpZGdldC5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyV2lkZ2V0LmNwcApAQCAtMzQ5LDcgKzM0OSw4IEBAIHZvaWQgUmVuZGVyV2lkZ2V0 Ojp1cGRhdGVXaWRnZXRQb3NpdGlvbigpCiAgICAgLy8gY29udGVudCBzaXplIGlzIHdyb25nKSB3 ZSBoYXZlIHRvIGRvIGEgbGF5b3V0IHRvIHNldCB0aGUgcmlnaHQgd2lkZ2V0IHNpemUKICAgICBp ZiAobV93aWRnZXQgJiYgbV93aWRnZXQtPmlzRnJhbWVWaWV3KCkpIHsKICAgICAgICAgRnJhbWVW aWV3KiBmcmFtZVZpZXcgPSBzdGF0aWNfY2FzdDxGcmFtZVZpZXcqPihtX3dpZGdldC5nZXQoKSk7 Ci0gICAgICAgIGlmIChib3VuZHNDaGFuZ2VkIHx8IGZyYW1lVmlldy0+bmVlZHNMYXlvdXQoKSkK KyAgICAgICAgLy8gQ2hlY2sgdGhlIGZyYW1lJ3MgcGFnZSB0byBtYWtlIHN1cmUgdGhhdCB0aGUg ZnJhbWUgaXNuJ3QgaW4gdGhlIHByb2Nlc3Mgb2YgYmVpbmcgZGVzdHJveWVkLgorICAgICAgICBp ZiAoKGJvdW5kc0NoYW5nZWQgfHwgZnJhbWVWaWV3LT5uZWVkc0xheW91dCgpKSAmJiBmcmFtZVZp ZXctPmZyYW1lKCktPnBhZ2UoKSkKICAgICAgICAgICAgIGZyYW1lVmlldy0+bGF5b3V0KCk7CiAg ICAgfQogfQo=