24949 2009-03-30 16:13:16 -0700 Back out some of the changes to FrameLoader in r42055 to unbreak Chrome. 2009-03-31 09:21:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 playmobil playmobil darin oldest_to_newest 115921 0 playmobil 2009-03-30 16:13:16 -0700 r42055 removed setCurrentHistoryItem() and etProvisionalHistoryItem() from FrameLoader and made loadURL and closeURL private. Chrome uses these functions, the attached patch is to back out those parts of the CL. 115923 1 29093 playmobil 2009-03-30 16:16:34 -0700 Created attachment 29093 patch1 115928 2 29093 darin 2009-03-30 16:25:35 -0700 Comment on attachment 29093 patch1 Where is the Chromium code that's making these calls? I did a grep on the entire WebCore and WebKit tree and didn't find it. I'm almost certain the Chromium code is broken and needs to be changed, but I can't tell that for sure unless I can see it. 115935 3 fishd 2009-03-30 16:47:03 -0700 Hi Darin, We are using these FrameLoader methods from our WebKit layer, which we have not yet upstreamed. We are knee deep in cleaning up that layer so that we can upstream it. We use loadURL for browser driven navigations, and we use closeURL as part of our asynchronous procedure for shutting down a WebView. (WebView closure is rather complicated in Chrome for good reasons, which I can explain if you like.) We need setCurrentHistoryItem and setProvisionalHistoryItem to support the way we have implement back/forward. You see, we don't keep the back/forward list in the same process as WebKit. You might recall the BackForwardListClient interface from me that you reviewed several months back. That (as well as these FrameLoader methods) enable us to maintain the back/forward list separately. So, to navigate back or forward, we instead navigate to a particular HistoryItem. Getting that to work properly requires a bit of work. While we work to upstream all of the Chromium WebKit layer, I hope that you will be supportive of re-exposing these methods on FrameLoader. I think it would be a lot easier to refactor our code once it lives in svn.webkit.org. Of course, if there are any obvious alternatives to these methods, I would love to hear about them. Can we at least land Jeremy's change as a bustage fix? 115936 4 darin 2009-03-30 16:52:05 -0700 (In reply to comment #3) > We use loadURL for browser driven navigations You should be using loadFrameRequestWithFormAndValues for this. > we use closeURL as part of our asynchronous procedure for shutting down a WebView. You may want to use detachFromParent() for this. > We need setCurrentHistoryItem and setProvisionalHistoryItem to support the way > we have implement back/forward. OK. Bad news. > Can we at least land Jeremy's change as a bustage fix? All right. We need quite a bit of improvement in FrameLoader, so the sooner you can get the Chromium loading code checked into the WebKit tree, the better. This is just the first step of some major repair. It looks like the Chrome requirements are actively getting in the way of fixing the design here! 115944 5 fishd 2009-03-30 17:32:42 -0700 > You should be using loadFrameRequestWithFormAndValues for this. Whoops. I "misspoke"... we use loadURL when creating a child frame. I'm sure it should be easy to replace this usage then. > > we use closeURL as part of our asynchronous procedure for shutting down a WebView. > > You may want to use detachFromParent() for this. Hmm, I'm not sure that that will work as is... unfortunately, we need just the first part which runs unload handlers. > All right. Thank you! > We need quite a bit of improvement in FrameLoader, so the sooner you > can get the Chromium loading code checked into the WebKit tree, the better. > This is just the first step of some major repair. It looks like the Chrome > requirements are actively getting in the way of fixing the design here! Yeah, I really don't like holding up progress on improving FrameLoader. It is an ugly beast. I'd be great if we could discuss further the funny requirements Chromium has on navigation. 116010 6 fishd 2009-03-31 09:11:50 -0700 It looks like we need to apply a change like http://trac.webkit.org/changeset/42104 to the Chromium WebKit layer in order to eliminate our dependency on FrameLoader::loadURL and setProvisionalHistoryItem. I'm afraid we still need setCurrentHistoryItem and closeURL for now. 116013 7 29120 playmobil 2009-03-31 09:17:06 -0700 Created attachment 29120 patch2 Per-Darin's comment, we still need closeURL() and setCurrentHistoryItem() 116015 8 29120 fishd 2009-03-31 09:19:19 -0700 Comment on attachment 29120 patch2 LGTM 116016 9 fishd 2009-03-31 09:21:38 -0700 Landed as: http://trac.webkit.org/changeset/42130 29093 2009-03-30 16:16:34 -0700 2009-03-31 09:17:06 -0700 patch1 fix2.patch text/plain 6020 playmobil Y29tbWl0IDIyZGEyYmFmNTJmOTdlMzE4OThhNTlhNzdhOWI5ODk3NWIzOTE1ODEKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxwbGF5bW9iaWxAZGhjcC0xNzItMjItNzEtOC5tdHYuY29ycC5nb29n bGUuY29tPgpEYXRlOiAgIE1vbiBNYXIgMzAgMTY6MTU6NDUgMjAwOSAtMDcwMAoKICAgIHI0MjA1 NSByZW1vdmVkIHNvbWUgZnVuY3Rpb25zIGluIEZyYW1lTG9hZGVyIHVzZWQgYnkgQ2hyb21lLgoK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWE5NDJmMS4uYzFiY2M3YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0wMy0zMCAgSmVyZW15IE1vc2tv dmljaCAgPGplcmVteUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgcjQyMDU1IHJlbW92ZWQgYSBmZXcgZnVuY3Rpb25zIGluIEZy YW1lTG9hZGVyIHVzZWQgYnkgQ2hyb21lLAorICAgICAgICB0aGlzIENMIGJhY2tzIG91dCBzb21l IG9mIHRob3NlIGNoYW5nZXMgdG8gdW5icmVhayB0aGUgQ2hyb21lIGJ1aWxkLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDk0OQorCisgICAgICAg ICogV2ViQ29yZS5iYXNlLmV4cDoKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRVUkxJbnRvQ2hpbGRGcmFtZSk6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZEl0ZW0pOgorICAgICAgICAqIGxvYWRl ci9GcmFtZUxvYWRlci5oOgorCiAyMDA5LTAzLTMwICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5 QGFwcGxlLmNvbT4KIAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgzODg3MT4gQ3Jhc2hUcmFj ZXI6IDE0ODMgY3Jhc2hlcyBRdWlja2xvb2tpbmcKZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29y ZS5iYXNlLmV4cCBiL1dlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAppbmRleCAwZTg2MDA1Li5lOTkz YTMzIDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKKysrIGIvV2ViQ29yZS9X ZWJDb3JlLmJhc2UuZXhwCkBAIC0xNTcsOSArMTU3LDExIEBAIF9fWk43V2ViQ29yZTExRnJhbWVM b2FkZXIxOGN1cnJlbnRIaXN0b3J5SXRlbUV2CiBfX1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMThz ZXRMb2NhbExvYWRQb2xpY3lFTlMwXzE1TG9jYWxMb2FkUG9saWN5RQogX19aTjdXZWJDb3JlMTFG cmFtZUxvYWRlcjE4c2hvdWxkSGlkZVJlZmVycmVyRVJLTlNfNEtVUkxFUktOU182U3RyaW5nRQog X19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjIxbG9hZFVSTEludG9DaGlsZEZyYW1lRVJLTlNfNEtV UkxFUktOU182U3RyaW5nRVBOU181RnJhbWVFCitfX1pON1dlYkNvcmUxMUZyYW1lTG9hZGVyMjFz ZXRDdXJyZW50SGlzdG9yeUl0ZW1FTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTFIaXN0b3J5SXRlbUVF RQogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjIyZmluZEZyYW1lRm9yTmF2aWdhdGlvbkVSS05T XzEyQXRvbWljU3RyaW5nRQogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjIzdGltZU9mTGFzdENv bXBsZXRlZExvYWRFdgogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjI0cmVnaXN0ZXJVUkxTY2hl bWVBc0xvY2FsRVJLTlNfNlN0cmluZ0UKK19fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIyNXNldFBy b3Zpc2lvbmFsSGlzdG9yeUl0ZW1FTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTFIaXN0b3J5SXRlbUVF RQogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjI2cmVsb2FkV2l0aE92ZXJyaWRlRW5jb2RpbmdF UktOU182U3RyaW5nRQogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjI2c2F2ZURvY3VtZW50QW5k U2Nyb2xsU3RhdGVFdgogX19aTjdXZWJDb3JlMTFGcmFtZUxvYWRlcjMzbG9hZEZyYW1lUmVxdWVz dFdpdGhGb3JtQW5kVmFsdWVzRVJLTlNfMTZGcmFtZUxvYWRSZXF1ZXN0RWJiTjNXVEYxMFBhc3NS ZWZQdHJJTlNfNUV2ZW50RUVFUE5TXzE1SFRNTEZvcm1FbGVtZW50RVJLTlM0XzdIYXNoTWFwSU5T XzZTdHJpbmdFU0JfTlNfMTBTdHJpbmdIYXNoRU5TNF8xMEhhc2hUcmFpdHNJU0JfRUVTRV9FRQpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGM5NDNkOTguLmE3NmYwN2EgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlci5jcHAKQEAgLTE0OTksNyArMTQ5OSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRVUkxJ bnRvQ2hpbGRGcmFtZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcmVmZXJlciwKICAg ICAgICAgICAgIC8vIHRoaXMgaXMgbmVlZGVkIGlzIFJhZGFyIDMyMTM1NTYuCiAgICAgICAgICAg ICB3b3JraW5nVVJMID0gS1VSTChjaGlsZEl0ZW0tPm9yaWdpbmFsVVJMU3RyaW5nKCkpOwogICAg ICAgICAgICAgY2hpbGRMb2FkVHlwZSA9IGxvYWRUeXBlOwotICAgICAgICAgICAgY2hpbGRGcmFt ZS0+bG9hZGVyKCktPm1fcHJvdmlzaW9uYWxIaXN0b3J5SXRlbSA9IGNoaWxkSXRlbTsKKyAgICAg ICAgICAgIGNoaWxkRnJhbWUtPmxvYWRlcigpLT5zZXRQcm92aXNpb25hbEhpc3RvcnlJdGVtKGNo aWxkSXRlbSk7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTQ4NjYsNiArNDg2NiwxNiBAQCBIaXN0 b3J5SXRlbSogRnJhbWVMb2FkZXI6OmN1cnJlbnRIaXN0b3J5SXRlbSgpCiAgICAgcmV0dXJuIG1f Y3VycmVudEhpc3RvcnlJdGVtLmdldCgpOwogfQogCit2b2lkIEZyYW1lTG9hZGVyOjpzZXRDdXJy ZW50SGlzdG9yeUl0ZW0oUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4gaXRlbSkKK3sKKyAgICBtX2N1 cnJlbnRIaXN0b3J5SXRlbSA9IGl0ZW07Cit9CisKK3ZvaWQgRnJhbWVMb2FkZXI6OnNldFByb3Zp c2lvbmFsSGlzdG9yeUl0ZW0oUGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4gaXRlbSkKK3sKKyAgICBt X3Byb3Zpc2lvbmFsSGlzdG9yeUl0ZW0gPSBpdGVtOworfQorCiB2b2lkIEZyYW1lTG9hZGVyOjpz ZXRNYWluRG9jdW1lbnRFcnJvcihEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvdXJj ZUVycm9yJiBlcnJvcikKIHsKICAgICBtX2NsaWVudC0+c2V0TWFpbkRvY3VtZW50RXJyb3IobG9h ZGVyLCBlcnJvcik7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCA1YTRlODMwLi4xMDA2MmZhIDEwMDY0 NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmgKQEAgLTEyNSw2ICsxMjUsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgIHZvaWQgc2V0dXBGb3JSZXBsYWNlKCk7CiAgICAgICAgIHZvaWQgc2V0dXBGb3JSZXBs YWNlQnlNSU1FVHlwZShjb25zdCBTdHJpbmcmIG5ld01JTUVUeXBlKTsKIAorICAgICAgICB2b2lk IGxvYWRVUkwoY29uc3QgS1VSTCYgbmV3VVJMLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBjb25z dCBTdHJpbmcmIGZyYW1lTmFtZSwgICAgICAgICAgIC8vIENhbGxlZCBieSBsb2FkRnJhbWVSZXF1 ZXN0V2l0aEZvcm1BbmRWYWx1ZXMoKSwgY2FsbHMgbG9hZFdpdGhOYXZpZ2F0aW9uQWN0aW9uIG9y IGVsc2UgZGlzcGF0Y2hlcyB0byBuYXZpZ2F0aW9uIHBvbGljeSBkZWxlZ2F0ZQorICAgICAgICAg ICAgYm9vbCBsb2NrSGlzdG9yeSwgRnJhbWVMb2FkVHlwZSwgUGFzc1JlZlB0cjxFdmVudD4sIFBh c3NSZWZQdHI8Rm9ybVN0YXRlPik7CiAgICAgICAgIHZvaWQgbG9hZFVSTEludG9DaGlsZEZyYW1l KGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmIHJlZmVyZXIsIEZyYW1lKik7CiAKICAgICAgICAg dm9pZCBsb2FkRnJhbWVSZXF1ZXN0V2l0aEZvcm1BbmRWYWx1ZXMoY29uc3QgRnJhbWVMb2FkUmVx dWVzdCYsIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9ja0JhY2tGb3J3YXJkTGlzdCwgICAgICAg ICAgIC8vIENhbGxlZCBieSBzdWJtaXRGb3JtLCBjYWxscyBsb2FkUG9zdFJlcXVlc3QoKQpAQCAt MjYyLDYgKzI2NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHN0b3Ao KTsKICAgICAgICAgdm9pZCBzdG9wTG9hZGluZyhib29sIHNlbmRVbmxvYWQpOworICAgICAgICBi b29sIGNsb3NlVVJMKCk7CiAKICAgICAgICAgdm9pZCBkaWRFeHBsaWNpdE9wZW4oKTsKIApAQCAt MzU2LDYgKzM1OSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzYXZlRG9j dW1lbnRBbmRTY3JvbGxTdGF0ZSgpOwogCiAgICAgICAgIEhpc3RvcnlJdGVtKiBjdXJyZW50SGlz dG9yeUl0ZW0oKTsKKyAgICAgICAgdm9pZCBzZXRDdXJyZW50SGlzdG9yeUl0ZW0oUGFzc1JlZlB0 cjxIaXN0b3J5SXRlbT4pOworICAgICAgICB2b2lkIHNldFByb3Zpc2lvbmFsSGlzdG9yeUl0ZW0o UGFzc1JlZlB0cjxIaXN0b3J5SXRlbT4pOwogCiAgICAgICAgIGVudW0gTG9jYWxMb2FkUG9saWN5 IHsKICAgICAgICAgICAgIEFsbG93TG9jYWxMb2Fkc0ZvckFsbCwgIC8vIE5vIHJlc3RyaWN0aW9u IG9uIGxvY2FsIGxvYWRzLgpAQCAtNTA4LDkgKzUxMyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgdm9pZCBsb2FkUG9zdFJlcXVlc3QoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29u c3QgU3RyaW5nJiByZWZlcnJlciwgICAgICAgICAgICAgICAgICAgICAgICAvLyBDYWxsZWQgYnkg bG9hZEZyYW1lUmVxdWVzdFdpdGhGb3JtQW5kVmFsdWVzKCksIGNhbGxzIGxvYWRXaXRoTmF2aWdh dGlvbkFjdGlvbgogICAgICAgICAgICAgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGJvb2wgbG9j a0hpc3RvcnksIEZyYW1lTG9hZFR5cGUsIFBhc3NSZWZQdHI8RXZlbnQ+LCBQYXNzUmVmUHRyPEZv cm1TdGF0ZT4pOwogCi0gICAgICAgIHZvaWQgbG9hZFVSTChjb25zdCBLVVJMJiBuZXdVUkwsIGNv bnN0IFN0cmluZyYgcmVmZXJyZXIsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCAgICAgICAgICAg Ly8gQ2FsbGVkIGJ5IGxvYWRGcmFtZVJlcXVlc3RXaXRoRm9ybUFuZFZhbHVlcygpLCBjYWxscyBs b2FkV2l0aE5hdmlnYXRpb25BY3Rpb24gb3IgZWxzZSBkaXNwYXRjaGVzIHRvIG5hdmlnYXRpb24g cG9saWN5IGRlbGVnYXRlICAgIAotICAgICAgICAgICAgYm9vbCBsb2NrSGlzdG9yeSwgRnJhbWVM b2FkVHlwZSwgUGFzc1JlZlB0cjxFdmVudD4sIFBhc3NSZWZQdHI8Rm9ybVN0YXRlPik7ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCi0KICAg ICAgICAgdm9pZCBjbGllbnRSZWRpcmVjdENhbmNlbGxlZE9yRmluaXNoZWQoYm9vbCBjYW5jZWxX aXRoTG9hZEluUHJvZ3Jlc3MpOwogICAgICAgICB2b2lkIGNsaWVudFJlZGlyZWN0ZWQoY29uc3Qg S1VSTCYsIGRvdWJsZSBkZWxheSwgZG91YmxlIGZpcmVEYXRlLCBib29sIGxvY2tCYWNrRm9yd2Fy ZExpc3QsIGJvb2wgaXNKYXZhU2NyaXB0Rm9ybUFjdGlvbik7CiAgICAgICAgIGJvb2wgc2hvdWxk UmVsb2FkKGNvbnN0IEtVUkwmIGN1cnJlbnRVUkwsIGNvbnN0IEtVUkwmIGRlc3RpbmF0aW9uVVJM KTsKQEAgLTUyOCw4ICs1MzAsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQg c3VibWl0Rm9ybUFnYWluKCk7CiAgICAgICAgIHZvaWQgc3VibWl0Rm9ybShjb25zdCBGcmFtZUxv YWRSZXF1ZXN0JiwgUGFzc1JlZlB0cjxFdmVudD4sIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9j a0JhY2tGb3J3YXJkTGlzdCk7CiAKLSAgICAgICAgYm9vbCBjbG9zZVVSTCgpOwotCiAgICAgICAg IEtVUkwgaGlzdG9yeVVSTChpbnQgZGlzdGFuY2UpOwogCiAgICAgICAgIC8vIFJldHVybnMgdHJ1 ZSBpZiBhcmd1bWVudCBpcyBhIEphdmFTY3JpcHQgVVJMLgo= 29120 2009-03-31 09:17:06 -0700 2009-03-31 09:19:19 -0700 patch2 fix2.patch text/plain 3147 playmobil Y29tbWl0IGYyN2E0NGUxOTlhMDFkZDFjYmEwYTc1MzU3MTJjZWZlODU4ZGJlMmUKQXV0aG9yOiBK ZXJlbXkgTW9za292aWNoIDxwbGF5bW9iaWxAZGhjcC0xNzItMjItNzEtOC5tdHYuY29ycC5nb29n bGUuY29tPgpEYXRlOiAgIFR1ZSBNYXIgMzEgMDk6MTQ6NTkgMjAwOSAtMDcwMAoKICAgIHI0MjA1 NSByZW1vdmVkIHNvbWUgZnVuY3Rpb25zIGluIEZyYW1lTG9hZGVyIHVzZWQgYnkgQ2hyb21lLgoK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWE5NDJmMS4uNGYzYWFkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAwOS0wMy0zMCAgSmVyZW15IE1vc2tv dmljaCAgPGplcmVteUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgcjQyMDU1IHJlbW92ZWQgc29tZSBmdW5jdGlvbnMgaW4gRnJh bWVMb2FkZXIgdXNlZCBieSBDaHJvbWUsCisgICAgICAgIHRoaXMgQ0wgYmFja3Mgb3V0IHNvbWUg b2YgdGhvc2UgY2hhbmdlcyB0byB1bmJyZWFrIHRoZSBDaHJvbWUgYnVpbGQuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0OTQ5CisKKyAgICAgICAg KiBXZWJDb3JlLmJhc2UuZXhwOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6Cisg ICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6CisKIDIwMDktMDMtMzAgIFRpbW90aHkgSGF0 Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODM4 ODcxPiBDcmFzaFRyYWNlcjogMTQ4MyBjcmFzaGVzIFF1aWNrbG9va2luZwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwIGIvV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCmluZGV4 IDBlODYwMDUuLmI5Y2U0MmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAor KysgYi9XZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAKQEAgLTE1Nyw2ICsxNTcsNyBAQCBfX1pON1dl YkNvcmUxMUZyYW1lTG9hZGVyMThjdXJyZW50SGlzdG9yeUl0ZW1FdgogX19aTjdXZWJDb3JlMTFG cmFtZUxvYWRlcjE4c2V0TG9jYWxMb2FkUG9saWN5RU5TMF8xNUxvY2FsTG9hZFBvbGljeUUKIF9f Wk43V2ViQ29yZTExRnJhbWVMb2FkZXIxOHNob3VsZEhpZGVSZWZlcnJlckVSS05TXzRLVVJMRVJL TlNfNlN0cmluZ0UKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIyMWxvYWRVUkxJbnRvQ2hpbGRG cmFtZUVSS05TXzRLVVJMRVJLTlNfNlN0cmluZ0VQTlNfNUZyYW1lRQorX19aTjdXZWJDb3JlMTFG cmFtZUxvYWRlcjIxc2V0Q3VycmVudEhpc3RvcnlJdGVtRU4zV1RGMTBQYXNzUmVmUHRySU5TXzEx SGlzdG9yeUl0ZW1FRUUKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIyMmZpbmRGcmFtZUZvck5h dmlnYXRpb25FUktOU18xMkF0b21pY1N0cmluZ0UKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIy M3RpbWVPZkxhc3RDb21wbGV0ZWRMb2FkRXYKIF9fWk43V2ViQ29yZTExRnJhbWVMb2FkZXIyNHJl Z2lzdGVyVVJMU2NoZW1lQXNMb2NhbEVSS05TXzZTdHJpbmdFCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK aW5kZXggYzk0M2Q5OC4uYmNlYmUzNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtNDg2Niw2 ICs0ODY2LDExIEBAIEhpc3RvcnlJdGVtKiBGcmFtZUxvYWRlcjo6Y3VycmVudEhpc3RvcnlJdGVt KCkKICAgICByZXR1cm4gbV9jdXJyZW50SGlzdG9yeUl0ZW0uZ2V0KCk7CiB9CiAKK3ZvaWQgRnJh bWVMb2FkZXI6OnNldEN1cnJlbnRIaXN0b3J5SXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPiBp dGVtKQoreworICAgIG1fY3VycmVudEhpc3RvcnlJdGVtID0gaXRlbTsKK30KKwogdm9pZCBGcmFt ZUxvYWRlcjo6c2V0TWFpbkRvY3VtZW50RXJyb3IoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgY29u c3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7CiAgICAgbV9jbGllbnQtPnNldE1haW5Eb2N1bWVu dEVycm9yKGxvYWRlciwgZXJyb3IpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuaCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggNWE0ZTgzMC4uNjFh MzRjNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCkBAIC0yNjIsNiArMjYyLDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiAgICAgICAgIHZvaWQgc3RvcCgpOwogICAgICAgICB2b2lkIHN0b3BMb2FkaW5n KGJvb2wgc2VuZFVubG9hZCk7CisgICAgICAgIGJvb2wgY2xvc2VVUkwoKTsKIAogICAgICAgICB2 b2lkIGRpZEV4cGxpY2l0T3BlbigpOwogCkBAIC0zNTYsNiArMzU3LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICB2b2lkIHNhdmVEb2N1bWVudEFuZFNjcm9sbFN0YXRlKCk7CiAKICAg ICAgICAgSGlzdG9yeUl0ZW0qIGN1cnJlbnRIaXN0b3J5SXRlbSgpOworICAgICAgICB2b2lkIHNl dEN1cnJlbnRIaXN0b3J5SXRlbShQYXNzUmVmUHRyPEhpc3RvcnlJdGVtPik7CiAKICAgICAgICAg ZW51bSBMb2NhbExvYWRQb2xpY3kgewogICAgICAgICAgICAgQWxsb3dMb2NhbExvYWRzRm9yQWxs LCAgLy8gTm8gcmVzdHJpY3Rpb24gb24gbG9jYWwgbG9hZHMuCkBAIC01MjgsOCArNTMwLDYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHN1Ym1pdEZvcm1BZ2FpbigpOwogICAg ICAgICB2b2lkIHN1Ym1pdEZvcm0oY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYsIFBhc3NSZWZQdHI8 RXZlbnQ+LCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QpOwogCi0g ICAgICAgIGJvb2wgY2xvc2VVUkwoKTsKLQogICAgICAgICBLVVJMIGhpc3RvcnlVUkwoaW50IGRp c3RhbmNlKTsKIAogICAgICAgICAvLyBSZXR1cm5zIHRydWUgaWYgYXJndW1lbnQgaXMgYSBKYXZh U2NyaXB0IFVSTC4K