69803 2011-10-10 17:10:01 -0700 Add compile-time asserts for RenderStyle::(Non)InheritedFlags size. 2011-10-17 21:08:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson darin eric hyatt macpherson simon.fraser webkit.review.bot oldest_to_newest 481312 0 macpherson 2011-10-10 17:10:01 -0700 Add compile-time asserts for RenderStyle::(Non)InheritedFlags size. 481324 1 110443 macpherson 2011-10-10 17:13:34 -0700 Created attachment 110443 Patch 481385 2 macpherson 2011-10-10 18:46:52 -0700 Eric requested something like this on https://bugs.webkit.org/show_bug.cgi?id=64583, and it would be good to have regardless of what happens to that patch. 481759 3 110443 levin 2011-10-11 11:31:23 -0700 Comment on attachment 110443 Patch I'm probably not the person to review this, but it is clear that there is a need to fix the Windows build failure. 481811 4 110443 eric 2011-10-11 12:18:30 -0700 Comment on attachment 110443 Patch Yup. These are super useful. I think normally we put the outside of the class itself, but this also seems OK, since it's right next to where the equals is. You'd have to modify both. 481952 5 macpherson 2011-10-11 15:13:38 -0700 I don't know why this fails on windows, and don't have a windows build environment to test on, so I'm going to throw a few patches at the build bots and see what happens. The size really shouldn't be > 8 bytes, but maybe windows doesn't round up to a 4-byte alignment? 481988 6 110596 macpherson 2011-10-11 15:54:47 -0700 Created attachment 110596 Patch 483768 7 110960 macpherson 2011-10-13 22:50:41 -0700 Created attachment 110960 Patch 483769 8 webkit.review.bot 2011-10-13 22:53:43 -0700 Attachment 110960 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Last 3072 characters of output: endering/style/RenderStyle.h:206: _white_space is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:207: _box_direction is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:213: _pointerEvents is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:214: _insideLink is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:250: _effectiveDisplay is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:251: _originalDisplay is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:252: _overflowX is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:253: _overflowY is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:254: _vertical_align is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:255: _clear is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:256: _position is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:257: _floating is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:258: _table_layout is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:260: _page_break_before is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:261: _page_break_after is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:262: _page_break_inside is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:264: _styleType is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:268: _pseudoBits is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:269: _unicodeBidi is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 29 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 484828 9 macpherson 2011-10-16 14:52:11 -0700 So, interestingly, I think this picked up a real bug on the windows build. These structs were much larger on windows (I don't remember the exact size). rearranging the order of the fields on windows got it down to ~13 bytes, and changing them to unsigned char (instead of unsigned) got them down to the same size as on mac. The style errors here are existing naming errors where I have simply changed the type from unsigned to unsigned char. 484887 10 110960 darin 2011-10-16 20:12:48 -0700 Comment on attachment 110960 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110960&action=review These assertions should be in the .cpp file so they are only compiled once. And if you have some need to change these all to “unsigned char”, then please explain why. > Source/WebCore/rendering/style/RenderStyle.h:172 > + COMPILE_ASSERT((sizeof(InheritedFlags) <= 8), InheritedFlags_does_not_grow); I’m not sure I understand why this is in the == operator, and further, why it is in the header file, not the .cpp file. > Source/WebCore/rendering/style/RenderStyle.h:218 > + unsigned char _empty_cells : 1; // EEmptyCell > + unsigned char _caption_side : 2; // ECaptionSide > + unsigned char _list_style_type : 7; // EListStyleType > + unsigned char _list_style_position : 1; // EListStylePosition > + unsigned char _visibility : 2; // EVisibility > + unsigned char _text_align : 4; // ETextAlign > + unsigned char _text_transform : 2; // ETextTransform > + unsigned char _text_decorations : ETextDecorationBits; > + unsigned char _cursor_style : 6; // ECursor > + unsigned char _direction : 1; // TextDirection > + unsigned char _border_collapse : 1; // EBorderCollapse > + unsigned char _white_space : 3; // EWhiteSpace > + unsigned char _box_direction : 1; // EBoxDirection (CSS3 box_direction property, flexible box layout module) > // 34 bits > > // non CSS2 inherited > - unsigned m_rtlOrdering : 1; // Order > + unsigned char m_rtlOrdering : 1; // Order > bool _force_backgrounds_to_white : 1; > - unsigned _pointerEvents : 4; // EPointerEvents > - unsigned _insideLink : 2; // EInsideLink > + unsigned char _pointerEvents : 4; // EPointerEvents > + unsigned char _insideLink : 2; // EInsideLink > // 43 bits > > // CSS Text Layout Module Level 3: Vertical writing support > - unsigned m_writingMode : 2; // WritingMode > + unsigned char m_writingMode : 2; // WritingMode Why are you adding “char” to all of these? It seems unrelated to the assertion and not an improvement. 484890 11 darin 2011-10-16 20:13:39 -0700 OK, I see now, the change from "unsigned" to "unsigned char" is a Windows-specific fix or perhaps compiler bug workaround. This needs to be mentioned in the change log. 484904 12 111207 macpherson 2011-10-16 21:48:04 -0700 Created attachment 111207 Patch 484907 13 webkit.review.bot 2011-10-16 21:51:20 -0700 Attachment 111207 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Last 3072 characters of output: endering/style/RenderStyle.h:205: _white_space is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:206: _box_direction is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:212: _pointerEvents is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:213: _insideLink is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:248: _effectiveDisplay is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:249: _originalDisplay is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:250: _overflowX is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:251: _overflowY is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:252: _vertical_align is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:253: _clear is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:254: _position is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:255: _floating is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:256: _table_layout is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:258: _page_break_before is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:259: _page_break_after is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:260: _page_break_inside is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:262: _styleType is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:266: _pseudoBits is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/rendering/style/RenderStyle.h:267: _unicodeBidi is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 29 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 485775 14 111207 webkit.review.bot 2011-10-17 21:08:04 -0700 Comment on attachment 111207 Patch Clearing flags on attachment: 111207 Committed r97712: <http://trac.webkit.org/changeset/97712> 485776 15 webkit.review.bot 2011-10-17 21:08:09 -0700 All reviewed patches have been landed. Closing bug. 110443 2011-10-10 17:13:34 -0700 2011-10-11 15:54:39 -0700 Patch bug-69803-20111011111332.patch text/plain 1956 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3MTA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTAgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgY29tcGls ZS10aW1lIGFzc2VydHMgZm9yIFJlbmRlclN0eWxlOjooTm9uKUluaGVyaXRlZEZsYWdzIHNpemUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTgwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4KKworICAgICAgICBBZGRzIENPTVBJTEVfQVNTRVJUcyBmb3IgdGhlIHNpemUgb2YgUmVu ZGVyU3R5bGU6OkluaGVyaXRlZEZsYWdzIGFuZAorICAgICAgICBSZW5kZXJTdHlsZTo6Tm9uSW5o ZXJpdGVkRmxhZ3MgdG8gZW5zdXJlIHRoYXQgdGhleSBhcmUgbm90IGFjY2lkZW50YWxseQorICAg ICAgICBncm93biBpbiBmdXR1cmUgY2hhbmdlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6Ok5vbklu aGVyaXRlZEZsYWdzOjpvcGVyYXRvcj09KToKKwogMjAxMS0xMC0xMCAgTmljbyBXZWJlciAgPHRo YWtpc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUGx1Z2luRG9jdW1lbnRQYXJzZXIgdXNlcyBp bmNvcnJlY3Qgc3ludGF4IGZvciBiYWNrZ3JvdW5kIGNvbG9yCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gOTcwNDApCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29ya2luZyBjb3B5 KQpAQCAtMTY5LDYgKzE2OSw3IEBAIHByb3RlY3RlZDoKICAgICBzdHJ1Y3QgSW5oZXJpdGVkRmxh Z3MgewogICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgSW5oZXJpdGVkRmxhZ3MmIG90aGVy KSBjb25zdAogICAgICAgICB7CisgICAgICAgICAgICBDT01QSUxFX0FTU0VSVCgoc2l6ZW9mKElu aGVyaXRlZEZsYWdzKSA9PSA4KSwgSW5oZXJpdGVkRmxhZ3NfZG9lc19ub3RfZ3Jvdyk7CiAgICAg ICAgICAgICByZXR1cm4gKF9lbXB0eV9jZWxscyA9PSBvdGhlci5fZW1wdHlfY2VsbHMpCiAgICAg ICAgICAgICAgICAgJiYgKF9jYXB0aW9uX3NpZGUgPT0gb3RoZXIuX2NhcHRpb25fc2lkZSkKICAg ICAgICAgICAgICAgICAmJiAoX2xpc3Rfc3R5bGVfdHlwZSA9PSBvdGhlci5fbGlzdF9zdHlsZV90 eXBlKQpAQCAtMjIyLDYgKzIyMyw3IEBAIHByb3RlY3RlZDoKICAgICBzdHJ1Y3QgTm9uSW5oZXJp dGVkRmxhZ3MgewogICAgICAgICBib29sIG9wZXJhdG9yPT0oY29uc3QgTm9uSW5oZXJpdGVkRmxh Z3MmIG90aGVyKSBjb25zdAogICAgICAgICB7CisgICAgICAgICAgICBDT01QSUxFX0FTU0VSVCgo c2l6ZW9mKE5vbkluaGVyaXRlZEZsYWdzKSA9PSA4KSwgTm9uSW5oZXJpdGVkRmxhZ3NfZG9lc19u b3RfZ3Jvdyk7CiAgICAgICAgICAgICByZXR1cm4gX2VmZmVjdGl2ZURpc3BsYXkgPT0gb3RoZXIu X2VmZmVjdGl2ZURpc3BsYXkKICAgICAgICAgICAgICAgICAmJiBfb3JpZ2luYWxEaXNwbGF5ID09 IG90aGVyLl9vcmlnaW5hbERpc3BsYXkKICAgICAgICAgICAgICAgICAmJiBfb3ZlcmZsb3dYID09 IG90aGVyLl9vdmVyZmxvd1gK 110596 2011-10-11 15:54:47 -0700 2011-10-13 22:50:33 -0700 Patch bug-69803-20111012095444.patch text/plain 1955 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3MTg3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTEgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgY29tcGls ZS10aW1lIGFzc2VydHMgZm9yIFJlbmRlclN0eWxlOjooTm9uKUluaGVyaXRlZEZsYWdzIHNpemUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTgwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4KKworICAgICAgICBBZGRzIENPTVBJTEVfQVNTRVJUcyBmb3IgdGhlIHNpemUgb2YgUmVu ZGVyU3R5bGU6OkluaGVyaXRlZEZsYWdzIGFuZAorICAgICAgICBSZW5kZXJTdHlsZTo6Tm9uSW5o ZXJpdGVkRmxhZ3MgdG8gZW5zdXJlIHRoYXQgdGhleSBhcmUgbm90IGFjY2lkZW50YWxseQorICAg ICAgICBncm93biBpbiBmdXR1cmUgY2hhbmdlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6Ok5vbklu aGVyaXRlZEZsYWdzOjpvcGVyYXRvcj09KToKKwogMjAxMS0xMC0xMSAgTm8nYW0gUm9zZW50aGFs ICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQg Zml4LCB1bmJyZWFraW5nIHRoZSBRdCBtaW5pbWFsIGJvdC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lvbiA5NzE4NykKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCSh3b3JraW5nIGNvcHkp CkBAIC0xNjksNiArMTY5LDcgQEAgcHJvdGVjdGVkOgogICAgIHN0cnVjdCBJbmhlcml0ZWRGbGFn cyB7CiAgICAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBJbmhlcml0ZWRGbGFncyYgb3RoZXIp IGNvbnN0CiAgICAgICAgIHsKKyAgICAgICAgICAgIENPTVBJTEVfQVNTRVJUKChzaXplb2YoSW5o ZXJpdGVkRmxhZ3MpIDw9IDgpLCBJbmhlcml0ZWRGbGFnc19kb2VzX25vdF9ncm93KTsKICAgICAg ICAgICAgIHJldHVybiAoX2VtcHR5X2NlbGxzID09IG90aGVyLl9lbXB0eV9jZWxscykKICAgICAg ICAgICAgICAgICAmJiAoX2NhcHRpb25fc2lkZSA9PSBvdGhlci5fY2FwdGlvbl9zaWRlKQogICAg ICAgICAgICAgICAgICYmIChfbGlzdF9zdHlsZV90eXBlID09IG90aGVyLl9saXN0X3N0eWxlX3R5 cGUpCkBAIC0yMjIsNiArMjIzLDcgQEAgcHJvdGVjdGVkOgogICAgIHN0cnVjdCBOb25Jbmhlcml0 ZWRGbGFncyB7CiAgICAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBOb25Jbmhlcml0ZWRGbGFn cyYgb3RoZXIpIGNvbnN0CiAgICAgICAgIHsKKyAgICAgICAgICAgIENPTVBJTEVfQVNTRVJUKChz aXplb2YoTm9uSW5oZXJpdGVkRmxhZ3MpIDw9IDgpLCBOb25Jbmhlcml0ZWRGbGFnc19kb2VzX25v dF9ncm93KTsKICAgICAgICAgICAgIHJldHVybiBfZWZmZWN0aXZlRGlzcGxheSA9PSBvdGhlci5f ZWZmZWN0aXZlRGlzcGxheQogICAgICAgICAgICAgICAgICYmIF9vcmlnaW5hbERpc3BsYXkgPT0g b3RoZXIuX29yaWdpbmFsRGlzcGxheQogICAgICAgICAgICAgICAgICYmIF9vdmVyZmxvd1ggPT0g b3RoZXIuX292ZXJmbG93WAo= 110960 2011-10-13 22:50:41 -0700 2011-10-16 21:47:55 -0700 Patch bug-69803-20111014165039.patch text/plain 6220 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NDM5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTMgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgY29tcGls ZS10aW1lIGFzc2VydHMgZm9yIFJlbmRlclN0eWxlOjooTm9uKUluaGVyaXRlZEZsYWdzIHNpemUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTgwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4KKworICAgICAgICBBZGRzIENPTVBJTEVfQVNTRVJUcyBmb3IgdGhlIHNpemUgb2YgUmVu ZGVyU3R5bGU6OkluaGVyaXRlZEZsYWdzIGFuZAorICAgICAgICBSZW5kZXJTdHlsZTo6Tm9uSW5o ZXJpdGVkRmxhZ3MgdG8gZW5zdXJlIHRoYXQgdGhleSBhcmUgbm90IGFjY2lkZW50YWxseQorICAg ICAgICBncm93biBpbiBmdXR1cmUgY2hhbmdlcy4KKworICAgICAgICAqIHJlbmRlcmluZy9zdHls ZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6Ok5vbklu aGVyaXRlZEZsYWdzOjpvcGVyYXRvcj09KToKKwogMjAxMS0xMC0xMyAgTWFyayBIYWhuZW5iZXJn ICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSB2aXJ0dWFsIGdldENv bnN0cnVjdERhdGEgdG8gZ2V0Q29uc3RydWN0RGF0YVZpcnR1YWwKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lvbiA5NzQzOSkKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNjksNiArMTY5LDcgQEAgcHJvdGVjdGVkOgogICAgIHN0cnVjdCBJbmhlcml0ZWRG bGFncyB7CiAgICAgICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBJbmhlcml0ZWRGbGFncyYgb3Ro ZXIpIGNvbnN0CiAgICAgICAgIHsKKyAgICAgICAgICAgIENPTVBJTEVfQVNTRVJUKChzaXplb2Yo SW5oZXJpdGVkRmxhZ3MpIDw9IDgpLCBJbmhlcml0ZWRGbGFnc19kb2VzX25vdF9ncm93KTsKICAg ICAgICAgICAgIHJldHVybiAoX2VtcHR5X2NlbGxzID09IG90aGVyLl9lbXB0eV9jZWxscykKICAg ICAgICAgICAgICAgICAmJiAoX2NhcHRpb25fc2lkZSA9PSBvdGhlci5fY2FwdGlvbl9zaWRlKQog ICAgICAgICAgICAgICAgICYmIChfbGlzdF9zdHlsZV90eXBlID09IG90aGVyLl9saXN0X3N0eWxl X3R5cGUpCkBAIC0xOTEsMzAgKzE5MiwzMCBAQCBwcm90ZWN0ZWQ6CiAKICAgICAgICAgYm9vbCBv cGVyYXRvciE9KGNvbnN0IEluaGVyaXRlZEZsYWdzJiBvdGhlcikgY29uc3QgeyByZXR1cm4gISgq dGhpcyA9PSBvdGhlcik7IH0KIAotICAgICAgICB1bnNpZ25lZCBfZW1wdHlfY2VsbHMgOiAxOyAv LyBFRW1wdHlDZWxsCi0gICAgICAgIHVuc2lnbmVkIF9jYXB0aW9uX3NpZGUgOiAyOyAvLyBFQ2Fw dGlvblNpZGUKLSAgICAgICAgdW5zaWduZWQgX2xpc3Rfc3R5bGVfdHlwZSA6IDc7IC8vIEVMaXN0 U3R5bGVUeXBlCi0gICAgICAgIHVuc2lnbmVkIF9saXN0X3N0eWxlX3Bvc2l0aW9uIDogMTsgLy8g RUxpc3RTdHlsZVBvc2l0aW9uCi0gICAgICAgIHVuc2lnbmVkIF92aXNpYmlsaXR5IDogMjsgLy8g RVZpc2liaWxpdHkKLSAgICAgICAgdW5zaWduZWQgX3RleHRfYWxpZ24gOiA0OyAvLyBFVGV4dEFs aWduCi0gICAgICAgIHVuc2lnbmVkIF90ZXh0X3RyYW5zZm9ybSA6IDI7IC8vIEVUZXh0VHJhbnNm b3JtCi0gICAgICAgIHVuc2lnbmVkIF90ZXh0X2RlY29yYXRpb25zIDogRVRleHREZWNvcmF0aW9u Qml0czsKLSAgICAgICAgdW5zaWduZWQgX2N1cnNvcl9zdHlsZSA6IDY7IC8vIEVDdXJzb3IKLSAg ICAgICAgdW5zaWduZWQgX2RpcmVjdGlvbiA6IDE7IC8vIFRleHREaXJlY3Rpb24KLSAgICAgICAg dW5zaWduZWQgX2JvcmRlcl9jb2xsYXBzZSA6IDE7IC8vIEVCb3JkZXJDb2xsYXBzZQotICAgICAg ICB1bnNpZ25lZCBfd2hpdGVfc3BhY2UgOiAzOyAvLyBFV2hpdGVTcGFjZQotICAgICAgICB1bnNp Z25lZCBfYm94X2RpcmVjdGlvbiA6IDE7IC8vIEVCb3hEaXJlY3Rpb24gKENTUzMgYm94X2RpcmVj dGlvbiBwcm9wZXJ0eSwgZmxleGlibGUgYm94IGxheW91dCBtb2R1bGUpCisgICAgICAgIHVuc2ln bmVkIGNoYXIgX2VtcHR5X2NlbGxzIDogMTsgLy8gRUVtcHR5Q2VsbAorICAgICAgICB1bnNpZ25l ZCBjaGFyIF9jYXB0aW9uX3NpZGUgOiAyOyAvLyBFQ2FwdGlvblNpZGUKKyAgICAgICAgdW5zaWdu ZWQgY2hhciBfbGlzdF9zdHlsZV90eXBlIDogNzsgLy8gRUxpc3RTdHlsZVR5cGUKKyAgICAgICAg dW5zaWduZWQgY2hhciBfbGlzdF9zdHlsZV9wb3NpdGlvbiA6IDE7IC8vIEVMaXN0U3R5bGVQb3Np dGlvbgorICAgICAgICB1bnNpZ25lZCBjaGFyIF92aXNpYmlsaXR5IDogMjsgLy8gRVZpc2liaWxp dHkKKyAgICAgICAgdW5zaWduZWQgY2hhciBfdGV4dF9hbGlnbiA6IDQ7IC8vIEVUZXh0QWxpZ24K KyAgICAgICAgdW5zaWduZWQgY2hhciBfdGV4dF90cmFuc2Zvcm0gOiAyOyAvLyBFVGV4dFRyYW5z Zm9ybQorICAgICAgICB1bnNpZ25lZCBjaGFyIF90ZXh0X2RlY29yYXRpb25zIDogRVRleHREZWNv cmF0aW9uQml0czsKKyAgICAgICAgdW5zaWduZWQgY2hhciBfY3Vyc29yX3N0eWxlIDogNjsgLy8g RUN1cnNvcgorICAgICAgICB1bnNpZ25lZCBjaGFyIF9kaXJlY3Rpb24gOiAxOyAvLyBUZXh0RGly ZWN0aW9uCisgICAgICAgIHVuc2lnbmVkIGNoYXIgX2JvcmRlcl9jb2xsYXBzZSA6IDE7IC8vIEVC b3JkZXJDb2xsYXBzZQorICAgICAgICB1bnNpZ25lZCBjaGFyIF93aGl0ZV9zcGFjZSA6IDM7IC8v IEVXaGl0ZVNwYWNlCisgICAgICAgIHVuc2lnbmVkIGNoYXIgX2JveF9kaXJlY3Rpb24gOiAxOyAv LyBFQm94RGlyZWN0aW9uIChDU1MzIGJveF9kaXJlY3Rpb24gcHJvcGVydHksIGZsZXhpYmxlIGJv eCBsYXlvdXQgbW9kdWxlKQogICAgICAgICAvLyAzNCBiaXRzCiAgICAgICAgIAogICAgICAgICAv LyBub24gQ1NTMiBpbmhlcml0ZWQKLSAgICAgICAgdW5zaWduZWQgbV9ydGxPcmRlcmluZyA6IDE7 IC8vIE9yZGVyCisgICAgICAgIHVuc2lnbmVkIGNoYXIgbV9ydGxPcmRlcmluZyA6IDE7IC8vIE9y ZGVyCiAgICAgICAgIGJvb2wgX2ZvcmNlX2JhY2tncm91bmRzX3RvX3doaXRlIDogMTsKLSAgICAg ICAgdW5zaWduZWQgX3BvaW50ZXJFdmVudHMgOiA0OyAvLyBFUG9pbnRlckV2ZW50cwotICAgICAg ICB1bnNpZ25lZCBfaW5zaWRlTGluayA6IDI7IC8vIEVJbnNpZGVMaW5rCisgICAgICAgIHVuc2ln bmVkIGNoYXIgX3BvaW50ZXJFdmVudHMgOiA0OyAvLyBFUG9pbnRlckV2ZW50cworICAgICAgICB1 bnNpZ25lZCBjaGFyIF9pbnNpZGVMaW5rIDogMjsgLy8gRUluc2lkZUxpbmsKICAgICAgICAgLy8g NDMgYml0cwogCiAgICAgICAgIC8vIENTUyBUZXh0IExheW91dCBNb2R1bGUgTGV2ZWwgMzogVmVy dGljYWwgd3JpdGluZyBzdXBwb3J0Ci0gICAgICAgIHVuc2lnbmVkIG1fd3JpdGluZ01vZGUgOiAy OyAvLyBXcml0aW5nTW9kZQorICAgICAgICB1bnNpZ25lZCBjaGFyIG1fd3JpdGluZ01vZGUgOiAy OyAvLyBXcml0aW5nTW9kZQogICAgICAgICAvLyA0NSBiaXRzCiAgICAgfSBpbmhlcml0ZWRfZmxh Z3M7CiAKQEAgLTIyMiw2ICsyMjMsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgc3RydWN0IE5vbkluaGVy aXRlZEZsYWdzIHsKICAgICAgICAgYm9vbCBvcGVyYXRvcj09KGNvbnN0IE5vbkluaGVyaXRlZEZs YWdzJiBvdGhlcikgY29uc3QKICAgICAgICAgeworICAgICAgICAgICAgQ09NUElMRV9BU1NFUlQo KHNpemVvZihOb25Jbmhlcml0ZWRGbGFncykgPD0gOCksIE5vbkluaGVyaXRlZEZsYWdzX2RvZXNf bm90X2dyb3cpOwogICAgICAgICAgICAgcmV0dXJuIF9lZmZlY3RpdmVEaXNwbGF5ID09IG90aGVy Ll9lZmZlY3RpdmVEaXNwbGF5CiAgICAgICAgICAgICAgICAgJiYgX29yaWdpbmFsRGlzcGxheSA9 PSBvdGhlci5fb3JpZ2luYWxEaXNwbGF5CiAgICAgICAgICAgICAgICAgJiYgX292ZXJmbG93WCA9 PSBvdGhlci5fb3ZlcmZsb3dYCkBAIC0yNDUsMjYgKzI0NywyNiBAQCBwcm90ZWN0ZWQ6CiAKICAg ICAgICAgYm9vbCBvcGVyYXRvciE9KGNvbnN0IE5vbkluaGVyaXRlZEZsYWdzJiBvdGhlcikgY29u c3QgeyByZXR1cm4gISgqdGhpcyA9PSBvdGhlcik7IH0KIAotICAgICAgICB1bnNpZ25lZCBfZWZm ZWN0aXZlRGlzcGxheSA6IDU7IC8vIEVEaXNwbGF5Ci0gICAgICAgIHVuc2lnbmVkIF9vcmlnaW5h bERpc3BsYXkgOiA1OyAvLyBFRGlzcGxheQotICAgICAgICB1bnNpZ25lZCBfb3ZlcmZsb3dYIDog MzsgLy8gRU92ZXJmbG93Ci0gICAgICAgIHVuc2lnbmVkIF9vdmVyZmxvd1kgOiAzOyAvLyBFT3Zl cmZsb3cKLSAgICAgICAgdW5zaWduZWQgX3ZlcnRpY2FsX2FsaWduIDogNDsgLy8gRVZlcnRpY2Fs QWxpZ24KLSAgICAgICAgdW5zaWduZWQgX2NsZWFyIDogMjsgLy8gRUNsZWFyCi0gICAgICAgIHVu c2lnbmVkIF9wb3NpdGlvbiA6IDI7IC8vIEVQb3NpdGlvbgotICAgICAgICB1bnNpZ25lZCBfZmxv YXRpbmcgOiAyOyAvLyBFRmxvYXQKLSAgICAgICAgdW5zaWduZWQgX3RhYmxlX2xheW91dCA6IDE7 IC8vIEVUYWJsZUxheW91dAotCi0gICAgICAgIHVuc2lnbmVkIF9wYWdlX2JyZWFrX2JlZm9yZSA6 IDI7IC8vIEVQYWdlQnJlYWsKLSAgICAgICAgdW5zaWduZWQgX3BhZ2VfYnJlYWtfYWZ0ZXIgOiAy OyAvLyBFUGFnZUJyZWFrCi0gICAgICAgIHVuc2lnbmVkIF9wYWdlX2JyZWFrX2luc2lkZSA6IDI7 IC8vIEVQYWdlQnJlYWsKKyAgICAgICAgdW5zaWduZWQgY2hhciBfZWZmZWN0aXZlRGlzcGxheSA6 IDU7IC8vIEVEaXNwbGF5CisgICAgICAgIHVuc2lnbmVkIGNoYXIgX29yaWdpbmFsRGlzcGxheSA6 IDU7IC8vIEVEaXNwbGF5CisgICAgICAgIHVuc2lnbmVkIGNoYXIgX292ZXJmbG93WCA6IDM7IC8v IEVPdmVyZmxvdworICAgICAgICB1bnNpZ25lZCBjaGFyIF9vdmVyZmxvd1kgOiAzOyAvLyBFT3Zl cmZsb3cKKyAgICAgICAgdW5zaWduZWQgY2hhciBfdmVydGljYWxfYWxpZ24gOiA0OyAvLyBFVmVy dGljYWxBbGlnbgorICAgICAgICB1bnNpZ25lZCBjaGFyIF9jbGVhciA6IDI7IC8vIEVDbGVhcgor ICAgICAgICB1bnNpZ25lZCBjaGFyIF9wb3NpdGlvbiA6IDI7IC8vIEVQb3NpdGlvbgorICAgICAg ICB1bnNpZ25lZCBjaGFyIF9mbG9hdGluZyA6IDI7IC8vIEVGbG9hdAorICAgICAgICB1bnNpZ25l ZCBjaGFyIF90YWJsZV9sYXlvdXQgOiAxOyAvLyBFVGFibGVMYXlvdXQKKworICAgICAgICB1bnNp Z25lZCBjaGFyIF9wYWdlX2JyZWFrX2JlZm9yZSA6IDI7IC8vIEVQYWdlQnJlYWsKKyAgICAgICAg dW5zaWduZWQgY2hhciBfcGFnZV9icmVha19hZnRlciA6IDI7IC8vIEVQYWdlQnJlYWsKKyAgICAg ICAgdW5zaWduZWQgY2hhciBfcGFnZV9icmVha19pbnNpZGUgOiAyOyAvLyBFUGFnZUJyZWFrCiAK LSAgICAgICAgdW5zaWduZWQgX3N0eWxlVHlwZSA6IDY7IC8vIFBzZXVkb0lkCisgICAgICAgIHVu c2lnbmVkIGNoYXIgX3N0eWxlVHlwZSA6IDY7IC8vIFBzZXVkb0lkCiAgICAgICAgIGJvb2wgX2Fm ZmVjdGVkQnlIb3ZlciA6IDE7CiAgICAgICAgIGJvb2wgX2FmZmVjdGVkQnlBY3RpdmUgOiAxOwog ICAgICAgICBib29sIF9hZmZlY3RlZEJ5RHJhZyA6IDE7Ci0gICAgICAgIHVuc2lnbmVkIF9wc2V1 ZG9CaXRzIDogNzsKLSAgICAgICAgdW5zaWduZWQgX3VuaWNvZGVCaWRpIDogMzsgLy8gRVVuaWNv ZGVCaWRpCisgICAgICAgIHVuc2lnbmVkIGNoYXIgX3BzZXVkb0JpdHMgOiA3OworICAgICAgICB1 bnNpZ25lZCBjaGFyIF91bmljb2RlQmlkaSA6IDM7IC8vIEVVbmljb2RlQmlkaQogICAgICAgICBi b29sIF9pc0xpbmsgOiAxOwogICAgICAgICAvLyA1MyBiaXRzCiAgICAgfSBub25pbmhlcml0ZWRf ZmxhZ3M7Cg== 111207 2011-10-16 21:48:04 -0700 2011-10-17 21:08:04 -0700 Patch bug-69803-20111017154801.patch text/plain 6316 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NTgyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMTAtMTYgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgY29tcGls ZS10aW1lIGFzc2VydHMgZm9yIFJlbmRlclN0eWxlOjooTm9uKUluaGVyaXRlZEZsYWdzIHNpemUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTgwMwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4KKworICAgICAgICBBZGRzIENPTVBJTEVfQVNTRVJUcyBmb3IgdGhlIHNpemUgb2YgUmVu ZGVyU3R5bGU6OkluaGVyaXRlZEZsYWdzIGFuZAorICAgICAgICBSZW5kZXJTdHlsZTo6Tm9uSW5o ZXJpdGVkRmxhZ3MgdG8gZW5zdXJlIHRoYXQgdGhleSBhcmUgbm90IGFjY2lkZW50YWxseQorICAg ICAgICBncm93biBpbiBmdXR1cmUgY2hhbmdlcy4KKyAgICAgICAgQ2hhbmdlIHR5cGVzIG9mIHVu c2lnbmVkIGJpdGZpZWxkcyB0byB1bnNpZ25lZCBjaGFyIHRvIGVuc3VyZSB0aGF0IHRoZQorICAg ICAgICBhYm92ZSBhc3NlcnRpb25zIHJlbWFpbiB0cnVlIHdoZW4gYnVpbGRpbmcgb24gd2luZG93 cy4KKworICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJTdHlsZSk6CisgICAgICAgIEFkZHMgYXNzZXJ0aW9ucyB0byBlbnN1 cmUgc3RydWN0IHNpemVzIGRvIG5vdCBjaGFuZ2UuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L1JlbmRlclN0eWxlLmg6CisgICAgICAgIENoYW5nZXMgdW5zaWduZWQgdG8gdW5zaWduZWQgY2hh ciBhcyBvdXRsaW5lZCBhYm92ZS4KKwogMjAxMS0xMC0xNiAgS2VudGFybyBIYXJhICA8aGFyYWtl bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgR2VuZXJhdGUgWE1MSHR0cFJlcXVlc3QgY29uc3Ry dWN0b3IgZm9yIEpTQyBieSBbQ29uc3RydWN0b3JdIElETApJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCShyZXZpc2lvbiA5NzU4MikKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTk4LDYgKzk4LDggQEAgQUxXQVlTX0lOTElORSBSZW5kZXJTdHlsZTo6UmVuZGVy U3R5bGUoKQogI2VuZGlmCiB7CiAgICAgc2V0Qml0RGVmYXVsdHMoKTsgLy8gV291bGQgaXQgYmUg ZmFzdGVyIHRvIGNvcHkgdGhpcyBmcm9tIHRoZSBkZWZhdWx0IHN0eWxlPworICAgIENPTVBJTEVf QVNTRVJUKChzaXplb2YoSW5oZXJpdGVkRmxhZ3MpIDw9IDgpLCBJbmhlcml0ZWRGbGFnc19kb2Vz X25vdF9ncm93KTsKKyAgICBDT01QSUxFX0FTU0VSVCgoc2l6ZW9mKE5vbkluaGVyaXRlZEZsYWdz KSA8PSA4KSwgTm9uSW5oZXJpdGVkRmxhZ3NfZG9lc19ub3RfZ3Jvdyk7CiB9CiAKIEFMV0FZU19J TkxJTkUgUmVuZGVyU3R5bGU6OlJlbmRlclN0eWxlKGJvb2wpCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gOTc1ODIpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkod29ya2luZyBjb3B5 KQpAQCAtMTkxLDMwICsxOTEsMzAgQEAgcHJvdGVjdGVkOgogCiAgICAgICAgIGJvb2wgb3BlcmF0 b3IhPShjb25zdCBJbmhlcml0ZWRGbGFncyYgb3RoZXIpIGNvbnN0IHsgcmV0dXJuICEoKnRoaXMg PT0gb3RoZXIpOyB9CiAKLSAgICAgICAgdW5zaWduZWQgX2VtcHR5X2NlbGxzIDogMTsgLy8gRUVt cHR5Q2VsbAotICAgICAgICB1bnNpZ25lZCBfY2FwdGlvbl9zaWRlIDogMjsgLy8gRUNhcHRpb25T aWRlCi0gICAgICAgIHVuc2lnbmVkIF9saXN0X3N0eWxlX3R5cGUgOiA3OyAvLyBFTGlzdFN0eWxl VHlwZQotICAgICAgICB1bnNpZ25lZCBfbGlzdF9zdHlsZV9wb3NpdGlvbiA6IDE7IC8vIEVMaXN0 U3R5bGVQb3NpdGlvbgotICAgICAgICB1bnNpZ25lZCBfdmlzaWJpbGl0eSA6IDI7IC8vIEVWaXNp YmlsaXR5Ci0gICAgICAgIHVuc2lnbmVkIF90ZXh0X2FsaWduIDogNDsgLy8gRVRleHRBbGlnbgot ICAgICAgICB1bnNpZ25lZCBfdGV4dF90cmFuc2Zvcm0gOiAyOyAvLyBFVGV4dFRyYW5zZm9ybQot ICAgICAgICB1bnNpZ25lZCBfdGV4dF9kZWNvcmF0aW9ucyA6IEVUZXh0RGVjb3JhdGlvbkJpdHM7 Ci0gICAgICAgIHVuc2lnbmVkIF9jdXJzb3Jfc3R5bGUgOiA2OyAvLyBFQ3Vyc29yCi0gICAgICAg IHVuc2lnbmVkIF9kaXJlY3Rpb24gOiAxOyAvLyBUZXh0RGlyZWN0aW9uCi0gICAgICAgIHVuc2ln bmVkIF9ib3JkZXJfY29sbGFwc2UgOiAxOyAvLyBFQm9yZGVyQ29sbGFwc2UKLSAgICAgICAgdW5z aWduZWQgX3doaXRlX3NwYWNlIDogMzsgLy8gRVdoaXRlU3BhY2UKLSAgICAgICAgdW5zaWduZWQg X2JveF9kaXJlY3Rpb24gOiAxOyAvLyBFQm94RGlyZWN0aW9uIChDU1MzIGJveF9kaXJlY3Rpb24g cHJvcGVydHksIGZsZXhpYmxlIGJveCBsYXlvdXQgbW9kdWxlKQorICAgICAgICB1bnNpZ25lZCBj aGFyIF9lbXB0eV9jZWxscyA6IDE7IC8vIEVFbXB0eUNlbGwKKyAgICAgICAgdW5zaWduZWQgY2hh ciBfY2FwdGlvbl9zaWRlIDogMjsgLy8gRUNhcHRpb25TaWRlCisgICAgICAgIHVuc2lnbmVkIGNo YXIgX2xpc3Rfc3R5bGVfdHlwZSA6IDc7IC8vIEVMaXN0U3R5bGVUeXBlCisgICAgICAgIHVuc2ln bmVkIGNoYXIgX2xpc3Rfc3R5bGVfcG9zaXRpb24gOiAxOyAvLyBFTGlzdFN0eWxlUG9zaXRpb24K KyAgICAgICAgdW5zaWduZWQgY2hhciBfdmlzaWJpbGl0eSA6IDI7IC8vIEVWaXNpYmlsaXR5Cisg ICAgICAgIHVuc2lnbmVkIGNoYXIgX3RleHRfYWxpZ24gOiA0OyAvLyBFVGV4dEFsaWduCisgICAg ICAgIHVuc2lnbmVkIGNoYXIgX3RleHRfdHJhbnNmb3JtIDogMjsgLy8gRVRleHRUcmFuc2Zvcm0K KyAgICAgICAgdW5zaWduZWQgY2hhciBfdGV4dF9kZWNvcmF0aW9ucyA6IEVUZXh0RGVjb3JhdGlv bkJpdHM7CisgICAgICAgIHVuc2lnbmVkIGNoYXIgX2N1cnNvcl9zdHlsZSA6IDY7IC8vIEVDdXJz b3IKKyAgICAgICAgdW5zaWduZWQgY2hhciBfZGlyZWN0aW9uIDogMTsgLy8gVGV4dERpcmVjdGlv bgorICAgICAgICB1bnNpZ25lZCBjaGFyIF9ib3JkZXJfY29sbGFwc2UgOiAxOyAvLyBFQm9yZGVy Q29sbGFwc2UKKyAgICAgICAgdW5zaWduZWQgY2hhciBfd2hpdGVfc3BhY2UgOiAzOyAvLyBFV2hp dGVTcGFjZQorICAgICAgICB1bnNpZ25lZCBjaGFyIF9ib3hfZGlyZWN0aW9uIDogMTsgLy8gRUJv eERpcmVjdGlvbiAoQ1NTMyBib3hfZGlyZWN0aW9uIHByb3BlcnR5LCBmbGV4aWJsZSBib3ggbGF5 b3V0IG1vZHVsZSkKICAgICAgICAgLy8gMzQgYml0cwogICAgICAgICAKICAgICAgICAgLy8gbm9u IENTUzIgaW5oZXJpdGVkCi0gICAgICAgIHVuc2lnbmVkIG1fcnRsT3JkZXJpbmcgOiAxOyAvLyBP cmRlcgorICAgICAgICB1bnNpZ25lZCBjaGFyIG1fcnRsT3JkZXJpbmcgOiAxOyAvLyBPcmRlcgog ICAgICAgICBib29sIF9mb3JjZV9iYWNrZ3JvdW5kc190b193aGl0ZSA6IDE7Ci0gICAgICAgIHVu c2lnbmVkIF9wb2ludGVyRXZlbnRzIDogNDsgLy8gRVBvaW50ZXJFdmVudHMKLSAgICAgICAgdW5z aWduZWQgX2luc2lkZUxpbmsgOiAyOyAvLyBFSW5zaWRlTGluaworICAgICAgICB1bnNpZ25lZCBj aGFyIF9wb2ludGVyRXZlbnRzIDogNDsgLy8gRVBvaW50ZXJFdmVudHMKKyAgICAgICAgdW5zaWdu ZWQgY2hhciBfaW5zaWRlTGluayA6IDI7IC8vIEVJbnNpZGVMaW5rCiAgICAgICAgIC8vIDQzIGJp dHMKIAogICAgICAgICAvLyBDU1MgVGV4dCBMYXlvdXQgTW9kdWxlIExldmVsIDM6IFZlcnRpY2Fs IHdyaXRpbmcgc3VwcG9ydAotICAgICAgICB1bnNpZ25lZCBtX3dyaXRpbmdNb2RlIDogMjsgLy8g V3JpdGluZ01vZGUKKyAgICAgICAgdW5zaWduZWQgY2hhciBtX3dyaXRpbmdNb2RlIDogMjsgLy8g V3JpdGluZ01vZGUKICAgICAgICAgLy8gNDUgYml0cwogICAgIH0gaW5oZXJpdGVkX2ZsYWdzOwog CkBAIC0yNDUsMjYgKzI0NSwyNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICAgICAgYm9vbCBvcGVyYXRv ciE9KGNvbnN0IE5vbkluaGVyaXRlZEZsYWdzJiBvdGhlcikgY29uc3QgeyByZXR1cm4gISgqdGhp cyA9PSBvdGhlcik7IH0KIAotICAgICAgICB1bnNpZ25lZCBfZWZmZWN0aXZlRGlzcGxheSA6IDU7 IC8vIEVEaXNwbGF5Ci0gICAgICAgIHVuc2lnbmVkIF9vcmlnaW5hbERpc3BsYXkgOiA1OyAvLyBF RGlzcGxheQotICAgICAgICB1bnNpZ25lZCBfb3ZlcmZsb3dYIDogMzsgLy8gRU92ZXJmbG93Ci0g ICAgICAgIHVuc2lnbmVkIF9vdmVyZmxvd1kgOiAzOyAvLyBFT3ZlcmZsb3cKLSAgICAgICAgdW5z aWduZWQgX3ZlcnRpY2FsX2FsaWduIDogNDsgLy8gRVZlcnRpY2FsQWxpZ24KLSAgICAgICAgdW5z aWduZWQgX2NsZWFyIDogMjsgLy8gRUNsZWFyCi0gICAgICAgIHVuc2lnbmVkIF9wb3NpdGlvbiA6 IDI7IC8vIEVQb3NpdGlvbgotICAgICAgICB1bnNpZ25lZCBfZmxvYXRpbmcgOiAyOyAvLyBFRmxv YXQKLSAgICAgICAgdW5zaWduZWQgX3RhYmxlX2xheW91dCA6IDE7IC8vIEVUYWJsZUxheW91dAot Ci0gICAgICAgIHVuc2lnbmVkIF9wYWdlX2JyZWFrX2JlZm9yZSA6IDI7IC8vIEVQYWdlQnJlYWsK LSAgICAgICAgdW5zaWduZWQgX3BhZ2VfYnJlYWtfYWZ0ZXIgOiAyOyAvLyBFUGFnZUJyZWFrCi0g ICAgICAgIHVuc2lnbmVkIF9wYWdlX2JyZWFrX2luc2lkZSA6IDI7IC8vIEVQYWdlQnJlYWsKKyAg ICAgICAgdW5zaWduZWQgY2hhciBfZWZmZWN0aXZlRGlzcGxheSA6IDU7IC8vIEVEaXNwbGF5Cisg ICAgICAgIHVuc2lnbmVkIGNoYXIgX29yaWdpbmFsRGlzcGxheSA6IDU7IC8vIEVEaXNwbGF5Cisg ICAgICAgIHVuc2lnbmVkIGNoYXIgX292ZXJmbG93WCA6IDM7IC8vIEVPdmVyZmxvdworICAgICAg ICB1bnNpZ25lZCBjaGFyIF9vdmVyZmxvd1kgOiAzOyAvLyBFT3ZlcmZsb3cKKyAgICAgICAgdW5z aWduZWQgY2hhciBfdmVydGljYWxfYWxpZ24gOiA0OyAvLyBFVmVydGljYWxBbGlnbgorICAgICAg ICB1bnNpZ25lZCBjaGFyIF9jbGVhciA6IDI7IC8vIEVDbGVhcgorICAgICAgICB1bnNpZ25lZCBj aGFyIF9wb3NpdGlvbiA6IDI7IC8vIEVQb3NpdGlvbgorICAgICAgICB1bnNpZ25lZCBjaGFyIF9m bG9hdGluZyA6IDI7IC8vIEVGbG9hdAorICAgICAgICB1bnNpZ25lZCBjaGFyIF90YWJsZV9sYXlv dXQgOiAxOyAvLyBFVGFibGVMYXlvdXQKKworICAgICAgICB1bnNpZ25lZCBjaGFyIF9wYWdlX2Jy ZWFrX2JlZm9yZSA6IDI7IC8vIEVQYWdlQnJlYWsKKyAgICAgICAgdW5zaWduZWQgY2hhciBfcGFn ZV9icmVha19hZnRlciA6IDI7IC8vIEVQYWdlQnJlYWsKKyAgICAgICAgdW5zaWduZWQgY2hhciBf cGFnZV9icmVha19pbnNpZGUgOiAyOyAvLyBFUGFnZUJyZWFrCiAKLSAgICAgICAgdW5zaWduZWQg X3N0eWxlVHlwZSA6IDY7IC8vIFBzZXVkb0lkCisgICAgICAgIHVuc2lnbmVkIGNoYXIgX3N0eWxl VHlwZSA6IDY7IC8vIFBzZXVkb0lkCiAgICAgICAgIGJvb2wgX2FmZmVjdGVkQnlIb3ZlciA6IDE7 CiAgICAgICAgIGJvb2wgX2FmZmVjdGVkQnlBY3RpdmUgOiAxOwogICAgICAgICBib29sIF9hZmZl Y3RlZEJ5RHJhZyA6IDE7Ci0gICAgICAgIHVuc2lnbmVkIF9wc2V1ZG9CaXRzIDogNzsKLSAgICAg ICAgdW5zaWduZWQgX3VuaWNvZGVCaWRpIDogMzsgLy8gRVVuaWNvZGVCaWRpCisgICAgICAgIHVu c2lnbmVkIGNoYXIgX3BzZXVkb0JpdHMgOiA3OworICAgICAgICB1bnNpZ25lZCBjaGFyIF91bmlj b2RlQmlkaSA6IDM7IC8vIEVVbmljb2RlQmlkaQogICAgICAgICBib29sIF9pc0xpbmsgOiAxOwog ICAgICAgICAvLyA1MyBiaXRzCiAgICAgfSBub25pbmhlcml0ZWRfZmxhZ3M7Cg==