136829 2014-09-15 12:07:31 -0700 [GTK] Add Wayland support to GLContextEGL 2014-09-17 23:22:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136849 1 zan zan mrobinson oldest_to_newest 1035279 0 zan 2014-09-15 12:07:31 -0700 [GTK] Add Wayland support to GLContextEGL 1035288 1 238136 zan 2014-09-15 12:21:05 -0700 Created attachment 238136 Patch 1035356 2 238136 mrobinson 2014-09-15 18:47:58 -0700 Comment on attachment 238136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238136&action=review > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:46 > +#if PLATFORM(GTK) > +#include <gdk/gdk.h> > +#if PLATFORM(X11) > +#include <gdk/gdkx.h> > +#endif > +#if PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2) > +#include <gdk/gdkwayland.h> > +#endif > +#endif Sad to still see GTK+ 2 stuff here. :/ > Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:81 > +#if PLATFORM(GTK) && !defined(GTK_API_VERSION_2) > + GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get()); > #if PLATFORM(X11) > + if (GDK_IS_X11_DISPLAY(display)) > + gSharedEGLDisplay = eglGetDisplay(GLContext::sharedX11Display()); > +#endif > +#if PLATFORM(WAYLAND) > + if (GDK_IS_WAYLAND_DISPLAY(display)) > + gSharedEGLDisplay = eglGetDisplay(GLContext::sharedWaylandDisplay()); > +#endif > +#elif PLATFORM(X11) It looks like this can just be: #if PLATFORM(GTK) && !defined(GTK_API_VERSION_2) && PLATFORM(WAYLAND) GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get()); if (GDK_IS_WAYLAND_DISPLAY(display)) gSharedEGLDisplay = eglGetDisplay(GLContext::sharedWaylandDisplay()); else #endif to avoid duplicating the X11 version. 1035407 3 238136 zan 2014-09-16 01:22:39 -0700 Comment on attachment 238136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238136&action=review >> Source/WebCore/platform/graphics/egl/GLContextEGL.cpp:81 >> +#elif PLATFORM(X11) > > It looks like this can just be: > > #if PLATFORM(GTK) && !defined(GTK_API_VERSION_2) && PLATFORM(WAYLAND) > GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get()); > if (GDK_IS_WAYLAND_DISPLAY(display)) > gSharedEGLDisplay = eglGetDisplay(GLContext::sharedWaylandDisplay()); > else > #endif > > to avoid duplicating the X11 version. OK, though I'm not a big fan of branches reaching through the #if/#endif borders. 1035420 4 238162 zan 2014-09-16 02:19:13 -0700 Created attachment 238162 Patch 1035555 5 238197 zan 2014-09-16 13:28:50 -0700 Created attachment 238197 Patch 1035704 6 238248 zan 2014-09-17 05:39:29 -0700 Created attachment 238248 Patch 1035792 7 238248 mrobinson 2014-09-17 16:21:31 -0700 Comment on attachment 238248 Patch Let's do this. 1035844 8 238248 zan 2014-09-17 23:22:17 -0700 Comment on attachment 238248 Patch Clearing flags on attachment: 238248 Committed r173716: <http://trac.webkit.org/changeset/173716> 1035845 9 zan 2014-09-17 23:22:25 -0700 All reviewed patches have been landed. Closing bug. 238136 2014-09-15 12:21:05 -0700 2014-09-16 02:19:05 -0700 Patch bug-136829-20140915122101.patch text/plain 2296 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzYyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA5LTE1ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFu ZCBzdXBwb3J0IHRvIEdMQ29udGV4dEVHTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM2ODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnNoYXJlZEVHTERpc3BsYXkpOiBTcGVjaWFsLWNhc2UgdGhl IHNoYXJlZCBFR0wgZGlzcGxheSBpbml0aWFsaXphdGlvbgorICAgICAgICBmb3IgdGhlIEdUSyBw b3J0LiBUaGUgdHlwZSBvZiB0aGUgc2hhcmVkIGRpc3BsYXkgc2hvdWxkIGNvcnJlc3BvbmQgdG8g dGhlIHR5cGUKKyAgICAgICAgb2YgZGlzcGxheSB3ZSdyZSBydW5uaW5nIHVuZGVyLgorCiAyMDE0 LTA5LTE1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQXZvaWQg cmVkdW5kYW50IGlzRWxlbWVudE5vZGUoKSBjaGVja3MgaW4gVHJhdmVyc2FsPEhUTUwqRWxlbWVu dD4gLyBUcmF2ZXJzYWw8U1ZHKkVsZW1lbnQ+CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcAkocmV2aXNpb24gMTcz NjIzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVH TC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDE2IEBACiAjaW5jbHVkZSAiT3BlbkdM U2hpbXMuaCIKICNlbmRpZgogCisjaWYgUExBVEZPUk0oR1RLKQorI2luY2x1ZGUgPGdkay9nZGsu aD4KKyNpZiBQTEFURk9STShYMTEpCisjaW5jbHVkZSA8Z2RrL2dka3guaD4KKyNlbmRpZgorI2lm IFBMQVRGT1JNKFdBWUxBTkQpICYmICFkZWZpbmVkKEdUS19BUElfVkVSU0lPTl8yKQorI2luY2x1 ZGUgPGdkay9nZGt3YXlsYW5kLmg+CisjZW5kaWYKKyNlbmRpZgorCiAjaWYgRU5BQkxFKEFDQ0VM RVJBVEVEXzJEX0NBTlZBUykKIC8vIGNhaXJvLWdsLmggaW5jbHVkZXMgc29tZSBkZWZpbml0aW9u cyBmcm9tIEdMWCB0aGF0IGNvbmZsaWN0IHdpdGgKIC8vIHRoZSBvbmVzIHByb3ZpZGVkIGJ5IHVz LiBTaW5jZSBHTENvbnRleHRFR0wgZG9lc24ndCB1c2UgYW55IEdMWApAQCAtNTgsNyArNjgsMTcg QEAgc3RhdGljIEVHTERpc3BsYXkgc2hhcmVkRUdMRGlzcGxheSgpCiAgICAgc3RhdGljIGJvb2wg aW5pdGlhbGl6ZWQgPSBmYWxzZTsKICAgICBpZiAoIWluaXRpYWxpemVkKSB7CiAgICAgICAgIGlu aXRpYWxpemVkID0gdHJ1ZTsKKyNpZiBQTEFURk9STShHVEspICYmICFkZWZpbmVkKEdUS19BUElf VkVSU0lPTl8yKQorICAgICAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ2RrX2Rpc3BsYXlfbWFu YWdlcl9nZXRfZGVmYXVsdF9kaXNwbGF5KGdka19kaXNwbGF5X21hbmFnZXJfZ2V0KCkpOwogI2lm IFBMQVRGT1JNKFgxMSkKKyAgICAgICAgaWYgKEdES19JU19YMTFfRElTUExBWShkaXNwbGF5KSkK KyAgICAgICAgICAgIGdTaGFyZWRFR0xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShHTENvbnRleHQ6 OnNoYXJlZFgxMURpc3BsYXkoKSk7CisjZW5kaWYKKyNpZiBQTEFURk9STShXQVlMQU5EKQorICAg ICAgICBpZiAoR0RLX0lTX1dBWUxBTkRfRElTUExBWShkaXNwbGF5KSkKKyAgICAgICAgICAgIGdT aGFyZWRFR0xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShHTENvbnRleHQ6OnNoYXJlZFdheWxhbmRE aXNwbGF5KCkpOworI2VuZGlmCisjZWxpZiBQTEFURk9STShYMTEpCiAgICAgICAgIGdTaGFyZWRF R0xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShHTENvbnRleHQ6OnNoYXJlZFgxMURpc3BsYXkoKSk7 CiAjZWxzZQogICAgICAgICBnU2hhcmVkRUdMRGlzcGxheSA9IGVnbEdldERpc3BsYXkoRUdMX0RF RkFVTFRfRElTUExBWSk7Cg== 238162 2014-09-16 02:19:13 -0700 2014-09-16 13:28:44 -0700 Patch bug-136829-20140916021909.patch text/plain 2692 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY1NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA5LTE2ICBJYWdvIFRv cmFsICA8aXRvcmFsQGlnYWxpYS5jb20+IGFuZCBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFuZCBzdXBwb3J0IHRvIEdMQ29udGV4 dEVHTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2 ODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnNoYXJlZEVHTERpc3BsYXkpOiBTcGVjaWFsLWNhc2UgdGhlIHNoYXJlZCBFR0wgZGlzcGxheSBp bml0aWFsaXphdGlvbgorICAgICAgICBmb3IgdGhlIEdUSyBwb3J0IHdoZW4gcnVubmluZyB1bmRl ciBXYXlsYW5kLiBJbiB0aGF0IGNhc2UgdGhlIHBvaW50ZXIgdG8gdGhlCisgICAgICAgIG5hdGl2 ZSB3bF9kaXNwbGF5IG9iamVjdCBzaG91bGQgYmUgcGFzc2VkIHRvIGVnbEdldERpc3BsYXkoKS4g SWYgbm90IHJ1bm5pbmcKKyAgICAgICAgdW5kZXIgV2F5bGFuZCB3ZSBzaG91bGQgZmFsbCBiYWNr IHRvIHVzaW5nIHRoZSBzaGFyZWQgWDExIGRpc3BsYXkgKGlmIHN1cHBvcnQKKyAgICAgICAgZm9y IHRoYXQgZGlzcGxheSBzeXN0ZW0gaXMgZW5hYmxlZCkgb3IgdGhlIEVHTF9ERUZBVUxUX0RJU1BM QVkuCisKIDIwMTQtMDktMTYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5v bi5mcj4KIAogICAgICAgICBbR1N0cmVhbWVyXSBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLWF1dGgu aHRtbCBpcyBmYWlsaW5nCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9l Z2wvR0xDb250ZXh0RUdMLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcAkocmV2aXNpb24gMTczNjU2KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTM1LDYgKzM1LDEzIEBACiAjaW5jbHVkZSAiT3BlbkdMU2hpbXMuaCIKICNl bmRpZgogCisjaWYgUExBVEZPUk0oR1RLKQorI2luY2x1ZGUgIkRpc3BsYXlTeXN0ZW1UeXBlLmgi CisjaWYgUExBVEZPUk0oV0FZTEFORCkgJiYgIWRlZmluZWQoR1RLX0FQSV9WRVJTSU9OXzIpCisj aW5jbHVkZSAiV2F5bGFuZERpc3BsYXkuaCIKKyNlbmRpZgorI2VuZGlmCisKICNpZiBFTkFCTEUo QUNDRUxFUkFURURfMkRfQ0FOVkFTKQogLy8gY2Fpcm8tZ2wuaCBpbmNsdWRlcyBzb21lIGRlZmlu aXRpb25zIGZyb20gR0xYIHRoYXQgY29uZmxpY3Qgd2l0aAogLy8gdGhlIG9uZXMgcHJvdmlkZWQg YnkgdXMuIFNpbmNlIEdMQ29udGV4dEVHTCBkb2Vzbid0IHVzZSBhbnkgR0xYCkBAIC01OCwxMCAr NjUsMTUgQEAgc3RhdGljIEVHTERpc3BsYXkgc2hhcmVkRUdMRGlzcGxheSgpCiAgICAgc3RhdGlj IGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKICAgICBpZiAoIWluaXRpYWxpemVkKSB7CiAgICAg ICAgIGluaXRpYWxpemVkID0gdHJ1ZTsKKyNpZiBQTEFURk9STShHVEspICYmIFBMQVRGT1JNKFdB WUxBTkQpICYmICFkZWZpbmVkKEdUS19BUElfVkVSU0lPTl8yKQorICAgICAgICBpZiAoRGlzcGxh eVN5c3RlbVR5cGU6OmdldCgpID09IERpc3BsYXlTeXN0ZW1UeXBlOjpXYXlsYW5kICYmIFdheWxh bmREaXNwbGF5OjppbnN0YW5jZSgpKQorICAgICAgICAgICAgZ1NoYXJlZEVHTERpc3BsYXkgPSBl Z2xHZXREaXNwbGF5KFdheWxhbmREaXNwbGF5OjppbnN0YW5jZSgpLT5uYXRpdmVEaXNwbGF5KCkp OworICAgICAgICBlbHNlIC8vIE5vdGUgdGhhdCB0aGlzIGJyYW5jaCBjb250aW51dGVzIG91dHNp ZGUgdGhpcyAjaWYtZ3VhcmRlZCBzZWdtZW50LgorI2VuZGlmCiAjaWYgUExBVEZPUk0oWDExKQot ICAgICAgICBnU2hhcmVkRUdMRGlzcGxheSA9IGVnbEdldERpc3BsYXkoR0xDb250ZXh0OjpzaGFy ZWRYMTFEaXNwbGF5KCkpOworICAgICAgICAgICAgZ1NoYXJlZEVHTERpc3BsYXkgPSBlZ2xHZXRE aXNwbGF5KEdMQ29udGV4dDo6c2hhcmVkWDExRGlzcGxheSgpKTsKICNlbHNlCi0gICAgICAgIGdT aGFyZWRFR0xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShFR0xfREVGQVVMVF9ESVNQTEFZKTsKKyAg ICAgICAgICAgIGdTaGFyZWRFR0xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShFR0xfREVGQVVMVF9E SVNQTEFZKTsKICNlbmRpZgogICAgICAgICBpZiAoZ1NoYXJlZEVHTERpc3BsYXkgIT0gRUdMX05P X0RJU1BMQVkgJiYgKCFlZ2xJbml0aWFsaXplKGdTaGFyZWRFR0xEaXNwbGF5LCAwLCAwKSB8fCAh ZWdsQmluZEFQSShnR0xBUEkpKSkKICAgICAgICAgICAgIGdTaGFyZWRFR0xEaXNwbGF5ID0gRUdM X05PX0RJU1BMQVk7Cg== 238197 2014-09-16 13:28:50 -0700 2014-09-17 05:39:23 -0700 Patch bug-136829-20140916132846.patch text/plain 2697 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY2NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA5LTE2ICBJYWdvIFRv cmFsICA8aXRvcmFsQGlnYWxpYS5jb20+IGFuZCBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFuZCBzdXBwb3J0IHRvIEdMQ29udGV4 dEVHTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2 ODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnNoYXJlZEVHTERpc3BsYXkpOiBTcGVjaWFsLWNhc2UgdGhlIHNoYXJlZCBFR0wgZGlzcGxheSBp bml0aWFsaXphdGlvbgorICAgICAgICBmb3IgdGhlIEdUSyBwb3J0IHdoZW4gcnVubmluZyB1bmRl ciBXYXlsYW5kLiBJbiB0aGF0IGNhc2UgdGhlIHBvaW50ZXIgdG8gdGhlCisgICAgICAgIG5hdGl2 ZSB3bF9kaXNwbGF5IG9iamVjdCBzaG91bGQgYmUgcGFzc2VkIHRvIGVnbEdldERpc3BsYXkoKS4g SWYgbm90IHJ1bm5pbmcKKyAgICAgICAgdW5kZXIgV2F5bGFuZCB3ZSBzaG91bGQgZmFsbCBiYWNr IHRvIHVzaW5nIHRoZSBzaGFyZWQgWDExIGRpc3BsYXkgKGlmIHN1cHBvcnQKKyAgICAgICAgZm9y IHRoYXQgZGlzcGxheSBzeXN0ZW0gaXMgZW5hYmxlZCkgb3IgdGhlIEVHTF9ERUZBVUxUX0RJU1BM QVkuCisKIDIwMTQtMDktMTYgIHBlYXZvQG91dGxvb2suY29tICA8cGVhdm9Ab3V0bG9vay5jb20+ CiAKICAgICAgICAgW0N1cmxdIFNvbWV0aW1lcyBpbmNvbXBsZXRlIG9yIGVtcHR5IGNvbnRlbnQg Y2FuIGJlIGxvYWRlZCBmcm9tIGNhY2hlLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAJKHJldmlzaW9uIDE3MzY2 NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2VnbC9HTENvbnRleHRFR0wu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSwxMyBAQAogI2luY2x1ZGUgIk9wZW5HTFNo aW1zLmgiCiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKEdUSykKKyNpbmNsdWRlICJHdGtVdGlsaXRp ZXMuaCIKKyNpZiBQTEFURk9STShXQVlMQU5EKSAmJiAhZGVmaW5lZChHVEtfQVBJX1ZFUlNJT05f MikKKyNpbmNsdWRlICJXYXlsYW5kRGlzcGxheS5oIgorI2VuZGlmCisjZW5kaWYKKwogI2lmIEVO QUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCiAvLyBjYWlyby1nbC5oIGluY2x1ZGVzIHNvbWUg ZGVmaW5pdGlvbnMgZnJvbSBHTFggdGhhdCBjb25mbGljdCB3aXRoCiAvLyB0aGUgb25lcyBwcm92 aWRlZCBieSB1cy4gU2luY2UgR0xDb250ZXh0RUdMIGRvZXNuJ3QgdXNlIGFueSBHTFgKQEAgLTU4 LDEwICs2NSwxNSBAQCBzdGF0aWMgRUdMRGlzcGxheSBzaGFyZWRFR0xEaXNwbGF5KCkKICAgICBz dGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOwogICAgIGlmICghaW5pdGlhbGl6ZWQpIHsK ICAgICAgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworI2lmIFBMQVRGT1JNKEdUSykgJiYgUExBVEZP Uk0oV0FZTEFORCkgJiYgIWRlZmluZWQoR1RLX0FQSV9WRVJTSU9OXzIpCisgICAgICAgIGlmIChE aXNwbGF5U3lzdGVtVHlwZTo6Z2V0KCkgPT0gRGlzcGxheVN5c3RlbVR5cGU6OldheWxhbmQgJiYg V2F5bGFuZERpc3BsYXk6Omluc3RhbmNlKCkpCisgICAgICAgICAgICBnU2hhcmVkRUdMRGlzcGxh eSA9IGVnbEdldERpc3BsYXkoV2F5bGFuZERpc3BsYXk6Omluc3RhbmNlKCktPm5hdGl2ZURpc3Bs YXkoKSk7CisgICAgICAgIGVsc2UgLy8gTm90ZSB0aGF0IHRoaXMgYnJhbmNoIGNvbnRpbnV0ZXMg b3V0c2lkZSB0aGlzICNpZi1ndWFyZGVkIHNlZ21lbnQuCisjZW5kaWYKICNpZiBQTEFURk9STShY MTEpCi0gICAgICAgIGdTaGFyZWRFR0xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShHTENvbnRleHQ6 OnNoYXJlZFgxMURpc3BsYXkoKSk7CisgICAgICAgICAgICBnU2hhcmVkRUdMRGlzcGxheSA9IGVn bEdldERpc3BsYXkoR0xDb250ZXh0OjpzaGFyZWRYMTFEaXNwbGF5KCkpOwogI2Vsc2UKLSAgICAg ICAgZ1NoYXJlZEVHTERpc3BsYXkgPSBlZ2xHZXREaXNwbGF5KEVHTF9ERUZBVUxUX0RJU1BMQVkp OworICAgICAgICAgICAgZ1NoYXJlZEVHTERpc3BsYXkgPSBlZ2xHZXREaXNwbGF5KEVHTF9ERUZB VUxUX0RJU1BMQVkpOwogI2VuZGlmCiAgICAgICAgIGlmIChnU2hhcmVkRUdMRGlzcGxheSAhPSBF R0xfTk9fRElTUExBWSAmJiAoIWVnbEluaXRpYWxpemUoZ1NoYXJlZEVHTERpc3BsYXksIDAsIDAp IHx8ICFlZ2xCaW5kQVBJKGdHTEFQSSkpKQogICAgICAgICAgICAgZ1NoYXJlZEVHTERpc3BsYXkg PSBFR0xfTk9fRElTUExBWTsK 238248 2014-09-17 05:39:29 -0700 2014-09-17 23:22:17 -0700 Patch bug-136829-20140917053926.patch text/plain 2679 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA5LTE3ICBJYWdvIFRv cmFsICA8aXRvcmFsQGlnYWxpYS5jb20+IGFuZCBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdh bGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgV2F5bGFuZCBzdXBwb3J0IHRvIEdMQ29udGV4 dEVHTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2 ODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnNoYXJlZEVHTERpc3BsYXkpOiBTcGVjaWFsLWNhc2UgdGhlIHNoYXJlZCBFR0wgZGlzcGxheSBp bml0aWFsaXphdGlvbgorICAgICAgICBmb3IgdGhlIEdUSyBwb3J0IHdoZW4gcnVubmluZyB1bmRl ciBXYXlsYW5kLiBJbiB0aGF0IGNhc2UgdGhlIHBvaW50ZXIgdG8gdGhlCisgICAgICAgIG5hdGl2 ZSB3bF9kaXNwbGF5IG9iamVjdCBzaG91bGQgYmUgcGFzc2VkIHRvIGVnbEdldERpc3BsYXkoKS4g SWYgbm90IHJ1bm5pbmcKKyAgICAgICAgdW5kZXIgV2F5bGFuZCB3ZSBzaG91bGQgZmFsbCBiYWNr IHRvIHVzaW5nIHRoZSBzaGFyZWQgWDExIGRpc3BsYXkgKGlmIHN1cHBvcnQKKyAgICAgICAgZm9y IHRoYXQgZGlzcGxheSBzeXN0ZW0gaXMgZW5hYmxlZCkgb3IgdGhlIEVHTF9ERUZBVUxUX0RJU1BM QVkuCisKIDIwMTQtMDktMTcgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIEFkZCBhIGhlbHBlciBmdW5jdGlvbiBmb3IgZGlzcGxheSBzeXN0ZW0g ZGVkdWN0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9lZ2wvR0xD b250ZXh0RUdMLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9lZ2wvR0xDb250ZXh0RUdMLmNwcAkocmV2aXNpb24gMTczNjkwKQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZWdsL0dMQ29udGV4dEVHTC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM1LDYgKzM1LDEzIEBACiAjaW5jbHVkZSAiT3BlbkdMU2hpbXMuaCIKICNlbmRpZgog CisjaWYgUExBVEZPUk0oR1RLKQorI2luY2x1ZGUgIkd0a1V0aWxpdGllcy5oIgorI2lmIFBMQVRG T1JNKFdBWUxBTkQpICYmICFkZWZpbmVkKEdUS19BUElfVkVSU0lPTl8yKQorI2luY2x1ZGUgIldh eWxhbmREaXNwbGF5LmgiCisjZW5kaWYKKyNlbmRpZgorCiAjaWYgRU5BQkxFKEFDQ0VMRVJBVEVE XzJEX0NBTlZBUykKIC8vIGNhaXJvLWdsLmggaW5jbHVkZXMgc29tZSBkZWZpbml0aW9ucyBmcm9t IEdMWCB0aGF0IGNvbmZsaWN0IHdpdGgKIC8vIHRoZSBvbmVzIHByb3ZpZGVkIGJ5IHVzLiBTaW5j ZSBHTENvbnRleHRFR0wgZG9lc24ndCB1c2UgYW55IEdMWApAQCAtNTgsMTAgKzY1LDE1IEBAIHN0 YXRpYyBFR0xEaXNwbGF5IHNoYXJlZEVHTERpc3BsYXkoKQogICAgIHN0YXRpYyBib29sIGluaXRp YWxpemVkID0gZmFsc2U7CiAgICAgaWYgKCFpbml0aWFsaXplZCkgewogICAgICAgICBpbml0aWFs aXplZCA9IHRydWU7CisjaWYgUExBVEZPUk0oR1RLKSAmJiBQTEFURk9STShXQVlMQU5EKSAmJiAh ZGVmaW5lZChHVEtfQVBJX1ZFUlNJT05fMikKKyAgICAgICAgaWYgKGdldERpc3BsYXlTeXN0ZW1U eXBlKCkgPT0gRGlzcGxheVN5c3RlbVR5cGU6OldheWxhbmQgJiYgV2F5bGFuZERpc3BsYXk6Omlu c3RhbmNlKCkpCisgICAgICAgICAgICBnU2hhcmVkRUdMRGlzcGxheSA9IGVnbEdldERpc3BsYXko V2F5bGFuZERpc3BsYXk6Omluc3RhbmNlKCktPm5hdGl2ZURpc3BsYXkoKSk7CisgICAgICAgIGVs c2UgLy8gTm90ZSB0aGF0IHRoaXMgYnJhbmNoIGNvbnRpbnV0ZXMgb3V0c2lkZSB0aGlzICNpZi1n dWFyZGVkIHNlZ21lbnQuCisjZW5kaWYKICNpZiBQTEFURk9STShYMTEpCi0gICAgICAgIGdTaGFy ZWRFR0xEaXNwbGF5ID0gZWdsR2V0RGlzcGxheShHTENvbnRleHQ6OnNoYXJlZFgxMURpc3BsYXko KSk7CisgICAgICAgICAgICBnU2hhcmVkRUdMRGlzcGxheSA9IGVnbEdldERpc3BsYXkoR0xDb250 ZXh0OjpzaGFyZWRYMTFEaXNwbGF5KCkpOwogI2Vsc2UKLSAgICAgICAgZ1NoYXJlZEVHTERpc3Bs YXkgPSBlZ2xHZXREaXNwbGF5KEVHTF9ERUZBVUxUX0RJU1BMQVkpOworICAgICAgICAgICAgZ1No YXJlZEVHTERpc3BsYXkgPSBlZ2xHZXREaXNwbGF5KEVHTF9ERUZBVUxUX0RJU1BMQVkpOwogI2Vu ZGlmCiAgICAgICAgIGlmIChnU2hhcmVkRUdMRGlzcGxheSAhPSBFR0xfTk9fRElTUExBWSAmJiAo IWVnbEluaXRpYWxpemUoZ1NoYXJlZEVHTERpc3BsYXksIDAsIDApIHx8ICFlZ2xCaW5kQVBJKGdH TEFQSSkpKQogICAgICAgICAgICAgZ1NoYXJlZEVHTERpc3BsYXkgPSBFR0xfTk9fRElTUExBWTsK