104670 2012-12-11 06:44:42 -0800 [GTK][AC] GraphicsLayers are not shown on the viewport 2013-01-14 10:46:09 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73767 105699 1 joone joone alex gustavo mrobinson webkit.review.bot oldest_to_newest 788402 0 joone 2012-12-11 06:44:42 -0800 GraphicsLayers are not shown on the viewport because we don't resize and show the GtkClutterEmbed yet. 788995 1 178922 joone 2012-12-11 16:58:50 -0800 Created attachment 178922 Patch 789323 2 178922 gustavo 2012-12-12 01:32:17 -0800 Comment on attachment 178922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178922&action=review LGTM, except for the duplicate timer scheduling. > Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp:59 > - return false; > + return true; This is what we need to implement to render the page contents, right? > Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp:93 > + scheduleLayerFlush(); > + m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 0, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0); You're scheduling the flush twice here, gotta remove the g_timeout_add_full call. > Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp:132 > - return FALSE; > + return false; this returns a gboolean, so I'd keep FALSE here 789404 3 178922 joone 2012-12-12 03:03:45 -0800 Comment on attachment 178922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178922&action=review >> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp:59 >> + return true; > > This is what we need to implement to render the page contents, right? Yes, it seems to paint the main content on the root layer. >> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp:93 >> + m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 0, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0); > > You're scheduling the flush twice here, gotta remove the g_timeout_add_full call. Yes, I will remove it. >> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp:132 >> + return false; > > this returns a gboolean, so I'd keep FALSE here Ok. 789412 4 179012 joone 2012-12-12 03:13:45 -0800 Created attachment 179012 Patch 789424 5 179012 webkit.review.bot 2012-12-12 03:35:46 -0800 Comment on attachment 179012 Patch Clearing flags on attachment: 179012 Committed r137447: <http://trac.webkit.org/changeset/137447> 806461 6 178922 gustavo 2013-01-14 10:46:09 -0800 Comment on attachment 178922 Patch Clearing flag for committed patch. 178922 2012-12-11 16:58:50 -0800 2013-01-14 10:46:09 -0800 Patch bug-104670-20121212015555.patch text/plain 5698 joone U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMmE0OTgyY2Qx OGVmY2I1YTEyZDI2MmY2OTIwNDcwM2M3YWVmNjY2Yi4uOTY1MDIzMWZhNmIwY2ExZDQ4ZDFkZjk5 ZDFlMWI1ZTI3MzdiMmY2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEy LTEyLTExICBKb29uZSBIdXIgIDxqb29uZS5odXJAaW50ZWwuY29tPgorCisgICAgICAgIFtHVEtd W0FDXSBHcmFwaGljc0xheWVycyBhcmUgbm90IHNob3duIG9uIHRoZSB2aWV3cG9ydAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NjcwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR3JhcGhpY3NMYXllcnMg YXJlIG5vdCBzaG93biBvbiB0aGUgdmlld3BvcnQgYmVjYXVzZSB0aGUgY29udGFpbmVyKEd0a0Ns dXR0ZXJFbWJlZCkgCisgICAgICAgIGlzIG5vdCByZXNpemVkIGFuZCBzaG93biwgc28gdGhpcyBw YXRjaCBhbGxvd3MgaXQgdG8gZml0IHRvIHRoZSB2aWV3cG9ydC4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Lmg6CisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnJlbmRlckxheWVy c1RvV2luZG93KToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQ6OnNldFJvb3RDb21wb3NpdGluZ0xheWVyKToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnJlc2l6ZVJvb3RMYXllcik6CisgICAgICAgIChXZWJLaXQ6 OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpsYXllckZsdXNoVGltZXJGaXJlZENhbGxi YWNrKToKKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNj aGVkdWxlTGF5ZXJGbHVzaCk6CisKIDIwMTItMTItMDUgIEFybmF1ZCBSZW5ldmllciAgPGEucmVu ZXZpZXJAc2lzYS5zYW1zdW5nLmNvbT4KIAogICAgICAgICBbR3RrXSBuYXZpZ2F0b3IucGx1Z2lu cyBjb250YWlucyB0b28gbWFueSBwbHVnaW4gZW50cmllcy4gRmlyc3Qgb25lIGFyZSBnYXJiYWdl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmgKaW5kZXggMDI1OTdkMTZkM2ZhNTQyOWQ2 Y2EzMzYxMmI2M2FjMGRiYzdiOTNlZS4uYWQzNTY4NTA3Nzg3ZWNlODBkMTYwYTkyYWU0Zjg2N2M5 ZWU4ZGQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC5oCkBAIC03Nyw2ICs3Nyw3 IEBAIHByaXZhdGU6CiAjaWYgVVNFKENMVVRURVIpCiAgICAgV2ViQ29yZTo6R3JhcGhpY3NMYXll ciogbV9yb290R3JhcGhpY3NMYXllcjsKICAgICBHdGtXaWRnZXQqIG1fcm9vdExheWVyRW1iZWRk ZXI7CisgICAgc3RhdGljIGdib29sZWFuIGxheWVyRmx1c2hUaW1lckZpcmVkQ2FsbGJhY2soQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQqKTsKICNlbGlmIFVTRShURVhUVVJFX01BUFBFUl9H TCkKICAgICBPd25QdHI8V2ViQ29yZTo6UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3c+IG1fcmVk aXJlY3RlZFdpbmRvdzsKICAgICBPd25QdHI8V2ViQ29yZTo6R3JhcGhpY3NMYXllcj4gbV9yb290 TGF5ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIuY3BwIGIvU291cmNlL1dlYktpdC9ndGsv V2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcApp bmRleCA5ZmNhZTUyNTdhNDE1YTkzNGJjNDJjNWMzNmJjMDhmZTU2ZWI1OTFjLi4xODkzNzNhYTYz NTUxMTU1NDU3MmYwMTQyMDgxZDgxNGE5ZjM3MDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0Q2x1dHRlci5jcHAKQEAgLTU2LDcgKzU2LDcgQEAgYm9vbCBBY2NlbGVy YXRlZENvbXBvc2l0aW5nQ29udGV4dDo6ZW5hYmxlZCgpCiBib29sIEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdDb250ZXh0OjpyZW5kZXJMYXllcnNUb1dpbmRvdyhjYWlyb190KiwgY29uc3QgSW50UmVj dCYgY2xpcFJlY3QpCiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQ6OnNldFJvb3RDb21wb3NpdGluZ0xheWVyKEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIp CkBAIC02OCwxNCArNjgsMTggQEAgdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6 c2V0Um9vdENvbXBvc2l0aW5nTGF5ZXIoR3JhcGhpY3NMYXllciogZ3JhcGgKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotICAgIC8vIENyZWF0ZSBhbiBpbnN0YW5jZSBvZiBHdGtDbHV0dGVyRW1i ZWQgdG8gaG9zdCBhY3RvcnMgYXMgd2ViIGxheWVycy4KKyAgICAvLyBDcmVhdGUgYW4gaW5zdGFu Y2Ugb2YgR3RrQ2x1dHRlckVtYmVkIHRvIGVtYmVkIGFjdG9ycyBhcyBHcmFwaGljc0xheWVycy4K ICAgICBpZiAoIW1fcm9vdExheWVyRW1iZWRkZXIpIHsKICAgICAgICAgbV9yb290TGF5ZXJFbWJl ZGRlciA9IGd0a19jbHV0dGVyX2VtYmVkX25ldygpOwogICAgICAgICBndGtfY29udGFpbmVyX2Fk ZChHVEtfQ09OVEFJTkVSKG1fd2ViVmlldyksIG1fcm9vdExheWVyRW1iZWRkZXIpOworCisgICAg ICAgIEd0a0FsbG9jYXRpb24gYWxsb2NhdGlvbjsKKyAgICAgICAgZ3RrX3dpZGdldF9nZXRfYWxs b2NhdGlvbihHVEtfV0lER0VUKG1fd2ViVmlldyksICZhbGxvY2F0aW9uKTsKKyAgICAgICAgZ3Rr X3dpZGdldF9zaXplX2FsbG9jYXRlKEdUS19XSURHRVQobV9yb290TGF5ZXJFbWJlZGRlciksICZh bGxvY2F0aW9uKTsKICAgICAgICAgZ3RrX3dpZGdldF9zaG93KG1fcm9vdExheWVyRW1iZWRkZXIp OwogICAgIH0KIAotICAgIC8vIEFkZCBhIHJvb3QgbGF5ZXIgdG8gdGhlIHN0YWdlLgorICAgIC8v IEFkZCBhIHJvb3QgR3JhcGhpY3NMYXllciB0byB0aGUgc3RhZ2UuCiAgICAgaWYgKGdyYXBoaWNz TGF5ZXIpIHsKICAgICAgICAgbV9yb290R3JhcGhpY3NMYXllciA9IGdyYXBoaWNzTGF5ZXI7CiAg ICAgICAgIENsdXR0ZXJDb2xvciBzdGFnZUNvbG9yID0geyAweEZGLCAweEZGLCAweEZGLCAweEZG IH07CkBAIC04NCw2ICs4OCw5IEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6 OnNldFJvb3RDb21wb3NpdGluZ0xheWVyKEdyYXBoaWNzTGF5ZXIqIGdyYXBoCiAgICAgICAgIGNs dXR0ZXJfY29udGFpbmVyX2FkZF9hY3RvcihDTFVUVEVSX0NPTlRBSU5FUihzdGFnZSksIG1fcm9v dEdyYXBoaWNzTGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSk7CiAgICAgICAgIGNsdXR0ZXJfYWN0b3Jf c2hvd19hbGwoc3RhZ2UpOwogICAgIH0KKworICAgIHNjaGVkdWxlTGF5ZXJGbHVzaCgpOworICAg IG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2tJZCA9IGdfdGltZW91dF9hZGRfZnVsbChHREtfUFJJ T1JJVFlfRVZFTlRTLCAwLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPihsYXllckZsdXNo VGltZXJGaXJlZENhbGxiYWNrKSwgdGhpcywgMCk7CiB9CiAKIHZvaWQgQWNjZWxlcmF0ZWRDb21w b3NpdGluZ0NvbnRleHQ6OnNldE5vbkNvbXBvc2l0ZWRDb250ZW50c05lZWREaXNwbGF5KGNvbnN0 IEludFJlY3QmIHJlY3QpCkBAIC0xMTAsNiArMTE3LDggQEAgdm9pZCBBY2NlbGVyYXRlZENvbXBv c2l0aW5nQ29udGV4dDo6cmVzaXplUm9vdExheWVyKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAg YWxsb2NhdGlvbi53aWR0aCA9IHNpemUud2lkdGgoKTsKICAgICBhbGxvY2F0aW9uLmhlaWdodCA9 IHNpemUuaGVpZ2h0KCk7CiAgICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKEdUS19XSURHRVQo bV9yb290TGF5ZXJFbWJlZGRlciksICZhbGxvY2F0aW9uKTsKKworICAgIHNjaGVkdWxlTGF5ZXJG bHVzaCgpOwogfQogCiB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzY3JvbGxO b25Db21wb3NpdGVkQ29udGVudHMoY29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgSW50 U2l6ZSYgc2Nyb2xsT2Zmc2V0KQpAQCAtMTE3LDEwICsxMjYsMTAgQEAgdm9pZCBBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dDo6c2Nyb2xsTm9uQ29tcG9zaXRlZENvbnRlbnRzKGNvbnN0IElu dFJlY3QmIHMKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi1zdGF0aWMgZ2Jvb2xlYW4gZmx1 c2hBbmRSZW5kZXJMYXllcnNDYWxsYmFjayhBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCog Y29udGV4dCkKK2dib29sZWFuIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpsYXllckZs dXNoVGltZXJGaXJlZENhbGxiYWNrKEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KiBjb250 ZXh0KQogewogICAgIGNvbnRleHQtPmZsdXNoQW5kUmVuZGVyTGF5ZXJzKCk7Ci0gICAgcmV0dXJu IEZBTFNFOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0 aW5nQ29udGV4dDo6c2NoZWR1bGVMYXllckZsdXNoKCkKQEAgLTEzMCw3ICsxMzksNyBAQCB2b2lk IEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpzY2hlZHVsZUxheWVyRmx1c2goKQogCiAg ICAgLy8gV2UgdXNlIGEgR0xpYiB0aW1lciBiZWNhdXNlIG90aGVyd2lzZSBHVEsrIGV2ZW50IGhh bmRsaW5nIGR1cmluZwogICAgIC8vIGRyYWdnaW5nIGNhbiBzdGFydmUgV2ViQ29yZSB0aW1lcnMs IHdoaWNoIGhhdmUgYSBsb3dlciBwcmlvcml0eS4KLSAgICBtX2xheWVyRmx1c2hUaW1lckNhbGxi YWNrSWQgPSBnX3RpbWVvdXRfYWRkX2Z1bGwoR0RLX1BSSU9SSVRZX0VWRU5UUywgMCwgcmVpbnRl cnByZXRfY2FzdDxHU291cmNlRnVuYz4oZmx1c2hBbmRSZW5kZXJMYXllcnNDYWxsYmFjayksIHRo aXMsIDApOworICAgIG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2tJZCA9IGdfdGltZW91dF9hZGRf ZnVsbChHREtfUFJJT1JJVFlfRVZFTlRTLCAwLCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5j PihsYXllckZsdXNoVGltZXJGaXJlZENhbGxiYWNrKSwgdGhpcywgMCk7CiB9CiAKIGJvb2wgQWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcygpCg== 179012 2012-12-12 03:13:45 -0800 2012-12-12 03:35:46 -0800 Patch bug-104670-20121212121048.patch text/plain 5472 joone U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMmE0OTgyY2Qx OGVmY2I1YTEyZDI2MmY2OTIwNDcwM2M3YWVmNjY2Yi4uNTJkNTI5YThhYjgyMGNhNjQ0NjU3MmM0 ODRlMzUyNzNmZjExN2RkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEy LTEyLTExICBKb29uZSBIdXIgIDxqb29uZS5odXJAaW50ZWwuY29tPgorCisgICAgICAgIFtHVEtd W0FDXSBHcmFwaGljc0xheWVycyBhcmUgbm90IHNob3duIG9uIHRoZSB2aWV3cG9ydAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NjcwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgorCisgICAgICAgIEdyYXBoaWNz TGF5ZXJzIGFyZSBub3Qgc2hvd24gb24gdGhlIHZpZXdwb3J0IGJlY2F1c2UgdGhlIGNvbnRhaW5l cihHdGtDbHV0dGVyRW1iZWQpIAorICAgICAgICBpcyBub3QgcmVzaXplZCBhbmQgc2hvd24sIHNv IHRoaXMgcGF0Y2ggYWxsb3dzIGl0IHRvIGZpdCB0byB0aGUgdmlld3BvcnQuCisKKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC5oOgorICAgICAg ICAqIFdlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Q2x1dHRlci5j cHA6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpyZW5k ZXJMYXllcnNUb1dpbmRvdyk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRp bmdDb250ZXh0OjpzZXRSb290Q29tcG9zaXRpbmdMYXllcik6CisgICAgICAgIChXZWJLaXQ6OkFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpyZXNpemVSb290TGF5ZXIpOgorICAgICAgICAo V2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6bGF5ZXJGbHVzaFRpbWVyRmly ZWRDYWxsYmFjayk6CisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250 ZXh0OjpzY2hlZHVsZUxheWVyRmx1c2gpOgorCiAyMDEyLTEyLTA1ICBBcm5hdWQgUmVuZXZpZXIg IDxhLnJlbmV2aWVyQHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0d0a10gbmF2aWdhdG9y LnBsdWdpbnMgY29udGFpbnMgdG9vIG1hbnkgcGx1Z2luIGVudHJpZXMuIEZpcnN0IG9uZSBhcmUg Z2FyYmFnZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Fj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3Jl U3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC5oCmluZGV4IDAyNTk3ZDE2ZDNm YTU0MjlkNmNhMzM2MTJiNjNhYzBkYmM3YjkzZWUuLmFkMzU2ODUwNzc4N2VjZTgwZDE2MGE5MmFl NGY4NjdjOWVlOGRkMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdC9n dGsvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQuaApAQCAtNzcs NiArNzcsNyBAQCBwcml2YXRlOgogI2lmIFVTRShDTFVUVEVSKQogICAgIFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXIqIG1fcm9vdEdyYXBoaWNzTGF5ZXI7CiAgICAgR3RrV2lkZ2V0KiBtX3Jvb3RMYXll ckVtYmVkZGVyOworICAgIHN0YXRpYyBnYm9vbGVhbiBsYXllckZsdXNoVGltZXJGaXJlZENhbGxi YWNrKEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Kik7CiAjZWxpZiBVU0UoVEVYVFVSRV9N QVBQRVJfR0wpCiAgICAgT3duUHRyPFdlYkNvcmU6OlJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93 PiBtX3JlZGlyZWN0ZWRXaW5kb3c7CiAgICAgT3duUHRyPFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXI+ IG1fcm9vdExheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBv cnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRDbHV0dGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Q2x1dHRl ci5jcHAKaW5kZXggOWZjYWU1MjU3YTQxNWE5MzRiYzQyYzVjMzZiYzA4ZmU1NmViNTkxYy4uM2U0 YzkxOWZiNjdiZWEwMDUwOGFiNGY2Yjg5M2RiYjliODQ5YzgxYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRD bHV0dGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVy YXRlZENvbXBvc2l0aW5nQ29udGV4dENsdXR0ZXIuY3BwCkBAIC01Niw3ICs1Niw3IEBAIGJvb2wg QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmVuYWJsZWQoKQogYm9vbCBBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dDo6cmVuZGVyTGF5ZXJzVG9XaW5kb3coY2Fpcm9fdCosIGNvbnN0 IEludFJlY3QmIGNsaXBSZWN0KQogewogICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJu IGZhbHNlOworICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRp bmdDb250ZXh0OjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiBncmFwaGlj c0xheWVyKQpAQCAtNjgsMTQgKzY4LDE4IEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Nv bnRleHQ6OnNldFJvb3RDb21wb3NpdGluZ0xheWVyKEdyYXBoaWNzTGF5ZXIqIGdyYXBoCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBDcmVhdGUgYW4gaW5zdGFuY2Ugb2YgR3RrQ2x1 dHRlckVtYmVkIHRvIGhvc3QgYWN0b3JzIGFzIHdlYiBsYXllcnMuCisgICAgLy8gQ3JlYXRlIGFu IGluc3RhbmNlIG9mIEd0a0NsdXR0ZXJFbWJlZCB0byBlbWJlZCBhY3RvcnMgYXMgR3JhcGhpY3NM YXllcnMuCiAgICAgaWYgKCFtX3Jvb3RMYXllckVtYmVkZGVyKSB7CiAgICAgICAgIG1fcm9vdExh eWVyRW1iZWRkZXIgPSBndGtfY2x1dHRlcl9lbWJlZF9uZXcoKTsKICAgICAgICAgZ3RrX2NvbnRh aW5lcl9hZGQoR1RLX0NPTlRBSU5FUihtX3dlYlZpZXcpLCBtX3Jvb3RMYXllckVtYmVkZGVyKTsK KworICAgICAgICBHdGtBbGxvY2F0aW9uIGFsbG9jYXRpb247CisgICAgICAgIGd0a193aWRnZXRf Z2V0X2FsbG9jYXRpb24oR1RLX1dJREdFVChtX3dlYlZpZXcpLCAmYWxsb2NhdGlvbik7CisgICAg ICAgIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZShHVEtfV0lER0VUKG1fcm9vdExheWVyRW1iZWRk ZXIpLCAmYWxsb2NhdGlvbik7CiAgICAgICAgIGd0a193aWRnZXRfc2hvdyhtX3Jvb3RMYXllckVt YmVkZGVyKTsKICAgICB9CiAKLSAgICAvLyBBZGQgYSByb290IGxheWVyIHRvIHRoZSBzdGFnZS4K KyAgICAvLyBBZGQgYSByb290IEdyYXBoaWNzTGF5ZXIgdG8gdGhlIHN0YWdlLgogICAgIGlmIChn cmFwaGljc0xheWVyKSB7CiAgICAgICAgIG1fcm9vdEdyYXBoaWNzTGF5ZXIgPSBncmFwaGljc0xh eWVyOwogICAgICAgICBDbHV0dGVyQ29sb3Igc3RhZ2VDb2xvciA9IHsgMHhGRiwgMHhGRiwgMHhG RiwgMHhGRiB9OwpAQCAtODQsNiArODgsOCBAQCB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdD b250ZXh0OjpzZXRSb290Q29tcG9zaXRpbmdMYXllcihHcmFwaGljc0xheWVyKiBncmFwaAogICAg ICAgICBjbHV0dGVyX2NvbnRhaW5lcl9hZGRfYWN0b3IoQ0xVVFRFUl9DT05UQUlORVIoc3RhZ2Up LCBtX3Jvb3RHcmFwaGljc0xheWVyLT5wbGF0Zm9ybUxheWVyKCkpOwogICAgICAgICBjbHV0dGVy X2FjdG9yX3Nob3dfYWxsKHN0YWdlKTsKICAgICB9CisKKyAgICBzY2hlZHVsZUxheWVyRmx1c2go KTsKIH0KIAogdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2V0Tm9uQ29tcG9z aXRlZENvbnRlbnRzTmVlZERpc3BsYXkoY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTExMCw2ICsx MTYsOCBAQCB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpyZXNpemVSb290TGF5 ZXIoY29uc3QgSW50U2l6ZSYgc2l6ZSkKICAgICBhbGxvY2F0aW9uLndpZHRoID0gc2l6ZS53aWR0 aCgpOwogICAgIGFsbG9jYXRpb24uaGVpZ2h0ID0gc2l6ZS5oZWlnaHQoKTsKICAgICBndGtfd2lk Z2V0X3NpemVfYWxsb2NhdGUoR1RLX1dJREdFVChtX3Jvb3RMYXllckVtYmVkZGVyKSwgJmFsbG9j YXRpb24pOworCisgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CiB9CiAKIHZvaWQgQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNjcm9sbE5vbkNvbXBvc2l0ZWRDb250ZW50cyhjb25zdCBJ bnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBJbnRTaXplJiBzY3JvbGxPZmZzZXQpCkBAIC0xMTcs NyArMTI1LDcgQEAgdm9pZCBBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6c2Nyb2xsTm9u Q29tcG9zaXRlZENvbnRlbnRzKGNvbnN0IEludFJlY3QmIHMKICAgICBub3RJbXBsZW1lbnRlZCgp OwogfQogCi1zdGF0aWMgZ2Jvb2xlYW4gZmx1c2hBbmRSZW5kZXJMYXllcnNDYWxsYmFjayhBY2Nl bGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCogY29udGV4dCkKK2dib29sZWFuIEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0OjpsYXllckZsdXNoVGltZXJGaXJlZENhbGxiYWNrKEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0KiBjb250ZXh0KQogewogICAgIGNvbnRleHQtPmZsdXNoQW5k UmVuZGVyTGF5ZXJzKCk7CiAgICAgcmV0dXJuIEZBTFNFOwpAQCAtMTMwLDcgKzEzOCw3IEBAIHZv aWQgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnNjaGVkdWxlTGF5ZXJGbHVzaCgpCiAK ICAgICAvLyBXZSB1c2UgYSBHTGliIHRpbWVyIGJlY2F1c2Ugb3RoZXJ3aXNlIEdUSysgZXZlbnQg aGFuZGxpbmcgZHVyaW5nCiAgICAgLy8gZHJhZ2dpbmcgY2FuIHN0YXJ2ZSBXZWJDb3JlIHRpbWVy cywgd2hpY2ggaGF2ZSBhIGxvd2VyIHByaW9yaXR5LgotICAgIG1fbGF5ZXJGbHVzaFRpbWVyQ2Fs bGJhY2tJZCA9IGdfdGltZW91dF9hZGRfZnVsbChHREtfUFJJT1JJVFlfRVZFTlRTLCAwLCByZWlu dGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPihmbHVzaEFuZFJlbmRlckxheWVyc0NhbGxiYWNrKSwg dGhpcywgMCk7CisgICAgbV9sYXllckZsdXNoVGltZXJDYWxsYmFja0lkID0gZ190aW1lb3V0X2Fk ZF9mdWxsKEdES19QUklPUklUWV9FVkVOVFMsIDAsIHJlaW50ZXJwcmV0X2Nhc3Q8R1NvdXJjZUZ1 bmM+KGxheWVyRmx1c2hUaW1lckZpcmVkQ2FsbGJhY2spLCB0aGlzLCAwKTsKIH0KIAogYm9vbCBB Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCkK