136849 2014-09-16 02:54:57 -0700 [GTK] Add a helper class for display system deduction 2014-09-17 05:36:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136829 136831 136832 136833 1 zan zan commit-queue mrobinson oldest_to_newest 1035430 0 zan 2014-09-16 02:54:57 -0700 [GTK] Add a helper class for display system deduction 1035508 1 238188 zan 2014-09-16 11:14:38 -0700 Created attachment 238188 Patch 1035511 2 commit-queue 2014-09-16 11:17:58 -0700 Attachment 238188 did not pass style-queue: ERROR: Source/WebCore/platform/gtk/DisplaySystemType.h:35: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1035514 3 238188 mrobinson 2014-09-16 11:24:54 -0700 Comment on attachment 238188 Patch You can probably just tuck this into GtkUtilities. 1035549 4 238195 zan 2014-09-16 13:12:29 -0700 Created attachment 238195 Patch 1035550 5 commit-queue 2014-09-16 13:14:58 -0700 Attachment 238195 did not pass style-queue: ERROR: Source/WebCore/platform/gtk/GtkUtilities.h:33: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1035578 6 238195 mrobinson 2014-09-16 13:59:08 -0700 Comment on attachment 238195 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238195&action=review Looks like the style error is a false positive. Apologies for my annoying review habits. Here are my final thoughts before landing. > Source/WebCore/platform/gtk/GtkUtilities.cpp:75 > + ASSERT(type != Unknown); Here you can simply do ASSERT_NOT_REACHED and return X11. By having an unknown type, you are forcing switch statements to handle Unknown which is a fatal error anyway and should be caught earlier. > Source/WebCore/platform/gtk/GtkUtilities.h:29 > +class DisplaySystemType { I'm not sure this method needs its own class. Why not just define DisplaySystemType and a method called getDisplaySystemType? > Source/WebCore/platform/gtk/GtkUtilities.h:32 > + Unknown, I think you can omit the Unknown type. 1035585 7 238211 zan 2014-09-16 14:32:23 -0700 Created attachment 238211 Patch 1035586 8 commit-queue 2014-09-16 14:33:46 -0700 Attachment 238211 did not pass style-queue: ERROR: Source/WebCore/platform/gtk/GtkUtilities.h:30: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1035587 9 238211 zan 2014-09-16 14:35:29 -0700 Comment on attachment 238211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238211&action=review You don't have to apologize. I appreciate you taking the time and going through patches thoroughly. > Source/WebCore/platform/gtk/GtkUtilities.cpp:67 > + static DisplaySystemType type = [] { This version simplifies ('simplifies') the initialization by using a lambda. This enables a properly applied ASSERT_NOT_REACHED() at the bottom of the labmda. 1035588 10 238211 zan 2014-09-16 14:36:19 -0700 Comment on attachment 238211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238211&action=review >> Source/WebCore/platform/gtk/GtkUtilities.cpp:67 >> + static DisplaySystemType type = [] { > > This version simplifies ('simplifies') the initialization by using a lambda. This enables a properly applied ASSERT_NOT_REACHED() at the bottom of the labmda. Plus there's no need for the is-this-static-var-initialized-yet check. 1035589 11 238211 mrobinson 2014-09-16 14:39:09 -0700 Comment on attachment 238211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238211&action=review >>> Source/WebCore/platform/gtk/GtkUtilities.cpp:67 >>> + static DisplaySystemType type = [] { >> >> This version simplifies ('simplifies') the initialization by using a lambda. This enables a properly applied ASSERT_NOT_REACHED() at the bottom of the labmda. > > Plus there's no need for the is-this-static-var-initialized-yet check. Does that actually delay the execution of the code until the first call? If so, that's pretty awesome. 1035700 12 238211 zan 2014-09-17 04:52:56 -0700 Comment on attachment 238211 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238211&action=review >>>> Source/WebCore/platform/gtk/GtkUtilities.cpp:67 >>>> + static DisplaySystemType type = [] { >>> >>> This version simplifies ('simplifies') the initialization by using a lambda. This enables a properly applied ASSERT_NOT_REACHED() at the bottom of the labmda. >> >> Plus there's no need for the is-this-static-var-initialized-yet check. > > Does that actually delay the execution of the code until the first call? If so, that's pretty awesome. That's exactly what happens. The lambda is also completely optimized away when building with optimizations, so there's no code being generated under a separate symbol. 1035702 13 238211 zan 2014-09-17 05:35:59 -0700 Comment on attachment 238211 Patch Clearing flags on attachment: 238211 Committed r173690: <http://trac.webkit.org/changeset/173690> 1035703 14 zan 2014-09-17 05:36:08 -0700 All reviewed patches have been landed. Closing bug. 238188 2014-09-16 11:14:38 -0700 2014-09-16 13:12:22 -0700 Patch bug-136849-20140916111434.patch text/plain 5822 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA5LTE2ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgYSBoZWxw ZXIgY2xhc3MgZm9yIGRpc3BsYXkgc3lzdGVtIGRlZHVjdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2ODQ5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGlzcGxheVN5c3RlbVR5cGUgaXMgYSBoZWxw ZXIgY2xhc3MgdGhhdCBjaGVja3MgdGhlIHR5cGUgb2YgdGhlIGRlZmF1bHQKKyAgICAgICAgR2Rr RGlzcGxheSBvYmplY3QgYW5kIGluaXRpYWxpemVzIGEgc3RhdGljIHZhcmlhYmxlIHRvIHRoZSBj b3JyZXNwb25kaW5nCisgICAgICAgIHZhbHVlLiBEaXNwbGF5U3lzdGVtVHlwZTo6Z2V0KCkgaXMg dGhlbiB1c2VkIHRvIHJldHVybiB0aGF0IHZhbHVlLgorCisgICAgICAgICogUGxhdGZvcm1HVEsu Y21ha2U6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL0Rpc3BsYXlTeXN0ZW1UeXBlLmNwcDogQWRk ZWQuCisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5U3lzdGVtVHlwZTo6Z2V0KToKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvRGlzcGxheVN5c3RlbVR5cGUuaDogQWRkZWQuCisKIDIwMTQtMDktMTYg IFlvdWVubiBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBb R1N0cmVhbWVyXSBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLWF1dGguaHRtbCBpcyBmYWlsaW5nCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFrZQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFrZQkocmV2aXNpb24gMTczNjU3KQorKysgU291cmNl L1dlYkNvcmUvUGxhdGZvcm1HVEsuY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw2ICsyMTEs NyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlUGxhdGZvcm1HVEtfU09VUkNFUwogICAgIHBsYXRmb3Jt L2d0ay9Db250ZXh0TWVudUl0ZW1HdGsuY3BwCiAgICAgcGxhdGZvcm0vZ3RrL0N1cnNvckd0ay5j cHAKICAgICBwbGF0Zm9ybS9ndGsvRGF0YU9iamVjdEd0ay5jcHAKKyAgICBwbGF0Zm9ybS9ndGsv RGlzcGxheVN5c3RlbVR5cGUuY3BwCiAgICAgcGxhdGZvcm0vZ3RrL0RyYWdEYXRhR3RrLmNwcAog ICAgIHBsYXRmb3JtL2d0ay9EcmFnSWNvbi5jcHAKICAgICBwbGF0Zm9ybS9ndGsvRHJhZ0ltYWdl R3RrLmNwcApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0Rpc3BsYXlTeXN0ZW1U eXBlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRGlzcGxh eVN5c3RlbVR5cGUuY3BwCShyZXZpc2lvbiAwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0Rpc3BsYXlTeXN0ZW1UeXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDU4IEBA CisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0IElnYWxpYSBTLkwuCisgKgorICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291 cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICog Mi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29y IG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICog VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVU T1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBD T05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1Ig QlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVP UlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNs dWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJEaXNwbGF5U3lzdGVtVHlwZS5oIgorCisjaW5jbHVk ZSA8Z2RrL2dkay5oPgorI2lmIFBMQVRGT1JNKFgxMSkKKyNpbmNsdWRlIDxnZGsvZ2RreC5oPgor I2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkgJiYgIWRlZmluZWQoR1RLX0FQSV9WRVJTSU9O XzIpCisjaW5jbHVkZSA8Z2RrL2dka3dheWxhbmQuaD4KKyNlbmRpZgorCituYW1lc3BhY2UgV2Vi Q29yZSB7CisKK0Rpc3BsYXlTeXN0ZW1UeXBlOjpUeXBlIERpc3BsYXlTeXN0ZW1UeXBlOjpnZXQo KQoreworICAgIHN0YXRpYyBUeXBlIHR5cGUgPSBVbmtub3duOworICAgIGlmICh0eXBlID09IFVu a25vd24pIHsKKyAgICAgICAgR2RrRGlzcGxheSogZGlzcGxheSA9IGdka19kaXNwbGF5X21hbmFn ZXJfZ2V0X2RlZmF1bHRfZGlzcGxheShnZGtfZGlzcGxheV9tYW5hZ2VyX2dldCgpKTsKKyNpZiBQ TEFURk9STShYMTEpCisgICAgICAgIGlmIChHREtfSVNfWDExX0RJU1BMQVkoZGlzcGxheSkpCisg ICAgICAgICAgICB0eXBlID0gWDExOworI2VuZGlmCisjaWYgUExBVEZPUk0oV0FZTEFORCkgJiYg IWRlZmluZWQoR1RLX0FQSV9WRVJTSU9OXzIpCisgICAgICAgIGlmIChHREtfSVNfV0FZTEFORF9E SVNQTEFZKGRpc3BsYXkpKQorICAgICAgICAgICAgdHlwZSA9IFdheWxhbmQ7CisjZW5kaWYKKyAg ICAgICAgQVNTRVJUKHR5cGUgIT0gVW5rbm93bik7CisgICAgfTsKKworICAgIHJldHVybiB0eXBl OworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvRGlzcGxheVN5c3RlbVR5cGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvRGlzcGxheVN5c3RlbVR5cGUuaAkocmV2aXNpb24gMCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EaXNwbGF5U3lzdGVtVHlwZS5oCSh3b3JraW5nIGNvcHkp CkBAIC0wLDAgKzEsNDQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQgSWdhbGlhIFMuTC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlz dHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9j dW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3Ry aWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g QU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQ UExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNU LCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VR VUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1F TlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRB LCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2lmbmRlZiBEaXNwbGF5U3lzdGVtVHlwZV9oCisjZGVmaW5lIERpc3BsYXlT eXN0ZW1UeXBlX2gKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitjbGFzcyBEaXNwbGF5U3lzdGVt VHlwZSB7CitwdWJsaWM6CisgICAgZW51bSBUeXBlIHsKKyAgICAgICAgVW5rbm93biwKKyAgICAg ICAgWDExLAorICAgICAgICBXYXlsYW5kCisgICAgfTsKKworICAgIHN0YXRpYyBUeXBlIGdldCgp OworfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQorCisjZW5kaWYgLy8gRGlzcGxheVN5c3Rl bVR5cGVfaAo= 238195 2014-09-16 13:12:29 -0700 2014-09-16 14:32:15 -0700 Patch bug-136849-20140916131226.patch text/plain 2917 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY2NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA5LTE2ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgYSBoZWxw ZXIgY2xhc3MgZm9yIGRpc3BsYXkgc3lzdGVtIGRlZHVjdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2ODQ5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGlzcGxheVN5c3RlbVR5cGUgaXMgYSBoZWxw ZXIgY2xhc3MgdGhhdCBjaGVja3MgdGhlIHR5cGUgb2YgdGhlIGRlZmF1bHQKKyAgICAgICAgR2Rr RGlzcGxheSBvYmplY3QgYW5kIGluaXRpYWxpemVzIGEgc3RhdGljIHZhcmlhYmxlIHRvIHRoZSBj b3JyZXNwb25kaW5nCisgICAgICAgIHZhbHVlLiBEaXNwbGF5U3lzdGVtVHlwZTo6Z2V0KCkgaXMg dGhlbiB1c2VkIHRvIHJldHVybiB0aGF0IHZhbHVlLgorCisgICAgICAgIFRoZSBjbGFzcyBpcyBk ZWNsYXJlZCBhbmQgaW1wbGVtZW50ZWQgaW4gR3RrVXRpbGl0aWVzIGZpbGVzLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp3aWRn ZXRJc09uc2NyZWVuVG9wbGV2ZWxXaW5kb3cpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheVN5 c3RlbVR5cGU6OmdldCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5oOgor CiAyMDE0LTA5LTE2ICBwZWF2b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAg ICAgICAgIFtDdXJsXSBTb21ldGltZXMgaW5jb21wbGV0ZSBvciBlbXB0eSBjb250ZW50IGNhbiBi ZSBsb2FkZWQgZnJvbSBjYWNoZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9H dGtVdGlsaXRpZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9HdGtVdGlsaXRpZXMuY3BwCShyZXZpc2lvbiAxNzM2NjcpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjIsNiArMjIs MTMgQEAKICNpbmNsdWRlICJJbnRQb2ludC5oIgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KIAorI2lm IFBMQVRGT1JNKFgxMSkKKyNpbmNsdWRlIDxnZGsvZ2RreC5oPgorI2VuZGlmCisjaWYgUExBVEZP Uk0oV0FZTEFORCkgJiYgIWRlZmluZWQoR1RLX0FQSV9WRVJTSU9OXzIpCisjaW5jbHVkZSA8Z2Rr L2dka3dheWxhbmQuaD4KKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEludFBvaW50 IGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoR3RrV2lkZ2V0KiB3aWRnZXQsIGNvbnN0 IEludFBvaW50JiBwb2ludCkKQEAgLTUyLDQgKzU5LDIzIEBAIGJvb2wgd2lkZ2V0SXNPbnNjcmVl blRvcGxldmVsV2luZG93KEd0a1cKICAgICByZXR1cm4gZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3 aWRnZXQpICYmIEdUS19JU19XSU5ET1cod2lkZ2V0KSAmJiAhR1RLX0lTX09GRlNDUkVFTl9XSU5E T1cod2lkZ2V0KTsKIH0KIAorRGlzcGxheVN5c3RlbVR5cGU6OlR5cGUgRGlzcGxheVN5c3RlbVR5 cGU6OmdldCgpCit7CisgICAgc3RhdGljIFR5cGUgdHlwZSA9IFVua25vd247CisgICAgaWYgKHR5 cGUgPT0gVW5rbm93bikgeworICAgICAgICBHZGtEaXNwbGF5KiBkaXNwbGF5ID0gZ2RrX2Rpc3Bs YXlfbWFuYWdlcl9nZXRfZGVmYXVsdF9kaXNwbGF5KGdka19kaXNwbGF5X21hbmFnZXJfZ2V0KCkp OworI2lmIFBMQVRGT1JNKFgxMSkKKyAgICAgICAgaWYgKEdES19JU19YMTFfRElTUExBWShkaXNw bGF5KSkKKyAgICAgICAgICAgIHR5cGUgPSBYMTE7CisjZW5kaWYKKyNpZiBQTEFURk9STShXQVlM QU5EKSAmJiAhZGVmaW5lZChHVEtfQVBJX1ZFUlNJT05fMikKKyAgICAgICAgaWYgKEdES19JU19X QVlMQU5EX0RJU1BMQVkoZGlzcGxheSkpCisgICAgICAgICAgICB0eXBlID0gV2F5bGFuZDsKKyNl bmRpZgorICAgICAgICBBU1NFUlQodHlwZSAhPSBVbmtub3duKTsKKyAgICB9OworCisgICAgcmV0 dXJuIHR5cGU7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgJKHJldmlzaW9uIDE3MzY2NykKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaAkod29ya2luZyBjb3B5KQpA QCAtMjYsNiArMjYsMTcgQEAgY2xhc3MgSW50UG9pbnQ7CiBJbnRQb2ludCBjb252ZXJ0V2lkZ2V0 UG9pbnRUb1NjcmVlblBvaW50KEd0a1dpZGdldCosIGNvbnN0IEludFBvaW50Jik7CiBib29sIHdp ZGdldElzT25zY3JlZW5Ub3BsZXZlbFdpbmRvdyhHdGtXaWRnZXQqKTsKIAorY2xhc3MgRGlzcGxh eVN5c3RlbVR5cGUgeworcHVibGljOgorICAgIGVudW0gVHlwZSB7CisgICAgICAgIFVua25vd24s CisgICAgICAgIFgxMSwKKyAgICAgICAgV2F5bGFuZAorICAgIH07CisKKyAgICBzdGF0aWMgVHlw ZSBnZXQoKTsKK307CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEd0a1V0 aWxpdGllc19oCg== 238211 2014-09-16 14:32:23 -0700 2014-09-17 05:35:59 -0700 Patch bug-136849-20140916143220.patch text/plain 3078 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MzY3MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA5LTE2ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgYSBoZWxw ZXIgZnVuY3Rpb24gZm9yIGRpc3BsYXkgc3lzdGVtIGRlZHVjdGlvbgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2ODQ5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZ2V0RGlzcGxheVN5c3RlbVR5cGUoKSBp cyBhIGhlbHBlciBmdW5jdGlvbiB0aGF0IGNoZWNrcyB0aGUgdHlwZSBvZiB0aGUKKyAgICAgICAg ZGVmYXVsdCBHZGtEaXNwbGF5IG9iamVjdCBhbmQgaW5pdGlhbGl6ZXMgYSBzdGF0aWMgdmFyaWFi bGUgdG8gdGhlCisgICAgICAgIGNvcnJlc3BvbmRpbmcgdmFsdWUuIEl0IHRoZW4gcmV0dXJucyB0 aGUgdmFsdWUgb2YgdGhhdCB2YXJpYWJsZS4KKworICAgICAgICBXaGVuIGJ1aWxkaW5nIHdpdGgg dGhlIEdUSysyIEFQSSAoc3RpbGwgdGhlIGNhc2Ugd2l0aCB0aGUgR1RLKzIgcGx1Z2luCisgICAg ICAgIHByb2Nlc3MpIHdlIGRlZmF1bHQgdG8gWDExLgorCisgICAgICAgIFRoZSBmdW5jdGlvbiBp cyBkZWNsYXJlZCBhbmQgaW1wbGVtZW50ZWQgaW4gR3RrVXRpbGl0aWVzIGZpbGVzLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp3 aWRnZXRJc09uc2NyZWVuVG9wbGV2ZWxXaW5kb3cpOgorICAgICAgICAoV2ViQ29yZTo6Z2V0RGlz cGxheVN5c3RlbVR5cGUpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaDoK KwogMjAxNC0wOS0xNiAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIE1vdmUgSFRNTENvbnZlcnRlciBmcm9tIGVkaXRpbmcvY29jb2EgdG8gcGxhdGZvcm0vY29j b2EuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNw cAkocmV2aXNpb24gMTczNjcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0 aWxpdGllcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyLDYgKzIyLDEzIEBACiAjaW5jbHVkZSAi SW50UG9pbnQuaCIKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAKKyNpZiBQTEFURk9STShYMTEpCisj aW5jbHVkZSA8Z2RrL2dka3guaD4KKyNlbmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQpICYmICFk ZWZpbmVkKEdUS19BUElfVkVSU0lPTl8yKQorI2luY2x1ZGUgPGdkay9nZGt3YXlsYW5kLmg+Cisj ZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBJbnRQb2ludCBjb252ZXJ0V2lkZ2V0UG9p bnRUb1NjcmVlblBvaW50KEd0a1dpZGdldCogd2lkZ2V0LCBjb25zdCBJbnRQb2ludCYgcG9pbnQp CkBAIC01Miw0ICs1OSwyNiBAQCBib29sIHdpZGdldElzT25zY3JlZW5Ub3BsZXZlbFdpbmRvdyhH dGtXCiAgICAgcmV0dXJuIGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2lkZ2V0KSAmJiBHVEtfSVNf V0lORE9XKHdpZGdldCkgJiYgIUdUS19JU19PRkZTQ1JFRU5fV0lORE9XKHdpZGdldCk7CiB9CiAK K0Rpc3BsYXlTeXN0ZW1UeXBlIGdldERpc3BsYXlTeXN0ZW1UeXBlKCkKK3sKKyNpZiBkZWZpbmVk KEdUS19BUElfVkVSU0lPTl8yKQorICAgIHJldHVybiBEaXNwbGF5U3lzdGVtVHlwZTo6WDExOwor I2Vsc2UKKyAgICBzdGF0aWMgRGlzcGxheVN5c3RlbVR5cGUgdHlwZSA9IFtdIHsKKyAgICAgICAg R2RrRGlzcGxheSogZGlzcGxheSA9IGdka19kaXNwbGF5X21hbmFnZXJfZ2V0X2RlZmF1bHRfZGlz cGxheShnZGtfZGlzcGxheV9tYW5hZ2VyX2dldCgpKTsKKyNpZiBQTEFURk9STShYMTEpCisgICAg ICAgIGlmIChHREtfSVNfWDExX0RJU1BMQVkoZGlzcGxheSkpCisgICAgICAgICAgICByZXR1cm4g RGlzcGxheVN5c3RlbVR5cGU6OlgxMTsKKyNlbmRpZgorI2lmIFBMQVRGT1JNKFdBWUxBTkQpCisg ICAgICAgIGlmIChHREtfSVNfV0FZTEFORF9ESVNQTEFZKGRpc3BsYXkpKQorICAgICAgICAgICAg cmV0dXJuIERpc3BsYXlTeXN0ZW1UeXBlOjpXYXlsYW5kOworI2VuZGlmCisgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gRGlzcGxheVN5c3RlbVR5cGU6OlgxMTsK KyAgICB9KCk7CisgICAgcmV0dXJuIHR5cGU7CisjZW5kaWYKK30KKwogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMu aAkocmV2aXNpb24gMTczNjcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0 aWxpdGllcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiwxMyBAQCBjbGFzcyBJbnRQb2lu dDsKIEludFBvaW50IGNvbnZlcnRXaWRnZXRQb2ludFRvU2NyZWVuUG9pbnQoR3RrV2lkZ2V0Kiwg Y29uc3QgSW50UG9pbnQmKTsKIGJvb2wgd2lkZ2V0SXNPbnNjcmVlblRvcGxldmVsV2luZG93KEd0 a1dpZGdldCopOwogCitlbnVtIGNsYXNzIERpc3BsYXlTeXN0ZW1UeXBlIHsKKyAgICBYMTEsCisg ICAgV2F5bGFuZAorfTsKKworRGlzcGxheVN5c3RlbVR5cGUgZ2V0RGlzcGxheVN5c3RlbVR5cGUo KTsKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gR3RrVXRpbGl0aWVzX2gK