42121 2010-07-12 17:40:14 -0700 [chromium] Add new WebClipboard method for setting generic data in copy/cut handlers. 2010-08-27 19:25:50 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 44727 0 dcheng webkit-unassigned commit-queue fishd tony oldest_to_newest 250187 0 dcheng 2010-07-12 17:40:14 -0700 Since it doesn't look like https://bugs.webkit.org/show_bug.cgi?id=40515 is going anywhere, work around it in M6 by creating another setter function. It'd still be nice to take the changes in https://bugs.webkit.org/show_bug.cgi?id=40515 and get rid of this new function in the embedding layer, but that's not going to happen in M6. 250193 1 61301 dcheng 2010-07-12 17:43:27 -0700 Created attachment 61301 Patch 250319 2 61301 fishd 2010-07-12 22:41:01 -0700 Comment on attachment 61301 Patch you need to update the ChangeLog file. it'd be helpful also if i could see how this new function will be used. 250761 3 61419 dcheng 2010-07-13 14:53:51 -0700 Created attachment 61419 Patch Sorry, forgot to commit the changes for the ChangeLog. ClipboardChromium::setData (or ChromiumDataObject) will call ChromiumBridge::clipboard()->writeDataFlavor() directly when setting data for a copy/cut. As mentioned in bug 40515, it'd be nice if we had the equivalent of startDrag() for copy and cut, but I don't think that feature is going to make M6. 259083 4 tony 2010-08-02 13:48:02 -0700 I think this would be easier to review if you had a chromium side change demonstrating how it's used. 261436 5 61419 eric 2010-08-06 13:49:44 -0700 Comment on attachment 61419 Patch r- based on tony and darin's comments above. 268152 6 dcheng 2010-08-23 16:21:57 -0700 (In reply to comment #4) > I think this would be easier to review if you had a chromium side change demonstrating how it's used. I'll try to post a patch for that this evening. I'm trying to separate my patches from each other right now, and it's a rather painful process. It's needed because drags and copies/cuts aren't written back to the system data object the same way. For drags: The drag controller starts a drag. The DOM receives a dragstart event and populates event.dataTransfer. The drag controller calls DragClient::startDrag(), which passes all the data that was set in event.dataTransfer to the Chromium side. For copy/cut: The editor clears the pasteboard before it does anything. Then a copy/cut event is dispatched to the DOM, and for each call to event.dataTransfer.setData(), data is immediately written back to the system pasteboard. There is no analogous version of DragClient::startDrag() for pasteboard operations. I wanted to add this, but haven't done so since I didn't receive feedback from Darin Adler. Since we must write back immediately, and the existing APIs are not rich enough, I added a new interface. 270156 7 65628 dcheng 2010-08-26 15:32:23 -0700 Created attachment 65628 Patch 270198 8 65628 tony 2010-08-26 16:19:39 -0700 Comment on attachment 65628 Patch I see, we're not using writeData yet (it looks like a stub on the chromium side). In that case, this seems fine. Don't forget to update webclipboard_impl.* on the Chromium side too. 270897 9 65628 commit-queue 2010-08-27 19:25:44 -0700 Comment on attachment 65628 Patch Clearing flags on attachment: 65628 Committed r66293: <http://trac.webkit.org/changeset/66293> 270898 10 commit-queue 2010-08-27 19:25:50 -0700 All reviewed patches have been landed. Closing bug. 61301 2010-07-12 17:43:27 -0700 2010-07-13 14:53:51 -0700 Patch 1.patch text/plain 1757 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ2xpcGJvYXJkLmggYi9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYkNsaXBib2FyZC5oCmluZGV4IDY3NTVkOTYuLjM0MGUxNjcg MTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViQ2xpcGJvYXJkLmgKKysrIGIv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDbGlwYm9hcmQuaApAQCAtNzEsMTcgKzcxLDI2IEBA IHB1YmxpYzoKICAgICAgICAgY29uc3QgV2ViVVJMJiwgY29uc3QgV2ViU3RyaW5nJiB0aXRsZSkg eyB9CiAgICAgdmlydHVhbCB2b2lkIHdyaXRlSW1hZ2UoCiAgICAgICAgIGNvbnN0IFdlYkltYWdl JiwgY29uc3QgV2ViVVJMJiwgY29uc3QgV2ViU3RyaW5nJiB0aXRsZSkgeyB9CisgICAgLy8gVXNl ZCBmb3IgZHJhZy9kcm9wLgogICAgIHZpcnR1YWwgdm9pZCB3cml0ZURhdGEoY29uc3QgV2ViRHJh Z0RhdGEmKSB7IH0KKyAgICAvLyBVc2VkIGZvciBjb3B5L3Bhc3RlLiBOb3RlIHRoYXQgdGhpcyBk b2VzIG5vdCBjb3ZlciBzZWxlY3Rpb24gY29weSwgd2hpY2gKKyAgICAvLyBpcyBoYW5kbGVkIHNl cGFyYXRlbHkuIFRoaXMgaXMgc29tZXdoYXQgb2YgYSBoYWNrIGR1ZSB0byB0aGUgZmFjdCB0aGF0 CisgICAgLy8gdGhlcmUgaXMgbm8gZXF1aXZhbGVudCBvZiBzdGFydERyYWcoKSBmb3IgY29weS9j dXQuIElkZWFsbHksIHRoaXMgc2hvdWxkCisgICAgLy8gYmUgY29tYmluZWQgd2l0aCB3cml0ZURh dGEoKSBhYm92ZSB3aGljaCBhbGxvd3MgdXMgdG8gZml4IGJ1Z3MgbGlrZQorICAgIC8vIHByZXZl bnRpbmcgdGhlIGRlZmF1bHQgYWN0aW9uIG9uIGNvcHkvY3V0IGNsZWFycyB0aGUgc3lzdGVtIHBh c3RlYm9hcmQuCisgICAgdmlydHVhbCB2b2lkIHdyaXRlRGF0YUZsYXZvcigKKyAgICAgICAgY29u c3QgV2ViU3RyaW5nJiB0eXBlLCBjb25zdCBXZWJTdHJpbmcmIGRhdGEpIHsgfQogCiAgICAgLy8g VGhlIGZvbGxvd2luZyBmdW5jdGlvbnMgYXJlIHVzZWQgZm9yIHJlYWRpbmcgcGxhdGZvcm0gZGF0 YSBmb3IgY29weSBhbmQKICAgICAvLyBwYXN0ZSwgZHJhZyBhbmQgZHJvcCwgYW5kIHNlbGVjdGlv biBjb3B5IChvbiBYKS4KICAgICB2aXJ0dWFsIFdlYlZlY3RvcjxXZWJTdHJpbmc+IHJlYWRBdmFp bGFibGVUeXBlcygKICAgICAgICAgQnVmZmVyLCBib29sKiBjb250YWluc0ZpbGVuYW1lcykgeyBy ZXR1cm4gV2ViVmVjdG9yPFdlYlN0cmluZz4oKTsgfQotICAgIC8vIFJldHVybnMgdHJ1ZSBpZiB0 aGUgcmVxdWVzdGVkIHR5cGUgd2FzIHN1Y2Nlc3NmdWxseSByZWFkIGZyb20gdGhlIGJ1ZmZlci4g CisgICAgLy8gUmV0dXJucyB0cnVlIGlmIHRoZSByZXF1ZXN0ZWQgdHlwZSB3YXMgc3VjY2Vzc2Z1 bGx5IHJlYWQgZnJvbSB0aGUgYnVmZmVyLgogICAgIHZpcnR1YWwgYm9vbCByZWFkRGF0YSgKICAg ICAgICAgQnVmZmVyLCBjb25zdCBXZWJTdHJpbmcmIHR5cGUsIFdlYlN0cmluZyogZGF0YSwKICAg ICAgICAgV2ViU3RyaW5nKiBtZXRhZGF0YSkgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFs IFdlYlZlY3RvcjxXZWJTdHJpbmc+IHJlYWRGaWxlbmFtZXMoQnVmZmVyKSB7IHJldHVybiBXZWJW ZWN0b3I8V2ViU3RyaW5nPigpOyB9CisgICAgdmlydHVhbCBXZWJWZWN0b3I8V2ViU3RyaW5nPiBy ZWFkRmlsZW5hbWVzKAorICAgICAgICBCdWZmZXIpIHsgcmV0dXJuIFdlYlZlY3RvcjxXZWJTdHJp bmc+KCk7IH0KIAogcHJvdGVjdGVkOgogICAgIH5XZWJDbGlwYm9hcmQoKSB7fQo= 61419 2010-07-13 14:53:51 -0700 2010-08-26 15:32:19 -0700 Patch 1.patch text/plain 2402 dcheng ZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCmluZGV4IGRkNjhjYTguLmRhZjRjZWYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE0IEBACisyMDEwLTA3LTEyICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1 bV0gQWRkIG5ldyBXZWJDbGlwYm9hcmQgbWV0aG9kIGZvciBzZXR0aW5nIGdlbmVyaWMgZGF0YSBp biBjb3B5L2N1dCBoYW5kbGVycy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQyMTIxCisKKyAgICAgICAgKiBwdWJsaWMvV2ViQ2xpcGJvYXJkLmg6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNsaXBib2FyZDo6d3JpdGVEYXRhRmxhdm9yKToKKyAgICAgICAg KFdlYktpdDo6V2ViQ2xpcGJvYXJkOjpyZWFkRmlsZW5hbWVzKToKKwogMjAxMC0wNy0wOCAgVml0 YWx5IFJlcGVzaGtvICA8dml0YWx5ckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Q2xpcGJvYXJkLmggYi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNsaXBib2FyZC5oCmluZGV4 IDY3NTVkOTYuLjM0MGUxNjcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Q2xpcGJvYXJkLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDbGlwYm9hcmQuaApA QCAtNzEsMTcgKzcxLDI2IEBAIHB1YmxpYzoKICAgICAgICAgY29uc3QgV2ViVVJMJiwgY29uc3Qg V2ViU3RyaW5nJiB0aXRsZSkgeyB9CiAgICAgdmlydHVhbCB2b2lkIHdyaXRlSW1hZ2UoCiAgICAg ICAgIGNvbnN0IFdlYkltYWdlJiwgY29uc3QgV2ViVVJMJiwgY29uc3QgV2ViU3RyaW5nJiB0aXRs ZSkgeyB9CisgICAgLy8gVXNlZCBmb3IgZHJhZy9kcm9wLgogICAgIHZpcnR1YWwgdm9pZCB3cml0 ZURhdGEoY29uc3QgV2ViRHJhZ0RhdGEmKSB7IH0KKyAgICAvLyBVc2VkIGZvciBjb3B5L3Bhc3Rl LiBOb3RlIHRoYXQgdGhpcyBkb2VzIG5vdCBjb3ZlciBzZWxlY3Rpb24gY29weSwgd2hpY2gKKyAg ICAvLyBpcyBoYW5kbGVkIHNlcGFyYXRlbHkuIFRoaXMgaXMgc29tZXdoYXQgb2YgYSBoYWNrIGR1 ZSB0byB0aGUgZmFjdCB0aGF0CisgICAgLy8gdGhlcmUgaXMgbm8gZXF1aXZhbGVudCBvZiBzdGFy dERyYWcoKSBmb3IgY29weS9jdXQuIElkZWFsbHksIHRoaXMgc2hvdWxkCisgICAgLy8gYmUgY29t YmluZWQgd2l0aCB3cml0ZURhdGEoKSBhYm92ZSB3aGljaCBhbGxvd3MgdXMgdG8gZml4IGJ1Z3Mg bGlrZQorICAgIC8vIHByZXZlbnRpbmcgdGhlIGRlZmF1bHQgYWN0aW9uIG9uIGNvcHkvY3V0IGNs ZWFycyB0aGUgc3lzdGVtIHBhc3RlYm9hcmQuCisgICAgdmlydHVhbCB2b2lkIHdyaXRlRGF0YUZs YXZvcigKKyAgICAgICAgY29uc3QgV2ViU3RyaW5nJiB0eXBlLCBjb25zdCBXZWJTdHJpbmcmIGRh dGEpIHsgfQogCiAgICAgLy8gVGhlIGZvbGxvd2luZyBmdW5jdGlvbnMgYXJlIHVzZWQgZm9yIHJl YWRpbmcgcGxhdGZvcm0gZGF0YSBmb3IgY29weSBhbmQKICAgICAvLyBwYXN0ZSwgZHJhZyBhbmQg ZHJvcCwgYW5kIHNlbGVjdGlvbiBjb3B5IChvbiBYKS4KICAgICB2aXJ0dWFsIFdlYlZlY3RvcjxX ZWJTdHJpbmc+IHJlYWRBdmFpbGFibGVUeXBlcygKICAgICAgICAgQnVmZmVyLCBib29sKiBjb250 YWluc0ZpbGVuYW1lcykgeyByZXR1cm4gV2ViVmVjdG9yPFdlYlN0cmluZz4oKTsgfQotICAgIC8v IFJldHVybnMgdHJ1ZSBpZiB0aGUgcmVxdWVzdGVkIHR5cGUgd2FzIHN1Y2Nlc3NmdWxseSByZWFk IGZyb20gdGhlIGJ1ZmZlci4gCisgICAgLy8gUmV0dXJucyB0cnVlIGlmIHRoZSByZXF1ZXN0ZWQg dHlwZSB3YXMgc3VjY2Vzc2Z1bGx5IHJlYWQgZnJvbSB0aGUgYnVmZmVyLgogICAgIHZpcnR1YWwg Ym9vbCByZWFkRGF0YSgKICAgICAgICAgQnVmZmVyLCBjb25zdCBXZWJTdHJpbmcmIHR5cGUsIFdl YlN0cmluZyogZGF0YSwKICAgICAgICAgV2ViU3RyaW5nKiBtZXRhZGF0YSkgeyByZXR1cm4gZmFs c2U7IH0KLSAgICB2aXJ0dWFsIFdlYlZlY3RvcjxXZWJTdHJpbmc+IHJlYWRGaWxlbmFtZXMoQnVm ZmVyKSB7IHJldHVybiBXZWJWZWN0b3I8V2ViU3RyaW5nPigpOyB9CisgICAgdmlydHVhbCBXZWJW ZWN0b3I8V2ViU3RyaW5nPiByZWFkRmlsZW5hbWVzKAorICAgICAgICBCdWZmZXIpIHsgcmV0dXJu IFdlYlZlY3RvcjxXZWJTdHJpbmc+KCk7IH0KIAogcHJvdGVjdGVkOgogICAgIH5XZWJDbGlwYm9h cmQoKSB7fQo= 65628 2010-08-26 15:32:23 -0700 2010-08-27 19:25:44 -0700 Patch bug-42121-20100826153222.patch text/plain 4482 dcheng ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjU2MTAwNjM3Y2I3YzUxYjljZDg4M2JhNzEyMGIwN2ZjMzFkMzRmNC4uNTZhNjk4ZmVkN2Q0YmRl ZThiNjNmM2VjMmI2NjJjMDYwOWU1OTMxMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wOC0yNiAgRGFu aWVsIENoZW5nICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEFkZCBuZXcgV2ViQ2xpcGJvYXJk IG1ldGhvZCBmb3Igc2V0dGluZyBnZW5lcmljIGRhdGEgaW4gY29weS9jdXQgaGFuZGxlcnMuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjEyMQorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0Nocm9t aXVtQnJpZGdlLmg6CisKIDIwMTAtMDgtMjYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vQ2hyb21pdW1CcmlkZ2UuaAppbmRleCAzNWFjZTg5YzYyNzcwNDQwYTgyNWQyZTBhMGM4 OWIxZGE3OGFlZjg0Li5iYzg2ZGUyYmI5OGEwM2RhM2RhMzk2NTg3NDM1NGE5NWEyYmJhYTBmIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgKKysr IGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oCkBAIC0xMDIsNyAr MTAyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBzdGF0aWMgdm9pZCBjbGlwYm9h cmRXcml0ZVBsYWluVGV4dChjb25zdCBTdHJpbmcmKTsKICAgICAgICAgc3RhdGljIHZvaWQgY2xp cGJvYXJkV3JpdGVVUkwoY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYpOwogICAgICAgICBzdGF0 aWMgdm9pZCBjbGlwYm9hcmRXcml0ZUltYWdlKE5hdGl2ZUltYWdlUHRyLCBjb25zdCBLVVJMJiwg Y29uc3QgU3RyaW5nJik7Ci0gICAgICAgIHN0YXRpYyB2b2lkIGNsaXBib2FyZFdyaXRlRGF0YShD bGlwYm9hcmREYXRhKik7CisgICAgICAgIHN0YXRpYyB2b2lkIGNsaXBib2FyZFdyaXRlRGF0YShj b25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0cmluZyYgZGF0YSwgY29uc3QgU3RyaW5nJiBtZXRh ZGF0YSk7CiAKICAgICAgICAgLy8gSW50ZXJmYWNlIGZvciBoYW5kbGluZyBjb3B5IGFuZCBwYXN0 ZSwgZHJhZyBhbmQgZHJvcCwgYW5kIHNlbGVjdGlvbiBjb3B5LgogICAgICAgICBzdGF0aWMgSGFz aFNldDxTdHJpbmc+IGNsaXBib2FyZFJlYWRBdmFpbGFibGVUeXBlcyhQYXN0ZWJvYXJkUHJpdmF0 ZTo6Q2xpcGJvYXJkQnVmZmVyLCBib29sKiBjb250YWluc0ZpbGVuYW1lcyk7CmRpZmYgLS1naXQg YS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpp bmRleCAwMjdjYTc1YjU1NGRkOTJjMGM1MzU1ZjJjZmMxODE5OWNiYWY1NWJlLi41NmIxMzhhOWI1 Zjg0ZjY1ZTM5ZTAzZWM2MzBlYjg3N2E2M2JjNTZjIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxMC0wOC0yNiAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1d IEFkZCBuZXcgV2ViQ2xpcGJvYXJkIG1ldGhvZCBmb3Igc2V0dGluZyBnZW5lcmljIGRhdGEgaW4g Y29weS9jdXQgaGFuZGxlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00MjEyMQorCisgICAgICAgICogcHVibGljL1dlYkNsaXBib2FyZC5oOgorICAg ICAgICAoV2ViS2l0OjpXZWJDbGlwYm9hcmQ6OndyaXRlRGF0YSk6CisgICAgICAgIChXZWJLaXQ6 OldlYkNsaXBib2FyZDo6cmVhZEZpbGVuYW1lcyk6CisgICAgICAgICogc3JjL0Nocm9taXVtQnJp ZGdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9taXVtQnJpZGdlOjpjbGlwYm9hcmRXcml0 ZURhdGEpOgorCiAyMDEwLTA4LTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJDbGlwYm9hcmQuaCBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Q2xpcGJvYXJkLmgKaW5kZXggNjc1NWQ5NmQ1YmM4MzliZDcwNmEzNTU3NDFmMjNjN2UxODRiYjA0 YS4uODYxYzUyMjY3OGUzOGQyNzg4NDc3NmU0YTVlNTVhNTVkMzFkNjIzNSAxMDA2NDQKLS0tIGEv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDbGlwYm9hcmQuaAorKysgYi9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkNsaXBib2FyZC5oCkBAIC03MSw3ICs3MSwxMCBAQCBwdWJsaWM6CiAgICAg ICAgIGNvbnN0IFdlYlVSTCYsIGNvbnN0IFdlYlN0cmluZyYgdGl0bGUpIHsgfQogICAgIHZpcnR1 YWwgdm9pZCB3cml0ZUltYWdlKAogICAgICAgICBjb25zdCBXZWJJbWFnZSYsIGNvbnN0IFdlYlVS TCYsIGNvbnN0IFdlYlN0cmluZyYgdGl0bGUpIHsgfQotICAgIHZpcnR1YWwgdm9pZCB3cml0ZURh dGEoY29uc3QgV2ViRHJhZ0RhdGEmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgd3JpdGVEYXRhKAor ICAgICAgICBjb25zdCBXZWJTdHJpbmcmIHR5cGUsCisgICAgICAgIGNvbnN0IFdlYlN0cmluZyYg ZGF0YSwKKyAgICAgICAgY29uc3QgV2ViU3RyaW5nJiBtZXRhZGF0YSkgeyB9CiAKICAgICAvLyBU aGUgZm9sbG93aW5nIGZ1bmN0aW9ucyBhcmUgdXNlZCBmb3IgcmVhZGluZyBwbGF0Zm9ybSBkYXRh IGZvciBjb3B5IGFuZAogICAgIC8vIHBhc3RlLCBkcmFnIGFuZCBkcm9wLCBhbmQgc2VsZWN0aW9u IGNvcHkgKG9uIFgpLgpAQCAtODEsNyArODQsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29s IHJlYWREYXRhKAogICAgICAgICBCdWZmZXIsIGNvbnN0IFdlYlN0cmluZyYgdHlwZSwgV2ViU3Ry aW5nKiBkYXRhLAogICAgICAgICBXZWJTdHJpbmcqIG1ldGFkYXRhKSB7IHJldHVybiBmYWxzZTsg fQotICAgIHZpcnR1YWwgV2ViVmVjdG9yPFdlYlN0cmluZz4gcmVhZEZpbGVuYW1lcyhCdWZmZXIp IHsgcmV0dXJuIFdlYlZlY3RvcjxXZWJTdHJpbmc+KCk7IH0KKyAgICB2aXJ0dWFsIFdlYlZlY3Rv cjxXZWJTdHJpbmc+IHJlYWRGaWxlbmFtZXMoCisgICAgICAgIEJ1ZmZlcikgeyByZXR1cm4gV2Vi VmVjdG9yPFdlYlN0cmluZz4oKTsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgfldlYkNsaXBib2FyZCgp IHt9CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL0Nocm9taXVtQnJpZGdlLmNwcCBi L1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCmluZGV4IDMzZjQwNWQ5ZDM2 YWUzMjllMDc0YTA0MzVlMGYyOTAwMjA1NGYzYzQuLjkxMWRjZjM5ZmQ5ODhjZmMwZDY5OGY4NGI1 OGUxNTJhNmVlMjI3MWIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1C cmlkZ2UuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvQ2hyb21pdW1CcmlkZ2UuY3BwCkBA IC0yMDAsMTEgKzIwMCwxMSBAQCB2b2lkIENocm9taXVtQnJpZGdlOjpjbGlwYm9hcmRXcml0ZUlt YWdlKE5hdGl2ZUltYWdlUHRyIGltYWdlLAogICAgIHdlYktpdENsaWVudCgpLT5jbGlwYm9hcmQo KS0+d3JpdGVJbWFnZSh3ZWJJbWFnZSwgc291cmNlVVJMLCB0aXRsZSk7CiB9CiAKLXZvaWQgQ2hy b21pdW1CcmlkZ2U6OmNsaXBib2FyZFdyaXRlRGF0YShDbGlwYm9hcmREYXRhKiBkYXRhKQordm9p ZCBDaHJvbWl1bUJyaWRnZTo6Y2xpcGJvYXJkV3JpdGVEYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBTdHJpbmcmIGRh dGEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5n JiBtZXRhZGF0YSkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIFdlYkRyYWdEYXRhIGRy YWdEYXRhOyAvLyBGSVhNRTogRGVmaW5lIHRoZSBjb252ZXJzaW9uIGZyb20gQ2xpcGJvYXJkRGF0 YSB0byBXZWJEcmFnRGF0YS4KLSAgICB3ZWJLaXRDbGllbnQoKS0+Y2xpcGJvYXJkKCktPndyaXRl RGF0YShkcmFnRGF0YSk7CisgICAgd2ViS2l0Q2xpZW50KCktPmNsaXBib2FyZCgpLT53cml0ZURh dGEodHlwZSwgZGF0YSwgbWV0YWRhdGEpOwogfQogCiBIYXNoU2V0PFN0cmluZz4gQ2hyb21pdW1C cmlkZ2U6OmNsaXBib2FyZFJlYWRBdmFpbGFibGVUeXBlcygK