115412 2013-04-30 05:36:10 -0700 [BlackBerry] Crash due to an assert in FrameView::doDeferredRepaints 2013-05-14 01:52:25 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned anilsson commit-queue jpetsovits rwlbuis oldest_to_newest 883028 0 cgarcia 2013-04-30 05:36:10 -0700 PR 328223 Program terminated with signal 11, Segmentation fault. #0 0x7c65208c in WebCore::FrameView::doDeferredRepaints (this=0x8094400) at /home/cgarcia/rim/webkit/Source/WebCore/page/FrameView.cpp:2227 2227 ASSERT(!m_deferringRepaints); (gdb) bt #0 0x7c65208c in WebCore::FrameView::doDeferredRepaints (this=0x8094400) at /home/cgarcia/rim/webkit/Source/WebCore/page/FrameView.cpp:2227 #1 0x7c652036 in WebCore::FrameView::flushDeferredRepaints (this=0x8094400) at /home/cgarcia/rim/webkit/Source/WebCore/page/FrameView.cpp:2219 #2 0x7c6562a4 in WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive (this=0x8094400) at /home/cgarcia/rim/webkit/Source/WebCore/page/FrameView.cpp:3625 #3 0x78e27506 in BlackBerry::WebKit::WebPagePrivate::requestLayoutIfNeeded (this=0x8096558) at /home/cgarcia/rim/webkit/Source/WebKit/blackberry/Api/WebPage.cpp:1347 #4 0x78e2840e in BlackBerry::WebKit::WebPagePrivate::zoomToInitialScaleOnLoad (this=0x8096558) at /home/cgarcia/rim/webkit/Source/WebKit/blackberry/Api/WebPage.cpp:1700 #5 0x78e28008 in BlackBerry::WebKit::WebPagePrivate::layoutFinished (this=0x8096558) at /home/cgarcia/rim/webkit/Source/WebKit/blackberry/Api/WebPage.cpp:1608 #6 0x78e5cd90 in WebCore::ChromeClientBlackBerry::layoutUpdated (this=0x8104470, frame=0x80ef3b0) at /home/cgarcia/rim/webkit/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp:743 #7 0x7c64fba6 in WebCore::FrameView::layout (this=0x8094400, allowSubtree=true) at /home/cgarcia/rim/webkit/Source/WebCore/page/FrameView.cpp:1379 #8 0x7c656242 in WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive (this=0x8094400) at /home/cgarcia/rim/webkit/Source/WebCore/page/FrameView.cpp:3611 #9 0x78e27506 in BlackBerry::WebKit::WebPagePrivate::requestLayoutIfNeeded (this=0x8096558) at /home/cgarcia/rim/webkit/Source/WebKit/blackberry/Api/WebPage.cpp:1347 #10 0x78e2840e in BlackBerry::WebKit::WebPagePrivate::zoomToInitialScaleOnLoad (this=0x8096558) at /home/cgarcia/rim/webkit/Source/WebKit/blackberry/Api/WebPage.cpp:1700 #11 0x78e5ce1e in WebCore::ChromeClientBlackBerry::didDiscoverFrameSet (this=0x8104470, frame=0x80ef3b0) at /home/cgarcia/rim/webkit/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp:769 #12 0x7c334e2c in WebCore::HTMLFrameSetElement::attach (this=0x82bedb8) at /home/cgarcia/rim/webkit/Source/WebCore/html/HTMLFrameSetElement.cpp:197 #13 0x7c1a65c8 in WebCore::Node::reattach (this=0x82bedb8) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Node.h:896 #14 0x7c1a0506 in WebCore::Element::recalcStyle (this=0x82bedb8, change=WebCore::Node::NoChange) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Element.cpp:1383 #15 0x7c1a0862 in WebCore::Element::recalcStyle (this=0x821cf38, change=WebCore::Node::NoChange) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Element.cpp:1448 #16 0x7c1a0862 in WebCore::Element::recalcStyle (this=0x821ce18, change=WebCore::Node::NoChange) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Element.cpp:1448 #17 0x7c13fcd4 in WebCore::Document::recalcStyle (this=0x826de00, change=WebCore::Node::NoChange) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Document.cpp:1840 #18 0x7c13fede in WebCore::Document::updateStyleIfNeeded (this=0x826de00) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Document.cpp:1885 #19 0x7c1400ae in WebCore::Document::updateLayout (this=0x826de00) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Document.cpp:1916 #20 0x7c1401b2 in WebCore::Document::updateLayoutIgnorePendingStylesheets (this=0x826de00) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Document.cpp:1954 #21 0x7c19dc64 in WebCore::Element::offsetTop (this=0x821cf38) at /home/cgarcia/rim/webkit/Source/WebCore/dom/Element.cpp:509 #22 0x7cd83e56 in WebCore::jsElementOffsetTop (exec=0x9300058, slotBase=...) at /home/cgarcia/rim/webkit/WebKitBuild/armle-v7/Debug/DerivedSources/WebCore/JSElement.cpp:321 #23 0x78f0832a in JSC::PropertySlot::getValue (this=0x7dfddc8, exec=0x9300058, propertyName=...) at /home/cgarcia/rim/webkit/Source/JavaScriptCore/runtime/PropertySlot.h:76 #24 0x7cc30c36 in JSC::JSValue::get (this=0x7dfddf8, exec=0x9300058, propertyName=..., slot=...) at /home/cgarcia/rim/webkit/Source/JavaScriptCore/runtime/JSCJSValueInlines.h:639 #25 0x0bee4cac in JSC::LLInt::llint_slow_path_get_by_id (exec=0x9300058, pc=0x8356608) at /home/cgarcia/rim/webkit/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp:917 #26 0x0beeb8fe in llint_op_get_by_id () from libjavascriptcore.so.0 #27 0x0beeb8fe in llint_op_get_by_id () from libjavascriptcore.so.0 883030 1 200102 cgarcia 2013-04-30 05:44:21 -0700 Created attachment 200102 Patch 883061 2 200102 anilsson 2013-04-30 06:53:38 -0700 Comment on attachment 200102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200102&action=review LGTM with some comments > Source/WebKit/blackberry/Api/BackingStore.cpp:393 > + m_webPage->d->updateLayoutAndStyleIfNeededRecursive(); You could consider calling the BackingStorePrivate::requestLayoutIfNeeded() method, which encapsulates this exact call. > Source/WebKit/blackberry/Api/BackingStore.cpp:1108 > void BackingStorePrivate::requestLayoutIfNeeded() const You could consider renaming this method "updateLayoutAndStyleIfNeededRecursive" to fit with the new naming scheme, but I would say the return on investment is low since we're planning to remove the BackingStore class eventually. 888295 3 200102 rwlbuis 2013-05-13 08:40:08 -0700 Comment on attachment 200102 Patch Ok. 888739 4 200102 commit-queue 2013-05-14 01:52:23 -0700 Comment on attachment 200102 Patch Clearing flags on attachment: 200102 Committed r150060: <http://trac.webkit.org/changeset/150060> 888740 5 commit-queue 2013-05-14 01:52:25 -0700 All reviewed patches have been landed. Closing bug. 200102 2013-04-30 05:44:21 -0700 2013-05-14 01:52:23 -0700 Patch bb-layout.diff text/plain 9151 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IGUzNTI5ZmUuLmY1ODE0NGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDEzLTA0LTMwICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbQmxh Y2tCZXJyeV0gQ3Jhc2ggZHVlIHRvIGFuIGFzc2VydCBpbiBGcmFtZVZpZXc6OmRvRGVmZXJyZWRS ZXBhaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTE1NDEyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UFIgMTE1NDEyCisKKyAgICAgICAgVGhlIHByb2JsZW0gaXMgdGhhdCB3ZSBhcmUgY2FsbGluZwor ICAgICAgICB1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKCkgKGJlY2F1c2Ug b2YKKyAgICAgICAgem9vbVRvSW5pdGlhbFNjYWxlT25Mb2FkKSBmcm9tIENob21lQ2xpZW50Ojps YXlvdXRVcGRhdGVkKCkKKyAgICAgICAgY2FsbGJhY2sgd2hpY2ggaXMgbm90IGV4cGVjdGVkLiBJ dCdzIGV4cGVjdGVkIHRvIGJlIGNhbGxlZCByaWdodAorICAgICAgICBiZWZvcmUgcGFpbnRpbmcs IGFuZCBub3QgcmlnaHQgYWZ0ZXIgcGFpbnRpbmcuIEV2ZW4gaWYgYSBuZXcKKyAgICAgICAgbGF5 b3V0IGlzIG5vdCBkb25lLCB1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKCkg Y2FsbHMKKyAgICAgICAgZmx1c2hEZWZlcnJlZFJlcGFpbnRzKCkgYW5kIGl0J3MgcG9zc2libGUg dGhhdCB0aGlzIGlzIGNhbGxlZCBpbgorICAgICAgICB0aGUgbWlkZGxlIG9mIGEgYmVnaW5EZWZl cnJlZFJlcGFpbnRzKCkgYW5kIGVuZERlZmVycmVkUmVwYWludHMoKQorICAgICAgICBhcHBhcmVu dGx5LgorICAgICAgICBJbiBnZW5lcmFsIG9ubHkgQmFja2luZ1N0b3JlIHNob3VsZCBjYWxsCisg ICAgICAgIHVwZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUgYmVmb3JlIHBhaW50 aW5nLCBhbmQgYSBzaW1wbGUKKyAgICAgICAgbGF5b3V0IGlzIGVub3VnaCBpbiBhbGwgb3RoZXIg Y2FzZXMgbGlrZSByZXNpemluZy4gVGhpcyBwYXRjaCByZW5hbWVzCisgICAgICAgIHJlcXVlc3RM YXlvdXRJZk5lZWRlZCBhcyB1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlIHRv CisgICAgICAgIG1ha2UgbW9yZSBvYnZpb3VzIHdoYXQgaXQgZG9lcywgYW5kIGFkZHMgbGF5b3V0 SWZOZWVkZWQgdGhhdCBjYWxscworICAgICAgICBsYXlvdXQuIFRoZSBmb3JtZXIgaXMgdXNlZCBi eSB0aGUgQmFja2luZ1N0b3JlIGFuZCB0aGUgbGF0dGVyIGJ5CisgICAgICAgIFdlYlBhZ2UuCisK KyAgICAgICAgKiBBcGkvQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6QmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVzdW1lU2NyZWVuVXBkYXRlcyk6CisgICAgICAg IChCbGFja0JlcnJ5OjpXZWJLaXQ6OkJhY2tpbmdTdG9yZVByaXZhdGU6OnJlcXVlc3RMYXlvdXRJ Zk5lZWRlZCk6CisgICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6em9vbUFib3V0UG9pbnQpOgorICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5l ZWRlZFJlY3Vyc2l2ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2 YXRlOjpsYXlvdXRJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlUHJpdmF0ZTo6b3ZlcmZsb3dFeGNlZWRzQ29udGVudHNTaXpl KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6Onpvb21Ub0lu aXRpYWxTY2FsZU9uTG9hZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQ cml2YXRlOjp3ZWJDb250ZXh0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFn ZVByaXZhdGU6Onpvb21BbmltYXRpb25GaW5pc2hlZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpzZXRWaWV3cG9ydFNpemUpOgorICAgICAgICAoQmxhY2tC ZXJyeTo6V2ViS2l0OjpXZWJQYWdlOjpzZXREZWZhdWx0TGF5b3V0U2l6ZSk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpyb290TGF5ZXJDb21taXRUaW1lckZp cmVkKToKKyAgICAgICAgKiBBcGkvV2ViUGFnZV9wLmg6CisgICAgICAgIChXZWJQYWdlUHJpdmF0 ZSk6CisKIDIwMTMtMDQtMjkgIEpha29iIFBldHNvdml0cyAgPGpwZXRzb3ZpdHNAYmxhY2tiZXJy eS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFJlcGxhY2UgZGlzYXBwZWFyaW5nIGZpbGxC dWZmZXIoKSBBUEkgd2l0aCBncmFwaGljcyBjb250ZXh0IGRyYXdpbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcCBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvQmFja2luZ1N0b3JlLmNwcAppbmRleCA2YmY0YzcxLi44ZTA0YzRl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0JhY2tpbmdTdG9yZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9CYWNraW5nU3RvcmUuY3BwCkBA IC0zOTAsNyArMzkwLDcgQEAgdm9pZCBCYWNraW5nU3RvcmVQcml2YXRlOjpyZXN1bWVTY3JlZW5V cGRhdGVzKEJhY2tpbmdTdG9yZTo6UmVzdW1lVXBkYXRlT3BlcmF0aW8KICNpZiBVU0UoQUNDRUxF UkFURURfQ09NUE9TSVRJTkcpCiAgICAgLy8gSXQgbmVlZHMgbGF5b3V0IGFuZCByZW5kZXIgYmVm b3JlIGNvbW1pdHRpbmcgcm9vdCBsYXllciBpZiB3ZSBzZXQgT1NEUwogICAgIGlmIChtX3dlYlBh Z2UtPmQtPm5lZWRzT25lU2hvdERyYXdpbmdTeW5jaHJvbml6YXRpb24oKSkKLSAgICAgICAgbV93 ZWJQYWdlLT5kLT5yZXF1ZXN0TGF5b3V0SWZOZWVkZWQoKTsKKyAgICAgICAgbV93ZWJQYWdlLT5k LT51cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKCk7CiAKICAgICAvLyBUaGlz IHdpbGwgYWxzbyBibGl0IHNpbmNlIHdlIHNldCB0aGUgT1NEUyBmbGFnIGFib3ZlLgogICAgIG1f d2ViUGFnZS0+ZC0+Y29tbWl0Um9vdExheWVySWZOZWVkZWQoKTsKQEAgLTExMDcsNyArMTEwNyw3 IEBAIFRpbGVJbmRleExpc3QgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVuZGVyKGNvbnN0IFRpbGVJ bmRleExpc3QmIHRpbGVJbmRleExpc3QpCiAKIHZvaWQgQmFja2luZ1N0b3JlUHJpdmF0ZTo6cmVx dWVzdExheW91dElmTmVlZGVkKCkgY29uc3QKIHsKLSAgICBtX3dlYlBhZ2UtPmQtPnJlcXVlc3RM YXlvdXRJZk5lZWRlZCgpOworICAgIG1fd2ViUGFnZS0+ZC0+dXBkYXRlTGF5b3V0QW5kU3R5bGVJ Zk5lZWRlZFJlY3Vyc2l2ZSgpOwogfQogCiB2b2lkIEJhY2tpbmdTdG9yZVByaXZhdGU6OnJlbmRl ckFuZEJsaXRWaXNpYmxlQ29udGVudHNJbW1lZGlhdGVseSgpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlLmNwcAppbmRleCA4MDU3MjgwLi4zOWFmYjM0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKQEAgLTEyNjMsOCArMTI2Myw4IEBAIGJvb2wg V2ViUGFnZVByaXZhdGU6Onpvb21BYm91dFBvaW50KGRvdWJsZSB1bmNsYW1wZWRTY2FsZSwgY29u c3QgRmxvYXRQb2ludCYgYW5jCiAKICAgICBpZiAobV93ZWJQYWdlLT5zZXR0aW5ncygpLT50ZXh0 UmVmbG93TW9kZSgpID09IFdlYlNldHRpbmdzOjpUZXh0UmVmbG93RW5hYmxlZCkgewogICAgICAg ICAvLyBUaGlzIGlzIGEgaGFjayBmb3IgZW1haWwgd2hpY2ggaGFzIHJlZmxvdyBhbHdheXMgdHVy bmVkIG9uLgotICAgICAgICBtX21haW5GcmFtZS0+dmlldygpLT5zZXROZWVkc0xheW91dCgpOwot ICAgICAgICByZXF1ZXN0TGF5b3V0SWZOZWVkZWQoKTsKKyAgICAgICAgc2V0TmVlZHNMYXlvdXQo KTsKKyAgICAgICAgbGF5b3V0SWZOZWVkZWQoKTsKICAgICAgICAgaWYgKG1fY3VycmVudFBpbmNo Wm9vbU5vZGUpCiAgICAgICAgICAgICBuZXdTY3JvbGxQb3NpdGlvbiA9IGNhbGN1bGF0ZVJlZmxv d2VkU2Nyb2xsUG9zaXRpb24oYW5jaG9yT2Zmc2V0LCBzY2FsZSA9PSBtaW5pbXVtU2NhbGUoKSA/ IDEgOiBpbnZlcnNlU2NhbGUpOwogICAgICAgICAgbV9jdXJyZW50UGluY2hab29tTm9kZSA9IDA7 CkBAIC0xMzMxLDcgKzEzMzEsNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXROZWVkc0xheW91 dCgpCiAgICAgdmlldy0+c2V0TmVlZHNMYXlvdXQoKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJpdmF0 ZTo6cmVxdWVzdExheW91dElmTmVlZGVkKCkgY29uc3QKK3ZvaWQgV2ViUGFnZVByaXZhdGU6OnVw ZGF0ZUxheW91dEFuZFN0eWxlSWZOZWVkZWRSZWN1cnNpdmUoKSBjb25zdAogewogICAgIEZyYW1l VmlldyogdmlldyA9IG1fbWFpbkZyYW1lLT52aWV3KCk7CiAgICAgQVNTRVJUKHZpZXcpOwpAQCAt MTMzOSw2ICsxMzM5LDE0IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnJlcXVlc3RMYXlvdXRJZk5l ZWRlZCgpIGNvbnN0CiAgICAgQVNTRVJUKCF2aWV3LT5uZWVkc0xheW91dCgpKTsKIH0KIAordm9p ZCBXZWJQYWdlUHJpdmF0ZTo6bGF5b3V0SWZOZWVkZWQoKSBjb25zdAoreworICAgIEZyYW1lVmll dyogdmlldyA9IG1fbWFpbkZyYW1lLT52aWV3KCk7CisgICAgQVNTRVJUKHZpZXcpOworICAgIGlm ICh2aWV3LT5uZWVkc0xheW91dCgpKQorICAgICAgICB2aWV3LT5sYXlvdXQoKTsKK30KKwogSW50 UG9pbnQgV2ViUGFnZVByaXZhdGU6OnNjcm9sbFBvc2l0aW9uKCkgY29uc3QKIHsKICAgICBpZiAo IW1fYmFja2luZ1N0b3JlQ2xpZW50KQpAQCAtMTU2MCw3ICsxNTY4LDcgQEAgdm9pZCBXZWJQYWdl UHJpdmF0ZTo6b3ZlcmZsb3dFeGNlZWRzQ29udGVudHNTaXplKCkKICAgICBpZiAoYWJzb2x1dGVW aXNpYmxlT3ZlcmZsb3dTaXplKCkud2lkdGgoKSA8IERFRkFVTFRfTUFYX0xBWU9VVF9XSURUSCAm JiAhaGFzVmlydHVhbFZpZXdwb3J0KCkpIHsKICAgICAgICAgaWYgKHNldFZpZXdNb2RlKHZpZXdN b2RlKCkpKSB7CiAgICAgICAgICAgICBzZXROZWVkc0xheW91dCgpOwotICAgICAgICAgICAgcmVx dWVzdExheW91dElmTmVlZGVkKCk7CisgICAgICAgICAgICBsYXlvdXRJZk5lZWRlZCgpOwogICAg ICAgICB9CiAgICAgfQogfQpAQCAtMTY2Miw3ICsxNjcwLDcgQEAgdm9pZCBXZWJQYWdlUHJpdmF0 ZTo6em9vbVRvSW5pdGlhbFNjYWxlT25Mb2FkKCkKICNpZiBERUJVR19XRUJQQUdFX0xPQUQKICAg ICAgICAgUGxhdGZvcm06OmxvZ0Fsd2F5cyhQbGF0Zm9ybTo6TG9nTGV2ZWxJbmZvLCAiV2ViUGFn ZVByaXZhdGU6Onpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCBjb250ZW50IGlzIGVtcHR5ISIpOwog I2VuZGlmCi0gICAgICAgIHJlcXVlc3RMYXlvdXRJZk5lZWRlZCgpOworICAgICAgICBsYXlvdXRJ Zk5lZWRlZCgpOwogICAgICAgICBub3RpZnlUcmFuc2Zvcm1lZENvbnRlbnRzU2l6ZUNoYW5nZWQo KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE2ODgsNyArMTY5Niw3IEBAIHZvaWQgV2Vi UGFnZVByaXZhdGU6Onpvb21Ub0luaXRpYWxTY2FsZU9uTG9hZCgpCiAgICAgfQogCiAgICAgLy8g em9vbUFib3V0UG9pbnQgYWJvdmUgY2FuIGFsc28gdG9nZ2xlIHNldE5lZWRzTGF5b3V0IGFuZCBj YXVzZSByZWN1cnNpdmUgbGF5b3V0Li4uCi0gICAgcmVxdWVzdExheW91dElmTmVlZGVkKCk7Cisg ICAgbGF5b3V0SWZOZWVkZWQoKTsKIAogICAgIGlmICghcGVyZm9ybWVkWm9vbSkgewogICAgICAg ICAvLyBXZSBvbmx5IG5vdGlmeSBpZiB3ZSBkaWRuJ3QgcGVyZm9ybSB6b29tLCBiZWNhdXNlIHpv b20gd2lsbCBub3RpZnkgb24KQEAgLTIxNTYsNyArMjE2NCw3IEBAIFBsYXRmb3JtOjpXZWJDb250 ZXh0IFdlYlBhZ2VQcml2YXRlOjp3ZWJDb250ZXh0KFRhcmdldERldGVjdGlvblN0cmF0ZWd5IHN0 cmF0ZWd5CiAgICAgICAgIHJldHVybiBjb250ZXh0OwogICAgIH0KIAotICAgIHJlcXVlc3RMYXlv dXRJZk5lZWRlZCgpOworICAgIGxheW91dElmTmVlZGVkKCk7CiAKICAgICBib29sIG5vZGVBbGxv d1NlbGVjdGlvbk92ZXJyaWRlID0gZmFsc2U7CiAgICAgTm9kZSogbGlua05vZGUgPSBub2RlLT5l bmNsb3NpbmdMaW5rRXZlbnRQYXJlbnRPclNlbGYoKTsKQEAgLTI5MjEsNyArMjkyOSw3IEBAIHZv aWQgV2ViUGFnZVByaXZhdGU6Onpvb21BbmltYXRpb25GaW5pc2hlZChkb3VibGUgZmluYWxBbmlt YXRpb25TY2FsZSwgY29uc3QgV2ViCiAgICAgfQogCiAjaWYgRU5BQkxFKFZJRVdQT1JUX1JFRkxP VykKLSAgICByZXF1ZXN0TGF5b3V0SWZOZWVkZWQoKTsKKyAgICBsYXlvdXRJZk5lZWRlZCgpOwog ICAgIGlmICh3aWxsVXNlVGV4dFJlZmxvdyAmJiBtX3Nob3VsZFJlZmxvd0Jsb2NrKSB7CiAgICAg ICAgIFBsYXRmb3JtOjpJbnRQb2ludCByb3VuZGVkUmVmbG93T2Zmc2V0KAogICAgICAgICAgICAg c3RkOjpmbG9vcmYobV9maW5hbEFuaW1hdGlvbkRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWZsb3dP ZmZzZXQueCgpKSwKQEAgLTM2NjcsNyArMzY3NSw3IEBAIGJvb2wgV2ViUGFnZVByaXZhdGU6OnNl dFZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiB0cmFuc2Zvcm1lZEFjdHVhbFZpc2libGVTaXpl CiAgICAgYm9vbCBzdGlsbE5lZWRzTGF5b3V0ID0gbmVlZHNMYXlvdXQ7CiAgICAgd2hpbGUgKHN0 aWxsTmVlZHNMYXlvdXQpIHsKICAgICAgICAgc2V0TmVlZHNMYXlvdXQoKTsKLSAgICAgICAgcmVx dWVzdExheW91dElmTmVlZGVkKCk7CisgICAgICAgIGxheW91dElmTmVlZGVkKCk7CiAgICAgICAg IHN0aWxsTmVlZHNMYXlvdXQgPSBmYWxzZTsKIAogICAgICAgICAvLyBFbXVsYXRlIHRoZSB6b29t VG9GaXRXaWR0aE9uTG9hZCBhbGdvcml0aG0gaWYgd2UncmUgcm90YXRpbmcuCkBAIC0zNjk1LDcg KzM3MDMsNyBAQCBib29sIFdlYlBhZ2VQcml2YXRlOjpzZXRWaWV3cG9ydFNpemUoY29uc3QgSW50 U2l6ZSYgdHJhbnNmb3JtZWRBY3R1YWxWaXNpYmxlU2l6ZQogICAgICAgICBJbnRSZWN0IGFjdHVh bFZpc2libGVSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChyb3RhdGlvbk1hdHJpeC5pbnZlcnNlKCku bWFwUmVjdChGbG9hdFJlY3Qodmlld3BvcnRSZWN0KSkpOwogICAgICAgICBtX21haW5GcmFtZS0+ dmlldygpLT5zZXRGaXhlZFJlcG9ydGVkU2l6ZShhY3R1YWxWaXNpYmxlUmVjdC5zaXplKCkpOwog ICAgICAgICBtX21haW5GcmFtZS0+dmlldygpLT5yZXBhaW50Rml4ZWRFbGVtZW50c0FmdGVyU2Ny b2xsaW5nKCk7Ci0gICAgICAgIHJlcXVlc3RMYXlvdXRJZk5lZWRlZCgpOworICAgICAgICBsYXlv dXRJZk5lZWRlZCgpOwogICAgICAgICBtX21haW5GcmFtZS0+dmlldygpLT51cGRhdGVGaXhlZEVs ZW1lbnRzQWZ0ZXJTY3JvbGxpbmcoKTsKICAgICB9CiAKQEAgLTM4NDAsNyArMzg0OCw3IEBAIHZv aWQgV2ViUGFnZTo6c2V0RGVmYXVsdExheW91dFNpemUoY29uc3QgUGxhdGZvcm06OkludFNpemUm IHBsYXRmb3JtU2l6ZSkKICAgICBpZiAobmVlZHNMYXlvdXQpIHsKICAgICAgICAgZC0+c2V0TmVl ZHNMYXlvdXQoKTsKICAgICAgICAgaWYgKCFkLT5pc0xvYWRpbmcoKSkKLSAgICAgICAgICAgIGQt PnJlcXVlc3RMYXlvdXRJZk5lZWRlZCgpOworICAgICAgICAgICAgZC0+bGF5b3V0SWZOZWVkZWQo KTsKICAgICB9CiB9CiAKQEAgLTU1NjAsNyArNTU2OCw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6 OnJvb3RMYXllckNvbW1pdFRpbWVyRmlyZWQoVGltZXI8V2ViUGFnZVByaXZhdGU+KikKICAgICAv LyB0byB0ZXh0dXJlLgogICAgIC8vIFRoZSBsYXlvdXQgY2FuIGFsc28gdHVybiBvZiBjb21wb3Np dGluZyBhbHRvZ2V0aGVyLCBzbyB3ZSBuZWVkIHRvIGJlIHByZXBhcmVkCiAgICAgLy8gdG8gaGFu ZGxlIGEgb25lIHNob3QgZHJhd2luZyBzeW5jaHJvbml6YXRpb24gYWZ0ZXIgdGhlIGxheW91dC4K LSAgICByZXF1ZXN0TGF5b3V0SWZOZWVkZWQoKTsKKyAgICBsYXlvdXRJZk5lZWRlZCgpOwogCiAg ICAgLy8gSWYgd2UgdHJhbnNpdGlvbmVkIHRvIGRyYXdpbmcgdGhlIHJvb3QgbGF5ZXIgdXNpbmcg Y29tcG9zaXRvciBpbnN0ZWFkIG9mCiAgICAgLy8gYmFja2luZyBzdG9yZSwgZG9pbmcgYSBvbmUg c2hvdCBkcmF3aW5nIHN5bmNocm9uaXphdGlvbiB3aXRoIHRoZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZV9wLmgKaW5kZXggY2Q1YWM5Mi4uZTc1YWRlOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCkBAIC0xNTAsNyArMTUwLDggQEAgcHVibGlj OgogICAgIHZvaWQgem9vbUFuaW1hdGlvbkZpbmlzaGVkKGRvdWJsZSBmaW5hbFNjYWxlLCBjb25z dCBXZWJDb3JlOjpGbG9hdFBvaW50JiBmaW5hbERvY3VtZW50U2Nyb2xsUG9zaXRpb24sIGJvb2wg c2hvdWxkQ29uc3RyYWluU2Nyb2xsaW5nVG9Db250ZW50RWRnZSk7CiAKICAgICAvLyBDYWxsZWQg YnkgdGhlIGJhY2tpbmcgc3RvcmUgYXMgd2VsbCBhcyB0aGUgbWV0aG9kIGJlbG93LgotICAgIHZv aWQgcmVxdWVzdExheW91dElmTmVlZGVkKCkgY29uc3Q7CisgICAgdm9pZCB1cGRhdGVMYXlvdXRB bmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKCkgY29uc3Q7CisgICAgdm9pZCBsYXlvdXRJZk5lZWRl ZCgpIGNvbnN0OwogICAgIHZvaWQgc2V0TmVlZHNMYXlvdXQoKTsKIAogICAgIFdlYkNvcmU6Oklu dFBvaW50IHNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7Cg==