28882 2009-09-01 11:56:18 -0700 Merge chromium's config.h.in into WebCore's config.h 2009-10-02 11:22:48 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 28396 1 yaar yaar commit-queue levin mrowe nsylvain oldest_to_newest 143966 0 yaar 2009-09-01 11:56:18 -0700 As an initial step for the webkit chromium port, as described here: http://trac.webkit.org/wiki/Chromium 143992 1 mrowe 2009-09-01 13:24:57 -0700 That URL doesn't describe this at all. 144653 2 yaar 2009-09-03 17:41:51 -0700 The link describes the overall webkit chromium port, but indeed it doesn't explain this bug. Chromium today has its own config.h (over here http://src.chromium.org/svn/trunk/src/webkit/config.h.in), which was forked a while back from webkit's config.h. As I'm preparing the ground for the webkit port, I'm depreciating chromium's config.h and moving its chromium-specific defines into the ifdef PLATFORM(CHROMIUM) section of webkit's config.h. 144657 3 39025 yaar 2009-09-03 17:57:29 -0700 Created attachment 39025 Adds chromium specific defines to WebCore/config.h 144663 4 39025 levin 2009-09-03 18:45:26 -0700 Comment on attachment 39025 Adds chromium specific defines to WebCore/config.h > diff --git a/WebCore/config.h b/WebCore/config.h > @@ -17,7 +17,6 @@ > * Boston, MA 02110-1301, USA. > * > */ > - Please leave this the way it was. Also add an appropriate copyright line at the top (presumably Google). > +// TODO(mark): This list will hopefully shrink but may also grow. s/TODO(mark)/FIXME/ I guess this is a perpetual FIXME. > +// run "nm libwebcore.a | grep -E '[atsATS] ([+-]\[|\.objc_class_name)'" and > +#define WebCoreControlTintObserver \ > + ChromiumWebCoreObjCWebCoreControlTintObserver I didn't see this name when I ran "nm libwebcore.a | grep -E '[atsATS] ([+-]\[|\.objc_class_name)'" > +#else // !PLATFORM(DARWIN) > + > +// Don't define SKIA on Mac. Undefine other things as well that might get set > +// as side-effects. I find this comment very confusing. It says not to define it but then defines it. Of course, this is the non OSX section. How about this? // Only use SKIA on non-Mac platforms. > +#define WTF_PLATFORM_SKIA 1 // Undefine other items that may get set as side-effects. As side-effects of what (using SKIA)? > +#undef WTF_PLATFORM_CG > +#undef WTF_PLATFORM_CF > +#endif // if PLATFORM(CHROMIUM) No "if" here. 145898 5 39296 yaar 2009-09-09 13:15:04 -0700 Created attachment 39296 New Patch David's feedback taken in. 145900 6 39296 mrowe 2009-09-09 13:26:46 -0700 Comment on attachment 39296 New Patch > +// WebCore should compile with WTF_CHANGES as WTF does. > +#define WTF_CHANGES 1 Why is this being added? This define is not used in WebCore. The define only exists for use in the implementation of FastMalloc. 145917 7 39296 levin 2009-09-09 13:55:27 -0700 Comment on attachment 39296 New Patch r- for now to answer questions/concerns below. > diff --git a/WebCore/config.h b/WebCore/config.h > + * Copyright (C) 2009, Google Inc. All rights reserved. No comma after 2009. > +// WebCore should compile with WTF_CHANGES as WTF does. > +#define WTF_CHANGES 1 According to this define is only needed for building FastMalloc, so it sounds like this shouldn't be here. Consider can/should these items be moved into the gyp file since other defines were moved there? #if !PLATFORM(DARWIN) // Define SKIA on non-Mac. #define WTF_PLATFORM_SKIA 1 #endif /* !PLATFORM(DARWIN) */ #define WTF_USE_GOOGLEURL 1 /* Chromium uses V8 by default */ #if !defined(WTF_USE_V8) #define WTF_USE_V8 1 #endif I don't have a good criteria for deciding what defines should be in each but would love to hear your ideas on this. 145958 8 yaar 2009-09-09 14:55:19 -0700 Thanks for reviewing this. Here are my answers: (In reply to comment #7) > (From update of attachment 39296 [details]) > r- for now to answer questions/concerns below. > > > diff --git a/WebCore/config.h b/WebCore/config.h > > + * Copyright (C) 2009, Google Inc. All rights reserved. > No comma after 2009. Will fix. > > > +// WebCore should compile with WTF_CHANGES as WTF does. > > +#define WTF_CHANGES 1 > > According to this define is only needed for building FastMalloc, so it sounds > like this shouldn't be here. > Chromium needs WTF_CHANGES is because chromiums uses the same WebCore/config.h for compiling both wtf and webcore. I plan to solve this once I get to the next steps of the chromium port (this patch is the 1st step). I want to keep the patches small. > Consider can/should these items be moved into the gyp file since other defines > were moved there? > #if !PLATFORM(DARWIN) > // Define SKIA on non-Mac. > #define WTF_PLATFORM_SKIA 1 > #endif /* !PLATFORM(DARWIN) */ > #define WTF_USE_GOOGLEURL 1 > > /* Chromium uses V8 by default */ > #if !defined(WTF_USE_V8) > #define WTF_USE_V8 1 > #endif > > I don't have a good criteria for deciding what defines should be in each but > would love to hear your ideas on this. We try to avoid non-feature defines/undefs in gyp files, since: 1) gyp can only define but cannot undef. 2) developers tend to miss gyp defines since not in source files but in command line args or don't really understand gyp. We only use gyp defines when absolutely necessary or temp solution. 145968 9 levin 2009-09-09 15:05:44 -0700 Last thing. I'm looking at the comments before the defines and none of them seem to add any value (e.g. "// Chromium doesn't use CFNetwork"). They restate what it being done but don't add a reason (add a why?), so I think they could all be removed. However, I would add one before WTF_CHANGES to explain why chromium needs this when no other build does. 145976 10 39307 yaar 2009-09-09 15:16:45 -0700 Created attachment 39307 New New Patch further feedback incorporated. 145980 11 39307 commit-queue 2009-09-09 15:36:04 -0700 Comment on attachment 39307 New New Patch Clearing flags on attachment: 39307 Committed r48231: <http://trac.webkit.org/changeset/48231> 145981 12 commit-queue 2009-09-09 15:36:08 -0700 All reviewed patches have been landed. Closing bug. 39025 2009-09-03 17:57:29 -0700 2009-09-09 13:15:04 -0700 Adds chromium specific defines to WebCore/config.h 28882.diff text/plain 3297 yaar ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmIwMDEwZC4uMjU4ZjQwZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0wOS0wMyAgWWFhciBTY2huaXRt YW4gIDx5YWFyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRlZCBjaHJvbWl1bSBzcGVjaWZpYyBkZWNsYXJhdGlvbnMgaW50 byBjb25maWcuaC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI4ODgyCisKKyAgICAgICAgKiBjb25maWcuaDogQWRkZWQgQ0hST01JVU0gc3BlY2lmaWMg ZGVmaW5lcy4KKwogMjAwOS0wOS0wMyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv Y29uZmlnLmggYi9XZWJDb3JlL2NvbmZpZy5oCmluZGV4IDQxMWRkYjEuLmE4YmU5NDIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvY29uZmlnLmgKKysrIGIvV2ViQ29yZS9jb25maWcuaApAQCAtMTcsNyAr MTcsNiBAQAogICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCiAgKgogICovCi0KICNpZiBk ZWZpbmVkKEhBVkVfQ09ORklHX0gpICYmIEhBVkVfQ09ORklHX0gKICNpbmNsdWRlICJhdXRvdG9v bHNjb25maWcuaCIKICNlbmRpZgpAQCAtOTYsNyArOTUsNyBAQAogLy8gdGhpcyBicmVha3MgY29t cGlsYXRpb24gb2YgPFFGb250RGF0YWJhc2U+LCBhdCBsZWFzdCwgc28gdHVybiBpdCBvZmYgZm9y IG5vdwogLy8gQWxzbyBnZW5lcmF0ZXMgZXJyb3JzIG9uIHd4IG9uIFdpbmRvd3MsIHByZXN1bWFi bHkgYmVjYXVzZSB0aGVzZSBmdW5jdGlvbnMKIC8vIGFyZSB1c2VkIGZyb20gd3ggaGVhZGVycy4K LSNpZiAhUExBVEZPUk0oUVQpICYmICFQTEFURk9STShXWCkKKyNpZiAhUExBVEZPUk0oUVQpICYm ICFQTEFURk9STShXWCkgJiYgIVBMQVRGT1JNKENIUk9NSVVNKQogI2luY2x1ZGUgPHd0Zi9EaXNh bGxvd0NUeXBlLmg+CiAjZW5kaWYKIApAQCAtMTU2LDE0ICsxNTUsNTggQEAKICNpbmNsdWRlIDx3 dGYvTWF0aEV4dHJhcy5oPgogI2VuZGlmCiAKLSNpZiAhZGVmaW5lZChXVEZfVVNFX1Y4KQotLyog Q3VycmVudGx5IENocm9taXVtIGlzIHRoZSBvbmx5IHBsYXRmb3JtIHdoaWNoIHVzZXMgVjggYnkg ZGVmYXVsdCAqLwogI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorCisjZGVmaW5lIFdURl9VU0VfR09P R0xFVVJMIDEKKworI2lmIFBMQVRGT1JNKERBUldJTikKKworLy8gQ2hyb21pdW0ncyB2ZXJzaW9u IG9mIFdlYkNvcmUgaW5jbHVkZXMgdGhlIGZvbGxvd2luZyBPYmplY3RpdmUtQyBjbGFzc2VzLgor Ly8gVGhlIHN5c3RlbS1wcm92aWRlZCBXZWJDb3JlIGZyYW1ld29yayBtYXkgYWxzbyBwcm92aWRl IHRoZXNlIGNsYXNzZXMuCisvLyBCZWNhdXNlIG9mIHRoZSBuYXR1cmUgb2YgT2JqZWN0aXZlLUMg YmluZGluZyAoZHluYW1pY2FsbHkgYXQgcnVudGltZSksCisvLyBpdCdzIHBvc3NpYmxlIGZvciB0 aGUgQ2hyb21pdW0tcHJvdmlkZWQgdmVyc2lvbnMgdG8gaW50ZXJmZXJlIHdpdGggdGhlCisvLyBz eXN0ZW0tcHJvdmlkZWQgdmVyc2lvbnMuICBUaGlzIG1heSBoYXBwZW4gd2hlbiBhIHN5c3RlbSBm cmFtZXdvcmsgYXR0ZW1wdHMKKy8vIHRvIHVzZSBXZWJDb3JlLmZyYW1ld29yaywgc3VjaCBhcyB3 aGVuIGNvbnZlcnRpbmcgYW4gSFRNTC1mbGF2b3JlZCBzdHJpbmcKKy8vIHRvIGFuIE5TQXR0cmli dXRlZFN0cmluZy4gIFRoZSBzb2x1dGlvbiBpcyB0byBmb3JjZSBPYmplY3RpdmUtQyBjbGFzcyBu YW1lcworLy8gdGhhdCB3b3VsZCBjb25mbGljdCB0byB1c2UgYWx0ZXJuYXRlIG5hbWVzLgorLy8K Ky8vIFRPRE8obWFyayk6IFRoaXMgbGlzdCB3aWxsIGhvcGVmdWxseSBzaHJpbmsgYnV0IG1heSBh bHNvIGdyb3cuICBQZXJpb2RpY2FsbHkKKy8vIHJ1biAibm0gbGlid2ViY29yZS5hIHwgZ3JlcCAt RSAnW2F0c0FUU10gKFsrLV1cW3xcLm9iamNfY2xhc3NfbmFtZSknIiBhbmQKKy8vIG1ha2Ugc3Vy ZSB0aGF0IGV2ZXJ5dGhpbmcgbGlzdGVkIHRoZXJlIGhhcyB0aGUgYWx0ZXJuYXRlIENocm9taXVt V2ViQ29yZU9iakMKKy8vIG5hbWUsIGFuZCB0aGF0IG5vdGhpbmcgZXh0cmFuZW91cyBpcyBsaXN0 ZWQgaGVyZS4gIElmIGFsbCBPYmplY3RpdmUtQyBjYW4KKy8vIGJlIGVsaW1pbmF0ZWQgZnJvbSBD aHJvbWl1bSdzIFdlYkNvcmUgbGlicmFyeSwgdGhlc2UgZGVmaW5lcyBzaG91bGQgYmUKKy8vIHJl bW92ZWQgZW50aXJlbHkuCisKKyNkZWZpbmUgU2Nyb2xsYmFyUHJlZnNPYnNlcnZlciBcCisgICAg ICAgIENocm9taXVtV2ViQ29yZU9iakNTY3JvbGxiYXJQcmVmc09ic2VydmVyCisjZGVmaW5lIFdl YkNvcmVDb250cm9sVGludE9ic2VydmVyIFwKKyAgICAgICAgQ2hyb21pdW1XZWJDb3JlT2JqQ1dl YkNvcmVDb250cm9sVGludE9ic2VydmVyCisjZGVmaW5lIFdlYkNvcmVSZW5kZXJUaGVtZU5vdGlm aWNhdGlvbk9ic2VydmVyIFwKKyAgICAgICAgQ2hyb21pdW1XZWJDb3JlT2JqQ1dlYkNvcmVSZW5k ZXJUaGVtZU5vdGlmaWNhdGlvbk9ic2VydmVyCisjZGVmaW5lIFdlYkZvbnRDYWNoZSBcCisgICAg ICAgIENocm9taXVtV2ViQ29yZU9iakNXZWJGb250Q2FjaGUKKworI2Vsc2UgLy8gIVBMQVRGT1JN KERBUldJTikKKworLy8gRG9uJ3QgZGVmaW5lIFNLSUEgb24gTWFjLiBVbmRlZmluZSBvdGhlciB0 aGluZ3MgYXMgd2VsbCB0aGF0IG1pZ2h0IGdldCBzZXQKKy8vIGFzIHNpZGUtZWZmZWN0cy4KKyNk ZWZpbmUgV1RGX1BMQVRGT1JNX1NLSUEgMQorI3VuZGVmIFdURl9QTEFURk9STV9DRworI3VuZGVm IFdURl9QTEFURk9STV9DRgorCisjZW5kaWYgLy8gIVBMQVRGT1JNKERBUldJTikKKworI2lmICFk ZWZpbmVkKFdURl9VU0VfVjgpCiAjZGVmaW5lIFdURl9VU0VfVjggMQotI2Vsc2UKKyNlbmRpZgor CisjdW5kZWYgV1RGX1VTRV9DRk5FVFdPUksKKworI2VuZGlmIC8vIGlmIFBMQVRGT1JNKENIUk9N SVVNKQorCisjaWYgIWRlZmluZWQoV1RGX1VTRV9WOCkKICNkZWZpbmUgV1RGX1VTRV9WOCAwCi0j ZW5kaWYgLyogUExBVEZPUk0oQ0hST01JVU0pICovCi0jZW5kaWYgLyogIWRlZmluZWQoV1RGX1VT RV9WOCkgKi8KKyNlbmRpZgogCiAvKiBVc2luZyBWOCBpbXBsaWVzIG5vdCB1c2luZyBKU0MgYW5k IHZpY2UgdmVyc2EgKi8KICNkZWZpbmUgV1RGX1VTRV9KU0MgIVdURl9VU0VfVjgK 39296 2009-09-09 13:15:04 -0700 2009-09-09 15:16:45 -0700 New Patch patch.diff text/plain 2232 yaar ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWFiNThiMi4uZmMxZDE0ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wOS0wOSAgWWFhciBTY2huaXRt YW4gIDx5YWFyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKyAgICAgICAgCisgICAgICAgIENocm9taXVtIHVzZXMgaXRzIG93biBjb25maWcuaCBm aWxlIHRoYXQgd2FzIGZvcmtlZCBmcm9tIHdlYmtpdCdzIGNvbmZpZy5oLgorICAgICAgICBCeSBt ZXJnaW5nIGluIENocm9taXVtJ3MgZGVmaW5lcywgQ2hyb21pdW0gd291bGQgYWdhaW4gYmUgYWJs ZSB0byB1c2Ugd2Via2l0J3MKKyAgICAgICAgY29uZmlnLmguCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4ODgyIAorCisgICAgICAgICogY29uZmln Lmg6IEFkZGVkIGNocm9taXVtLXNwZWNpZmljIGRlZmluZXMuIAorCiAyMDA5LTA5LTA4ICBKZW5z IEFsZmtlICA8c25lakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2NvbmZpZy5oIGIvV2ViQ29yZS9jb25maWcuaApp bmRleCBjN2FjNGNhLi44ZjJkOThkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2NvbmZpZy5oCisrKyBi L1dlYkNvcmUvY29uZmlnLmgKQEAgLTEsNiArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAy MDA0LCAyMDA1LCAyMDA2IEFwcGxlIEluYy4KLSAqIAorICogQ29weXJpZ2h0IChDKSAyMDA5LCBH b29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKICAqIFRoaXMgbGlicmFyeSBpcyBm cmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBp dCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCiAgKiBM aWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRo ZXIKQEAgLTk2LDcgKzk3LDcgQEAKIC8vIHRoaXMgYnJlYWtzIGNvbXBpbGF0aW9uIG9mIDxRRm9u dERhdGFiYXNlPiwgYXQgbGVhc3QsIHNvIHR1cm4gaXQgb2ZmIGZvciBub3cKIC8vIEFsc28gZ2Vu ZXJhdGVzIGVycm9ycyBvbiB3eCBvbiBXaW5kb3dzLCBwcmVzdW1hYmx5IGJlY2F1c2UgdGhlc2Ug ZnVuY3Rpb25zCiAvLyBhcmUgdXNlZCBmcm9tIHd4IGhlYWRlcnMuCi0jaWYgIVBMQVRGT1JNKFFU KSAmJiAhUExBVEZPUk0oV1gpCisjaWYgIVBMQVRGT1JNKFFUKSAmJiAhUExBVEZPUk0oV1gpICYm ICFQTEFURk9STShDSFJPTUlVTSkKICNpbmNsdWRlIDx3dGYvRGlzYWxsb3dDVHlwZS5oPgogI2Vu ZGlmCiAKQEAgLTE1NiwxMyArMTU3LDMxIEBACiAjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4K ICNlbmRpZgogCi0jaWYgIWRlZmluZWQoV1RGX1VTRV9WOCkKLS8qIEN1cnJlbnRseSBDaHJvbWl1 bSBpcyB0aGUgb25seSBwbGF0Zm9ybSB3aGljaCB1c2VzIFY4IGJ5IGRlZmF1bHQgKi8KICNpZiBQ TEFURk9STShDSFJPTUlVTSkKKworI2lmICFQTEFURk9STShEQVJXSU4pCisvLyBEZWZpbmUgU0tJ QSBvbiBub24tTWFjLgorI2RlZmluZSBXVEZfUExBVEZPUk1fU0tJQSAxCisjZW5kaWYgLyogIVBM QVRGT1JNKERBUldJTikgKi8KKworLy8gV2ViQ29yZSBzaG91bGQgY29tcGlsZSB3aXRoIFdURl9D SEFOR0VTIGFzIFdURiBkb2VzLgorI2RlZmluZSBXVEZfQ0hBTkdFUyAxCisKKy8vIFVzZSB0aGUg R29vZ2xldXJsIGxpYnJhcnkuCisjZGVmaW5lIFdURl9VU0VfR09PR0xFVVJMIDEKKworLyogQ2hy b21pdW0gdXNlcyBWOCBieSBkZWZhdWx0ICovCisjaWYgIWRlZmluZWQoV1RGX1VTRV9WOCkKICNk ZWZpbmUgV1RGX1VTRV9WOCAxCi0jZWxzZQotI2RlZmluZSBXVEZfVVNFX1Y4IDAKKyNlbmRpZgor CisvLyBDaHJvbWl1bSBkb2Vzbid0IHVzZSBDRk5ldHdvcmsKKyN1bmRlZiBXVEZfVVNFX0NGTkVU V09SSworCiAjZW5kaWYgLyogUExBVEZPUk0oQ0hST01JVU0pICovCisKKyNpZiAhZGVmaW5lZChX VEZfVVNFX1Y4KQorI2RlZmluZSBXVEZfVVNFX1Y4IDAKICNlbmRpZiAvKiAhZGVmaW5lZChXVEZf VVNFX1Y4KSAqLwogCiAvKiBVc2luZyBWOCBpbXBsaWVzIG5vdCB1c2luZyBKU0MgYW5kIHZpY2Ug dmVyc2EgKi8K 39307 2009-09-09 15:16:45 -0700 2009-09-09 15:36:04 -0700 New New Patch patch.diff text/plain 2254 yaar ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWFiNThiMi4uZmMxZDE0ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wOS0wOSAgWWFhciBTY2huaXRt YW4gIDx5YWFyQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKyAgICAgICAgCisgICAgICAgIENocm9taXVtIHVzZXMgaXRzIG93biBjb25maWcuaCBm aWxlIHRoYXQgd2FzIGZvcmtlZCBmcm9tIHdlYmtpdCdzIGNvbmZpZy5oLgorICAgICAgICBCeSBt ZXJnaW5nIGluIENocm9taXVtJ3MgZGVmaW5lcywgQ2hyb21pdW0gd291bGQgYWdhaW4gYmUgYWJs ZSB0byB1c2Ugd2Via2l0J3MKKyAgICAgICAgY29uZmlnLmguCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4ODgyIAorCisgICAgICAgICogY29uZmln Lmg6IEFkZGVkIGNocm9taXVtLXNwZWNpZmljIGRlZmluZXMuIAorCiAyMDA5LTA5LTA4ICBKZW5z IEFsZmtlICA8c25lakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2NvbmZpZy5oIGIvV2ViQ29yZS9jb25maWcuaApp bmRleCBjN2FjNGNhLi42MmE3ZjYwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2NvbmZpZy5oCisrKyBi L1dlYkNvcmUvY29uZmlnLmgKQEAgLTEsNiArMSw3IEBACiAvKgogICogQ29weXJpZ2h0IChDKSAy MDA0LCAyMDA1LCAyMDA2IEFwcGxlIEluYy4KLSAqIAorICogQ29weXJpZ2h0IChDKSAyMDA5IEdv b2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZy ZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKICAqIExp Y2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhl cgpAQCAtOTYsNyArOTcsNyBAQAogLy8gdGhpcyBicmVha3MgY29tcGlsYXRpb24gb2YgPFFGb250 RGF0YWJhc2U+LCBhdCBsZWFzdCwgc28gdHVybiBpdCBvZmYgZm9yIG5vdwogLy8gQWxzbyBnZW5l cmF0ZXMgZXJyb3JzIG9uIHd4IG9uIFdpbmRvd3MsIHByZXN1bWFibHkgYmVjYXVzZSB0aGVzZSBm dW5jdGlvbnMKIC8vIGFyZSB1c2VkIGZyb20gd3ggaGVhZGVycy4KLSNpZiAhUExBVEZPUk0oUVQp ICYmICFQTEFURk9STShXWCkKKyNpZiAhUExBVEZPUk0oUVQpICYmICFQTEFURk9STShXWCkgJiYg IVBMQVRGT1JNKENIUk9NSVVNKQogI2luY2x1ZGUgPHd0Zi9EaXNhbGxvd0NUeXBlLmg+CiAjZW5k aWYKIApAQCAtMTU2LDEzICsxNTcsMzAgQEAKICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgog I2VuZGlmCiAKLSNpZiAhZGVmaW5lZChXVEZfVVNFX1Y4KQotLyogQ3VycmVudGx5IENocm9taXVt IGlzIHRoZSBvbmx5IHBsYXRmb3JtIHdoaWNoIHVzZXMgVjggYnkgZGVmYXVsdCAqLwogI2lmIFBM QVRGT1JNKENIUk9NSVVNKQorCisjaWYgIVBMQVRGT1JNKERBUldJTikKKy8vIERlZmluZSBTS0lB IG9uIG5vbi1NYWMuCisjZGVmaW5lIFdURl9QTEFURk9STV9TS0lBIDEKKyNlbmRpZiAvKiAhUExB VEZPUk0oREFSV0lOKSAqLworCisvLyBDaHJvbWl1bSB1c2VzIHRoaXMgZmlsZSBpbnN0ZWFkIG9m IEphdmFTY3JpcHRDb3JlL2NvbmZpZy5oIHRvIGNvbXBpbGUKKy8vIEphdmFTY3JpcHRDb3JlL3d0 ZiAoY2hyb21pdW0gZG9lc24ndCBjb21waWxlIHRoZSByZXN0IG9mIEpTQykuIFRoZXJlZm9yZSwK Ky8vIHRoaXMgZGVmaW5lIGlzIHJlcXVpcmVkLgorI2RlZmluZSBXVEZfQ0hBTkdFUyAxCisKKyNk ZWZpbmUgV1RGX1VTRV9HT09HTEVVUkwgMQorCisjaWYgIWRlZmluZWQoV1RGX1VTRV9WOCkKICNk ZWZpbmUgV1RGX1VTRV9WOCAxCi0jZWxzZQotI2RlZmluZSBXVEZfVVNFX1Y4IDAKKyNlbmRpZgor CisjdW5kZWYgV1RGX1VTRV9DRk5FVFdPUksKKwogI2VuZGlmIC8qIFBMQVRGT1JNKENIUk9NSVVN KSAqLworCisjaWYgIWRlZmluZWQoV1RGX1VTRV9WOCkKKyNkZWZpbmUgV1RGX1VTRV9WOCAwCiAj ZW5kaWYgLyogIWRlZmluZWQoV1RGX1VTRV9WOCkgKi8KIAogLyogVXNpbmcgVjggaW1wbGllcyBu b3QgdXNpbmcgSlNDIGFuZCB2aWNlIHZlcnNhICovCg==