132512 2014-05-02 20:44:18 -0700 [iOS][WK2] Support disabling speculative tiling 2014-05-03 18:49:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin thorton oldest_to_newest 1006280 0 benjamin 2014-05-02 20:44:18 -0700 [iOS][WK2] Support speculative tiling 1006281 1 230736 benjamin 2014-05-02 20:48:11 -0700 Created attachment 230736 Patch 1006352 2 230736 thorton 2014-05-03 11:12:51 -0700 Comment on attachment 230736 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230736&action=review > Source/WebCore/ChangeLog:9 > + Move ScrollView::setScrollVelocity() and ScrollView::computeCoverageRect() to FrameView. > + When speculative tiling is disabled, return an unmodified exposed rect. You could leave it in ScrollView, override in FrameView and check m_speculativeTilingEnabled before calling to the superclass. But, was there a reason it was in ScrollView itself in the first place? > Source/WebCore/page/FrameView.cpp:4125 > +FloatRect FrameView::computeCoverageRect(double horizontalMargin, double verticalMargin) const It still makes me sad that this is separate from the one in TileController (that this logic is spread out). 1006353 3 230736 simon.fraser 2014-05-03 11:27:58 -0700 Comment on attachment 230736 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230736&action=review > Source/WebCore/page/FrameView.h:694 > + double m_horizontalVelocity; > + double m_verticalVelocity; > + double m_scaleChangeRate; > + double m_lastVelocityUpdateTime; Shame to bloat all FrameViews with this, when only the main one will care. Maybe move it into a unique_ptr'd object? 1006429 4 benjamin 2014-05-03 17:52:16 -0700 (In reply to comment #3) > (From update of attachment 230736 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230736&action=review > > > Source/WebCore/page/FrameView.h:694 > > + double m_horizontalVelocity; > > + double m_verticalVelocity; > > + double m_scaleChangeRate; > > + double m_lastVelocityUpdateTime; > > Shame to bloat all FrameViews with this, when only the main one will care. Maybe move it into a unique_ptr'd object? It is not worth optimizing memory for document-level classes. There are never enough objects that it causes issues. 1006433 5 benjamin 2014-05-03 18:02:51 -0700 (In reply to comment #2) > (From update of attachment 230736 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230736&action=review > > > Source/WebCore/ChangeLog:9 > > + Move ScrollView::setScrollVelocity() and ScrollView::computeCoverageRect() to FrameView. > > + When speculative tiling is disabled, return an unmodified exposed rect. > > You could leave it in ScrollView, override in FrameView and check m_speculativeTilingEnabled before calling to the superclass. But, was there a reason it was in ScrollView itself in the first place? It was on ScrollView because it is related to the exposedRect() concept. > > Source/WebCore/page/FrameView.cpp:4125 > > +FloatRect FrameView::computeCoverageRect(double horizontalMargin, double verticalMargin) const > > It still makes me sad that this is separate from the one in TileController (that this logic is spread out). Maybe I am misunderstanding something here: isn't TileController generic for any tiled graphic layer? I agree the code does not really belong on ScrollView/FrameView, but I was under the impression the final home for this would be the compositor or something like that. 1006439 6 thorton 2014-05-03 18:24:34 -0700 (In reply to comment #5) > (In reply to comment #2) > > (From update of attachment 230736 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=230736&action=review > > > > > Source/WebCore/ChangeLog:9 > > > + Move ScrollView::setScrollVelocity() and ScrollView::computeCoverageRect() to FrameView. > > > + When speculative tiling is disabled, return an unmodified exposed rect. > > > > You could leave it in ScrollView, override in FrameView and check m_speculativeTilingEnabled before calling to the superclass. But, was there a reason it was in ScrollView itself in the first place? > > It was on ScrollView because it is related to the exposedRect() concept. Right. But no actual reason to keep it there. OK! > > > Source/WebCore/page/FrameView.cpp:4125 > > > +FloatRect FrameView::computeCoverageRect(double horizontalMargin, double verticalMargin) const > > > > It still makes me sad that this is separate from the one in TileController (that this logic is spread out). > > Maybe I am misunderstanding something here: isn't TileController generic for any tiled graphic layer? Sure, but e.g. TileController::computeTileCoverageRect does math that is special for scrolling tiled layers (etc.), based on information pushed down to it. > I agree the code does not really belong on ScrollView/FrameView, but I was under the impression the final home for this would be the compositor or something like that. Maybe! I think you should land this as-is, in any case. 1006441 7 benjamin 2014-05-03 18:49:58 -0700 Committed r168233: <http://trac.webkit.org/changeset/168233> 230736 2014-05-02 20:48:11 -0700 2014-05-03 11:27:57 -0700 Patch bug-132512-20140502204742.patch text/plain 9369 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY3Zjk4MTU5NmQ1MDRl NGMzYmY1N2E0MGVjZWYzMDExMjFlNGI4NC4uYjhkMGJjMGE4NTk4NjAwYmRjNmI3MTRjZjc3ZWI3 MDFiZTZiYWE5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA1LTAyICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBbaU9TXVtXSzJd IFN1cHBvcnQgZGlzYWJsaW5nIHNwZWN1bGF0aXZlIHRpbGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNTEyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSBTY3JvbGxWaWV3OjpzZXRTY3JvbGxW ZWxvY2l0eSgpIGFuZCBTY3JvbGxWaWV3Ojpjb21wdXRlQ292ZXJhZ2VSZWN0KCkgdG8gRnJhbWVW aWV3LgorICAgICAgICBXaGVuIHNwZWN1bGF0aXZlIHRpbGluZyBpcyBkaXNhYmxlZCwgcmV0dXJu IGFuIHVubW9kaWZpZWQgZXhwb3NlZCByZWN0LgorCisgICAgICAgIFRpbWUvdmVsb2NpdHkgYWRq dXNtZW50cyBhcmUgY29tcGxldGVseSB1bm5lY2Vzc2FyeSBhdCB0aGUgbW9tZW50IHNpbmNlIHNw ZWN1bGF0aXZlIHRpbGluZworICAgICAgICBpcyBlbmFibGVkIGFzIHNvb24gYXMgdGhlIHZpZXcg c2Nyb2xscy4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAgICAqIHBhZ2UvRnJh bWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6c2V0U2Nyb2xsVmVsb2Np dHkpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpjb21wdXRlQ292ZXJhZ2VSZWN0KToK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZp ZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvU2Nyb2xsVmlld0lPUy5tbToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldFNjcm9sbFZlbG9jaXR5KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OmNvbXB1dGVDb3ZlcmFnZVJlY3QpOiBEZWxldGVkLgor CiAyMDE0LTA1LTAxICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bWluaW11bVNjYWxlKCkgdXNlcyB0aGUgaW5p dGlhbCBzY2FsZSBhcyBpbml0aWFsIHZhbHVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGE2ODNh NDdhYTFhZjc3NzkyMWEzMTBmNjRlMWJmOTJkYzlhODU2M2EuLmE0MDYxNjE2MjZiN2U5MTFhNWQy Y2Q1YjUxNGFkYWI1OWUyMWEwYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu ZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0yNDQxLDggKzI0 NDEsOCBAQCBfV2ViVGhyZWFkVW5sb2NrR3VhcmRGb3JNYWlsCiBfV2ViVUlBcHBsaWNhdGlvbkRp ZEJlY29tZUFjdGl2ZU5vdGlmaWNhdGlvbgogX1dlYlVJQXBwbGljYXRpb25XaWxsRW50ZXJGb3Jl Z3JvdW5kTm90aWZpY2F0aW9uCiBfV2ViVUlBcHBsaWNhdGlvbldpbGxSZXNpZ25BY3RpdmVOb3Rp ZmljYXRpb24KK19fWk43V2ViQ29yZTlGcmFtZVZpZXcxN3NldFNjcm9sbFZlbG9jaXR5RWRkZGQK IF9fWk43V2ViQ29yZTEwU2Nyb2xsVmlldzE1c2V0U2Nyb2xsT2Zmc2V0RVJLTlNfOEludFBvaW50 RQotX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MTdzZXRTY3JvbGxWZWxvY2l0eUVkZGRkCiBfX1pO N1dlYkNvcmUxMFNjcm9sbFZpZXcyMXNldEV4cG9zZWRDb250ZW50UmVjdEVSS05TXzdJbnRSZWN0 RQogX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MjRzZXRVbm9ic2N1cmVkQ29udGVudFJlY3RFUktO U183SW50UmVjdEUKIF9fWk43V2ViQ29yZTEwWExpbmtOYW1lczRpbml0RXYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcAppbmRleCAxNWMyNDFlODlkY2UwN2Y1NTk4YzlmNTU5MjkyYmU1MjVjN2E0 Yjg5Li4zYmMzYTk2YWJjMGEzYmM5NWVjMjQ2MTg3YjhlMDg0NWNhMGE0OGYwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00MTEzLDYgKzQxMTMsNTggQEAgYm9vbCBGcmFtZVZpZXc6 OnVwZGF0ZUZpeGVkUG9zaXRpb25MYXlvdXRSZWN0KCkKICAgICB9CiAgICAgcmV0dXJuIGZhbHNl OwogfQorCit2b2lkIEZyYW1lVmlldzo6c2V0U2Nyb2xsVmVsb2NpdHkoZG91YmxlIGhvcml6b250 YWxWZWxvY2l0eSwgZG91YmxlIHZlcnRpY2FsVmVsb2NpdHksIGRvdWJsZSBzY2FsZUNoYW5nZVJh dGUsIGRvdWJsZSB0aW1lc3RhbXApCit7CisgICAgbV9ob3Jpem9udGFsVmVsb2NpdHkgPSBob3Jp em9udGFsVmVsb2NpdHk7CisgICAgbV92ZXJ0aWNhbFZlbG9jaXR5ID0gdmVydGljYWxWZWxvY2l0 eTsKKyAgICBtX3NjYWxlQ2hhbmdlUmF0ZSA9IHNjYWxlQ2hhbmdlUmF0ZTsKKyAgICBtX2xhc3RW ZWxvY2l0eVVwZGF0ZVRpbWUgPSB0aW1lc3RhbXA7Cit9CisKK0Zsb2F0UmVjdCBGcmFtZVZpZXc6 OmNvbXB1dGVDb3ZlcmFnZVJlY3QoZG91YmxlIGhvcml6b250YWxNYXJnaW4sIGRvdWJsZSB2ZXJ0 aWNhbE1hcmdpbikgY29uc3QKK3sKKyAgICBGbG9hdFJlY3QgZXhwb3NlZENvbnRlbnRSZWN0ID0g dGhpcy0+ZXhwb3NlZENvbnRlbnRSZWN0KCk7CisgICAgaWYgKCFtX3NwZWN1bGF0aXZlVGlsaW5n RW5hYmxlZCkKKyAgICAgICAgcmV0dXJuIGV4cG9zZWRDb250ZW50UmVjdDsKKworICAgIGRvdWJs ZSBjdXJyZW50VGltZSA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOworICAgIGRvdWJs ZSB0aW1lRGVsdGEgPSBjdXJyZW50VGltZSAtIG1fbGFzdFZlbG9jaXR5VXBkYXRlVGltZTsKKwor ICAgIEZsb2F0UmVjdCBmdXR1cmVSZWN0ID0gZXhwb3NlZENvbnRlbnRSZWN0OworICAgIGZ1dHVy ZVJlY3Quc2V0TG9jYXRpb24oRmxvYXRQb2ludChmdXR1cmVSZWN0LmxvY2F0aW9uKCkueCgpICsg dGltZURlbHRhICogbV9ob3Jpem9udGFsVmVsb2NpdHksIGZ1dHVyZVJlY3QubG9jYXRpb24oKS55 KCkgKyB0aW1lRGVsdGEgKiBtX3ZlcnRpY2FsVmVsb2NpdHkpKTsKKworICAgIGlmIChtX2hvcml6 b250YWxWZWxvY2l0eSkgeworICAgICAgICBmdXR1cmVSZWN0LnNldFdpZHRoKGZ1dHVyZVJlY3Qu d2lkdGgoKSArIGhvcml6b250YWxNYXJnaW4pOworICAgICAgICBpZiAobV9ob3Jpem9udGFsVmVs b2NpdHkgPCAwKQorICAgICAgICAgICAgZnV0dXJlUmVjdC5zZXRYKGZ1dHVyZVJlY3QueCgpIC0g aG9yaXpvbnRhbE1hcmdpbik7CisgICAgfQorCisgICAgaWYgKG1fdmVydGljYWxWZWxvY2l0eSkg eworICAgICAgICBmdXR1cmVSZWN0LnNldEhlaWdodChmdXR1cmVSZWN0LmhlaWdodCgpICsgdmVy dGljYWxNYXJnaW4pOworICAgICAgICBpZiAobV92ZXJ0aWNhbFZlbG9jaXR5IDwgMCkKKyAgICAg ICAgICAgIGZ1dHVyZVJlY3Quc2V0WShmdXR1cmVSZWN0LnkoKSAtIHZlcnRpY2FsTWFyZ2luKTsK KyAgICB9CisKKyAgICBpZiAobV9zY2FsZUNoYW5nZVJhdGUgPD0gMCAmJiAhbV9ob3Jpem9udGFs VmVsb2NpdHkgJiYgIW1fdmVydGljYWxWZWxvY2l0eSkgeworICAgICAgICBmdXR1cmVSZWN0LnNl dFdpZHRoKGZ1dHVyZVJlY3Qud2lkdGgoKSArIGhvcml6b250YWxNYXJnaW4pOworICAgICAgICBm dXR1cmVSZWN0LnNldEhlaWdodChmdXR1cmVSZWN0LmhlaWdodCgpICsgdmVydGljYWxNYXJnaW4p OworICAgICAgICBmdXR1cmVSZWN0LnNldFgoZnV0dXJlUmVjdC54KCkgLSBob3Jpem9udGFsTWFy Z2luIC8gMik7CisgICAgICAgIGZ1dHVyZVJlY3Quc2V0WShmdXR1cmVSZWN0LnkoKSAtIHZlcnRp Y2FsTWFyZ2luIC8gMik7CisgICAgfQorCisgICAgSW50U2l6ZSBjb250ZW50U2l6ZSA9IGNvbnRl bnRzU2l6ZSgpOworICAgIGlmIChmdXR1cmVSZWN0Lm1heFgoKSA+IGNvbnRlbnRTaXplLndpZHRo KCkpCisgICAgICAgIGZ1dHVyZVJlY3Quc2V0WChjb250ZW50U2l6ZS53aWR0aCgpIC0gZnV0dXJl UmVjdC53aWR0aCgpKTsKKyAgICBpZiAoZnV0dXJlUmVjdC5tYXhZKCkgPiBjb250ZW50U2l6ZS5o ZWlnaHQoKSkKKyAgICAgICAgZnV0dXJlUmVjdC5zZXRZKGNvbnRlbnRTaXplLmhlaWdodCgpIC0g ZnV0dXJlUmVjdC5oZWlnaHQoKSk7CisgICAgaWYgKGZ1dHVyZVJlY3QueCgpIDwgMCkKKyAgICAg ICAgZnV0dXJlUmVjdC5zZXRYKDApOworICAgIGlmIChmdXR1cmVSZWN0LnkoKSA8IDApCisgICAg ICAgIGZ1dHVyZVJlY3Quc2V0WSgwKTsKKworICAgIHJldHVybiBmdXR1cmVSZWN0OworfQogI2Vu ZGlmIC8vIFBMQVRGT1JNKElPUykKIAogdm9pZCBGcmFtZVZpZXc6OnNldFNjcm9sbGluZ1BlcmZv cm1hbmNlTG9nZ2luZ0VuYWJsZWQoYm9vbCBmbGFnKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5k ZXggZWEyOTgzYmY5MTE4YzQ0OGE1MTFmNDJmM2NjNWMyZGFkNDlhOTdiMy4uYjc4NTZlY2NiYTU0 Zjc5NDEwODkyOTg0MTgzZmY3NjljZGYxYzU4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBA IC0xMjksNiArMTI5LDkgQEAgcHVibGljOgogICAgIEludFJlY3QgY3VzdG9tRml4ZWRQb3NpdGlv bkxheW91dFJlY3QoKSBjb25zdCB7IHJldHVybiBtX2N1c3RvbUZpeGVkUG9zaXRpb25MYXlvdXRS ZWN0OyB9CiAgICAgdm9pZCBzZXRDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdChjb25zdCBJ bnRSZWN0Jik7CiAgICAgYm9vbCB1cGRhdGVGaXhlZFBvc2l0aW9uTGF5b3V0UmVjdCgpOworCisg ICAgdm9pZCBzZXRTY3JvbGxWZWxvY2l0eShkb3VibGUgaG9yaXpvbnRhbFZlbG9jaXR5LCBkb3Vi bGUgdmVydGljYWxWZWxvY2l0eSwgZG91YmxlIHNjYWxlQ2hhbmdlUmF0ZSwgZG91YmxlIHRpbWVz dGFtcCk7CisgICAgRmxvYXRSZWN0IGNvbXB1dGVDb3ZlcmFnZVJlY3QoZG91YmxlIGhvcml6b250 YWxNYXJnaW4sIGRvdWJsZSB2ZXJ0aWNhbE1hcmdpbikgY29uc3Q7CiAjZWxzZQogICAgIGJvb2wg dXNlQ3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3QoKSBjb25zdCB7IHJldHVybiBmYWxzZTsg fQogI2VuZGlmCkBAIC02ODQsNiArNjg3LDExIEBAIHByaXZhdGU6CiAjaWYgUExBVEZPUk0oSU9T KQogICAgIGJvb2wgbV91c2VDdXN0b21GaXhlZFBvc2l0aW9uTGF5b3V0UmVjdDsKICAgICBJbnRS ZWN0IG1fY3VzdG9tRml4ZWRQb3NpdGlvbkxheW91dFJlY3Q7CisKKyAgICBkb3VibGUgbV9ob3Jp em9udGFsVmVsb2NpdHk7CisgICAgZG91YmxlIG1fdmVydGljYWxWZWxvY2l0eTsKKyAgICBkb3Vi bGUgbV9zY2FsZUNoYW5nZVJhdGU7CisgICAgZG91YmxlIG1fbGFzdFZlbG9jaXR5VXBkYXRlVGlt ZTsKICNlbmRpZgogCiAgICAgSW50U2l6ZSBtX292ZXJyaWRlVmlld3BvcnRTaXplOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4IDJkNjFiMjk1Zjc5YzhjNGRhODFiYmYwZDdk NjY0ODg5NDkwMzZkYTUuLjM1ZTFlMmQwMGUxOTVkYWRiYjQyZWQ2ZmVlNjg1OGFjYTk4ZWIwYzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTE4Niw5ICsxODYsNiBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRFeHBvc2VkQ29udGVudFJlY3QoY29uc3QgSW50UmVjdCYpOwog ICAgIHZvaWQgc2V0VW5vYnNjdXJlZENvbnRlbnRSZWN0KGNvbnN0IEludFJlY3QmKTsKIAotICAg IHZvaWQgc2V0U2Nyb2xsVmVsb2NpdHkoZG91YmxlIGhvcml6b250YWxWZWxvY2l0eSwgZG91Ymxl IHZlcnRpY2FsVmVsb2NpdHksIGRvdWJsZSBzY2FsZUNoYW5nZVJhdGUsIGRvdWJsZSB0aW1lc3Rh bXApOwotICAgIEZsb2F0UmVjdCBjb21wdXRlQ292ZXJhZ2VSZWN0KGRvdWJsZSBob3Jpem9udGFs TWFyZ2luLCBkb3VibGUgdmVydGljYWxNYXJnaW4pIGNvbnN0OwotCiAgICAgdm9pZCBzZXRBY3R1 YWxTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2ludCYpOwogICAgIExlZ2FjeVRpbGVDYWNoZSog bGVnYWN5VGlsZUNhY2hlKCk7CiAjZW5kaWYKQEAgLTQyMSwxMSArNDE4LDYgQEAgcHJpdmF0ZToK ICNpZiBQTEFURk9STShJT1MpCiAgICAgSW50UmVjdCBtX2V4cG9zZWRDb250ZW50UmVjdDsKICAg ICBJbnRSZWN0IG1fdW5vYnNjdXJlZENvbnRlbnRSZWN0OwotCi0gICAgZG91YmxlIG1faG9yaXpv bnRhbFZlbG9jaXR5OwotICAgIGRvdWJsZSBtX3ZlcnRpY2FsVmVsb2NpdHk7Ci0gICAgZG91Ymxl IG1fc2NhbGVDaGFuZ2VSYXRlOwotICAgIGRvdWJsZSBtX2xhc3RWZWxvY2l0eVVwZGF0ZVRpbWU7 CiAjZWxzZQogICAgIEludFJlY3QgbV9maXhlZFZpc2libGVDb250ZW50UmVjdDsKICNlbmRpZgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1MubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvU2Nyb2xsVmlld0lPUy5tbQppbmRleCAyYzUx ZjMxNDkxNWQ1YWQ2Y2M2MjE1MWYyZWE3Nzc2MzI2YmFjMDA1Li4zOWNkZWJlN2U5YTY4OGU2ZjNm MWQ4Y2RkNmQ2NDg0M2ExYjc0NWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvU2Nyb2xsVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv U2Nyb2xsVmlld0lPUy5tbQpAQCAtMTE5LDU2ICsxMTksNiBAQCB2b2lkIFNjcm9sbFZpZXc6OnNl dFVub2JzY3VyZWRDb250ZW50UmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIG1fdW5vYnNj dXJlZENvbnRlbnRSZWN0ID0gcmVjdDsKIH0KIAotdm9pZCBTY3JvbGxWaWV3OjpzZXRTY3JvbGxW ZWxvY2l0eShkb3VibGUgaG9yaXpvbnRhbFZlbG9jaXR5LCBkb3VibGUgdmVydGljYWxWZWxvY2l0 eSwgZG91YmxlIHNjYWxlQ2hhbmdlUmF0ZSwgZG91YmxlIHRpbWVzdGFtcCkKLXsKLSAgICBtX2hv cml6b250YWxWZWxvY2l0eSA9IGhvcml6b250YWxWZWxvY2l0eTsKLSAgICBtX3ZlcnRpY2FsVmVs b2NpdHkgPSB2ZXJ0aWNhbFZlbG9jaXR5OwotICAgIG1fc2NhbGVDaGFuZ2VSYXRlID0gc2NhbGVD aGFuZ2VSYXRlOwotICAgIG1fbGFzdFZlbG9jaXR5VXBkYXRlVGltZSA9IHRpbWVzdGFtcDsKLX0K LQotRmxvYXRSZWN0IFNjcm9sbFZpZXc6OmNvbXB1dGVDb3ZlcmFnZVJlY3QoZG91YmxlIGhvcml6 b250YWxNYXJnaW4sIGRvdWJsZSB2ZXJ0aWNhbE1hcmdpbikgY29uc3QKLXsKLSAgICBGbG9hdFJl Y3QgZXhwb3NlZENvbnRlbnRSZWN0ID0gdGhpcy0+ZXhwb3NlZENvbnRlbnRSZWN0KCk7Ci0KLSAg ICBkb3VibGUgY3VycmVudFRpbWUgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsKLSAg ICBkb3VibGUgdGltZURlbHRhID0gY3VycmVudFRpbWUgLSBtX2xhc3RWZWxvY2l0eVVwZGF0ZVRp bWU7Ci0KLSAgICBGbG9hdFJlY3QgZnV0dXJlUmVjdCA9IGV4cG9zZWRDb250ZW50UmVjdDsKLSAg ICBmdXR1cmVSZWN0LnNldExvY2F0aW9uKEZsb2F0UG9pbnQoZnV0dXJlUmVjdC5sb2NhdGlvbigp LngoKSArIHRpbWVEZWx0YSAqIG1faG9yaXpvbnRhbFZlbG9jaXR5LCBmdXR1cmVSZWN0LmxvY2F0 aW9uKCkueSgpICsgdGltZURlbHRhICogbV92ZXJ0aWNhbFZlbG9jaXR5KSk7Ci0KLSAgICBpZiAo bV9ob3Jpem9udGFsVmVsb2NpdHkpIHsKLSAgICAgICAgZnV0dXJlUmVjdC5zZXRXaWR0aChmdXR1 cmVSZWN0LndpZHRoKCkgKyBob3Jpem9udGFsTWFyZ2luKTsKLSAgICAgICAgaWYgKG1faG9yaXpv bnRhbFZlbG9jaXR5IDwgMCkKLSAgICAgICAgICAgIGZ1dHVyZVJlY3Quc2V0WChmdXR1cmVSZWN0 LngoKSAtIGhvcml6b250YWxNYXJnaW4pOwotICAgIH0KLQotICAgIGlmIChtX3ZlcnRpY2FsVmVs b2NpdHkpIHsKLSAgICAgICAgZnV0dXJlUmVjdC5zZXRIZWlnaHQoZnV0dXJlUmVjdC5oZWlnaHQo KSArIHZlcnRpY2FsTWFyZ2luKTsKLSAgICAgICAgaWYgKG1fdmVydGljYWxWZWxvY2l0eSA8IDAp Ci0gICAgICAgICAgICBmdXR1cmVSZWN0LnNldFkoZnV0dXJlUmVjdC55KCkgLSB2ZXJ0aWNhbE1h cmdpbik7Ci0gICAgfQotCi0gICAgaWYgKG1fc2NhbGVDaGFuZ2VSYXRlIDw9IDAgJiYgIW1faG9y aXpvbnRhbFZlbG9jaXR5ICYmICFtX3ZlcnRpY2FsVmVsb2NpdHkpIHsKLSAgICAgICAgZnV0dXJl UmVjdC5zZXRXaWR0aChmdXR1cmVSZWN0LndpZHRoKCkgKyBob3Jpem9udGFsTWFyZ2luKTsKLSAg ICAgICAgZnV0dXJlUmVjdC5zZXRIZWlnaHQoZnV0dXJlUmVjdC5oZWlnaHQoKSArIHZlcnRpY2Fs TWFyZ2luKTsKLSAgICAgICAgZnV0dXJlUmVjdC5zZXRYKGZ1dHVyZVJlY3QueCgpIC0gaG9yaXpv bnRhbE1hcmdpbiAvIDIpOwotICAgICAgICBmdXR1cmVSZWN0LnNldFkoZnV0dXJlUmVjdC55KCkg LSB2ZXJ0aWNhbE1hcmdpbiAvIDIpOwotICAgIH0KLQotICAgIEludFNpemUgY29udGVudFNpemUg PSBjb250ZW50c1NpemUoKTsKLSAgICBpZiAoZnV0dXJlUmVjdC5tYXhYKCkgPiBjb250ZW50U2l6 ZS53aWR0aCgpKQotICAgICAgICBmdXR1cmVSZWN0LnNldFgoY29udGVudFNpemUud2lkdGgoKSAt IGZ1dHVyZVJlY3Qud2lkdGgoKSk7Ci0gICAgaWYgKGZ1dHVyZVJlY3QubWF4WSgpID4gY29udGVu dFNpemUuaGVpZ2h0KCkpCi0gICAgICAgIGZ1dHVyZVJlY3Quc2V0WShjb250ZW50U2l6ZS5oZWln aHQoKSAtIGZ1dHVyZVJlY3QuaGVpZ2h0KCkpOwotICAgIGlmIChmdXR1cmVSZWN0LngoKSA8IDAp Ci0gICAgICAgIGZ1dHVyZVJlY3Quc2V0WCgwKTsKLSAgICBpZiAoZnV0dXJlUmVjdC55KCkgPCAw KQotICAgICAgICBmdXR1cmVSZWN0LnNldFkoMCk7Ci0KLSAgICByZXR1cm4gZnV0dXJlUmVjdDsK LX0KLQogSW50UmVjdCBTY3JvbGxWaWV3OjpleHBvc2VkQ29udGVudFJlY3QoKSBjb25zdAogewog ICAgIGlmIChOU1Njcm9sbFZpZXcgKnZpZXcgPSBzdGF0aWNfY2FzdDxOU1Njcm9sbFZpZXcgKj4o cGxhdGZvcm1XaWRnZXQoKSkpIHsK