61548 2011-05-26 11:44:43 -0700 Add 'Skia for rendering, CG for UI' option to Chromium porting layer 2011-05-31 09:05:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 caryclark caryclark commit-queue eric fishd mark thakis oldest_to_newest 410647 0 caryclark 2011-05-26 11:44:43 -0700 Add 'Skia for rendering, CG for UI' option to Chromium porting layer 410704 1 95014 caryclark 2011-05-26 11:57:16 -0700 Created attachment 95014 Patch 410709 2 95014 eric 2011-05-26 12:04:36 -0700 Comment on attachment 95014 Patch I'm confused. Can we draw the UI with anything other than CG? If not, seems we wouldn't need this. 410721 3 caryclark 2011-05-26 12:14:52 -0700 As checked in, if WebKit uses Skia, the UI doesn't use CG, and vice-versa. Windows and Linux ports use Skia, but don't use CG for the UI. In the future, the Mac port uses Skia for WebKit, and uses CG for the UI. In the distant future, the Mac port uses hardware-accelerated Skia, and may not use CG for the UI. Some of the current scaffolding will go away once all of Chrome uses Skia for WebKit. Allowing the scaffolding for now allows checking in Skia support incrementally instead of all at once. 410858 4 95014 fishd 2011-05-26 14:45:40 -0700 Comment on attachment 95014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95014&action=review > Source/WebKit/chromium/public/WebCommon.h:44 > + #define UI_USING_CG 0 this seems like the wrong place for this define. this is the webkit layer, which either renders using SKIA or CG. that's what WEBKIT_USING_SKIA conveys. it sounds like maybe you want to add a #define in the chromium tree somewhere. > Source/WebKit/chromium/src/DragClientImpl.cpp:91 > +#if WEBKIT_USING_SKIA && !UI_USING_CG this seems problematic. it seems like we should modify the chromium code which implements WebViewClient::startDragging to understand that it is getting a SkBitmap instead of a CGImage here. it would be much better to patch some conversion code into chromium than to confuse webkit with the notion of supporting two graphics libraries in different contexts. 411341 5 95014 caryclark 2011-05-27 05:13:07 -0700 Comment on attachment 95014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95014&action=review >> Source/WebKit/chromium/public/WebCommon.h:44 >> + #define UI_USING_CG 0 > > this seems like the wrong place for this define. this is the webkit layer, > which either renders using SKIA or CG. that's what WEBKIT_USING_SKIA conveys. > > it sounds like maybe you want to add a #define in the chromium tree somewhere. Could you please be more specific and suggest where 'somewhere' is? >> Source/WebKit/chromium/src/DragClientImpl.cpp:91 >> +#if WEBKIT_USING_SKIA && !UI_USING_CG > > this seems problematic. it seems like we should modify the chromium > code which implements WebViewClient::startDragging to understand that > it is getting a SkBitmap instead of a CGImage here. > > it would be much better to patch some conversion code into chromium > than to confuse webkit with the notion of supporting two graphics > libraries in different contexts. I thought that this code was chromium-specific already. Since there are no references to 'startDrag' or 'DragImageRef' outside of Source/WebCore and Source/WebKit, I'm at a loss as to what I should do. Who can I work with to restructure this as you suggest? 412619 6 95433 caryclark 2011-05-31 07:49:03 -0700 Created attachment 95433 Patch 412624 7 95433 eric 2011-05-31 07:59:19 -0700 Comment on attachment 95433 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95433&action=review > Source/WebKit/chromium/public/WebCommon.h:50 > + #if defined(__APPLE__) && !WEBKIT_USING_SKIA What if WEBKIT_USING_SKIA is not defined? I assume ! will do the right thing? 412656 8 95433 caryclark 2011-05-31 08:39:39 -0700 Comment on attachment 95433 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=95433&action=review >> Source/WebKit/chromium/public/WebCommon.h:50 >> + #if defined(__APPLE__) && !WEBKIT_USING_SKIA > > What if WEBKIT_USING_SKIA is not defined? I assume ! will do the right thing? WEBKIT_USING_SKIA is always defined either on line 43 or line 45, just above these lines. 412657 9 95433 eric 2011-05-31 08:43:44 -0700 Comment on attachment 95433 Patch OK. 412670 10 95433 commit-queue 2011-05-31 09:05:45 -0700 Comment on attachment 95433 Patch Clearing flags on attachment: 95433 Committed r87728: <http://trac.webkit.org/changeset/87728> 412672 11 commit-queue 2011-05-31 09:05:52 -0700 All reviewed patches have been landed. Closing bug. 95014 2011-05-26 11:57:16 -0700 2011-05-31 07:48:58 -0700 Patch bug-61548-20110526145715.patch text/plain 5174 caryclark SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA4NzQwNikKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQg QEAKKzIwMTEtMDUtMjYgIENhcnkgQ2xhcmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgJ1NraWEgZm9y IHJlbmRlcmluZywgQ0cgZm9yIFVJJyBvcHRpb24gdG8gQ2hyb21pdW0gcG9ydGluZyBsYXllcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE1NDgKKwor ICAgICAgICBTa2lhIG9uIE1hYyB1c2VzIFNraWEgdG8gcmVuZGVyIFdlYktpdCwgYW5kIENHCisg ICAgICAgIHRvIHJlbmRlciBVSSBlbGVtZW50cy4gU2VwYXJhdGUgb3V0IHRoZSB0d28gc28gdGhh dCBDRworICAgICAgICBjYW4gYmUgY2FsbGVkIGZvciByZW5kZXJpbmcgV2ViS2l0LCByZW5kZXJp bmcgVUksIG9yIGJvdGguCisKKyAgICAgICAgKiBwdWJsaWMvV2ViQ29tbW9uLmg6CisgICAgICAg IEFkZCBhIFVJX1VTSU5HX0NHIHN3aXRjaCBzZXQgc2VwYXJhdGVseSBmcm9tIFdFQktJVF9VU0lO R19DRy4KKyAgICAgICAgRG9uJ3QgYWxsb3cgV2ViS2l0IHRvIHVzZSBDRyBpZiBpdCBpcyBhbHJl YWR5IHVzaW5nIFNraWEuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViSW1hZ2UuaDoKKyAgICAgICAg QWRkIG1ldGhvZHMgdG8gV2ViSW1hZ2UgdGhhdCBjb252ZXJ0IGZyb20gQ0dJbWFnZSB0byBTa0Jp dG1hcC4KKyAKKyAgICAgICAgKiBzcmMvRHJhZ0NsaWVudEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpEcmFnQ2xpZW50SW1wbDo6c3RhcnREcmFnKToKKyAgICAgICAgVHdlYWsgY2FsbCB0byBX ZWJJbWFnZSBjb25zdHJ1Y3RvciBmb3IgbmV3IGZsYXZvci4KKworICAgICAgICAqIHNyYy9QbGF0 Zm9ybUJyaWRnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUJyaWRnZTo6cGFpbnRT Y3JvbGxiYXJUaHVtYik6CisgICAgICAgIEFsbG93IHNjcm9sbGJhciB0aHVtYiBkcmF3IHRvIHRh a2UgV2ViQ2FudmFzLgorCisgICAgICAgICogc3JjL1dlYkltYWdlU2tpYS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkltYWdlOjpXZWJJbWFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkltYWdl OjpvcGVyYXRvcj0pOgorICAgICAgICBJbXBsZW1lbnQgQ0dJbWFnZSB0byBTa0JpdG1hcAorCiAy MDExLTA1LTI1ICBTaGlzaGlyIEFncmF3YWwgIDxzaGlzaGlyQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJDb21tb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJDb21tb24uaAkocmV2aXNpb24gODczODMpCisrKyBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3B1YmxpYy9XZWJDb21tb24uaAkod29ya2luZyBjb3B5KQpAQCAtNDEsMTMg KzQxLDE1IEBACiAjaWYgIWRlZmluZWQoV0VCS0lUX1VTSU5HX1NLSUEpCiAgICAgI2lmICFkZWZp bmVkKF9fQVBQTEVfXykKICAgICAgICAgI2RlZmluZSBXRUJLSVRfVVNJTkdfU0tJQSAxCisgICAg ICAgICNkZWZpbmUgVUlfVVNJTkdfQ0cgMAogICAgICNlbHNlCiAgICAgICAgICNkZWZpbmUgV0VC S0lUX1VTSU5HX1NLSUEgMAorICAgICAgICAjZGVmaW5lIFVJX1VTSU5HX0NHIDEKICAgICAjZW5k aWYKICNlbmRpZgogCiAjaWYgIWRlZmluZWQoV0VCS0lUX1VTSU5HX0NHKQotICAgICNpZiBkZWZp bmVkKF9fQVBQTEVfXykKKyAgICAjaWYgZGVmaW5lZChfX0FQUExFX18pICYmICFXRUJLSVRfVVNJ TkdfU0tJQQogICAgICAgICAjZGVmaW5lIFdFQktJVF9VU0lOR19DRyAxCiAgICAgI2Vsc2UKICAg ICAgICAgI2RlZmluZSBXRUJLSVRfVVNJTkdfQ0cgMApJbmRleDogU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViSW1hZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9XZWJJbWFnZS5oCShyZXZpc2lvbiA4NzM4MykKKysrIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkltYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDkg QEAKIAogI2lmIFdFQktJVF9VU0lOR19TS0lBCiAjaW5jbHVkZSA8U2tCaXRtYXAuaD4KLSNlbGlm IFdFQktJVF9VU0lOR19DRworI2VuZGlmCisKKyNpZiBXRUJLSVRfVVNJTkdfQ0cgfHwgVUlfVVNJ TkdfQ0cKIHR5cGVkZWYgc3RydWN0IENHSW1hZ2UqIENHSW1hZ2VSZWY7CiAjZW5kaWYKIApAQCAt OTIsNiArOTQsMTEgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgfQogCisj aWYgVUlfVVNJTkdfQ0cKKyAgICBXZWJJbWFnZShDR0ltYWdlUmVmKTsKKyAgICBXZWJJbWFnZSYg b3BlcmF0b3I9KENHSW1hZ2VSZWYpOworI2VuZGlmCisKICAgICBTa0JpdG1hcCYgZ2V0U2tCaXRt YXAoKSB7IHJldHVybiBtX2JpdG1hcDsgfQogICAgIGNvbnN0IFNrQml0bWFwJiBnZXRTa0JpdG1h cCgpIGNvbnN0IHsgcmV0dXJuIG1fYml0bWFwOyB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL0RyYWdDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9EcmFnQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDg3MzgzKQorKysgU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRHJhZ0NsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC04OCw3ICs4OCw3IEBAIHZvaWQgRHJhZ0NsaWVudEltcGw6OnN0YXJ0RHJhZyhEcmFnSW1h Z2UKICAgICBXZWJQb2ludCBvZmZzZXRQb2ludChvZmZzZXRTaXplLndpZHRoKCksIG9mZnNldFNp emUuaGVpZ2h0KCkpOwogICAgIG1fd2ViVmlldy0+c3RhcnREcmFnZ2luZygKICAgICAgICAgZHJh Z0RhdGEsIHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb25zTWFzaz4oZHJhZ09wZXJhdGlvbk1h c2spLAotI2lmIFdFQktJVF9VU0lOR19TS0lBCisjaWYgV0VCS0lUX1VTSU5HX1NLSUEgJiYgIVVJ X1VTSU5HX0NHCiAgICAgICAgIGRyYWdJbWFnZSA/IFdlYkltYWdlKCpkcmFnSW1hZ2UpIDogV2Vi SW1hZ2UoKSwKICNlbHNlCiAgICAgICAgIGRyYWdJbWFnZSA/IFdlYkltYWdlKGRyYWdJbWFnZSkg OiBXZWJJbWFnZSgpLApJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1C cmlkZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRm b3JtQnJpZGdlLmNwcAkocmV2aXNpb24gODczODMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5Niw4ICs3OTYsMTMg QEAgdm9pZCBQbGF0Zm9ybUJyaWRnZTo6cGFpbnRTY3JvbGxiYXJUaHVtYgogICAgIHdlYlRoZW1l U2Nyb2xsYmFySW5mby52aXNpYmxlU2l6ZSA9IHNjcm9sbGJhckluZm8udmlzaWJsZVNpemU7CiAg ICAgd2ViVGhlbWVTY3JvbGxiYXJJbmZvLnRvdGFsU2l6ZSA9IHNjcm9sbGJhckluZm8udG90YWxT aXplOwogCisjaWYgV0VCS0lUX1VTSU5HX1NLSUEKKyAgICBXZWJLaXQ6OldlYkNhbnZhcyogd2Vi Q2FudmFzID0gZ2MtPnBsYXRmb3JtQ29udGV4dCgpLT5jYW52YXMoKTsKKyNlbHNlCisgICAgV2Vi S2l0OjpXZWJDYW52YXMqIHdlYkNhbnZhcyA9IGdjLT5wbGF0Zm9ybUNvbnRleHQoKTsKKyNlbmRp ZgogICAgIHdlYktpdENsaWVudCgpLT50aGVtZUVuZ2luZSgpLT5wYWludFNjcm9sbGJhclRodW1i KAotICAgICAgICBnYy0+cGxhdGZvcm1Db250ZXh0KCksCisgICAgICAgIHdlYkNhbnZhcywKICAg ICAgICAgc3RhdGljX2Nhc3Q8V2ViVGhlbWVFbmdpbmU6OlN0YXRlPihzdGF0ZSksCiAgICAgICAg IHN0YXRpY19jYXN0PFdlYlRoZW1lRW5naW5lOjpTaXplPihzaXplKSwKICAgICAgICAgcmVjdCwK SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkltYWdlU2tpYS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW1hZ2VTa2lhLmNwcAkocmV2 aXNpb24gODczODMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbWFnZVNraWEu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0MywxMCBAQAogI2luY2x1ZGUgPHd0Zi9QYXNz T3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KIAorI2lmIFdFQktJVF9VU0lO R19TS0lBICYmIFVJX1VTSU5HX0NHCisjaW5jbHVkZSAic2tpYS9leHQvc2tpYV91dGlsc19tYWMu aCIKKyNlbmRpZgorCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktp dCB7CkBAIC0xMTksNCArMTIzLDE5IEBAIFdlYkltYWdlJiBXZWJJbWFnZTo6b3BlcmF0b3I9KGNv bnN0IFBhc3MKICAgICByZXR1cm4gKnRoaXM7CiB9CiAKKyNpZiBVSV9VU0lOR19DRworV2ViSW1h Z2U6OldlYkltYWdlKENHSW1hZ2VSZWYgaW1hZ2VSZWYpCit7CisgICAgaW5pdCgpOworICAgIGFz c2lnbihnZng6OkNHSW1hZ2VUb1NrQml0bWFwKGltYWdlUmVmKSk7Cit9CisKK1dlYkltYWdlJiBX ZWJJbWFnZTo6b3BlcmF0b3I9KENHSW1hZ2VSZWYgaW1hZ2VSZWYpCit7CisgICAgaW5pdCgpOwor ICAgIGFzc2lnbihnZng6OkNHSW1hZ2VUb1NrQml0bWFwKGltYWdlUmVmKSk7CisgICAgcmV0dXJu ICp0aGlzOworfQorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAo= 95433 2011-05-31 07:49:03 -0700 2011-05-31 09:05:45 -0700 Patch bug-61548-20110531104902.patch text/plain 2077 caryclark SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA4NzQwNikKKysrIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDUtMjYgIENhcnkgQ2xhcmsgIDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBDaHJvbWl1 bSBwb3J0aW5nIGxheWVyIHRvIHVzZSBTa2lhIG9uIE1hYy4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxNTQ4CisKKyAgICAgICAgKiBwdWJsaWMvV2Vi Q29tbW9uLmg6CisgICAgICAgIERvbid0IGFsbG93IFdlYktpdCB0byB1c2UgQ0cgaWYgaXQgaXMg YWxyZWFkeSB1c2luZyBTa2lhLgorCisgICAgICAgICogc3JjL1BsYXRmb3JtQnJpZGdlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQnJpZGdlOjpwYWludFNjcm9sbGJhclRodW1iKToK KyAgICAgICAgQWxsb3cgc2Nyb2xsYmFyIHRodW1iIGRyYXcgdG8gdGFrZSBXZWJDYW52YXMuCisK IDIwMTEtMDUtMjUgIFNoaXNoaXIgQWdyYXdhbCAgPHNoaXNoaXJAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkNvbW1vbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYkNvbW1vbi5oCShyZXZpc2lvbiA4NzM4MykKKysrIFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkNvbW1vbi5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3 ICs0Nyw3IEBACiAjZW5kaWYKIAogI2lmICFkZWZpbmVkKFdFQktJVF9VU0lOR19DRykKLSAgICAj aWYgZGVmaW5lZChfX0FQUExFX18pCisgICAgI2lmIGRlZmluZWQoX19BUFBMRV9fKSAmJiAhV0VC S0lUX1VTSU5HX1NLSUEKICAgICAgICAgI2RlZmluZSBXRUJLSVRfVVNJTkdfQ0cgMQogICAgICNl bHNlCiAgICAgICAgICNkZWZpbmUgV0VCS0lUX1VTSU5HX0NHIDAKSW5kZXg6IFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtQnJpZGdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybUJyaWRnZS5jcHAJKHJldmlzaW9uIDg3MzgzKQor KysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1CcmlkZ2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03OTYsOCArNzk2LDEzIEBAIHZvaWQgUGxhdGZvcm1CcmlkZ2U6OnBhaW50U2Ny b2xsYmFyVGh1bWIKICAgICB3ZWJUaGVtZVNjcm9sbGJhckluZm8udmlzaWJsZVNpemUgPSBzY3Jv bGxiYXJJbmZvLnZpc2libGVTaXplOwogICAgIHdlYlRoZW1lU2Nyb2xsYmFySW5mby50b3RhbFNp emUgPSBzY3JvbGxiYXJJbmZvLnRvdGFsU2l6ZTsKIAorI2lmIFdFQktJVF9VU0lOR19TS0lBCisg ICAgV2ViS2l0OjpXZWJDYW52YXMqIHdlYkNhbnZhcyA9IGdjLT5wbGF0Zm9ybUNvbnRleHQoKS0+ Y2FudmFzKCk7CisjZWxzZQorICAgIFdlYktpdDo6V2ViQ2FudmFzKiB3ZWJDYW52YXMgPSBnYy0+ cGxhdGZvcm1Db250ZXh0KCk7CisjZW5kaWYKICAgICB3ZWJLaXRDbGllbnQoKS0+dGhlbWVFbmdp bmUoKS0+cGFpbnRTY3JvbGxiYXJUaHVtYigKLSAgICAgICAgZ2MtPnBsYXRmb3JtQ29udGV4dCgp LAorICAgICAgICB3ZWJDYW52YXMsCiAgICAgICAgIHN0YXRpY19jYXN0PFdlYlRoZW1lRW5naW5l OjpTdGF0ZT4oc3RhdGUpLAogICAgICAgICBzdGF0aWNfY2FzdDxXZWJUaGVtZUVuZ2luZTo6U2l6 ZT4oc2l6ZSksCiAgICAgICAgIHJlY3QsCg==