159455 2016-07-06 00:44:40 -0700 [GTK] Web view background colors don't work in accelerated compositing mode 2016-08-15 06:49:10 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 159463 154066 159465 159512 1 cgarcia webkit-unassigned amit.kachroo berto bugs-noreply commit-queue gustavo mcatanzaro mrobinson yoon zan oldest_to_newest 1208112 0 cgarcia 2016-07-06 00:44:40 -0700 This can be easily tested with MiniBrowser, for example: $ WEBKIT_FORCE_COMPOSITING_MODE=1 MiniBrowser --bg-color="rgba(255, 0, 0, 0.70)" -e The background is opaque white, and there are artifacts when resizing the window (because the web process is not rendering backgrounds when setting a web view bg color). This needs changes in the UI process when using the redirected window, but also in the web process. And of course it always happens with the threaded compositor when ACC mode is always enabled. 1208182 1 282882 cgarcia 2016-07-06 05:27:28 -0700 Created attachment 282882 Patch This needs patch attached to bug #159463 1208184 2 commit-queue 2016-07-06 05:29:42 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1212966 3 282882 mcatanzaro 2016-07-20 17:25:04 -0700 Comment on attachment 282882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282882&action=review The compatibility issue should be mentioned when you prepare release notes for 2.14. > Source/WebKit2/ChangeLog:12 > + window has an RGBA visual, even when setting a fully opaque brakcground, because we still need the web process background > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:3519 > + * #GtkWidget:app-paintable property set to %TRUE, for backgrounds colors to work. Get rid of this comma. > Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp:192 > + xDamageNotifier().add(m_window.get(), [this, damageNotify = WTFMove(damageNotify)] { Is it normal WebKit style to put spaces around the assignment operator here? I think it's easier to read without spaces. 1213069 4 cgarcia 2016-07-21 00:13:17 -0700 (In reply to comment #3) > Comment on attachment 282882 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=282882&action=review > > The compatibility issue should be mentioned when you prepare release notes > for 2.14. > > > Source/WebKit2/ChangeLog:12 > > + window has an RGBA visual, even when setting a fully opaque brakcground, because we still need the web process > > background > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:3519 > > + * #GtkWidget:app-paintable property set to %TRUE, for backgrounds colors to work. > > Get rid of this comma. > > > Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp:192 > > + xDamageNotifier().add(m_window.get(), [this, damageNotify = WTFMove(damageNotify)] { > > Is it normal WebKit style to put spaces around the assignment operator here? > I think it's easier to read without spaces. Yes. 1213071 5 cgarcia 2016-07-21 00:14:18 -0700 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 282882 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=282882&action=review > > > > The compatibility issue should be mentioned when you prepare release notes > > for 2.14. > > > > > Source/WebKit2/ChangeLog:12 > > > + window has an RGBA visual, even when setting a fully opaque brakcground, because we still need the web process > > > > background > > > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp:3519 > > > + * #GtkWidget:app-paintable property set to %TRUE, for backgrounds colors to work. > > > > Get rid of this comma. > > > > > Source/WebKit2/UIProcess/gtk/RedirectedXCompositeWindow.cpp:192 > > > + xDamageNotifier().add(m_window.get(), [this, damageNotify = WTFMove(damageNotify)] { > > > > Is it normal WebKit style to put spaces around the assignment operator here? > > I think it's easier to read without spaces. > > Yes. Yes, that it's normal webkit style, I don't think removing the spaces makes it easier to read ta all. 1213072 6 cgarcia 2016-07-21 00:19:09 -0700 Committed r203496: <http://trac.webkit.org/changeset/203496> 1220020 7 amit.kachroo 2016-08-15 06:49:10 -0700 *** Bug 158153 has been marked as a duplicate of this bug. *** 282882 2016-07-06 05:27:28 -0700 2016-07-20 17:25:04 -0700 Patch wk2-ac-mode-bg-colors.diff text/plain 10354 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5NWQ5ZDAyLi4zNTcxMDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMg QEAKIDIwMTYtMDctMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIFdlYiB2aWV3IGJhY2tncm91bmQgY29sb3JzIGRvbid0IHdvcmsg aW4gYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5NDU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gbm9uIEFDIG1vZGUgaXQncyB0aGUgZHJhd2luZyBh cmVhIGJhY2tpbmcgc3RvcmUgdGhlIG9uZSBkcmF3aW5nIHRoZSBiYWNrZ3JvdW5kLCBhbmQgdGhl IHdlYiBwcm9jZXNzIGp1c3QKKyAgICAgICAgcmVuZGVycyBpbnRvIGEgdHJhbnNwYXJlbnQgYml0 bWFwLiBJbiBBQyBtb2RlIHdlIG5lZWQgdG8gbWFrZSB0aGUgcmVkaXJlY3RlZCB3aW5kb3cgcGl4 bWFwIHRyYW5zcGFyZW50IGZvciB0aGUKKyAgICAgICAgd2ViIHByb2Nlc3MgdG8gcmVuZGVyIHRo ZXJlLCBhbmQgbGV0IHRoZSB3ZWIgdmlldyBmaWxsIHRoZSBiYWNrZ3JvdW5kIGNvbG9yIGJlZm9y ZSByZW5kZXJpbmcgdGhlIHJlZGlyZWN0ZWQKKyAgICAgICAgd2luZG93IHBpeG1hcCBvbiB0b3Au IFRvIGJlIGFibGUgdG8gbWFrZSB0aGUgcmVkaXJlY3RlZCB3aW5kb3cgc3VyZmFjZSB0cmFuc3Bh cmVudCwgd2UgbmVlZCB0byBlbnN1cmUgdGhlIHBhcmVudAorICAgICAgICB3aW5kb3cgaGFzIGFu IFJHQkEgdmlzdWFsLCBldmVuIHdoZW4gc2V0dGluZyBhIGZ1bGx5IG9wYXF1ZSBicmFrY2dyb3Vu ZCwgYmVjYXVzZSB3ZSBzdGlsbCBuZWVkIHRoZSB3ZWIgcHJvY2VzcworICAgICAgICB0byByZW5k ZXIgb24gdGhlIHRyYW5zcGFyZW50IHh3aW5kb3cuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmNwcDogVXBkYXRlIGRvY3VtZW50YXRpb24gb2Ygd2Via2l0X3dl Yl92aWV3X3NldF9iYWNrZ3JvdW5kX2NvbG9yKCkgc2luY2Ugbm93CisgICAgICAgIGl0J3MgcmVx dWlyZWQgdG8gc2V0IHRoZSBSR0JBIHZpc3VhbCBldmVuIGZvciBvcGFxdWUgY29sb3JzIGluIGNh c2UgQUMgbW9kZSBpcyBlbmFibGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdSZW5kZXJBY2NlbGVyYXRl ZENvbXBvc2l0aW5nUmVzdWx0cyk6IFdoZW4gYSBiYWNrZ3JvdW5kIGNvbG9yIGhhcyBiZWVuIHNl dCwgZmlsbCBpdCBiZWZvcmUKKyAgICAgICAgcmVuZGVyaW5nIHRoZSByZWRpcmVjdGVkIHdpbmRv dyBzdXJmYWNlLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvUmVkaXJlY3RlZFhDb21wb3NpdGVX aW5kb3cuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6 UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cpOiBNYXJrIHRoZSBzdXJmYWNlIGFzIGRpcnR5IGFm dGVyIGV2ZXJ5IGRhbWFnZQorICAgICAgICBldmVudCwgc2luY2UgdGhlIHdlYiBwcm9jZXNzIGhh cyBtb2RpZmllZCBpdC4KKyAgICAgICAgKFdlYktpdDo6UmVkaXJlY3RlZFhDb21wb3NpdGVXaW5k b3c6OnN1cmZhY2UpOiBJbml0aWFsaXplIHRoZSBzdXJmYWNlIGFmdGVyIGNyZWF0aW5nIGl0LCB0 byBhdm9pZCBmbGlja2VyaW5nIGFuZAorICAgICAgICByZW5kZXJpbmcgYXJ0aWZhY3RzIHdoZW4g d2FpdGluZyBmb3IgdGhlIGZpcnN0IGRhbWFnZSBldmVudCBmcm9tIHRoZSB3ZWIgcHJvY2Vzcy4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwOgor ICAgICAgICAoV2ViS2l0OjpMYXllclRyZWVIb3N0R3RrOjpjb21wb3NpdGVMYXllcnNUb0NvbnRl eHQpOiBVc2UgYSBmdWxseSB0cmFuc3BhcmVudCBjb2xvciB0byBjbGVhciB0aGUgY29udGV4dCB3 aGVuIHRoZSBwYWdlCisgICAgICAgIGlzIHJlc2l6ZWQgb3Igd2hlbiBhIHZpZXcgYmFja2dyb3Vu ZCBjb2xvciBoYXMgYmVlbiBzZXQuCisKKzIwMTYtMDctMDYgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtHVEtdIEF2b2lkIHRoZSByZWRpcmVj dGVkIHdpbmRvdyByZXNpemUgd2hlbiB0aGUgdmlldyBpcyByZWFsaXplZCBpbiBBQyBtb2RlCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTk0NjMKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll dy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNw cAppbmRleCA0MTQ4MDZjLi43YzczYTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMzUxNSwyNSArMzUxNSwyMiBAQCB2 b2lkIHdlYmtpdFdlYlZpZXdXZWJQcm9jZXNzQ3Jhc2hlZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 KQogICogdGhlIGFjdHVhbCBjb250ZW50cyBhcmUgcmVuZGVyZWQuIE5vdGUgdGhhdCBpZiB0aGUg d2ViIHBhZ2UgbG9hZGVkIGluIEB3ZWJfdmlldwogICogc3BlY2lmaWVzIGEgYmFja2dyb3VuZCBj b2xvciwgaXQgd2lsbCB0YWtlIHByZWNlZGVuY2Ugb3ZlciB0aGUgQHJnYmEgY29sb3IuCiAgKiBC eSBkZWZhdWx0IHRoZSBAd2ViX3ZpZXcgYmFja2dyb3VuZCBjb2xvciBpcyBvcGFxdWUgd2hpdGUu Ci0gKiBJZiB0aGUgQHJnYmEgY29sb3IgaXMgbm90IGZ1bGx5IG9wYXF1ZSwgdGhlIHBhcmVudCB3 aW5kb3cgbXVzdCBoYXZlIGEgUkdCQSB2aXN1YWwgYW5kCi0gKiAjR3RrV2lkZ2V0OmFwcC1wYWlu dGFibGUgcHJvcGVydHkgc2V0IHRvICVUUlVFLCBmb3IgdGhlIHRyYW5zcGFyZW5jaWVzIHRvIHdv cmsuCisgKiBOb3RlIHRoYXQgdGhlIHBhcmVudCB3aW5kb3cgbXVzdCBoYXZlIGEgUkdCQSB2aXN1 YWwgYW5kCisgKiAjR3RrV2lkZ2V0OmFwcC1wYWludGFibGUgcHJvcGVydHkgc2V0IHRvICVUUlVF LCBmb3IgYmFja2dyb3VuZHMgY29sb3JzIHRvIHdvcmsuCiAgKgogICogPGluZm9ybWFsZXhhbXBs ZT48cHJvZ3JhbWxpc3Rpbmc+CiAgKiBzdGF0aWMgdm9pZCBicm93c2VyX3dpbmRvd19zZXRfYmFj a2dyb3VuZF9jb2xvciAoQnJvd3NlcldpbmRvdyAqd2luZG93LAogICogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEdka1JHQkEgKnJnYmEpCiAg KiB7CiAgKiAgICAgV2ViS2l0V2ViVmlldyAqd2ViX3ZpZXc7CisgKiAgICAgR2RrU2NyZWVuICpz Y3JlZW4gPSBndGtfd2luZG93X2dldF9zY3JlZW4gKEdUS19XSU5ET1cgKHdpbmRvdykpOworICog ICAgIEdka1Zpc3VhbCAqcmdiYV92aXN1YWwgPSBnZGtfc2NyZWVuX2dldF9yZ2JhX3Zpc3VhbCAo c2NyZWVuKTsKICAqCi0gKiAgICAgaWYgKHJnYmEtPmFscGhhIDwgMSkgewotICogICAgICAgICBH ZGtTY3JlZW4gKnNjcmVlbiA9IGd0a193aW5kb3dfZ2V0X3NjcmVlbiAoR1RLX1dJTkRPVyAod2lu ZG93KSk7Ci0gKiAgICAgICAgIEdka1Zpc3VhbCAqcmdiYV92aXN1YWwgPSBnZGtfc2NyZWVuX2dl dF9yZ2JhX3Zpc3VhbCAoc2NyZWVuKTsKKyAqICAgICBpZiAoIXJnYmFfdmlzdWFsKQorICogICAg ICAgICAgcmV0dXJuOwogICoKLSAqICAgICAgICAgaWYgKCFyZ2JhX3Zpc3VhbCkKLSAqICAgICAg ICAgICAgICByZXR1cm47Ci0gKgotICogICAgICAgICBndGtfd2lkZ2V0X3NldF92aXN1YWwgKEdU S19XSURHRVQgKHdpbmRvdyksIHJnYmFfdmlzdWFsKTsKLSAqICAgICAgICAgZ3RrX3dpZGdldF9z ZXRfYXBwX3BhaW50YWJsZSAoR1RLX1dJREdFVCAod2luZG93KSwgVFJVRSk7Ci0gKiAgICAgfQor ICogICAgIGd0a193aWRnZXRfc2V0X3Zpc3VhbCAoR1RLX1dJREdFVCAod2luZG93KSwgcmdiYV92 aXN1YWwpOworICogICAgIGd0a193aWRnZXRfc2V0X2FwcF9wYWludGFibGUgKEdUS19XSURHRVQg KHdpbmRvdyksIFRSVUUpOwogICoKICAqICAgICB3ZWJfdmlldyA9IGJyb3dzZXJfd2luZG93X2dl dF93ZWJfdmlldyAod2luZG93KTsKICAqICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X2JhY2tncm91 bmRfY29sb3IgKHdlYl92aWV3LCByZ2JhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCA2OGY2NDY4Li5iY2Nh ZWQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlld0Jhc2UuY3BwCkBAIC01OTIsMTAgKzU5MiwyOCBAQCBzdGF0aWMgYm9vbCB3ZWJr aXRXZWJWaWV3UmVuZGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Jlc3VsdHMoV2ViS2l0V2ViVmll d0Jhc2UqCiAgICAgd2Via2l0V2ViVmlld0Jhc2VSZXNpemVSZWRpcmVjdGVkV2luZG93KHdlYlZp ZXdCYXNlKTsKICAgICBpZiAoY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlID0gcHJpdi0+cmVkaXJl Y3RlZFdpbmRvdy0+c3VyZmFjZSgpKSB7CiAgICAgICAgIGNhaXJvX3NhdmUoY3IpOworCisgICAg ICAgIGlmICghcHJpdi0+cGFnZVByb3h5LT5kcmF3c0JhY2tncm91bmQoKSkgeworICAgICAgICAg ICAgY29uc3QgV2ViQ29yZTo6Q29sb3IgY29sb3IgPSBwcml2LT5wYWdlUHJveHktPmJhY2tncm91 bmRDb2xvcigpOworICAgICAgICAgICAgaWYgKGNvbG9yLmhhc0FscGhhKCkpIHsKKyAgICAgICAg ICAgICAgICBjYWlyb19yZWN0YW5nbGUoY3IsIGNsaXBSZWN0LT54LCBjbGlwUmVjdC0+eSwgY2xp cFJlY3QtPndpZHRoLCBjbGlwUmVjdC0+aGVpZ2h0KTsKKyAgICAgICAgICAgICAgICBjYWlyb19z ZXRfb3BlcmF0b3IoY3IsIENBSVJPX09QRVJBVE9SX0NMRUFSKTsKKyAgICAgICAgICAgICAgICBj YWlyb19maWxsKGNyKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKGNvbG9yLmFs cGhhKCkgPiAwKSB7CisgICAgICAgICAgICAgICAgc2V0U291cmNlUkdCQUZyb21Db2xvcihjciwg Y29sb3IpOworICAgICAgICAgICAgICAgIGNhaXJvX3NldF9vcGVyYXRvcihjciwgQ0FJUk9fT1BF UkFUT1JfU09VUkNFKTsKKyAgICAgICAgICAgICAgICBjYWlyb19yZWN0YW5nbGUoY3IsIGNsaXBS ZWN0LT54LCBjbGlwUmVjdC0+eSwgY2xpcFJlY3QtPndpZHRoLCBjbGlwUmVjdC0+aGVpZ2h0KTsK KyAgICAgICAgICAgICAgICBjYWlyb19maWxsKGNyKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorCiAgICAgICAgIGNhaXJvX3JlY3RhbmdsZShjciwgY2xpcFJlY3QtPngsIGNsaXBSZWN0LT55 LCBjbGlwUmVjdC0+d2lkdGgsIGNsaXBSZWN0LT5oZWlnaHQpOwogICAgICAgICBjYWlyb19zZXRf c291cmNlX3N1cmZhY2UoY3IsIHN1cmZhY2UsIDAsIDApOwotICAgICAgICBjYWlyb19zZXRfb3Bl cmF0b3IoY3IsIENBSVJPX09QRVJBVE9SX1NPVVJDRSk7CisgICAgICAgIGNhaXJvX3NldF9vcGVy YXRvcihjciwgQ0FJUk9fT1BFUkFUT1JfT1ZFUik7CiAgICAgICAgIGNhaXJvX2ZpbGwoY3IpOwor CiAgICAgICAgIGNhaXJvX3Jlc3RvcmUoY3IpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2d0ay9SZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNw cAppbmRleCA4ZGE1ZjA1Li4zN2Q4MjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZ3RrL1JlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93LmNwcApAQCAtMTg5 LDcgKzE4OSwxMiBAQCBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6UmVkaXJlY3RlZFhDb21w b3NpdGVXaW5kb3coV2ViUGFnZVByb3h5JiB3ZWJQYWdlLCBjbwogICAgICAgICAmd2luZG93QXR0 cmlidXRlcyk7CiAgICAgWE1hcFdpbmRvdyhtX2Rpc3BsYXksIG1fd2luZG93LmdldCgpKTsKIAot ICAgIHhEYW1hZ2VOb3RpZmllcigpLmFkZChtX3dpbmRvdy5nZXQoKSwgV1RGTW92ZShkYW1hZ2VO b3RpZnkpKTsKKyAgICB4RGFtYWdlTm90aWZpZXIoKS5hZGQobV93aW5kb3cuZ2V0KCksIFt0aGlz LCBkYW1hZ2VOb3RpZnkgPSBXVEZNb3ZlKGRhbWFnZU5vdGlmeSldIHsKKyAgICAgICAgLy8gVGhl IHN1cmZhY2UgaGFzIGJlZW4gbW9kaWZpZWQgYnkgdGhlIHdlYiBwcm9jZXNzLCBtYXJrIGl0IGFz IGRpcnR5LgorICAgICAgICBpZiAobV9zdXJmYWNlKQorICAgICAgICAgICAgY2Fpcm9fc3VyZmFj ZV9tYXJrX2RpcnR5KG1fc3VyZmFjZS5nZXQoKSk7CisgICAgICAgIGRhbWFnZU5vdGlmeSgpOwor ICAgIH0pOwogCiAgICAgd2hpbGUgKDEpIHsKICAgICAgICAgWEV2ZW50IGV2ZW50OwpAQCAtMjY5 LDcgKzI3NCwxMCBAQCBjYWlyb19zdXJmYWNlX3QqIFJlZGlyZWN0ZWRYQ29tcG9zaXRlV2luZG93 OjpzdXJmYWNlKCkKICAgICBjYWlyb1N1cmZhY2VTZXREZXZpY2VTY2FsZShuZXdTdXJmYWNlLmdl dCgpLCBtX3dlYlBhZ2UuZGV2aWNlU2NhbGVGYWN0b3IoKSwgbV93ZWJQYWdlLmRldmljZVNjYWxl RmFjdG9yKCkpOwogCiAgICAgUmVmUHRyPGNhaXJvX3Q+IGNyID0gYWRvcHRSZWYoY2Fpcm9fY3Jl YXRlKG5ld1N1cmZhY2UuZ2V0KCkpKTsKLSAgICBjYWlyb19zZXRfc291cmNlX3JnYihjci5nZXQo KSwgMSwgMSwgMSk7CisgICAgaWYgKCFtX3dlYlBhZ2UuZHJhd3NCYWNrZ3JvdW5kKCkpCisgICAg ICAgIGNhaXJvX3NldF9vcGVyYXRvcihjci5nZXQoKSwgQ0FJUk9fT1BFUkFUT1JfQ0xFQVIpOwor ICAgIGVsc2UKKyAgICAgICAgc2V0U291cmNlUkdCQUZyb21Db2xvcihjci5nZXQoKSwgbV93ZWJQ YWdlLmJhY2tncm91bmRDb2xvcigpKTsKICAgICBjYWlyb19wYWludChjci5nZXQoKSk7CiAKICAg ICAvLyBOdmlkaWEgZHJpdmVycyBzZWVtIHRvIHByZXBhcmUgdGhlaXIgcmVkaXJlY3RlZCB3aW5k b3cgcGl4bWFwIGFzeW5jaHJvbm91c2x5LCBzbyBmb3IgYSBmZXcgZnJhY3Rpb25zCkBAIC0yNzcs NiArMjg1LDcgQEAgY2Fpcm9fc3VyZmFjZV90KiBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6 c3VyZmFjZSgpCiAgICAgLy8gcGl4bWFwIHdpbmRvdy1iYWNraW5ncyksIHRoZSBwaXhtYXAgbWVt b3J5IGlzIHVuaW5pdGlhbGl6ZWQuIFRvIHdvcmsgYXJvdW5kIHRoaXMgaXNzdWUsIHBhaW50IHRo ZSBvbGQKICAgICAvLyBwaXhtYXAgdG8gdGhlIG5ldyBvbmUgdG8gcHJvcGVybHkgaW5pdGlhbGl6 ZSBpdC4KICAgICBpZiAobV9zdXJmYWNlKSB7CisgICAgICAgIGNhaXJvX3NldF9vcGVyYXRvcihj ci5nZXQoKSwgQ0FJUk9fT1BFUkFUT1JfT1ZFUik7CiAgICAgICAgIGNhaXJvX3NldF9zb3VyY2Vf c3VyZmFjZShjci5nZXQoKSwgbV9zdXJmYWNlLmdldCgpLCAwLCAwKTsKICAgICAgICAgY2Fpcm9f cGFpbnQoY3IuZ2V0KCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9ndGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL0xheWVyVHJlZUhvc3RHdGsuY3BwCmluZGV4IDQ0ZTVlMDgu Ljk5MzQzZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9n dGsvTGF5ZXJUcmVlSG9zdEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL2d0ay9MYXllclRyZWVIb3N0R3RrLmNwcApAQCAtMzEzLDkgKzMxMyw4IEBAIHZvaWQg TGF5ZXJUcmVlSG9zdEd0azo6Y29tcG9zaXRlTGF5ZXJzVG9Db250ZXh0KENvbXBvc2l0ZVB1cnBv c2UgcHVycG9zZSkKICAgICAvLyB3ZSBzZXQgdGhlIHZpZXdwb3J0IHBhcmFtZXRlcnMgZGlyZWN0 bHkgZnJvbSB0aGUgd2luZG93IHNpemUuCiAgICAgSW50U2l6ZSBjb250ZXh0U2l6ZSA9IG1fY29u dGV4dC0+ZGVmYXVsdEZyYW1lQnVmZmVyU2l6ZSgpOwogICAgIGdsVmlld3BvcnQoMCwgMCwgY29u dGV4dFNpemUud2lkdGgoKSwgY29udGV4dFNpemUuaGVpZ2h0KCkpOwotCi0gICAgaWYgKHB1cnBv c2UgPT0gRm9yUmVzaXplKSB7Ci0gICAgICAgIGdsQ2xlYXJDb2xvcigxLCAxLCAxLCAwKTsKKyAg ICBpZiAocHVycG9zZSA9PSBGb3JSZXNpemUgfHwgIW1fd2ViUGFnZS5kcmF3c0JhY2tncm91bmQo KSkgeworICAgICAgICBnbENsZWFyQ29sb3IoMCwgMCwgMCwgMCk7CiAgICAgICAgIGdsQ2xlYXIo R0xfQ09MT1JfQlVGRkVSX0JJVCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjg1ZmVkYS4uOTJkZmNmMyAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisy MDE2LTA3LTA2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbR1RLXSBXZWIgdmlldyBiYWNrZ3JvdW5kIGNvbG9ycyBkb24ndCB3b3JrIGluIGFj Y2VsZXJhdGVkIGNvbXBvc2l0aW5nIG1vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1OTQ1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNldCBhbHdheXMgUkdCQSB2aXN1YWwgdG8gdGhlIHZpZXcgd2lk Z2V0IHdoZW4gc2V0dGluZyBhIGJhY2tncm91bmQgY29sb3IuCisKKyAgICAgICAgKiBNaW5pQnJv d3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfc2V0X2Jh Y2tncm91bmRfY29sb3IpOgorCiAyMDE2LTA3LTA1ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBFbmhhbmNlIFdpbmRvd3MgRFJUIGltcGxlbWVudGF0aW9u IHRvIHN1cHBvcnQgcGxhdGZvcm0gc2Nyb2xsIHdoZWVsIGV2ZW50cy4KZGlmZiAtLWdpdCBhL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jCmluZGV4IDFmNzNmNmYuLmQ5Y2NlOGIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dz ZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpAQCAtMTI3MSwxNCArMTI3MSwxMiBAQCB2b2lkIGJyb3dz ZXJfd2luZG93X3NldF9iYWNrZ3JvdW5kX2NvbG9yKEJyb3dzZXJXaW5kb3cgKndpbmRvdywgR2Rr UkdCQSAqcmdiYSkKICAgICBpZiAoZ2RrX3JnYmFfZXF1YWwocmdiYSwgJnZpZXdSR0JBKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHJnYmEtPmFscGhhIDwgMSkgewotICAgICAgICBHZGtW aXN1YWwgKnJnYmFWaXN1YWwgPSBnZGtfc2NyZWVuX2dldF9yZ2JhX3Zpc3VhbChndGtfd2luZG93 X2dldF9zY3JlZW4oR1RLX1dJTkRPVyh3aW5kb3cpKSk7Ci0gICAgICAgIGlmICghcmdiYVZpc3Vh bCkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICBHZGtWaXN1YWwgKnJnYmFWaXN1YWwgPSBnZGtf c2NyZWVuX2dldF9yZ2JhX3Zpc3VhbChndGtfd2luZG93X2dldF9zY3JlZW4oR1RLX1dJTkRPVyh3 aW5kb3cpKSk7CisgICAgaWYgKCFyZ2JhVmlzdWFsKQorICAgICAgICByZXR1cm47CiAKLSAgICAg ICAgZ3RrX3dpZGdldF9zZXRfdmlzdWFsKEdUS19XSURHRVQod2luZG93KSwgcmdiYVZpc3VhbCk7 Ci0gICAgICAgIGd0a193aWRnZXRfc2V0X2FwcF9wYWludGFibGUoR1RLX1dJREdFVCh3aW5kb3cp LCBUUlVFKTsKLSAgICB9CisgICAgZ3RrX3dpZGdldF9zZXRfdmlzdWFsKEdUS19XSURHRVQod2lu ZG93KSwgcmdiYVZpc3VhbCk7CisgICAgZ3RrX3dpZGdldF9zZXRfYXBwX3BhaW50YWJsZShHVEtf V0lER0VUKHdpbmRvdyksIFRSVUUpOwogCiAgICAgd2Via2l0X3dlYl92aWV3X3NldF9iYWNrZ3Jv dW5kX2NvbG9yKHdpbmRvdy0+d2ViVmlldywgcmdiYSk7CiB9Cg==