66322 2011-08-16 11:49:29 -0700 Prepare frames for history navigation 2011-08-18 04:11:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gavinp gavinp ap beidson creis fishd gavinp japhet webkit.review.bot oldest_to_newest 451785 0 gavinp 2011-08-16 11:49:29 -0700 Advance frame state before history navigation in new frame 451787 1 104075 gavinp 2011-08-16 11:51:22 -0700 Created attachment 104075 Patch 451788 2 104075 gavinp 2011-08-16 11:52:04 -0700 Comment on attachment 104075 Patch By advancing the state machine for a new Frame like this, we avoid getting explicit reloads on history navigation when a back/forward navigation happens to cross a renderer boundary 451789 3 gavinp 2011-08-16 11:52:31 -0700 fishd, WDYT? 451911 4 104075 fishd 2011-08-16 15:25:59 -0700 Comment on attachment 104075 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104075&action=review > Source/WebKit/chromium/src/WebFrameImpl.cpp:905 > + FrameLoaderStateMachine* stateMachine = m_frame->loader()->stateMachine(); The state machine feels like an internal detail of the FrameLoader. I suspect it may be better to add a method on FrameLoader that is expected to perform this fixup. I wonder if we shouldn't move some of the setCurrentItem calls behind such a method too. The challenge is to come up with a good name that properly describes the work. 451914 5 fishd 2011-08-16 15:30:16 -0700 (In reply to comment #2) > (From update of attachment 104075 [details]) > By advancing the state machine for a new Frame like this, we avoid getting explicit reloads on history navigation when a back/forward navigation happens to cross a renderer boundary Yes, I think this is the correct fixup to perform when we find that there is no current HistoryItem. One idea is to express all of this in terms of some kind of alternative to Frame::init(), or perhaps as a method that can be called after Frame::init(). Maybe doing this fixup inside loadHistoryItem is the wrong thing. Maybe Chromium should call some extra function after creating the WebView. Maybe instead of initializeMainFrame we should have an initializeMainFrameWithHistoryItem? Or, maybe initializeMainFrame should take a WebHistoryItem parameter? 452682 6 104266 gavinp 2011-08-17 16:14:54 -0700 Created attachment 104266 Patch 452687 7 104266 gavinp 2011-08-17 16:18:36 -0700 Comment on attachment 104266 Patch Thanks for the review Darin. I've elected to add a method to the FrameLoader, and call it from loadFromHistory in the WebFrameImpl. I thought that this was simple enough, and accomplished the goal of having an understandable method that conses up a frame suitable for history navigation. WDYT? 452947 8 104266 webkit.review.bot 2011-08-18 04:10:58 -0700 Comment on attachment 104266 Patch Clearing flags on attachment: 104266 Committed r93296: <http://trac.webkit.org/changeset/93296> 452948 9 webkit.review.bot 2011-08-18 04:11:03 -0700 All reviewed patches have been landed. Closing bug. 104075 2011-08-16 11:51:22 -0700 2011-08-17 16:14:49 -0700 Patch bug-66322-20110816145120.patch text/plain 2830 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogOTMwODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NTI3OTQ1NTA2N2NjYWQ1ZTY0NmNmOGNiNzk0OTY2MTVmMjQxYzU5My4uZmJhYWJkMmFjYWZjNDM2 MzU4MzAxZTAxNTMyYjFlM2I2MzI0MzYyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxMS0wOC0xNiAgR2F2aW4gUGV0ZXJzICA8Z2F2aW5wQGNocm9taXVt Lm9yZz4KKworICAgICAgICBBZHZhbmNlIGZyYW1lIHN0YXRlIGJlZm9yZSBoaXN0b3J5IG5hdmln YXRpb24gaW4gbmV3IGZyYW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NjMyMgorCisgICAgICAgIEJ5IGFkdmFuY2luZyB0aGUgc3RhdGUgbWFjaGlu ZSBmb3IgYSBuZXcgRnJhbWUgbGlrZSB0aGlzLCB3ZSBhdm9pZAorICAgICAgICBnZXR0aW5nIGV4 cGxpY2l0IHJlbG9hZHMgb24gaGlzdG9yeSBuYXZpZ2F0aW9uIHdoZW4gYSBiYWNrL2ZvcndhcmQK KyAgICAgICAgbmF2aWdhdGlvbiBoYXBwZW5zIHRvIGNyb3NzIGEgcmVuZGVyZXIgYm91bmRhcnkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9X ZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OmxvYWRIaXN0 b3J5SXRlbSk6CisKIDIwMTEtMDgtMTUgIERtaXRyeSBUaXRvdiAgPGRpbWljaEBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBBZGQgV2ViRnJhbWVDbGllbnQ6OmRpZEFkb3B0VVJM TG9hZGVyKCkgbm90aWZpY2F0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJh bWVJbXBsLmNwcAppbmRleCA0MjE2YWE0ZGNlMjUyNmNhNTU3NjI5ODkyYjQyMjgxMmU2ZGE2NTJh Li4wOTA3N2JjNWY4YjcwYzEwODE0MDY2N2I4NmZkNjQxOTY1NDZmMjhmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKQEAgLTg4OSwxNSArODg5LDIzIEBA IHZvaWQgV2ViRnJhbWVJbXBsOjpsb2FkSGlzdG9yeUl0ZW0oY29uc3QgV2ViSGlzdG9yeUl0ZW0m IGl0ZW0pCiAgICAgUmVmUHRyPEhpc3RvcnlJdGVtPiBoaXN0b3J5SXRlbSA9IFBhc3NSZWZQdHI8 SGlzdG9yeUl0ZW0+KGl0ZW0pOwogICAgIEFTU0VSVChoaXN0b3J5SXRlbS5nZXQoKSk7CiAKLSAg ICAvLyBJZiB0aGVyZSBpcyBubyBjdXJyZW50SXRlbSwgd2hpY2ggaGFwcGVucyB3aGVuIHdlIGFy ZSBuYXZpZ2F0aW5nIGluCi0gICAgLy8gc2Vzc2lvbiBoaXN0b3J5IGFmdGVyIGEgY3Jhc2gsIHdl IG5lZWQgdG8gbWFudWZhY3R1cmUgb25lIG90aGVyd2lzZSBXZWJLaXQKLSAgICAvLyBob2Fya3Mu IFRoaXMgaXMgcHJvYmFibHkgdGhlIHdyb25nIHRoaW5nIHRvIGRvLCBidXQgaXQgc2VlbXMgdG8g d29yay4KKyAgICAvLyBJZiB0aGVyZSBpcyBubyBjdXJyZW50SXRlbSwgd2hpY2ggaGFwcGVucyB3 aGVuIHdlIGFyZQorICAgIC8vIG5hdmlnYXRpbmcgaW4gc2Vzc2lvbiBoaXN0b3J5IGFmdGVyIGEg Y3Jhc2gsIG9yIGJhY2sgYWNyb3NzIGEKKyAgICAvLyByZW5kZXJlciBib3VuZGFyeSwgd2UgbmVl ZCB0byBtYW51ZmFjdHVyZSBvbmUgb3RoZXJ3aXNlIFdlYktpdAorICAgIC8vIGhvYXJrcy4gVGhp cyBpcyBwcm9iYWJseSB0aGUgd3JvbmcgdGhpbmcgdG8gZG8sIGJ1dCBpdCBzZWVtcyB0bworICAg IC8vIHdvcmsuCiAgICAgUmVmUHRyPEhpc3RvcnlJdGVtPiBjdXJyZW50SXRlbSA9IG1fZnJhbWUt PmxvYWRlcigpLT5oaXN0b3J5KCktPmN1cnJlbnRJdGVtKCk7CiAgICAgaWYgKCFjdXJyZW50SXRl bSkgewogICAgICAgICBjdXJyZW50SXRlbSA9IEhpc3RvcnlJdGVtOjpjcmVhdGUoKTsKICAgICAg ICAgY3VycmVudEl0ZW0tPnNldExhc3RWaXNpdFdhc0ZhaWx1cmUodHJ1ZSk7CiAgICAgICAgIG1f ZnJhbWUtPmxvYWRlcigpLT5oaXN0b3J5KCktPnNldEN1cnJlbnRJdGVtKGN1cnJlbnRJdGVtLmdl dCgpKTsKICAgICAgICAgbV9mcmFtZS0+cGFnZSgpLT5iYWNrRm9yd2FyZCgpLT5zZXRDdXJyZW50 SXRlbShjdXJyZW50SXRlbS5nZXQoKSk7CisKKyAgICAgICAgLy8gVGhlIHN0YXRlIG9mIHRoaXMg ZnJhbWUgc2hvdWxkIGJlIHNldCBhcyBpZiBpdCBoYWQgYSBsb2FkIGJlZm9yZS4KKyAgICAgICAg RnJhbWVMb2FkZXJTdGF0ZU1hY2hpbmUqIHN0YXRlTWFjaGluZSA9IG1fZnJhbWUtPmxvYWRlcigp LT5zdGF0ZU1hY2hpbmUoKTsKKyAgICAgICAgQVNTRVJUKHN0YXRlTWFjaGluZS0+aXNEaXNwbGF5 aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSk7CisgICAgICAgIHN0YXRlTWFjaGluZS0+YWR2YW5j ZVRvKEZyYW1lTG9hZGVyU3RhdGVNYWNoaW5lOjpEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1l bnRQb3N0Q29tbWl0KTsKKyAgICAgICAgc3RhdGVNYWNoaW5lLT5hZHZhbmNlVG8oRnJhbWVMb2Fk ZXJTdGF0ZU1hY2hpbmU6OkNvbW1pdHRlZEZpcnN0UmVhbExvYWQpOwogICAgIH0KIAogICAgIG1f aW5TYW1lRG9jdW1lbnRIaXN0b3J5TG9hZCA9IGN1cnJlbnRJdGVtLT5zaG91bGREb1NhbWVEb2N1 bWVudE5hdmlnYXRpb25UbyhoaXN0b3J5SXRlbS5nZXQoKSk7Cg== 104266 2011-08-17 16:14:54 -0700 2011-08-18 04:10:58 -0700 Patch bug-66322-20110817191452.patch text/plain 5180 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogOTMwODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2MGU4ZmM1MzEzOThiMmNk YjZjMDk4YmY5NjBhYTczNzlhODhiYmVhLi4zYmRkNTQ2OWUxZGQ5M2ZmMGMwNDRkNGY5NGNiYzRi OTIyZDMxY2VkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDgtMTcgIEdhdmlu IFBldGVycyAgPGdhdmlucEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUHJlcGFyZSBmcmFtZXMg Zm9yIGhpc3RvcnkgbmF2aWdhdGlvbi4KKworICAgICAgICBCZWZvcmUgYmVnaW5uaW5nIGFuIGV4 cGxpY2l0IGhpc3RvcnkgbmF2aWdhdGlvbiBpbiBhIG5ld2x5IGluaXRpYWxpemVkCisgICAgICAg IGZyYW1lLCBpdCdzIGltcG9ydGFudCB0byBnaXZlIGEgInByZXZpb3VzIiBpdGVtIHRvIGF2b2lk IGNyYXNoZXMsIGFuZAorICAgICAgICBnaXZlIGEgc3RhdGUgdG8gdGhlIHN0YXRlIG1hY2hpbmUg dG8gYXZvaWQgZXh0cmEgdmFsaWRhdGluZyBsb2Fkcy4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYzMjIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGFzIGhpc3RvcnkgbmF2aWdh dGlvbiBpcyB2ZXJ5IGRpZmZpY3VsdCB0byB0ZXN0IGluCisgICAgICAgIER1bXBSZW5kZXJUcmVl LgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lTG9hZGVyOjpwcmVwYXJlRm9ySGlzdG9yeU5hdmlnYXRpb24pOgorICAgICAgICAqIGxv YWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDExLTA4LTE1ICBKZWZmcmV5IFBmYXUgIDxqcGZhdUBh cHBsZS5jb20+CiAKICAgICAgICAgTmV3IFhNTCBwYXJzZXI6IGFkZCB4bWwgbmFtZXNwYWNlIHRv IHRoZSBkZWZhdWx0IG1hcCBvZiBuYW1lc3BhY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAppbmRleCA5ZGFjYWQ1NDE0MzhjZDZjZTVmZjNjMWU1ZGRkZjI4M2Y1YWJjYjMzLi43 NDMyZWMzMDRlYzg2YmIzMGY5MjliODY3ZmYyYzFmZmQ0MzA2N2E5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTEwOTAsNiArMTA5MCwyNSBAQCB2b2lkIEZyYW1lTG9h ZGVyOjpzdGFydGVkKCkKICAgICAgICAgZnJhbWUtPmxvYWRlcigpLT5tX2lzQ29tcGxldGUgPSBm YWxzZTsKIH0KIAordm9pZCBGcmFtZUxvYWRlcjo6cHJlcGFyZUZvckhpc3RvcnlOYXZpZ2F0aW9u KCkKK3sKKyAgICAvLyBJZiB0aGVyZSBpcyBubyBjdXJyZW50SXRlbSwgYnV0IHdlIHN0aWxsIHdh bnQgdG8gZW5nYWdlIGluIAorICAgIC8vIGhpc3RvcnkgbmF2aWdhdGlvbiB3ZSBuZWVkIHRvIG1h bnVmYWN0dXJlIG9uZSwgYW5kIHVwZGF0ZQorICAgIC8vIHRoZSBzdGF0ZSBtYWNoaW5lIG9mIHRo aXMgZnJhbWUgdG8gaW1wZXJzb25hdGUgaGF2aW5nCisgICAgLy8gbG9hZGVkIGl0LgorICAgIFJl ZlB0cjxIaXN0b3J5SXRlbT4gY3VycmVudEl0ZW0gPSBoaXN0b3J5KCktPmN1cnJlbnRJdGVtKCk7 CisgICAgaWYgKCFjdXJyZW50SXRlbSkgeworICAgICAgICBjdXJyZW50SXRlbSA9IEhpc3RvcnlJ dGVtOjpjcmVhdGUoKTsKKyAgICAgICAgY3VycmVudEl0ZW0tPnNldExhc3RWaXNpdFdhc0ZhaWx1 cmUodHJ1ZSk7CisgICAgICAgIGhpc3RvcnkoKS0+c2V0Q3VycmVudEl0ZW0oY3VycmVudEl0ZW0u Z2V0KCkpOworICAgICAgICBmcmFtZSgpLT5wYWdlKCktPmJhY2tGb3J3YXJkKCktPnNldEN1cnJl bnRJdGVtKGN1cnJlbnRJdGVtLmdldCgpKTsKKworICAgICAgICBBU1NFUlQoc3RhdGVNYWNoaW5l KCktPmlzRGlzcGxheWluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkpOworICAgICAgICBzdGF0ZU1h Y2hpbmUoKS0+YWR2YW5jZVRvKEZyYW1lTG9hZGVyU3RhdGVNYWNoaW5lOjpEaXNwbGF5aW5nSW5p dGlhbEVtcHR5RG9jdW1lbnRQb3N0Q29tbWl0KTsKKyAgICAgICAgc3RhdGVNYWNoaW5lKCktPmFk dmFuY2VUbyhGcmFtZUxvYWRlclN0YXRlTWFjaGluZTo6Q29tbWl0dGVkRmlyc3RSZWFsTG9hZCk7 CisgICAgfQorfQorCiB2b2lkIEZyYW1lTG9hZGVyOjpwcmVwYXJlRm9yTG9hZFN0YXJ0KCkKIHsK ICAgICBpZiAoUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmgKaW5kZXggZWRmYzVhMWFjMmVlYzI3NDRkMjNjYjcwOGMzMjJlNDk3OWJkZjFl Yi4uZDZhMjExOTk2NmRlZGVhNmYwOGZkMTAwYzZlNmE5ZGVmNDY2MGJiMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAgLTkxLDYgKzkxLDcgQEAgcHVibGljOgogICAgIFN1YmZy YW1lTG9hZGVyKiBzdWJmcmFtZUxvYWRlcigpIGNvbnN0IHsgcmV0dXJuICZtX3N1YmZyYW1lTG9h ZGVyOyB9CiAgICAgSWNvbkNvbnRyb2xsZXIqIGljb24oKSBjb25zdCB7IHJldHVybiAmbV9pY29u OyB9CiAKKyAgICB2b2lkIHByZXBhcmVGb3JIaXN0b3J5TmF2aWdhdGlvbigpOwogICAgIHZvaWQg cHJlcGFyZUZvckxvYWRTdGFydCgpOwogICAgIHZvaWQgc2V0dXBGb3JSZXBsYWNlKCk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNTI3OTQ1NTA2N2NjYWQ1ZTY0NmNmOGNiNzk0OTY2 MTVmMjQxYzU5My4uNjA3ZGVmNGMzZTlmMGVlMDFhMmQ3MDczNjBmODEyODcxOTQ3YzQ0NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMS0wOC0xNyAgR2F2 aW4gUGV0ZXJzICA8Z2F2aW5wQGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVwYXJlIGZyYW1l cyBmb3IgaGlzdG9yeSBuYXZpZ2F0aW9uLgorCisgICAgICAgIEJlZm9yZSBiZWdpbm5pbmcgYW4g ZXhwbGljaXQgaGlzdG9yeSBuYXZpZ2F0aW9uIGluIGEgbmV3bHkgaW5pdGlhbGl6ZWQKKyAgICAg ICAgZnJhbWUsIGl0J3MgaW1wb3J0YW50IHRvIGdpdmUgYSAicHJldmlvdXMiIGl0ZW0gdG8gYXZv aWQgY3Jhc2hlcywgYW5kCisgICAgICAgIGdpdmUgYSBzdGF0ZSB0byB0aGUgc3RhdGUgbWFjaGlu ZSB0byBhdm9pZCBleHRyYSB2YWxpZGF0aW5nIGxvYWRzLgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjMyMgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6bG9hZEhpc3RvcnlJdGVtKToKKwogMjAxMS0wOC0x NSAgRG1pdHJ5IFRpdG92ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21p dW1dIEFkZCBXZWJGcmFtZUNsaWVudDo6ZGlkQWRvcHRVUkxMb2FkZXIoKSBub3RpZmljYXRpb24K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IDQyMTZh YTRkY2UyNTI2Y2E1NTc2Mjk4OTJiNDIyODEyZTZkYTY1MmEuLjZjMDYxN2I2ZGM0ZjM3YmE2ZGYz NDFjMTc2ZGJlMjRjZGJkMGIzNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYkZyYW1lSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi RnJhbWVJbXBsLmNwcApAQCAtODg5LDE3ICs4ODksOCBAQCB2b2lkIFdlYkZyYW1lSW1wbDo6bG9h ZEhpc3RvcnlJdGVtKGNvbnN0IFdlYkhpc3RvcnlJdGVtJiBpdGVtKQogICAgIFJlZlB0cjxIaXN0 b3J5SXRlbT4gaGlzdG9yeUl0ZW0gPSBQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPihpdGVtKTsKICAg ICBBU1NFUlQoaGlzdG9yeUl0ZW0uZ2V0KCkpOwogCi0gICAgLy8gSWYgdGhlcmUgaXMgbm8gY3Vy cmVudEl0ZW0sIHdoaWNoIGhhcHBlbnMgd2hlbiB3ZSBhcmUgbmF2aWdhdGluZyBpbgotICAgIC8v IHNlc3Npb24gaGlzdG9yeSBhZnRlciBhIGNyYXNoLCB3ZSBuZWVkIHRvIG1hbnVmYWN0dXJlIG9u ZSBvdGhlcndpc2UgV2ViS2l0Ci0gICAgLy8gaG9hcmtzLiBUaGlzIGlzIHByb2JhYmx5IHRoZSB3 cm9uZyB0aGluZyB0byBkbywgYnV0IGl0IHNlZW1zIHRvIHdvcmsuCisgICAgbV9mcmFtZS0+bG9h ZGVyKCktPnByZXBhcmVGb3JIaXN0b3J5TmF2aWdhdGlvbigpOwogICAgIFJlZlB0cjxIaXN0b3J5 SXRlbT4gY3VycmVudEl0ZW0gPSBtX2ZyYW1lLT5sb2FkZXIoKS0+aGlzdG9yeSgpLT5jdXJyZW50 SXRlbSgpOwotICAgIGlmICghY3VycmVudEl0ZW0pIHsKLSAgICAgICAgY3VycmVudEl0ZW0gPSBI aXN0b3J5SXRlbTo6Y3JlYXRlKCk7Ci0gICAgICAgIGN1cnJlbnRJdGVtLT5zZXRMYXN0VmlzaXRX YXNGYWlsdXJlKHRydWUpOwotICAgICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+aGlzdG9yeSgpLT5z ZXRDdXJyZW50SXRlbShjdXJyZW50SXRlbS5nZXQoKSk7Ci0gICAgICAgIG1fZnJhbWUtPnBhZ2Uo KS0+YmFja0ZvcndhcmQoKS0+c2V0Q3VycmVudEl0ZW0oY3VycmVudEl0ZW0uZ2V0KCkpOwotICAg IH0KLQogICAgIG1faW5TYW1lRG9jdW1lbnRIaXN0b3J5TG9hZCA9IGN1cnJlbnRJdGVtLT5zaG91 bGREb1NhbWVEb2N1bWVudE5hdmlnYXRpb25UbyhoaXN0b3J5SXRlbS5nZXQoKSk7CiAgICAgbV9m cmFtZS0+cGFnZSgpLT5nb1RvSXRlbShoaXN0b3J5SXRlbS5nZXQoKSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEZyYW1lTG9hZFR5cGVJbmRleGVkQmFja0ZvcndhcmQpOwo=