143675 2015-04-13 12:36:16 -0700 Regression: Scrolling on popsci.com spends too much time in FrameView::viewportsContentsChanged() 2015-04-14 15:50:37 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez bfulgham commit-queue esprehn+autocc glenn koivisto kondapallykalyan simon.fraser oldest_to_newest 1084908 0 cdumez 2015-04-13 12:36:16 -0700 Scrolling on popsci.com spends too much time in FrameView::viewportsContentsChanged(). Radar: <rdar://problem/20507791> 1084915 1 250666 cdumez 2015-04-13 12:41:55 -0700 Created attachment 250666 Patch 1084946 2 250666 simon.fraser 2015-04-13 13:33:58 -0700 Comment on attachment 250666 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250666&action=review > Source/WebCore/page/FrameView.cpp:2142 > if (auto* renderView = frame->contentRenderer()) > - renderView->resumePausedImageAnimationsIfNeeded(); > + renderView->resumePausedImageAnimationsIfNeeded(visibleRect); There's a behavior change here (and you don't have any tests that noticed it). Previously you were computing windowClipRect() for each subframe. Now you're just using the main frame's windowClipRect for those subframes, which seems wrong. 1085004 3 250683 cdumez 2015-04-13 16:55:39 -0700 Created attachment 250683 Patch 1085016 4 250683 commit-queue 2015-04-13 17:46:48 -0700 Comment on attachment 250683 Patch Clearing flags on attachment: 250683 Committed r182773: <http://trac.webkit.org/changeset/182773> 1085017 5 commit-queue 2015-04-13 17:46:52 -0700 All reviewed patches have been landed. Closing bug. 1085070 6 ap 2015-04-13 23:27:18 -0700 This appears to have broken Windows pretty thoroughly: <https://build.webkit.org/results/Apple%20Win%207%20Debug%20(Tests)/r182776%20(65689)/results.html>. 1085162 7 cdumez 2015-04-14 09:53:59 -0700 (In reply to comment #6) > This appears to have broken Windows pretty thoroughly: > <https://build.webkit.org/results/Apple%20Win%207%20Debug%20(Tests)/ > r182776%20(65689)/results.html>. Looking now. 1085165 8 cdumez 2015-04-14 09:56:57 -0700 (In reply to comment #7) > (In reply to comment #6) > > This appears to have broken Windows pretty thoroughly: > > <https://build.webkit.org/results/Apple%20Win%207%20Debug%20(Tests)/ > > r182776%20(65689)/results.html>. > > Looking now. Looks like the failures started later? This is when my patch landed on this bot: https://build.webkit.org/builders/Apple%20Win%207%20Debug%20%28Tests%29/builds/65687 1085167 9 cdumez 2015-04-14 10:00:10 -0700 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #6) > > > This appears to have broken Windows pretty thoroughly: > > > <https://build.webkit.org/results/Apple%20Win%207%20Debug%20(Tests)/ > > > r182776%20(65689)/results.html>. > > > > Looking now. > > Looks like the failures started later? This is when my patch landed on this > bot: > https://build.webkit.org/builders/Apple%20Win%207%20Debug%20%28Tests%29/ > builds/65687 Never mind, it does seem related to my change. Most crashes don't have a backtrace but I found one: 0018eee8 05ff4290 064f14f7 0018ef44 00000001 WTF!WTFCrash+0x21 0018ef4c 05ff4952 0018ef58 00000001 0018ef9c WebKit!WebCore::FrameView::windowClipRect+0x40 0018ef90 05ff490f 0ebc3ea8 0018efbc 05ffa4ff WebKit!WebCore::FrameView::resumeVisibleImageAnimationsIncludingSubframes+0x32 0018ef9c 05ffa4ff 0ebc3ea8 0060aa90 006060c0 WebKit!WebCore::FrameView::viewportContentsChanged+0xf 0018efbc 05ff56bf 0ebc3ea8 0018efd4 06911367 WebKit!WebCore::FrameView::performPostLayoutTasks+0x12f 0018efc8 06911367 0d18bc60 0018efe4 067e0259 WebKit!WebCore::FrameView::postLayoutTimerFired+0xf 0018efd4 067e0259 0ebc3ea8 0d18bc60 0018effc WebKit!std::_Pmf_wrap<void (__thiscall WebCore::WebSocket::*)(void),void,WebCore::WebSocket>::operator()+0x17 0018efe4 067e00f5 00000000 00000000 0d18bc60 WebKit!std::_Bind<1,void,std::_Pmf_wrap<void (__thiscall WebCore::XMLHttpRequest::*)(void),void,WebCore::XMLHttpRequest>,WebCore::XMLHttpRequest *>::_Do_call<,0>+0x39 0018effc 067e0116 0d18bc60 0018f014 067e0a72 WebKit!std::_Bind<1,void,std::_Pmf_wrap<void (__thiscall WebCore::XMLHttpRequest::*)(void),void,WebCore::XMLHttpRequest>,WebCore::XMLHttpRequest *>::operator()<>+0x25 0018f008 067e0a72 0d18bc58 0018f020 05cd5f78 WebKit!std::_Callable_obj<std::_Bind<1,void,std::_Pmf_wrap<void (__thiscall WebCore::XMLHttpRequest::*)(void),void,WebCore::XMLHttpRequest>,WebCore::XMLHttpRequest *>,0>::_ApplyX<void>+0x16 0018f014 05cd5f78 0ebc4050 0018f02c 05cd6f32 WebKit!std::_Func_impl<std::_Callable_obj<std::_Bind<1,void,std::_Pmf_wrap<void (__thiscall WebCore::XMLHttpRequest::*)(void),void,WebCore::XMLHttpRequest>,WebCore::XMLHttpRequest *>,0>,std::allocator<std::_Func_class<void> >,void>::_Do_call+0x12 0018f020 05cd6f32 0ebc4018 0018f05c 066d341c WebKit!std::_Func_class<void>::operator()+0x28 0018f02c 066d341c d3d79865 41d54b72 00000000 WebKit!WebCore::Timer::fired+0x12 0018f05c 066d32f6 0018f06c 06ad16bf 0018f098 WebKit!WebCore::ThreadTimers::sharedTimerFiredInternal+0x11c 0018f064 06ad16bf 0018f098 76f862fa 003d074e WebKit!WebCore::ThreadTimers::sharedTimerFired+0x16 0018f06c 76f862fa 003d074e 0000c126 00000000 WebKit!WebCore::TimerWindowWndProc+0x7f 1085190 10 cdumez 2015-04-14 10:45:00 -0700 The assertion being hit is likely this one, even though the line number does not exactly match: ASSERT(frame().view() == this); I am not sure yet how my patch could impact this invariant. Also, the crashes appear to be flaky on the Windows bot. 1085294 11 cdumez 2015-04-14 15:50:37 -0700 (In reply to comment #10) > The assertion being hit is likely this one, even though the line number does > not exactly match: > ASSERT(frame().view() == this); > > I am not sure yet how my patch could impact this invariant. Also, the > crashes appear to be flaky on the Windows bot. Windows bot is now in good shape after https://bugs.webkit.org/show_bug.cgi?id=143723. 250666 2015-04-13 12:41:55 -0700 2015-04-13 16:55:36 -0700 Patch bug-143675-20150413124100.patch text/plain 6297 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGUwNGRjNmY1ODA4YTNh ZmI1ZWNjOWI4MzU4ZTYxYjJlNmQyOGE5OS4uYjBlM2JkMmU5OGMyNzQ5MTRjNGQ4ZTU1NzM1YmJh MmExMTM5ODRkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA0LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbjogU2Nyb2xs aW5nIG9uIHBvcHNjaS5jb20gc3BlbmRzIHRvbyBtdWNoIHRpbWUgaW4gRnJhbWVWaWV3Ojp2aWV3 cG9ydHNDb250ZW50c0NoYW5nZWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQzNjc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDUwNzc5MT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wdXRl IHRoZSB2aXNpYmxlIHJlY3Qgb25seSBvbmNlIGluIEZyYW1lVmlldzo6dmlld3BvcnRDb250ZW50 c0NoYW5nZWQoKSBpbnN0ZWFkCisgICAgICAgIG9mIG9uY2UgcGVyIGZyYW1lIGluIHJlc3VtZVZp c2libGVJbWFnZUFuaW1hdGlvbnNJbmNsdWRpbmdTdWJmcmFtZXMoKSwgYXMgY29tcHV0aW5nCisg ICAgICAgIGl0IGNhbiBiZSBleHBlbnNpdmUgYW5kIHRoZXJlIGNhbiBiZSBhIGxvdCBvZiBmcmFt ZXMuCisKKyAgICAgICAgQWZ0ZXIgdGhpcyBjaGFuZ2UsIHZpZXdwb3J0Q29udGVudHNDaGFuZ2Vk KCkgaXMgYSAwJSBpbiB0aGUgcHJvZmlsZXMgd2hlbiBzY3JvbGxpbmcKKyAgICAgICAgb24gcG9w c2NpLmNvbS4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6dmlld3BvcnRDb250ZW50c0NoYW5nZWQpOgorICAgICAgICAoV2ViQ29y ZTo6RnJhbWVWaWV3OjpyZXN1bWVWaXNpYmxlSW1hZ2VBbmltYXRpb25zSW5jbHVkaW5nU3ViZnJh bWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlVGhyb3R0bGVkRE9NVGlt ZXJzU3RhdGUpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6cmVzdW1l UGF1c2VkSW1hZ2VBbmltYXRpb25zSWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJWaWV3Lmg6CisKIDIwMTUtMDQtMTIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtDb2NvYV0gTG9jYWxpemFibGUgc3RyaW5ncyBhcmUgaW5jb25zaXN0ZW50IGFu ZCBuZWVkIHRvIGJlIHJlZ2VuZXJhdGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXgg OWIzYTJiMWFkMTgxNTM2ZjBkNDg5ZWMwZjQyODg2YWRkNmFhZDRkOC4uNDBhMDYyNzI5NjVkMGQx M2M2ZWQ1ODQwMjNlYmI3M2M3NjQyZjdmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApA QCAtMTc3MSwxMCArMTc3MSwxMSBAQCB2b2lkIEZyYW1lVmlldzo6ZGVsYXllZFNjcm9sbEV2ZW50 VGltZXJGaXJlZCgpCiAKIHZvaWQgRnJhbWVWaWV3Ojp2aWV3cG9ydENvbnRlbnRzQ2hhbmdlZCgp CiB7CisgICAgSW50UmVjdCB2aXNpYmxlUmVjdCA9IHdpbmRvd1RvQ29udGVudHMod2luZG93Q2xp cFJlY3QoKSk7CiAgICAgLy8gV2hlbiB0aGUgdmlld3BvcnQgY29udGVudHMgY2hhbmdlcyAoc2Ny b2xsLCByZXNpemUsIHN0eWxlIHJlY2FsYywgbGF5b3V0LCAuLi4pLAogICAgIC8vIGNoZWNrIGlm IHdlIHNob3VsZCByZXN1bWUgYW5pbWF0ZWQgaW1hZ2VzIG9yIHVudGhyb3R0bGUgRE9NIHRpbWVy cy4KLSAgICByZXN1bWVWaXNpYmxlSW1hZ2VBbmltYXRpb25zSW5jbHVkaW5nU3ViZnJhbWVzKCk7 Ci0gICAgdXBkYXRlVGhyb3R0bGVkRE9NVGltZXJzU3RhdGUoKTsKKyAgICByZXN1bWVWaXNpYmxl SW1hZ2VBbmltYXRpb25zSW5jbHVkaW5nU3ViZnJhbWVzKCZ2aXNpYmxlUmVjdCk7CisgICAgdXBk YXRlVGhyb3R0bGVkRE9NVGltZXJzU3RhdGUodmlzaWJsZVJlY3QpOwogfQogCiBib29sIEZyYW1l Vmlldzo6Zml4ZWRFbGVtZW50c0xheW91dFJlbGF0aXZlVG9GcmFtZSgpIGNvbnN0CkBAIC0yMTMy LDEyICsyMTMzLDEzIEBAIHZvaWQgRnJhbWVWaWV3OjpzY3JvbGxQb3NpdGlvbkNoYW5nZWQoY29u c3QgSW50UG9pbnQmIG9sZFBvc2l0aW9uLCBjb25zdCBJbnRQb2luCiAgICAgdmlld3BvcnRDb250 ZW50c0NoYW5nZWQoKTsKIH0KIAotdm9pZCBGcmFtZVZpZXc6OnJlc3VtZVZpc2libGVJbWFnZUFu aW1hdGlvbnNJbmNsdWRpbmdTdWJmcmFtZXMoKQordm9pZCBGcmFtZVZpZXc6OnJlc3VtZVZpc2li bGVJbWFnZUFuaW1hdGlvbnNJbmNsdWRpbmdTdWJmcmFtZXMoSW50UmVjdCogb3B0aW9uYWxWaXNp YmxlUmVjdCkKIHsKKyAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gb3B0aW9uYWxWaXNpYmxlUmVj dCA/ICpvcHRpb25hbFZpc2libGVSZWN0IDogd2luZG93VG9Db250ZW50cyh3aW5kb3dDbGlwUmVj dCgpKTsKICAgICAvLyBBIGNoYW5nZSBpbiBzY3JvbGwgcG9zaXRpb24gbWF5IGFmZmVjdCBpbWFn ZSB2aXNpYmlsaXR5IGluIHN1YmZyYW1lcy4KICAgICBmb3IgKGF1dG8qIGZyYW1lID0gbV9mcmFt ZS5nZXQoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQobV9mcmFt ZS5nZXQoKSkpIHsKICAgICAgICAgaWYgKGF1dG8qIHJlbmRlclZpZXcgPSBmcmFtZS0+Y29udGVu dFJlbmRlcmVyKCkpCi0gICAgICAgICAgICByZW5kZXJWaWV3LT5yZXN1bWVQYXVzZWRJbWFnZUFu aW1hdGlvbnNJZk5lZWRlZCgpOworICAgICAgICAgICAgcmVuZGVyVmlldy0+cmVzdW1lUGF1c2Vk SW1hZ2VBbmltYXRpb25zSWZOZWVkZWQodmlzaWJsZVJlY3QpOwogICAgIH0KIH0KIApAQCAtMzA4 NiwxMyArMzA4OCwxMSBAQCB2b2lkIEZyYW1lVmlldzo6dW5yZWdpc3RlclRocm90dGxlZERPTVRp bWVyKERPTVRpbWVyKiB0aW1lcikKICAgICBtX3Rocm90dGxlZFRpbWVycy5yZW1vdmUodGltZXIp OwogfQogCi12b2lkIEZyYW1lVmlldzo6dXBkYXRlVGhyb3R0bGVkRE9NVGltZXJzU3RhdGUoKQor dm9pZCBGcmFtZVZpZXc6OnVwZGF0ZVRocm90dGxlZERPTVRpbWVyc1N0YXRlKEludFJlY3Qgdmlz aWJsZVJlY3QpCiB7CiAgICAgaWYgKG1fdGhyb3R0bGVkVGltZXJzLmlzRW1wdHkoKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgSW50UmVjdCB2aXNpYmxlUmVjdCA9IHdpbmRvd1RvQ29udGVudHMo d2luZG93Q2xpcFJlY3QoKSk7Ci0KICAgICAvLyBEbyBub3QgaXRlcmF0ZSBvdmVyIHRoZSBIYXNo U2V0IGJlY2F1c2UgY2FsbGluZyBET01UaW1lcjo6dXBkYXRlVGhyb3R0bGluZ1N0YXRlQWZ0ZXJW aWV3cG9ydENoYW5nZSgpCiAgICAgLy8gbWF5IGNhdXNlIHRpbWVycyB0byByZW1vdmUgdGhlbXNl bHZlcyBmcm9tIGl0IHdoaWxlIHdlIGFyZSBpdGVyYXRpbmcuCiAgICAgVmVjdG9yPERPTVRpbWVy Kj4gdGltZXJzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggMzMyYTZmMmYyMGVjMGUwZTgx YTQ2Yjk1MjI3ZDk3Mjk4ZjBlNzNmNi4uMzA2ZjQ0MGFlM2UzODMyNmU1N2RhNmEzYjAxYzU1ZTU5 YTZhNTQzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC0yNDcsNyArMjQ3LDcgQEAgcHVi bGljOgogICAgIHZvaWQgZGVsYXllZFNjcm9sbEV2ZW50VGltZXJGaXJlZCgpOwogCiAgICAgdm9p ZCB2aWV3cG9ydENvbnRlbnRzQ2hhbmdlZCgpOwotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgcmVz dW1lVmlzaWJsZUltYWdlQW5pbWF0aW9uc0luY2x1ZGluZ1N1YmZyYW1lcygpOworICAgIFdFQkNP UkVfRVhQT1JUIHZvaWQgcmVzdW1lVmlzaWJsZUltYWdlQW5pbWF0aW9uc0luY2x1ZGluZ1N1YmZy YW1lcyhJbnRSZWN0KiBvcHRpb25hbFZpc2libGVSZWN0ID0gbnVsbHB0cik7CiAKICAgICAvLyBU aGlzIGlzIGRpZmZlcmVudCB0aGFuIHZpc2libGVDb250ZW50UmVjdCgpIGluIHRoYXQgaXQgaWdu b3JlcyBuZWdhdGl2ZSAob3Igb3Zlcmx5IHBvc2l0aXZlKQogICAgIC8vIG9mZnNldHMgZnJvbSBy dWJiZXItYmFuZGluZywgYW5kIGl0IHRha2VzIHpvb21pbmcgaW50byBhY2NvdW50LiAKQEAgLTU3 Niw3ICs1NzYsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZm9yY2VMYXlvdXRQYXJlbnRWaWV3SWZO ZWVkZWQoKTsKICAgICB2b2lkIHBlcmZvcm1Qb3N0TGF5b3V0VGFza3MoKTsKICAgICB2b2lkIGF1 dG9TaXplSWZFbmFibGVkKCk7Ci0gICAgdm9pZCB1cGRhdGVUaHJvdHRsZWRET01UaW1lcnNTdGF0 ZSgpOworICAgIHZvaWQgdXBkYXRlVGhyb3R0bGVkRE9NVGltZXJzU3RhdGUoSW50UmVjdCB2aXNp YmxlUmVjdCk7CiAKICAgICB2b2lkIHVwZGF0ZUxheWVyRmx1c2hUaHJvdHRsaW5nKCk7CiAgICAg V0VCQ09SRV9FWFBPUlQgdm9pZCBhZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCmluZGV4IDRmMzM5MTk0MmM0YTBhYTM0NmU3 MmZiOTA4NGQzZWE3NDhhMWRmODMuLjdhNjAxNzc3NmMxZjhiZTMyOTY5M2Y1YzVmYmIyMGE5Zjhl ODEyNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKQEAgLTEzNTYs OSArMTM1Niw4IEBAIHZvaWQgUmVuZGVyVmlldzo6cmVtb3ZlUmVuZGVyZXJXaXRoUGF1c2VkSW1h Z2VBbmltYXRpb25zKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyCiAgICAgbV9yZW5kZXJlcnNXaXRo UGF1c2VkSW1hZ2VBbmltYXRpb24ucmVtb3ZlKCZyZW5kZXJlcik7CiB9CiAKLXZvaWQgUmVuZGVy Vmlldzo6cmVzdW1lUGF1c2VkSW1hZ2VBbmltYXRpb25zSWZOZWVkZWQoKQordm9pZCBSZW5kZXJW aWV3OjpyZXN1bWVQYXVzZWRJbWFnZUFuaW1hdGlvbnNJZk5lZWRlZChJbnRSZWN0IHZpc2libGVS ZWN0KQogewotICAgIGF1dG8gdmlzaWJsZVJlY3QgPSBmcmFtZVZpZXcoKS53aW5kb3dUb0NvbnRl bnRzKGZyYW1lVmlldygpLndpbmRvd0NsaXBSZWN0KCkpOwogICAgIFZlY3RvcjxSZW5kZXJFbGVt ZW50KiwgMTA+IHRvUmVtb3ZlOwogICAgIGZvciAoYXV0byogcmVuZGVyZXIgOiBtX3JlbmRlcmVy c1dpdGhQYXVzZWRJbWFnZUFuaW1hdGlvbikgewogICAgICAgICBpZiAocmVuZGVyZXItPnJlcGFp bnRGb3JQYXVzZWRJbWFnZUFuaW1hdGlvbnNJZk5lZWRlZCh2aXNpYmxlUmVjdCkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAppbmRleCA1ZDVlYjE0NDQzZmMzOTM2MTFiMTJiOTVk YTViMjRmYzQ5YTg0MWU4Li4yNTBmNTA4NjljNzY1Y2VkNDFkZjgyMGEwM2ZjMzM4ODZjMjVkMmIw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKQEAgLTIyNCw3ICsyMjQsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBkaWRDcmVhdGVSZW5kZXJlcigpIHsgKyttX3JlbmRlcmVyQ291 bnQ7IH0KICAgICB2b2lkIGRpZERlc3Ryb3lSZW5kZXJlcigpIHsgLS1tX3JlbmRlcmVyQ291bnQ7 IH0KIAotICAgIHZvaWQgcmVzdW1lUGF1c2VkSW1hZ2VBbmltYXRpb25zSWZOZWVkZWQoKTsKKyAg ICB2b2lkIHJlc3VtZVBhdXNlZEltYWdlQW5pbWF0aW9uc0lmTmVlZGVkKEludFJlY3QgdmlzaWJs ZVJlY3QpOwogICAgIHZvaWQgYWRkUmVuZGVyZXJXaXRoUGF1c2VkSW1hZ2VBbmltYXRpb25zKFJl bmRlckVsZW1lbnQmKTsKICAgICB2b2lkIHJlbW92ZVJlbmRlcmVyV2l0aFBhdXNlZEltYWdlQW5p bWF0aW9ucyhSZW5kZXJFbGVtZW50Jik7CiAK 250683 2015-04-13 16:55:39 -0700 2015-04-13 17:46:48 -0700 Patch bug-143675-20150413165444.patch text/plain 5899 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzRjYzA2NjM0Y2U0ZDJl NzMwOThlMmNmYzk0NDhjMmJlZDQyNDY1YS4uN2NjZjY2Y2NhZDFkMDUwNjgzOGRiZmFiZDcxMTBl M2U5M2RhMjkwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE1LTA0LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbjogU2Nyb2xs aW5nIG9uIHBvcHNjaS5jb20gc3BlbmRzIHRvbyBtdWNoIHRpbWUgaW4gRnJhbWVWaWV3Ojp2aWV3 cG9ydHNDb250ZW50c0NoYW5nZWQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQzNjc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgT3B0aW1pemUgcmVzdW1lVmlzaWJsZUltYWdlQW5pbWF0aW9uc0luY2x1 ZGluZ1N1YmZyYW1lcygpIHNvIHRoYXQgdGhlIEZyYW1lVmlld3MnCisgICAgICAgIHdpbmRvd0Ns aXBSZWN0IGdldHMgY29tcHV0ZWQgbGVzcyBvZnRlbjoKKyAgICAgICAgLSBDYWNoZSB0aGUgRnJh bWVWaWV3J3Mgd2luZG93Q2xpcFJlY3QgYmVmb3JlIHJlc3VtaW5nIGltYWdlIGFuaW1hdGlvbnMg aW4gc3ViZnJhbWVzCisgICAgICAgICAgYXMgY2FsbGluZyB3aW5kb3dDbGlwUmVjdCgpIG9uIHRo b3NlIHN1YmZyYW1lcycgdmlldyBpcyBnb2luZyB0byBjYWxsIHdpbmRvd0NsaXBSZWN0KCkKKyAg ICAgICAgICBvbiB0aGVpciBhbmNlc3RvcnMuIFRoaXMgYXZvaWRzIGEgbG90IG9mIHVubmVjZXNz YXJ5IHdpbmRvd0NsaXBSZWN0IHJlY29tcHV0YXRpb25zCisgICAgICAgICAgaW4gZGVlcCBmcmFt ZSB0cmVlcy4KKyAgICAgICAgLSBTdG9wIHRyYXZlcnNpbmcgdGhlIEZyYW1lIHRyZWUgaWYgdGhl IGN1cnJlbnQgZnJhbWUgZG9lcyBub3QgaGF2ZSBhIGNvbnRlbnQKKyAgICAgICAgICByZW5kZXJl ciwgYXMgdGhpcyBtZWFucyB0aGUgc3ViZnJhbWVzIHdvbid0IGhhdmUgb25lIGVpdGhlci4KKyAg ICAgICAgLSBTdG9wIHRyYXZlcnNpbmcgdGhlIEZyYW1lIHRyZWUgaWYgdGhlIGN1cnJlbnQgZnJh bWUncyB2aWV3IGhhcyBhbiBlbXB0eQorICAgICAgICAgIHdpbmRvd0NsaXBSZWN0KCkgYXMgdGhp cyBtZWFucyB0aGUgd2luZG93Q2xpcFJlY3Qgd2lsbCBiZSBlbXB0eSBmb3IgdGhvc2UKKyAgICAg ICAgICBzdWJmcmFtZXMgYXMgd2VsbC4KKworICAgICAgICBPbiBwb3BzY2kuY29tLCB0aGlzIGN1 dHMgZG93biB0aGUgbnVtYmVyIG9mIHVuY2FjaGVkIHdpbmRvd0NsaXBSZWN0KCkgY2FsbHMgYnkK KyAgICAgICAgYXBwcm94aW1hdGVseSBoYWxmLiBJIHNlZSB2aWV3cG9ydHNDb250ZW50c0NoYW5n ZWQoKSBhdCB+MC40JSB3aGVuIHNjcm9sbGluZworICAgICAgICBvbiBwb3BzY2kuY29tIGFmdGVy IHRoaXMgY2hhbmdlLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpyZXN1bWVWaXNpYmxlSW1hZ2VBbmltYXRpb25zSW5jbHVkaW5n U3ViZnJhbWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6d2luZG93Q2xpcFJlY3Qp OgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6cmVzdW1lUGF1c2VkSW1h Z2VBbmltYXRpb25zSWZOZWVkZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJWaWV3Lmg6 CisKIDIwMTUtMDQtMTMgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAg ICAgICAgW1dpbl0gVW5yZXZpZXdlZCBmaXggYWZ0ZXIgcjE4Mjc1Ny4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAppbmRleCA5YjNhMmIxYWQxODE1MzZmMGQ0ODllYzBmNDI4ODZhZGQ2YWFkNGQ4 Li45YmYxMDQ2YjljOWZjOTEyNTg4ZTA2OTk0OTUyMWM3Njc2ZWUxMmY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCkBAIC0yMTM0LDEwICsyMTM0LDIzIEBAIHZvaWQgRnJhbWVWaWV3Ojpz Y3JvbGxQb3NpdGlvbkNoYW5nZWQoY29uc3QgSW50UG9pbnQmIG9sZFBvc2l0aW9uLCBjb25zdCBJ bnRQb2luCiAKIHZvaWQgRnJhbWVWaWV3OjpyZXN1bWVWaXNpYmxlSW1hZ2VBbmltYXRpb25zSW5j bHVkaW5nU3ViZnJhbWVzKCkKIHsKLSAgICAvLyBBIGNoYW5nZSBpbiBzY3JvbGwgcG9zaXRpb24g bWF5IGFmZmVjdCBpbWFnZSB2aXNpYmlsaXR5IGluIHN1YmZyYW1lcy4KLSAgICBmb3IgKGF1dG8q IGZyYW1lID0gbV9mcmFtZS5nZXQoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50cmF2 ZXJzZU5leHQobV9mcmFtZS5nZXQoKSkpIHsKLSAgICAgICAgaWYgKGF1dG8qIHJlbmRlclZpZXcg PSBmcmFtZS0+Y29udGVudFJlbmRlcmVyKCkpCi0gICAgICAgICAgICByZW5kZXJWaWV3LT5yZXN1 bWVQYXVzZWRJbWFnZUFuaW1hdGlvbnNJZk5lZWRlZCgpOworICAgIGF1dG8qIHJlbmRlclZpZXcg PSBmcmFtZSgpLmNvbnRlbnRSZW5kZXJlcigpOworICAgIGlmICghcmVuZGVyVmlldykKKyAgICAg ICAgcmV0dXJuOworCisgICAgSW50UmVjdCB3aW5kb3dDbGlwUmVjdCA9IHRoaXMtPndpbmRvd0Ns aXBSZWN0KCk7CisgICAgYXV0byB2aXNpYmxlUmVjdCA9IHdpbmRvd1RvQ29udGVudHMod2luZG93 Q2xpcFJlY3QpOworICAgIGlmICh2aXNpYmxlUmVjdC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVy bjsKKworICAgIC8vIFJlc3VtZSBwYXVzZWQgaW1hZ2UgYW5pbWF0aW9ucyBpbiB0aGlzIGZyYW1l LgorICAgIHJlbmRlclZpZXctPnJlc3VtZVBhdXNlZEltYWdlQW5pbWF0aW9uc0lmTmVlZGVkKHZp c2libGVSZWN0KTsKKworICAgIC8vIFJlY3Vyc2l2ZSBjYWxsIGZvciBzdWJmcmFtZXMuIFdlIGNh Y2hlIHRoZSBjdXJyZW50IEZyYW1lVmlldydzIHdpbmRvd0NsaXBSZWN0IHRvIGF2b2lkIHJlY29t cHV0aW5nIGl0IGZvciBldmVyeSBzdWJmcmFtZS4KKyAgICBUZW1wb3JhcnlDaGFuZ2U8SW50UmVj dCo+IHdpbmRvd0NsaXBSZWN0Q2FjaGUobV9jYWNoZWRXaW5kb3dDbGlwUmVjdCwgJndpbmRvd0Ns aXBSZWN0KTsKKyAgICBmb3IgKEZyYW1lKiBjaGlsZEZyYW1lID0gZnJhbWUoKS50cmVlKCkuZmly c3RDaGlsZCgpOyBjaGlsZEZyYW1lOyBjaGlsZEZyYW1lID0gY2hpbGRGcmFtZS0+dHJlZSgpLm5l eHRTaWJsaW5nKCkpIHsKKyAgICAgICAgaWYgKGF1dG8qIGNoaWxkVmlldyA9IGNoaWxkRnJhbWUt PnZpZXcoKSkKKyAgICAgICAgICAgIGNoaWxkVmlldy0+cmVzdW1lVmlzaWJsZUltYWdlQW5pbWF0 aW9uc0luY2x1ZGluZ1N1YmZyYW1lcygpOwogICAgIH0KIH0KIApAQCAtMzI2NCw2ICszMjc3LDkg QEAgSW50UmVjdCBGcmFtZVZpZXc6OndpbmRvd0NsaXBSZWN0KCkgY29uc3QKIHsKICAgICBBU1NF UlQoZnJhbWUoKS52aWV3KCkgPT0gdGhpcyk7CiAKKyAgICBpZiAobV9jYWNoZWRXaW5kb3dDbGlw UmVjdCkKKyAgICAgICAgcmV0dXJuICptX2NhY2hlZFdpbmRvd0NsaXBSZWN0OworCiAgICAgaWYg KHBhaW50c0VudGlyZUNvbnRlbnRzKCkpCiAgICAgICAgIHJldHVybiBjb250ZW50c1RvV2luZG93 KEludFJlY3QoSW50UG9pbnQoKSwgdG90YWxDb250ZW50c1NpemUoKSkpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuaAppbmRleCAzMzJhNmYyZjIwZWMwZTBlODFhNDZiOTUyMjdkOTcyOThmMGU3M2Y2 Li4xYmRiYzlhMTBkYmU3NjNjMTMzNDhiZmRjZjIxNDZhN2RlZTI2Njc4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmgKQEAgLTc4NSw2ICs3ODUsOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV92aXN1 YWxVcGRhdGVzQWxsb3dlZEJ5Q2xpZW50OwogICAgIAogICAgIFNjcm9sbFBpbm5pbmdCZWhhdmlv ciBtX3Njcm9sbFBpbm5pbmdCZWhhdmlvcjsKKworICAgIEludFJlY3QqIG1fY2FjaGVkV2luZG93 Q2xpcFJlY3QgeyBudWxscHRyIH07CiB9OwogCiBpbmxpbmUgdm9pZCBGcmFtZVZpZXc6OmluY3Jl bWVudFZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudCh1bnNpZ25lZCBjb3VudCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAppbmRleCA0ZjMzOTE5NDJjNGEwYWEzNDZl NzJmYjkwODRkM2VhNzQ4YTFkZjgzLi43YTYwMTc3NzZjMWY4YmUzMjk2OTNmNWM1ZmJiMjBhOWY4 ZTgxMjQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCkBAIC0xMzU2 LDkgKzEzNTYsOCBAQCB2b2lkIFJlbmRlclZpZXc6OnJlbW92ZVJlbmRlcmVyV2l0aFBhdXNlZElt YWdlQW5pbWF0aW9ucyhSZW5kZXJFbGVtZW50JiByZW5kZXJlcgogICAgIG1fcmVuZGVyZXJzV2l0 aFBhdXNlZEltYWdlQW5pbWF0aW9uLnJlbW92ZSgmcmVuZGVyZXIpOwogfQogCi12b2lkIFJlbmRl clZpZXc6OnJlc3VtZVBhdXNlZEltYWdlQW5pbWF0aW9uc0lmTmVlZGVkKCkKK3ZvaWQgUmVuZGVy Vmlldzo6cmVzdW1lUGF1c2VkSW1hZ2VBbmltYXRpb25zSWZOZWVkZWQoSW50UmVjdCB2aXNpYmxl UmVjdCkKIHsKLSAgICBhdXRvIHZpc2libGVSZWN0ID0gZnJhbWVWaWV3KCkud2luZG93VG9Db250 ZW50cyhmcmFtZVZpZXcoKS53aW5kb3dDbGlwUmVjdCgpKTsKICAgICBWZWN0b3I8UmVuZGVyRWxl bWVudCosIDEwPiB0b1JlbW92ZTsKICAgICBmb3IgKGF1dG8qIHJlbmRlcmVyIDogbV9yZW5kZXJl cnNXaXRoUGF1c2VkSW1hZ2VBbmltYXRpb24pIHsKICAgICAgICAgaWYgKHJlbmRlcmVyLT5yZXBh aW50Rm9yUGF1c2VkSW1hZ2VBbmltYXRpb25zSWZOZWVkZWQodmlzaWJsZVJlY3QpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKaW5kZXggNWQ1ZWIxNDQ0M2ZjMzkzNjExYjEyYjk1 ZGE1YjI0ZmM0OWE4NDFlOC4uMjUwZjUwODY5Yzc2NWNlZDQxZGY4MjBhMDNmYzMzODg2YzI1ZDJi MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBAIC0yMjQsNyArMjI0LDcg QEAgcHVibGljOgogICAgIHZvaWQgZGlkQ3JlYXRlUmVuZGVyZXIoKSB7ICsrbV9yZW5kZXJlckNv dW50OyB9CiAgICAgdm9pZCBkaWREZXN0cm95UmVuZGVyZXIoKSB7IC0tbV9yZW5kZXJlckNvdW50 OyB9CiAKLSAgICB2b2lkIHJlc3VtZVBhdXNlZEltYWdlQW5pbWF0aW9uc0lmTmVlZGVkKCk7Cisg ICAgdm9pZCByZXN1bWVQYXVzZWRJbWFnZUFuaW1hdGlvbnNJZk5lZWRlZChJbnRSZWN0IHZpc2li bGVSZWN0KTsKICAgICB2b2lkIGFkZFJlbmRlcmVyV2l0aFBhdXNlZEltYWdlQW5pbWF0aW9ucyhS ZW5kZXJFbGVtZW50Jik7CiAgICAgdm9pZCByZW1vdmVSZW5kZXJlcldpdGhQYXVzZWRJbWFnZUFu aW1hdGlvbnMoUmVuZGVyRWxlbWVudCYpOwogCg==