119075 2013-07-24 22:44:04 -0700 With frame flattening on, too many resize events fired if document is resized in onresize handler. 2013-07-26 18:15:54 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yongjun_zhang webkit-unassigned commit-queue ddkilzer esprehn+autocc glenn kling koivisto kondapallykalyan psolanki simon.fraser yongjun_zhang zalan oldest_to_newest 911515 0 yongjun_zhang 2013-07-24 22:44:04 -0700 This is exposed by http://trac.webkit.org/changeset/149382. When frame flattening is on, if we change an iframe's document size in its resize handler, we could get excessive number of resize events. 911552 1 zalan 2013-07-25 02:34:27 -0700 I think http://trac.webkit.org/changeset/149287 made the major logic change by moving 'resize event' sending from performPostLayout() to setFrameRect() and making it sync, while http://trac.webkit.org/changeset/149382 tried to ease on that by checking against isInLayout() and sending the resize event off async. What I think what happens is that http://trac.webkit.org/changeset/150011 copied the resize event sending back to the performPostLayout() (now we are sending it off at 2 places), but since peformPostLayout() can be invoke by a timer, the isInLayout() guarding does not help there anymore and we are sending the resize events sync. Do you have a test case on this? 912120 2 yongjun_zhang 2013-07-26 14:53:25 -0700 (In reply to comment #1) > I think http://trac.webkit.org/changeset/149287 made the major logic change by moving 'resize event' sending from performPostLayout() to setFrameRect() and making it sync, while http://trac.webkit.org/changeset/149382 tried to ease on that by checking against isInLayout() and sending the resize event off async. > What I think what happens is that http://trac.webkit.org/changeset/150011 copied the resize event sending back to the performPostLayout() (now we are sending it off at 2 places), but since peformPostLayout() can be invoke by a timer, the isInLayout() guarding does not help there anymore and we are sending the resize events sync. > The problems is actually not caused by sync sending resize events. Rather, it is caused by queueing extra resize events in DocumentEventQueue when it is still dispatching the previous resize event in DocumentEventQueue::pendingEventTimerFired, and this makes a loop in the same runloop. Before 149287, we were dispatching the resize event in performPostLayout() in another runloop. 912129 3 207557 yongjun_zhang 2013-07-26 15:16:15 -0700 Created attachment 207557 Don't send resize event when widget frame is being changed in RenderFrameBase::layoutWithFlattening. 912172 4 207557 simon.fraser 2013-07-26 17:02:25 -0700 Comment on attachment 207557 Don't send resize event when widget frame is being changed in RenderFrameBase::layoutWithFlattening. View in context: https://bugs.webkit.org/attachment.cgi?id=207557&action=review > Source/WebCore/ChangeLog:8 > + With http://trac.webkit.org/changeset/149287, WebCore also send resize event in FrameView::setFrameRect. When sends > Source/WebCore/ChangeLog:12 > + is done layout. is done laying out > Source/WebCore/page/FrameView.h:441 > + void setResizeEventAllowed(bool resizeEventAllowed) { m_resizeEventAllowed = resizeEventAllowed; } Might as well add a const inline setter for this too. This currently doesn't allow nesting. Does it need to (using a counter)? > Source/WebCore/rendering/RenderFrameBase.cpp:68 > + childFrameView->setResizeEventAllowed(false); Could TemporaryChange<> help you here? 912175 5 yongjun_zhang 2013-07-26 17:15:54 -0700 (In reply to comment #4) > (From update of attachment 207557 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=207557&action=review > > Source/WebCore/page/FrameView.h:441 > > + void setResizeEventAllowed(bool resizeEventAllowed) { m_resizeEventAllowed = resizeEventAllowed; } > > Might as well add a const inline setter for this too. Did you mean getter? I will add it. > > This currently doesn't allow nesting. Does it need to (using a counter)? > > > Source/WebCore/rendering/RenderFrameBase.cpp:68 > > + childFrameView->setResizeEventAllowed(false); > > Could TemporaryChange<> help you here? Seems like if the method and member variable is in the same class, TemporaryChange<> would work. In this patch, the method and member variable are from different classes. thanks for the review. 912177 6 207567 yongjun_zhang 2013-07-26 17:28:33 -0700 Created attachment 207567 Address review comments for commit. 912192 7 207567 commit-queue 2013-07-26 18:15:52 -0700 Comment on attachment 207567 Address review comments for commit. Clearing flags on attachment: 207567 Committed r153397: <http://trac.webkit.org/changeset/153397> 912193 8 commit-queue 2013-07-26 18:15:54 -0700 All reviewed patches have been landed. Closing bug. 207557 2013-07-26 15:16:15 -0700 2013-07-26 17:28:33 -0700 Don't send resize event when widget frame is being changed in RenderFrameBase::layoutWithFlattening. frame_flattening_slow.patch text/plain 3760 yongjun_zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzM4MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA3LTI2ICBZb25nanVu IFpoYW5nICA8eW9uZ2p1bl96aGFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2l0aCBmcmFtZSBm bGF0dGVuaW5nIG9uLCB0b28gbWFueSByZXNpemUgZXZlbnRzIGZpcmVkIGlmIGRvY3VtZW50IGlz IHJlc2l6ZWQgaW4gb25yZXNpemUgaGFuZGxlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTA3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdpdGggaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2Vz ZXQvMTQ5Mjg3LCBXZWJDb3JlIGFsc28gc2VuZCByZXNpemUgZXZlbnQgaW4gRnJhbWVWaWV3Ojpz ZXRGcmFtZVJlY3QuICBXaGVuCisgICAgICAgIGZsYXR0ZW5pbmcgYW4gaWZyYW1lLCBzZXRGcmFt ZVJlY3QgY291bGQgYmUgY2FsbGVkIG11bHRpcGxlIHRpbWVzIGZyb20gUmVuZGVyRnJhbWVCYXNl OjpsYXlvdXRXaXRoRmxhdHRlbmluZyBhbmQKKyAgICAgICAgd2UgY291bGQgZ2V0IG11bHRpcGxl IHJlc2l6ZSBldmVudHMuICBUaGlzIHBhdGNoIGFkZHMgYSBmbGFnIGluIEZyYW1lVmlldyB0byBk aXNhbGxvdyBzZW5kaW5nIHJlc2l6ZSBldmVudHMgaWYKKyAgICAgICAgd2UgYXJlIGluc2lkZSBs YXlvdXRXaXRoRmxhdHRlbmluZy4gIFRoZSByZXNpemUgZXZlbnQgd2lsbCBiZSBzZW50IGluIHBl cmZvcm1Qb3N0TGF5b3V0VGFza3MgYWZ0ZXIgdGhlIGlmcmFtZQorICAgICAgICBpcyBkb25lIGxh eW91dC4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQgYnkgdmVyaWZ5aW5nIHRoZSByZW5kZXJp bmcgc2xvd25lc3MgaW4gd3d3LmhpLXBkYS5jb20gaXMgZml4ZWQgd2hlbiBmcmFtZSBmbGF0dGVu aW5nIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZVZpZXc6OkZyYW1lVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OnNldEZyYW1lUmVjdCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2V0UmVzaXplRXZlbnRBbGxvd2VkKToKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckZyYW1lQmFzZTo6bGF5b3V0V2l0aEZsYXR0ZW5pbmcpOgorCiAyMDEzLTA3LTI2ICBPbGl2ZXIg SHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihGVEw/KTogQ3Jh c2hlcyBpbiBwbHVnaW4gdGVzdHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJl dmlzaW9uIDE1MzM3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjA0LDYgKzIwNCw3IEBAIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1l KiBmcmFtZSkKICNlbmRpZgogICAgICwgbV92aXN1YWxVcGRhdGVzQWxsb3dlZEJ5Q2xpZW50KHRy dWUpCiAgICAgLCBtX3Njcm9sbFBpbm5pbmdCZWhhdmlvcihEb05vdFBpbikKKyAgICAsIG1fcmVz aXplRXZlbnRBbGxvd2VkKHRydWUpCiB7CiAgICAgaW5pdCgpOwogCkBAIC00ODEsNyArNDgyLDgg QEAgdm9pZCBGcmFtZVZpZXc6OnNldEZyYW1lUmVjdChjb25zdCBJbnRSZQogICAgIH0KICNlbmRp ZgogCi0gICAgc2VuZFJlc2l6ZUV2ZW50SWZOZWVkZWQoKTsKKyAgICBpZiAobV9yZXNpemVFdmVu dEFsbG93ZWQpCisgICAgICAgIHNlbmRSZXNpemVFdmVudElmTmVlZGVkKCk7CiB9CiAKICNpZiBF TkFCTEUoUkVRVUVTVF9BTklNQVRJT05fRlJBTUUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmgJKHJldmlzaW9uIDE1MzM3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJ KHdvcmtpbmcgY29weSkKQEAgLTQzOCw2ICs0MzgsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXN1 bWVBbmltYXRpbmdJbWFnZXMoKTsKICAgICAKICAgICB2b2lkIHNldFNjcm9sbFBpbm5pbmdCZWhh dmlvcihTY3JvbGxQaW5uaW5nQmVoYXZpb3IpOworICAgIHZvaWQgc2V0UmVzaXplRXZlbnRBbGxv d2VkKGJvb2wgcmVzaXplRXZlbnRBbGxvd2VkKSB7IG1fcmVzaXplRXZlbnRBbGxvd2VkID0gcmVz aXplRXZlbnRBbGxvd2VkOyB9CiAKIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIGJvb2wgc2Nyb2xs Q29udGVudHNGYXN0UGF0aChjb25zdCBJbnRTaXplJiBzY3JvbGxEZWx0YSwgY29uc3QgSW50UmVj dCYgcmVjdFRvU2Nyb2xsLCBjb25zdCBJbnRSZWN0JiBjbGlwUmVjdCk7CkBAIC02NzEsNiArNjcy LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdmlzdWFsVXBkYXRlc0FsbG93ZWRCeUNsaWVudDsK ICAgICAKICAgICBTY3JvbGxQaW5uaW5nQmVoYXZpb3IgbV9zY3JvbGxQaW5uaW5nQmVoYXZpb3I7 CisgICAgYm9vbCBtX3Jlc2l6ZUV2ZW50QWxsb3dlZDsKIH07CiAKIGlubGluZSB2b2lkIEZyYW1l Vmlldzo6aW5jcmVtZW50VmlzdWFsbHlOb25FbXB0eUNoYXJhY3RlckNvdW50KHVuc2lnbmVkIGNv dW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lQmFzZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lQmFzZS5j cHAJKHJldmlzaW9uIDE1MzM3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG cmFtZUJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NSw2ICs2NSw4IEBAIHZvaWQgUmVuZGVy RnJhbWVCYXNlOjpsYXlvdXRXaXRoRmxhdHRlbmkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAor ICAgIGNoaWxkRnJhbWVWaWV3LT5zZXRSZXNpemVFdmVudEFsbG93ZWQoZmFsc2UpOworCiAgICAg Ly8gbmVlZCB0byB1cGRhdGUgdG8gY2FsY3VsYXRlIG1pbi9tYXggY29ycmVjdGx5CiAgICAgdXBk YXRlV2lkZ2V0UG9zaXRpb24oKTsKIApAQCAtOTMsNiArOTUsNyBAQCB2b2lkIFJlbmRlckZyYW1l QmFzZTo6bGF5b3V0V2l0aEZsYXR0ZW5pCiAgICAgICAgIHNldFdpZHRoKG1heDxMYXlvdXRVbml0 Pih3aWR0aCgpLCBjaGlsZEZyYW1lVmlldy0+Y29udGVudHNXaWR0aCgpICsgaEJvcmRlcikpOwog CiAgICAgdXBkYXRlV2lkZ2V0UG9zaXRpb24oKTsKKyAgICBjaGlsZEZyYW1lVmlldy0+c2V0UmVz aXplRXZlbnRBbGxvd2VkKHRydWUpOwogCiAgICAgQVNTRVJUKCFjaGlsZEZyYW1lVmlldy0+bGF5 b3V0UGVuZGluZygpKTsKICAgICBBU1NFUlQoIWNoaWxkUm9vdC0+bmVlZHNMYXlvdXQoKSk7Cg== 207567 2013-07-26 17:28:33 -0700 2013-07-26 18:15:52 -0700 Address review comments for commit. frame_flattening_slow.patch text/plain 3920 yongjun_zhang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzM4MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA3LTI2ICBZb25nanVu IFpoYW5nICA8eW9uZ2p1bl96aGFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2l0aCBmcmFtZSBm bGF0dGVuaW5nIG9uLCB0b28gbWFueSByZXNpemUgZXZlbnRzIGZpcmVkIGlmIGRvY3VtZW50IGlz IHJlc2l6ZWQgaW4gb25yZXNpemUgaGFuZGxlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTA3NQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEZyYXNlci4KKworICAgICAgICBXaXRoIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0 LzE0OTI4NywgV2ViQ29yZSBhbHNvIHNlbmRzIHJlc2l6ZSBldmVudCBpbiBGcmFtZVZpZXc6OnNl dEZyYW1lUmVjdC4gIFdoZW4KKyAgICAgICAgZmxhdHRlbmluZyBhbiBpZnJhbWUsIHNldEZyYW1l UmVjdCBjb3VsZCBiZSBjYWxsZWQgbXVsdGlwbGUgdGltZXMgZnJvbSBSZW5kZXJGcmFtZUJhc2U6 OmxheW91dFdpdGhGbGF0dGVuaW5nIGFuZAorICAgICAgICB3ZSBjb3VsZCBnZXQgbXVsdGlwbGUg cmVzaXplIGV2ZW50cy4gIFRoaXMgcGF0Y2ggYWRkcyBhIGZsYWcgaW4gRnJhbWVWaWV3IHRvIGRp c2FsbG93IHNlbmRpbmcgcmVzaXplIGV2ZW50cyBpZgorICAgICAgICB3ZSBhcmUgaW5zaWRlIGxh eW91dFdpdGhGbGF0dGVuaW5nLiAgVGhlIHJlc2l6ZSBldmVudCB3aWxsIGJlIHNlbnQgaW4gcGVy Zm9ybVBvc3RMYXlvdXRUYXNrcyBhZnRlciB0aGUgaWZyYW1lCisgICAgICAgIGlzIGRvbmUgbGF5 aW5nIG91dC4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQgYnkgdmVyaWZ5aW5nIHRoZSByZW5k ZXJpbmcgc2xvd25lc3MgaW4gd3d3LmhpLXBkYS5jb20gaXMgZml4ZWQgd2hlbiBmcmFtZSBmbGF0 dGVuaW5nIGlzIGVuYWJsZWQuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OkZyYW1lVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OnNldEZyYW1lUmVjdCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2V0UmVzaXplRXZlbnRBbGxvd2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cmVzaXplRXZlbnRBbGxvd2VkKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZy YW1lQmFzZTo6bGF5b3V0V2l0aEZsYXR0ZW5pbmcpOgorCiAyMDEzLTA3LTI2ICBPbGl2ZXIgSHVu dCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihGVEw/KTogQ3Jhc2hl cyBpbiBwbHVnaW4gdGVzdHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlz aW9uIDE1MzM3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjA0LDYgKzIwNCw3IEBAIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1lKiBm cmFtZSkKICNlbmRpZgogICAgICwgbV92aXN1YWxVcGRhdGVzQWxsb3dlZEJ5Q2xpZW50KHRydWUp CiAgICAgLCBtX3Njcm9sbFBpbm5pbmdCZWhhdmlvcihEb05vdFBpbikKKyAgICAsIG1fcmVzaXpl RXZlbnRBbGxvd2VkKHRydWUpCiB7CiAgICAgaW5pdCgpOwogCkBAIC00ODEsNyArNDgyLDggQEAg dm9pZCBGcmFtZVZpZXc6OnNldEZyYW1lUmVjdChjb25zdCBJbnRSZQogICAgIH0KICNlbmRpZgog Ci0gICAgc2VuZFJlc2l6ZUV2ZW50SWZOZWVkZWQoKTsKKyAgICBpZiAobV9yZXNpemVFdmVudEFs bG93ZWQpCisgICAgICAgIHNlbmRSZXNpemVFdmVudElmTmVlZGVkKCk7CiB9CiAKICNpZiBFTkFC TEUoUkVRVUVTVF9BTklNQVRJT05fRlJBTUUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJ KHJldmlzaW9uIDE1MzM3OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdv cmtpbmcgY29weSkKQEAgLTQzOSw2ICs0MzksOSBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBz ZXRTY3JvbGxQaW5uaW5nQmVoYXZpb3IoU2Nyb2xsUGlubmluZ0JlaGF2aW9yKTsKIAorICAgIHZv aWQgc2V0UmVzaXplRXZlbnRBbGxvd2VkKGJvb2wgcmVzaXplRXZlbnRBbGxvd2VkKSB7IG1fcmVz aXplRXZlbnRBbGxvd2VkID0gcmVzaXplRXZlbnRBbGxvd2VkOyB9CisgICAgYm9vbCByZXNpemVF dmVudEFsbG93ZWQoKSBjb25zdCB7IHJldHVybiBtX3Jlc2l6ZUV2ZW50QWxsb3dlZDsgfQorCiBw cm90ZWN0ZWQ6CiAgICAgdmlydHVhbCBib29sIHNjcm9sbENvbnRlbnRzRmFzdFBhdGgoY29uc3Qg SW50U2l6ZSYgc2Nyb2xsRGVsdGEsIGNvbnN0IEludFJlY3QmIHJlY3RUb1Njcm9sbCwgY29uc3Qg SW50UmVjdCYgY2xpcFJlY3QpOwogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxDb250ZW50c1Nsb3dQ YXRoKGNvbnN0IEludFJlY3QmIHVwZGF0ZVJlY3QpOwpAQCAtNjcxLDYgKzY3NCw3IEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX3Zpc3VhbFVwZGF0ZXNBbGxvd2VkQnlDbGllbnQ7CiAgICAgCiAgICAg U2Nyb2xsUGlubmluZ0JlaGF2aW9yIG1fc2Nyb2xsUGlubmluZ0JlaGF2aW9yOworICAgIGJvb2wg bV9yZXNpemVFdmVudEFsbG93ZWQ7CiB9OwogCiBpbmxpbmUgdm9pZCBGcmFtZVZpZXc6OmluY3Jl bWVudFZpc3VhbGx5Tm9uRW1wdHlDaGFyYWN0ZXJDb3VudCh1bnNpZ25lZCBjb3VudCkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZUJhc2UuY3BwCShyZXZpc2lv biAxNTMzNzgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVCYXNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsOCBAQCB2b2lkIFJlbmRlckZyYW1lQmFzZTo6 bGF5b3V0V2l0aEZsYXR0ZW5pCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBjaGlsZEZy YW1lVmlldy0+c2V0UmVzaXplRXZlbnRBbGxvd2VkKGZhbHNlKTsKKwogICAgIC8vIG5lZWQgdG8g dXBkYXRlIHRvIGNhbGN1bGF0ZSBtaW4vbWF4IGNvcnJlY3RseQogICAgIHVwZGF0ZVdpZGdldFBv c2l0aW9uKCk7CiAKQEAgLTkzLDYgKzk1LDcgQEAgdm9pZCBSZW5kZXJGcmFtZUJhc2U6OmxheW91 dFdpdGhGbGF0dGVuaQogICAgICAgICBzZXRXaWR0aChtYXg8TGF5b3V0VW5pdD4od2lkdGgoKSwg Y2hpbGRGcmFtZVZpZXctPmNvbnRlbnRzV2lkdGgoKSArIGhCb3JkZXIpKTsKIAogICAgIHVwZGF0 ZVdpZGdldFBvc2l0aW9uKCk7CisgICAgY2hpbGRGcmFtZVZpZXctPnNldFJlc2l6ZUV2ZW50QWxs b3dlZCh0cnVlKTsKIAogICAgIEFTU0VSVCghY2hpbGRGcmFtZVZpZXctPmxheW91dFBlbmRpbmco KSk7CiAgICAgQVNTRVJUKCFjaGlsZFJvb3QtPm5lZWRzTGF5b3V0KCkpOwo=