121165 2013-09-11 10:16:44 -0700 [GTK][WK1] Block accelerated compositing under non-X11 displays 2013-09-12 09:01:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 81456 1 zan zan changseok gustavo mrobinson oldest_to_newest 927842 0 zan 2013-09-11 10:16:44 -0700 [GTK][WK1] Only utilize the RedirectedXCompositeWindow under X11 displays 927847 1 211325 zan 2013-09-11 10:25:18 -0700 Created attachment 211325 Patch 927859 2 mrobinson 2013-09-11 10:47:11 -0700 Wouldn't it make more sense to simply disable accelerated compositing entirely when running on Wayland? 927872 3 zan 2013-09-11 11:04:30 -0700 The accelerated compositing setting is disabled by default in WK1, but I guess it would still make sense. The setting is also overridable, so perhaps there should be some warning about the feature being unsupported when someone tries to enable it? 927876 4 mrobinson 2013-09-11 11:07:47 -0700 (In reply to comment #3) > The accelerated compositing setting is disabled by default in WK1, but I guess it would still make sense. > > The setting is also overridable, so perhaps there should be some warning about the feature being unsupported when someone tries to enable it? I guess the WebKit1 code does not have a mode where the AcceleratedCompositingContext is null, so perhaps this is the simplest way. 927881 5 zan 2013-09-11 11:23:50 -0700 OK if I still include the AcceleratedCompositingContextGL changes? The RedirectedXCompositeWindow is still specific to X11 displays. 927911 6 211325 mrobinson 2013-09-11 12:04:40 -0700 Comment on attachment 211325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211325&action=review > Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp:45 > +#if defined(GDK_WINDOWING_X11) > +#include <gdk/gdkx.h> > +#endif Is it possible to move this past the end of the first block of includes? We typically do that if possible. > Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp:93 > +#if PLATFORM(X11) && defined(GDK_WINDOWING_X11) > + if (GDK_IS_X11_DISPLAY(display)) { > + if (m_redirectedWindow = RedirectedXCompositeWindow::create(pageSize)) > + m_redirectedWindow->setDamageNotifyCallback(redirectedWindowDamagedCallback, m_webView); > + } > +#endif I think maybe it would be cleaner to simply put: #if !defined(GDK_WINDOWING_X11) return; #endif if (!GDK_IS_X11_DISPLAY(display)) return; at the beginning of the function. Is this 927939 7 211325 zan 2013-09-11 12:54:12 -0700 Comment on attachment 211325 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211325&action=review >> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp:45 >> +#endif > > Is it possible to move this past the end of the first block of includes? We typically do that if possible. OK. >> Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp:93 >> +#endif > > I think maybe it would be cleaner to simply put: > > #if !defined(GDK_WINDOWING_X11) > return; > #endif > if (!GDK_IS_X11_DISPLAY(display)) > return; > > at the beginning of the function. Is this I'd put the GDK_IS_X11_DISPLAY() check inside the GDK_WINDOWING_X11 guard: #if !defined(GDK_WINDOWING_X11) if (!GDK_IS_X11_DISPLAY(display)) return; #endif I don't like the outstanding return statement guarded by GDK_WINDOWING_X11, it's kind of odd. Also, GDK_IS_X11_DISPLAY() would be missing if not guarded with GDK_WINDOWING_X11 and building with a GTK+ dependency that doesn't provide the X11 backend. 927946 8 mrobinson 2013-09-11 13:11:42 -0700 (In reply to comment #7) > #if !defined(GDK_WINDOWING_X11) > if (!GDK_IS_X11_DISPLAY(display)) > return; > #endif I assume you meant #if defined(GDK_WINDOWING_X11) here? This doesn't handle the case where GDK doesn't have support for X11. Perhaps this makes more sense? #if defined(GDK_WINDOWING_X11) if (!GDK_IS_X11_DISPLAY(display)) return; #else return; #endif 927964 9 zan 2013-09-11 13:51:11 -0700 (In reply to comment #8) > (In reply to comment #7) > > > #if !defined(GDK_WINDOWING_X11) > > if (!GDK_IS_X11_DISPLAY(display)) > > return; > > #endif > > > I assume you meant #if defined(GDK_WINDOWING_X11) here? This doesn't handle the case where GDK doesn't have support for X11. Yes, I didn't mean to use the negation, but it's still wrong. > Perhaps this makes more sense? > > #if defined(GDK_WINDOWING_X11) > if (!GDK_IS_X11_DISPLAY(display)) > return; > #else > return; > #endif That's the one. 928186 10 211406 zan 2013-09-12 00:35:05 -0700 Created attachment 211406 Patch 928321 11 211406 zan 2013-09-12 09:01:41 -0700 Comment on attachment 211406 Patch Clearing flags on attachment: 211406 Committed r155619: <http://trac.webkit.org/changeset/155619> 928322 12 zan 2013-09-12 09:01:48 -0700 All reviewed patches have been landed. Closing bug. 211325 2013-09-11 10:25:18 -0700 2013-09-12 00:34:56 -0700 Patch bug-121165-20130911102518.patch text/plain 4627 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggZmMyZWU3MzAy ZjNhYWM5NjI4ZjNkNzdmN2I0NjZjMjdhNWNhMzMzNy4uNTdkOWU5MGNiNmM5N2VhMjZmMTU3NDRm NjMxNjY1NjViOGYyZDRmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEz LTA5LTExICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBb R1RLXVtXSzFdIE9ubHkgdXRpbGl6ZSB0aGUgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cgdW5k ZXIgWDExIGRpc3BsYXlzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjExNjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIGlzIGFuYWxvZ291cyB0byB0aGUgY2hhbmdlcyBpbiByMTU0NzI5IHRoYXQg bWFkZSB0aGUgUmVkaXJlY3RlZFhDb21wb3NpdGVXaW5kb3cgdXNlIGluIFdlYktpdDIKKyAgICAg ICAgbGltaXRlZCBvbmx5IHRvIHRoZSBYMTEgZGlzcGxheXMuCisKKyAgICAgICAgKiBXZWJDb3Jl U3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dEdMLmNwcDogUmVtb3ZlIHR3byB1 bm5lY2Vzc2FyeSBoZWFkZXIgaW5jbHVkZXMgdGhhdCBhbHNvCisgICAgICAgIGludHJvZHVjZSBz eW1ib2xzIHRoYXQgY29uZmxpY3Qgd2l0aCB0aGUgc3ltYm9scyBkZWZpbmVkIGluIHRoZSBYIGhl YWRlcnMuIEluY2x1ZGUgdGhlIDxnZGsvZ2RreC5oPiBoZWFkZXIKKyAgICAgICAgaWYgdGhlIEdU SysgZGVwZW5kZW5jeSBjYW4gcHJvdmlkZSBpdC4KKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHQ6OmluaXRpYWxpemUpOiBPbmx5IHNldCB1cCB0aGUgUmVkaXJl Y3RlZFhDb21wb3NpdGVXaW5kb3cgaW5zdGFuY2UKKyAgICAgICAgaWYgcnVubmluZyB1bmRlciBh biBYMTEgZGlzcGxheS4KKyAgICAgICAgKFdlYktpdDo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Nv bnRleHQ6OnJlbmRlckxheWVyc1RvV2luZG93KTogVGhlIHJlbW92YWwgb2YgdGhlIHVubmVjZXNz YXJ5IGhlYWRlcgorICAgICAgICBpbmNsdXNpb25zIGFsc28gcmVtb3ZlZCB0aGUgc3RkOjptYXgo KSBpbmplY3Rpb24gaW50byB0aGUgZ2xvYmFsIHNjb3BlLiBVc2luZyBzdGQ6Om1heCBkaXJlY3Rs eSBpbnN0ZWFkLgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4 dDo6c2NoZWR1bGVMYXllckZsdXNoKTogRGl0dG8uCisKIDIwMTMtMDktMTEgIE1hcmlvIFNhbmNo ZXogUHJhZGEgIDxtYXJpby5wcmFkYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1v dmUgR2FpbCBkZXBlbmRlbmN5IGZyb20gYnVpbGQgc3lzdGVtIGZvciBHVEszCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5n Q29udGV4dEdMLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0R0wuY3BwCmluZGV4IDVlM2E3MjRkMDRmMTM1NmIwYmZhYzZh NDg0MjVlOGNmM2U4OGUwOWUuLjc0NTRjMjhhNWJlNDk0YTgwMmMyNDQyZmVlODU0NDc5YmM1YWEy ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0FjY2VsZXJh dGVkQ29tcG9zaXRpbmdDb250ZXh0R0wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNv cmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0R0wuY3BwCkBAIC0yMiw4ICsy Miw2IEBACiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKSAmJiBVU0UoVEVYVFVSRV9N QVBQRVJfR0wpCiAKICNpbmNsdWRlICJDYWlyb1V0aWxpdGllcy5oIgotI2luY2x1ZGUgIkNocm9t ZS5oIgotI2luY2x1ZGUgIkNocm9tZUNsaWVudEd0ay5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAj aW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NMYXllclRleHR1cmVNYXBw ZXIuaCIKQEAgLTQyLDYgKzQwLDkgQEAKIAogI2luY2x1ZGUgPGNhaXJvLmg+CiAjaW5jbHVkZSA8 Z2RrL2dkay5oPgorI2lmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19YMTEpCisjaW5jbHVkZSA8Z2Rr L2dka3guaD4KKyNlbmRpZgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAogY29uc3QgZG91YmxlIGdG cmFtZXNQZXJTZWNvbmQgPSA2MDsKQEAgLTgzLDE0ICs4NCwxOCBAQCB2b2lkIEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0Ojppbml0aWFsaXplKCkKIAogICAgIEludFNpemUgcGFnZVNpemUg PSBnZXRXZWJWaWV3U2l6ZShtX3dlYlZpZXcpOwogICAgIGlmICghbV9yZWRpcmVjdGVkV2luZG93 KSB7Ci0gICAgICAgIGlmIChtX3JlZGlyZWN0ZWRXaW5kb3cgPSBSZWRpcmVjdGVkWENvbXBvc2l0 ZVdpbmRvdzo6Y3JlYXRlKHBhZ2VTaXplKSkKLSAgICAgICAgICAgIG1fcmVkaXJlY3RlZFdpbmRv dy0+c2V0RGFtYWdlTm90aWZ5Q2FsbGJhY2socmVkaXJlY3RlZFdpbmRvd0RhbWFnZWRDYWxsYmFj aywgbV93ZWJWaWV3KTsKKyAgICAgICAgR2RrRGlzcGxheSogZGlzcGxheSA9IGdka19kaXNwbGF5 X21hbmFnZXJfZ2V0X2RlZmF1bHRfZGlzcGxheShnZGtfZGlzcGxheV9tYW5hZ2VyX2dldCgpKTsK KyNpZiBQTEFURk9STShYMTEpICYmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19YMTEpCisgICAgICAg IGlmIChHREtfSVNfWDExX0RJU1BMQVkoZGlzcGxheSkpIHsKKyAgICAgICAgICAgIGlmIChtX3Jl ZGlyZWN0ZWRXaW5kb3cgPSBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdzo6Y3JlYXRlKHBhZ2VT aXplKSkKKyAgICAgICAgICAgICAgICBtX3JlZGlyZWN0ZWRXaW5kb3ctPnNldERhbWFnZU5vdGlm eUNhbGxiYWNrKHJlZGlyZWN0ZWRXaW5kb3dEYW1hZ2VkQ2FsbGJhY2ssIG1fd2ViVmlldyk7Cisg ICAgICAgIH0KKyNlbmRpZgorICAgICAgICBpZiAoIW1fcmVkaXJlY3RlZFdpbmRvdykKKyAgICAg ICAgICAgIHJldHVybjsKICAgICB9IGVsc2UKICAgICAgICAgbV9yZWRpcmVjdGVkV2luZG93LT5y ZXNpemUocGFnZVNpemUpOwogCi0gICAgaWYgKCFtX3JlZGlyZWN0ZWRXaW5kb3cpCi0gICAgICAg IHJldHVybjsKLQogICAgIG1fcm9vdExheWVyID0gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKDAsIHRo aXMpOwogICAgIG1fcm9vdExheWVyLT5zZXREcmF3c0NvbnRlbnQoZmFsc2UpOwogICAgIG1fcm9v dExheWVyLT5zZXRTaXplKHBhZ2VTaXplKTsKQEAgLTE1OCw3ICsxNjMsNyBAQCBib29sIEFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0OjpyZW5kZXJMYXllcnNUb1dpbmRvdyhjYWlyb190KiBj ciwgY29uc3QgSW50UgogCiAgICAgaWYgKCFtX2xheWVyRmx1c2hUaW1lckNhbGxiYWNrSWQgJiYg KHRvVGV4dHVyZU1hcHBlckxheWVyKG1fcm9vdExheWVyLmdldCgpKS0+ZGVzY2VuZGFudHNPclNl bGZIYXZlUnVubmluZ0FuaW1hdGlvbnMoKSB8fCBtX25lZWRzRXh0cmFGbHVzaCkpIHsKICAgICAg ICAgbV9uZWVkc0V4dHJhRmx1c2ggPSBmYWxzZTsKLSAgICAgICAgZG91YmxlIG5leHRGbHVzaCA9 IG1heCgoMSAvIGdGcmFtZXNQZXJTZWNvbmQpIC0gKGN1cnJlbnRUaW1lKCkgLSBtX2xhc3RGbHVz aFRpbWUpLCAwLjApOworICAgICAgICBkb3VibGUgbmV4dEZsdXNoID0gc3RkOjptYXgoKDEgLyBn RnJhbWVzUGVyU2Vjb25kKSAtIChjdXJyZW50VGltZSgpIC0gbV9sYXN0Rmx1c2hUaW1lKSwgMC4w KTsKICAgICAgICAgbV9sYXllckZsdXNoVGltZXJDYWxsYmFja0lkID0gZ190aW1lb3V0X2FkZF9m dWxsKEdES19QUklPUklUWV9FVkVOVFMsIDEwMDAgKiBuZXh0Rmx1c2gsIHJlaW50ZXJwcmV0X2Nh c3Q8R1NvdXJjZUZ1bmM+KGxheWVyRmx1c2hUaW1lckZpcmVkQ2FsbGJhY2spLCB0aGlzLCAwKTsK ICAgICB9CiAKQEAgLTMyNSw3ICszMzAsNyBAQCB2b2lkIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdD b250ZXh0OjpzY2hlZHVsZUxheWVyRmx1c2goKQogCiAgICAgLy8gV2UgdXNlIGEgR0xpYiB0aW1l ciBiZWNhdXNlIG90aGVyd2lzZSBHVEsrIGV2ZW50IGhhbmRsaW5nIGR1cmluZyBkcmFnZ2luZyBj YW4KICAgICAvLyBzdGFydmUgV2ViQ29yZSB0aW1lcnMsIHdoaWNoIGhhdmUgYSBsb3dlciBwcmlv cml0eS4KLSAgICBkb3VibGUgbmV4dEZsdXNoID0gbWF4KGdTY2hlZHVsZURlbGF5IC0gKGN1cnJl bnRUaW1lKCkgLSBtX2xhc3RGbHVzaFRpbWUpLCAwLjApOworICAgIGRvdWJsZSBuZXh0Rmx1c2gg PSBzdGQ6Om1heChnU2NoZWR1bGVEZWxheSAtIChjdXJyZW50VGltZSgpIC0gbV9sYXN0Rmx1c2hU aW1lKSwgMC4wKTsKICAgICBtX2xheWVyRmx1c2hUaW1lckNhbGxiYWNrSWQgPSBnX3RpbWVvdXRf YWRkX2Z1bGwoR0RLX1BSSU9SSVRZX0VWRU5UUywgbmV4dEZsdXNoICogMTAwMCwgcmVpbnRlcnBy ZXRfY2FzdDxHU291cmNlRnVuYz4obGF5ZXJGbHVzaFRpbWVyRmlyZWRDYWxsYmFjayksIHRoaXMs IDApOwogfQogCg== 211406 2013-09-12 00:35:05 -0700 2013-09-12 09:01:41 -0700 Patch bug-121165-20130912003503.patch text/plain 7420 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggZmMyZWU3MzAy ZjNhYWM5NjI4ZjNkNzdmN2I0NjZjMjdhNWNhMzMzNy4uZWI4MWU0ODk3NGJhN2UxMzFkOTNiNGQ1 NjM2NGUyYjQyYzBkM2YyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEz LTA5LTEyICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBb R1RLXVtXSzFdIEJsb2NrIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIHVuZGVyIG5vbi1YMTEgZGlz cGxheXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEy MTE2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgaXMgYW5hbG9nb3VzIHRvIHRoZSBjaGFuZ2VzIGluIHIxNTQ3MjggYW5kIHIxNTQ3MjkgdGhh dCBlbmZvcmNlIGRpc2FibGluZyBhY2NlbGVyYXRlZCBjb21wb3NpdGluZworICAgICAgICB1bmRl ciBXYXlsYW5kIGRpc3BsYXlzIGFuZCBtYWRlIHRoZSBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRv dyB1c2UgaW4gV2ViS2l0MiBsaW1pdGVkIG9ubHkgdG8gdGhlIFgxMSBkaXNwbGF5cy4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0R0wuY3Bw OiBSZW1vdmUgdHdvIHVubmVjZXNzYXJ5IGhlYWRlciBpbmNsdWRlcyB0aGF0IGFsc28KKyAgICAg ICAgaW50cm9kdWNlIHN5bWJvbHMgdGhhdCBjb25mbGljdCB3aXRoIHRoZSBzeW1ib2xzIGRlZmlu ZWQgaW4gdGhlIFggaGVhZGVycy4gSW5jbHVkZSB0aGUgPGdkay9nZGt4Lmg+IGhlYWRlcgorICAg ICAgICBpZiB0aGUgR1RLKyBkZXBlbmRlbmN5IGNhbiBwcm92aWRlIGl0LgorICAgICAgICAoV2Vi S2l0OjpBY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dDo6aW5pdGlhbGl6ZSk6IE9ubHkgc2V0 IHVwIHRoZSBSZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdyBpbnN0YW5jZQorICAgICAgICBpZiBy dW5uaW5nIHVuZGVyIGFuIFgxMSBkaXNwbGF5LgorICAgICAgICAoV2ViS2l0OjpBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dDo6cmVuZGVyTGF5ZXJzVG9XaW5kb3cpOiBUaGUgcmVtb3ZhbCBv ZiB0aGUgdW5uZWNlc3NhcnkgaGVhZGVyCisgICAgICAgIGluY2x1c2lvbnMgYWxzbyByZW1vdmVk IHRoZSBzdGQ6Om1heCgpIGluamVjdGlvbiBpbnRvIHRoZSBnbG9iYWwgc2NvcGUuIFVzaW5nIHN0 ZDo6bWF4IGRpcmVjdGx5IGluc3RlYWQuCisgICAgICAgIChXZWJLaXQ6OkFjY2VsZXJhdGVkQ29t cG9zaXRpbmdDb250ZXh0OjpzY2hlZHVsZUxheWVyRmx1c2gpOiBEaXR0by4KKyAgICAgICAgKiB3 ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh1cGRhdGVBY2NlbGVyYXRlZENvbXBv c2l0aW5nU2V0dGluZyk6IEEgaGVscGVyIGZ1bmN0aW9uIHRoYXQgZW5zdXJlcyB0aGUgYWNjZWxl cmF0ZWQgY29tcG9zaXRpbmcgZmVhdHVyZQorICAgICAgICBzdGF5cyBkaXNhYmxlZCB1bmRlciBX YXlsYW5kIGRpc3BsYXlzLiBJdCBhbHNvIHByaW50cyBvdXQgYSB3YXJuaW5nIG1lc3NhZ2UgdGhl IGZpcnN0IHRpbWUgdGhlIHVzZXIgdHJpZXMKKyAgICAgICAgdG8gZW5hYmxlIGFjY2VsZXJhdGVk IGNvbXBvc2l0aW5nIHVuZGVyIFdheWxhbmQgZGlzcGxheXMsIHRlbGxpbmcgdGhhdCB0aGUgZmVh dHVyZSBpcyBub3Qgc3VwcG9ydGVkIGFuZAorICAgICAgICB3aWxsIHJlbWFpbiBkaXNhYmxlZC4K KyAgICAgICAgKHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3MpOiBDYWxsIHVwZGF0ZUFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdTZXR0aW5nKCkgdG8gZW5hYmxlIHRoZSBmZWF0dXJlIGlmIHBv c3NpYmxlLgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NldHRpbmdzX25vdGlmeSk6IERpdHRv LgorCiAyMDEzLTA5LTExICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bWFyaW8ucHJhZGFAc2Ftc3Vu Zy5jb20+CiAKICAgICAgICAgW0dUS10gUmVtb3ZlIEdhaWwgZGVwZW5kZW5jeSBmcm9tIGJ1aWxk IHN5c3RlbSBmb3IgR1RLMwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1 cHBvcnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRHTC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dEdMLmNwcApp bmRleCA1ZTNhNzI0ZDA0ZjEzNTZiMGJmYWM2YTQ4NDI1ZThjZjNlODhlMDllLi5jMTc4N2MzMzE3 ZTBhMTEyMTAyNDY2MDBkOGU3Mjc4NGMwNmI5OGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dEdMLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0 aW5nQ29udGV4dEdMLmNwcApAQCAtMjIsOCArMjIsNiBAQAogI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykgJiYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQogCiAjaW5jbHVkZSAiQ2Fpcm9V dGlsaXRpZXMuaCIKLSNpbmNsdWRlICJDaHJvbWUuaCIKLSNpbmNsdWRlICJDaHJvbWVDbGllbnRH dGsuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2luY2x1 ZGUgIkdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgiCkBAIC00NCw2ICs0MiwxMCBAQAogI2lu Y2x1ZGUgPGdkay9nZGsuaD4KICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKKyNpZiBQTEFURk9STShY MTEpICYmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19YMTEpCisjaW5jbHVkZSA8Z2RrL2dka3guaD4K KyNlbmRpZgorCiBjb25zdCBkb3VibGUgZ0ZyYW1lc1BlclNlY29uZCA9IDYwOwogCiAvLyBUaGVy ZSBzZWVtcyB0byBiZSBhIGRlbGljYXRlIGJhbGFuY2UgYmV0d2VlbiB0aGUgbWFpbiBsb29wIGJl aW5nIGZsb29kZWQKQEAgLTgxLDYgKzgzLDEyIEBAIHZvaWQgQWNjZWxlcmF0ZWRDb21wb3NpdGlu Z0NvbnRleHQ6OmluaXRpYWxpemUoKQogICAgIGlmIChtX3Jvb3RMYXllcikKICAgICAgICAgcmV0 dXJuOwogCisjaWYgUExBVEZPUk0oWDExKSAmJiBkZWZpbmVkKEdES19XSU5ET1dJTkdfWDExKQor ICAgIEdka0Rpc3BsYXkqIGRpc3BsYXkgPSBnZGtfZGlzcGxheV9tYW5hZ2VyX2dldF9kZWZhdWx0 X2Rpc3BsYXkoZ2RrX2Rpc3BsYXlfbWFuYWdlcl9nZXQoKSk7CisgICAgaWYgKCFHREtfSVNfWDEx X0RJU1BMQVkoZGlzcGxheSkpCisjZW5kaWYKKyAgICAgICAgcmV0dXJuOworCiAgICAgSW50U2l6 ZSBwYWdlU2l6ZSA9IGdldFdlYlZpZXdTaXplKG1fd2ViVmlldyk7CiAgICAgaWYgKCFtX3JlZGly ZWN0ZWRXaW5kb3cpIHsKICAgICAgICAgaWYgKG1fcmVkaXJlY3RlZFdpbmRvdyA9IFJlZGlyZWN0 ZWRYQ29tcG9zaXRlV2luZG93OjpjcmVhdGUocGFnZVNpemUpKQpAQCAtMTU4LDcgKzE2Niw3IEBA IGJvb2wgQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHQ6OnJlbmRlckxheWVyc1RvV2luZG93 KGNhaXJvX3QqIGNyLCBjb25zdCBJbnRSCiAKICAgICBpZiAoIW1fbGF5ZXJGbHVzaFRpbWVyQ2Fs bGJhY2tJZCAmJiAodG9UZXh0dXJlTWFwcGVyTGF5ZXIobV9yb290TGF5ZXIuZ2V0KCkpLT5kZXNj ZW5kYW50c09yU2VsZkhhdmVSdW5uaW5nQW5pbWF0aW9ucygpIHx8IG1fbmVlZHNFeHRyYUZsdXNo KSkgewogICAgICAgICBtX25lZWRzRXh0cmFGbHVzaCA9IGZhbHNlOwotICAgICAgICBkb3VibGUg bmV4dEZsdXNoID0gbWF4KCgxIC8gZ0ZyYW1lc1BlclNlY29uZCkgLSAoY3VycmVudFRpbWUoKSAt IG1fbGFzdEZsdXNoVGltZSksIDAuMCk7CisgICAgICAgIGRvdWJsZSBuZXh0Rmx1c2ggPSBzdGQ6 Om1heCgoMSAvIGdGcmFtZXNQZXJTZWNvbmQpIC0gKGN1cnJlbnRUaW1lKCkgLSBtX2xhc3RGbHVz aFRpbWUpLCAwLjApOwogICAgICAgICBtX2xheWVyRmx1c2hUaW1lckNhbGxiYWNrSWQgPSBnX3Rp bWVvdXRfYWRkX2Z1bGwoR0RLX1BSSU9SSVRZX0VWRU5UUywgMTAwMCAqIG5leHRGbHVzaCwgcmVp bnRlcnByZXRfY2FzdDxHU291cmNlRnVuYz4obGF5ZXJGbHVzaFRpbWVyRmlyZWRDYWxsYmFjayks IHRoaXMsIDApOwogICAgIH0KIApAQCAtMzI1LDcgKzMzMyw3IEBAIHZvaWQgQWNjZWxlcmF0ZWRD b21wb3NpdGluZ0NvbnRleHQ6OnNjaGVkdWxlTGF5ZXJGbHVzaCgpCiAKICAgICAvLyBXZSB1c2Ug YSBHTGliIHRpbWVyIGJlY2F1c2Ugb3RoZXJ3aXNlIEdUSysgZXZlbnQgaGFuZGxpbmcgZHVyaW5n IGRyYWdnaW5nIGNhbgogICAgIC8vIHN0YXJ2ZSBXZWJDb3JlIHRpbWVycywgd2hpY2ggaGF2ZSBh IGxvd2VyIHByaW9yaXR5LgotICAgIGRvdWJsZSBuZXh0Rmx1c2ggPSBtYXgoZ1NjaGVkdWxlRGVs YXkgLSAoY3VycmVudFRpbWUoKSAtIG1fbGFzdEZsdXNoVGltZSksIDAuMCk7CisgICAgZG91Ymxl IG5leHRGbHVzaCA9IHN0ZDo6bWF4KGdTY2hlZHVsZURlbGF5IC0gKGN1cnJlbnRUaW1lKCkgLSBt X2xhc3RGbHVzaFRpbWUpLCAwLjApOwogICAgIG1fbGF5ZXJGbHVzaFRpbWVyQ2FsbGJhY2tJZCA9 IGdfdGltZW91dF9hZGRfZnVsbChHREtfUFJJT1JJVFlfRVZFTlRTLCBuZXh0Rmx1c2ggKiAxMDAw LCByZWludGVycHJldF9jYXN0PEdTb3VyY2VGdW5jPihsYXllckZsdXNoVGltZXJGaXJlZENhbGxi YWNrKSwgdGhpcywgMCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2 aWV3LmNwcAppbmRleCA4NjRiYjhlNjY4ZjhlNjdkY2Y0MGNhODMxZmY4ZDg1OTViNDhkYmNhLi40 OGI0MDZmOWNjYTlhNWRjMzJhYzBlNDZlMDY0YjUwYzhjYWI4ZWU1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xMjIsNiArMTIyLDEwIEBACiAjaW5j bHVkZSAiRGV2aWNlT3JpZW50YXRpb25DbGllbnRHdGsuaCIKICNlbmRpZgogCisjaWYgUExBVEZP Uk0oV0FZTEFORCkgJiYgZGVmaW5lZChHREtfV0lORE9XSU5HX1dBWUxBTkQpCisjaW5jbHVkZSA8 Z2RrL2dka3dheWxhbmQuaD4KKyNlbmRpZgorCiAvKioKICAqIFNFQ1RJT046d2Via2l0d2Vidmll dwogICogQHNob3J0X2Rlc2NyaXB0aW9uOiBUaGUgY2VudHJhbCBjbGFzcyBvZiB0aGUgV2ViS2l0 R1RLKyBBUEkKQEAgLTM0OTMsNiArMzQ5NywyNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3Zp ZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICBnX3R5 cGVfY2xhc3NfYWRkX3ByaXZhdGUod2ViVmlld0NsYXNzLCBzaXplb2YoV2ViS2l0V2ViVmlld1By aXZhdGUpKTsKIH0KIAorc3RhdGljIHZvaWQgdXBkYXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ1Nl dHRpbmcoU2V0dGluZ3MmIHNldHRpbmdzLCBib29sIHZhbHVlKQoreworI2lmIFBMQVRGT1JNKFdB WUxBTkQpICYmIGRlZmluZWQoR0RLX1dJTkRPV0lOR19XQVlMQU5EKQorICAgIEdka0Rpc3BsYXkq IGRpc3BsYXkgPSBnZGtfZGlzcGxheV9tYW5hZ2VyX2dldF9kZWZhdWx0X2Rpc3BsYXkoZ2RrX2Rp c3BsYXlfbWFuYWdlcl9nZXQoKSk7CisgICAgaWYgKEdES19JU19XQVlMQU5EX0RJU1BMQVkoZGlz cGxheSkpIHsKKyAgICAgICAgaWYgKCF2YWx1ZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAg ICAgICBzdGF0aWMgYm9vbCB1bnN1cHBvcnRlZEFDV2FybmluZ1Nob3duID0gZmFsc2U7CisgICAg ICAgIGlmICghdW5zdXBwb3J0ZWRBQ1dhcm5pbmdTaG93bikgeworICAgICAgICAgICAgZ193YXJu aW5nKCJBY2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBub3Qgc3VwcG9ydGVkIHVuZGVyIFdheWxh bmQgZGlzcGxheXMsIGRpc2FibGluZy4iKTsKKyAgICAgICAgICAgIHVuc3VwcG9ydGVkQUNXYXJu aW5nU2hvd24gPSB0cnVlOworICAgICAgICB9CisgICAgICAgIHNldHRpbmdzLnNldEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdFbmFibGVkKGZhbHNlKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyNl bmRpZgorCisgICAgc2V0dGluZ3Muc2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQodmFs dWUpOworfQorCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRpbmdzKFdl YktpdFdlYlZpZXcqIHdlYlZpZXcpCiB7CiAgICAgV2ViS2l0V2ViU2V0dGluZ3NQcml2YXRlKiBz ZXR0aW5nc1ByaXZhdGUgPSB3ZWJWaWV3LT5wcml2LT53ZWJTZXR0aW5ncy0+cHJpdjsKQEAgLTM1 NjIsNyArMzU4Nyw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGlu Z3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICNlbmRpZgogCiAjaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKQotICAgIGNvcmVTZXR0aW5ncy5zZXRBY2NlbGVyYXRlZENvbXBvc2l0aW5n RW5hYmxlZChzZXR0aW5nc1ByaXZhdGUtPmVuYWJsZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmcpOwor ICAgIHVwZGF0ZUFjY2VsZXJhdGVkQ29tcG9zaXRpbmdTZXR0aW5nKGNvcmVTZXR0aW5ncywgc2V0 dGluZ3NQcml2YXRlLT5lbmFibGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKTsKICAgICBjaGFyKiBk ZWJ1Z1Zpc3VhbHNFbnZpcm9ubWVudCA9IGdldGVudigiV0VCS0lUX1NIT1dfQ09NUE9TSVRJTkdf REVCVUdfVklTVUFMUyIpOwogICAgIGJvb2wgc2hvd0RlYnVnVmlzdWFscyA9IGRlYnVnVmlzdWFs c0Vudmlyb25tZW50ICYmICFzdHJjbXAoZGVidWdWaXN1YWxzRW52aXJvbm1lbnQsICIxIik7CiAg ICAgY29yZVNldHRpbmdzLnNldFNob3dEZWJ1Z0JvcmRlcnMoc2hvd0RlYnVnVmlzdWFscyk7CkBA IC0zNzExLDcgKzM3MzYsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0dGluZ3Nf bm90aWZ5KFdlYktpdFdlYlNldHRpbmdzKiB3ZWJTZXR0aW5ncywgR1BhcgogCiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGVsc2UgaWYgKG5hbWUgPT0gZ19pbnRlcm5fc3Ry aW5nKCJlbmFibGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmciKSkKLSAgICAgICAgc2V0dGluZ3Mu c2V0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoZ192YWx1ZV9nZXRfYm9vbGVhbigmdmFs dWUpKTsKKyAgICAgICAgdXBkYXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ1NldHRpbmcoc2V0dGlu Z3MsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4oJnZhbHVlKSk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShX RUJfQVVESU8pCg==