91990 2012-07-23 06:38:58 -0700 [Qt] Default sizes for input-text and text-area are different when running DRT/WTR 2012-08-07 05:49:13 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 91504 91570 91621 92186 1 cmarcelo luciano.wolf bruno.abinader laszlo.gombos luciano.wolf menard ossy webkit.review.bot zoltan oldest_to_newest 675672 0 cmarcelo 2012-07-23 06:38:58 -0700 For testing we use the same fonts and the same RenderTheme for WK1 and WK2. I think the default sizes for forms should be the same as well, so we can keep the same expected results for both WK1 and WK2. I identified this problem while rebaselining editing/inserting for the new fonts. Two tests failing in WK2 because of this are: editing/inserting/4960120-1.html editing/inserting/before-after-input-element.html 675875 1 cmarcelo 2012-07-23 11:59:49 -0700 tables/mozilla_expected_failures/bugs/bug92647-1.html 676130 2 cmarcelo 2012-07-23 16:06:01 -0700 css3/selectors3/html/css3-modsel-23.html css3/selectors3/html/css3-modsel-24.html css3/selectors3/html/css3-modsel-68.html css3/selectors3/html/css3-modsel-69.html css3/selectors3/xhtml/css3-modsel-23.xml css3/selectors3/xhtml/css3-modsel-24.xml css3/selectors3/xhtml/css3-modsel-68.xml css3/selectors3/xhtml/css3-modsel-69.xml css3/selectors3/xml/css3-modsel-23.xml css3/selectors3/xml/css3-modsel-24.xml css3/selectors3/xml/css3-modsel-68.xml css3/selectors3/xml/css3-modsel-69.xml 679155 3 bruno.abinader 2012-07-26 04:41:27 -0700 editing/selection/3690703-2.html editing/selection/3690703.html editing/selection/3690719.html (and more to come from previous rebaselines) 679171 4 bruno.abinader 2012-07-26 05:02:09 -0700 editing/selection/4895428-3.html editing/selection/4975120.html editing/selection/drag-select-1.html 679254 5 bruno.abinader 2012-07-26 06:19:03 -0700 fast/forms/basic-inputs.html fast/forms/basic-textareas-quirks.html fast/forms/control-restrict-line-height.html fast/forms/encoding-test.html fast/forms/fieldset-align.html fast/forms/input-appearance-bkcolor.html fast/forms/input-appearance-default-bkcolor.html fast/forms/input-appearance-disabled.html fast/forms/input-appearance-focus.html fast/forms/input-appearance-preventDefault.html fast/forms/input-appearance-readonly.html fast/forms/input-appearance-selection.html fast/forms/input-appearance-visibility.html fast/forms/input-baseline.html fast/forms/input-double-click-selection-gap-bug.html fast/forms/input-placeholder-visibility-1.html fast/forms/input-placeholder-visibility-3.html fast/forms/input-readonly-dimmed.html fast/forms/input-readonly-empty.html fast/forms/input-spaces.html fast/forms/input-text-click-inside.html fast/forms/input-text-double-click.html fast/forms/input-text-option-delete.html fast/forms/input-text-self-emptying-click.html fast/forms/input-text-word-wrap.html fast/forms/input-width.html fast/forms/placeholder-position.html fast/forms/search-cancel-button-style-sharing.html fast/forms/search-display-none-cancel-button.html fast/forms/search-rtl.html fast/forms/search-vertical-alignment.html fast/forms/text-style-color.html fast/forms/textarea-placeholder-pseudo-style.html fast/forms/textarea-placeholder-visibility-1.html fast/forms/textarea-placeholder-visibility-2.html fast/forms/textfield-focus-ring.html fast/forms/textfield-outline.html fast/forms/textfield-overflow.html 679419 6 bruno.abinader 2012-07-26 09:28:12 -0700 fast/text/international/unicode-bidi-plaintext-in-textarea.html fast/text/textIteratorNilRenderer.html 679445 7 bruno.abinader 2012-07-26 09:50:20 -0700 fast/table/colspanMinWidth.html fast/table/spanOverlapRepaint.html fast/table/text-field-baseline.html 682038 8 ossy 2012-07-30 08:33:29 -0700 tables/mozilla/bugs/bug1188.html tables/mozilla/bugs/bug18359.html tables/mozilla/bugs/bug24200.html tables/mozilla/bugs/bug2479-3.html tables/mozilla/bugs/bug28928.html tables/mozilla/bugs/bug30559.html tables/mozilla/bugs/bug4382.html tables/mozilla/bugs/bug4527.html tables/mozilla/bugs/bug46368-1.html tables/mozilla/bugs/bug46368-2.html tables/mozilla/bugs/bug51037.html tables/mozilla/bugs/bug55545.html tables/mozilla/bugs/bug59354.html tables/mozilla/bugs/bug96334.html tables/mozilla/dom/tableDom.html tables/mozilla/other/move_row.html 682051 9 ossy 2012-07-30 08:51:47 -0700 There are only 83 tests related to this bug. I think we can simple check in qt-5.0-wk2 specific results to have better test coverage until find a proper fix this bug. ( or feauture? :) ) 682113 10 cmarcelo 2012-07-30 10:04:51 -0700 (In reply to comment #9) > There are only 83 tests related to this bug. I think we can simple check in qt-5.0-wk2 specific results to have better test coverage until find a proper fix this bug. ( or feauture? :) ) I don't think it's a good idea, given that the Luciano is already working on a fix for this and there's no essential reason to WK2 behave differently than WK1 in those cases. In general I think having WK2 specific results should be seen as the last option, only have them if we have a very good reason. 682894 11 ossy 2012-07-31 03:48:55 -0700 I didn't notice if Luciano is working on it. Of course having same results for WK1 and WK2 is the best solution. :) But if we don't find the proper solution for a long time, we should commit WK2 specific expected results too not to lose test coverage for these tests. The results for WK2 aren't wrong, only a little bit different. 683019 12 luciano.wolf 2012-07-31 07:23:45 -0700 I'm investigating and one of my findings is that DRT and WTR use different fonts (Liberation Serif / Times). Now I'm trying to implement the functions inside webkit/Source/WebKit2/UIProcess/qt/WebPreferencesQt.cpp to make it use the same font as DRT. The current implementation uses default values from webkit/Source/WebKit2/Shared/WebPreferencesStore.h. I hope to close this bug till this weekend. 688104 13 156686 luciano.wolf 2012-08-06 07:12:38 -0700 Created attachment 156686 Use correct fonts from testfonts directory 688131 14 156686 kbalazs 2012-08-06 07:48:33 -0700 Comment on attachment 156686 Use correct fonts from testfonts directory View in context: https://bugs.webkit.org/attachment.cgi?id=156686&action=review Here are my informal complaining comments :) > Source/WebKit2/UIProcess/qt/WebPreferencesQt.cpp:56 > +#define INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \ > + set##TypeName##ValueIfInUserDefaults(WebPreferencesKey::KeyLower##Key(), m_store, qFontHint); This is a crasy name for this macro :) > Tools/WebKitTestRunner/qt/main.cpp:124 > + WebKit::initializeTestFonts(); > + QCoreApplication::setAttribute(Qt::AA_Use96Dpi, true); > + Does that mean that we draw input-tet and text-area on the UI side? Otherwise it's not clear to me why this is necessary. 688172 15 luciano.wolf 2012-08-06 09:04:32 -0700 (In reply to comment #14) > (From update of attachment 156686 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156686&action=review > > Here are my informal complaining comments :) > > > Source/WebKit2/UIProcess/qt/WebPreferencesQt.cpp:56 > > +#define INITIALIZE_PREFERENCE_FROM_NSUSERDEFAULTS(KeyUpper, KeyLower, TypeName, Type, DefaultValue) \ > > + set##TypeName##ValueIfInUserDefaults(WebPreferencesKey::KeyLower##Key(), m_store, qFontHint); > > This is a crasy name for this macro :) I took it from Mac implementation :) I'll rename it to something better. > > > Tools/WebKitTestRunner/qt/main.cpp:124 > > + WebKit::initializeTestFonts(); > > + QCoreApplication::setAttribute(Qt::AA_Use96Dpi, true); > > + > > Does that mean that we draw input-tet and text-area on the UI side? Otherwise it's not clear to me why this is necessary. If we don't initialize fontconfig stuff before reaching that macro QFont.defaultFamily returns different (Dejavu font type) results. The way I found to fix this behaviour was to initialize here - as DumpRenderTree does. 688230 16 156717 luciano.wolf 2012-08-06 10:01:44 -0700 Created attachment 156717 Macro has been renamed 688355 17 156746 luciano.wolf 2012-08-06 12:41:50 -0700 Created attachment 156746 Patch for landing 688508 18 156746 webkit.review.bot 2012-08-06 16:05:31 -0700 Comment on attachment 156746 Patch for landing Clearing flags on attachment: 156746 Committed r124808: <http://trac.webkit.org/changeset/124808> 688509 19 webkit.review.bot 2012-08-06 16:05:37 -0700 All reviewed patches have been landed. Closing bug. 688997 20 ossy 2012-08-07 03:13:29 -0700 (In reply to comment #18) > (From update of attachment 156746 [details]) > Clearing flags on attachment: 156746 > > Committed r124808: <http://trac.webkit.org/changeset/124808> You forgot to unskip tests and remove unnecessary qt-5.0-wk2 expected files. I did it - https://trac.webkit.org/changeset/124873 689075 21 luciano.wolf 2012-08-07 05:49:13 -0700 (In reply to comment #20) > (In reply to comment #18) > > (From update of attachment 156746 [details] [details]) > > Clearing flags on attachment: 156746 > > > > Committed r124808: <http://trac.webkit.org/changeset/124808> > > You forgot to unskip tests and remove unnecessary qt-5.0-wk2 expected files. > I did it - https://trac.webkit.org/changeset/124873 oops! Thanks a lot! 156686 2012-08-06 07:12:38 -0700 2012-08-06 10:01:33 -0700 Use correct fonts from testfonts directory bug-91990-20120806111220.patch text/plain 5438 luciano.wolf U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDg0NTBmNWQxZDliM2Fk NTAxZWU0YjczOGNlYWYzY2E0OWMwNzZkNy4uMjdhNDBjZDc3MzY2MTg2ZWI5Zjc4OTM1MjViNzFh Y2ExY2QzOTYzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTA2ICBMdWNp YW5vIFdvbGYgIDxsdWNpYW5vLndvbGZAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdIERl ZmF1bHQgc2l6ZXMgZm9yIGlucHV0LXRleHQgYW5kIHRleHQtYXJlYSBhcmUgZGlmZmVyZW50IHdo ZW4gcnVubmluZyBEUlQvV1RSCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05MTk5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdUUiB3YXNuJ3QgdXNpbmcgdGhlIHByb3BlciBmb250IHR5cGVzIHByb3ZpZGVk IGJ5IHRlc3Rmb250cyBkaXJlY3RvcnkuCisgICAgICAgIFRoZSBzYW1lIGFwcHJvYWNoIGFzIERS VCB3YXMgYXBwbGllZCBhbmQgbm93IGl0IHRha2VzIGluZm8gZnJvbSBRRm9udCB0bworICAgICAg ICB1cGRhdGUgdGhlIHN0b3JlIHZhcmlhYmxlLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1dl YlByZWZlcmVuY2VzUXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpzZXRTdHJpbmdWYWx1ZUlmSW5V c2VyRGVmYXVsdHMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJl ZmVyZW5jZXM6OnBsYXRmb3JtSW5pdGlhbGl6ZVN0b3JlKToKKwogMjAxMi0wOC0wNiAgQW5kcmFz IEJlY3NpICA8YW5kcmFzLmJlY3NpQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdW1dLMl0gUmVt b3ZlIHdvcmthcm91bmRzIGZyb20gaW5wdXQgZXZlbnQgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQcmVmZXJlbmNlc1F0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQcmVmZXJlbmNlc1F0LmNwcAppbmRleCBmYWU0YTJkNzY4 NWU2NGFmMDQwYjFjYzM5MDU2NGY0ZTVmMGY5Njc0Li4wMDVkYTczZTk4YjhkMTI1ZWYxN2QxZDcw MmRiODM0Y2FkNDcyN2U0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv V2ViUHJlZmVyZW5jZXNRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dl YlByZWZlcmVuY2VzUXQuY3BwCkBAIC0yNSwxMSArMjUsMzkgQEAKIAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCisjaW5jbHVkZSA8UUZvbnQ+CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCitzdGF0aWMgdm9pZCBzZXRTdHJpbmdWYWx1ZUlmSW5Vc2VyRGVm YXVsdHMoY29uc3QgU3RyaW5nJiBiYXNlS2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSwg Y29uc3QgUUhhc2g8U3RyaW5nLCBRRm9udDo6U3R5bGVIaW50PiBxRm9udEhpbnQpCit7CisgICAg Ly8gVXNlIHNhbWUgYXBwcm9hY2ggYXMgRHVtcFJlbmRlclRyZWUgZG9lcyAtIGdldCBmb250IGlu Zm8gZnJvbSBRRm9udC4KKyAgICBzdGF0aWMgUUZvbnQgZGVmYXVsdEZvbnQ7CisgICAgZGVmYXVs dEZvbnQuc2V0U3R5bGVIaW50KHFGb250SGludFtiYXNlS2V5XSk7CisgICAgc3RvcmUuc2V0U3Ry aW5nVmFsdWVGb3JLZXkoYmFzZUtleSwgZGVmYXVsdEZvbnQuZGVmYXVsdEZhbWlseSgpKTsKK30K Kwogdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFsaXplU3RvcmUoKQogeworICAg IGlmICghbV9pZGVudGlmaWVyKQorICAgICAgICByZXR1cm47CisKKyAgICBRSGFzaCA8U3RyaW5n LCBRRm9udDo6U3R5bGVIaW50PiBxRm9udEhpbnQ7CisKKyAgICBxRm9udEhpbnRbIlN0YW5kYXJk Rm9udEZhbWlseSJdID0gUUZvbnQ6OlNlcmlmOworICAgIHFGb250SGludFsiQ3Vyc2l2ZUZvbnRG YW1pbHkiXSA9IFFGb250OjpDdXJzaXZlOworICAgIHFGb250SGludFsiRmFudGFzeUZvbnRGYW1p bHkiXSA9IFFGb250OjpGYW50YXN5OworICAgIHFGb250SGludFsiRml4ZWRGb250RmFtaWx5Il0g PSBRRm9udDo6TW9ub3NwYWNlOworICAgIHFGb250SGludFsiU2Fuc1NlcmlmRm9udEZhbWlseSJd ID0gUUZvbnQ6OlNhbnNTZXJpZjsKKyAgICBxRm9udEhpbnRbIlNlcmlmRm9udEZhbWlseSJdID0g UUZvbnQ6OlNlcmlmOworICAgIHFGb250SGludFsiUGljdG9ncmFwaEZvbnRGYW1pbHkiXSA9IFFG b250OjpTZXJpZjsKKworI2RlZmluZSBJTklUSUFMSVpFX1BSRUZFUkVOQ0VfRlJPTV9OU1VTRVJE RUZBVUxUUyhLZXlVcHBlciwgS2V5TG93ZXIsIFR5cGVOYW1lLCBUeXBlLCBEZWZhdWx0VmFsdWUp IFwKKyAgICBzZXQjI1R5cGVOYW1lIyNWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoV2ViUHJlZmVyZW5j ZXNLZXk6OktleUxvd2VyIyNLZXkoKSwgbV9zdG9yZSwgcUZvbnRIaW50KTsKKworICAgIEZPUl9F QUNIX1dFQktJVF9GT05UX0ZBTUlMWV9QUkVGRVJFTkNFKElOSVRJQUxJWkVfUFJFRkVSRU5DRV9G Uk9NX05TVVNFUkRFRkFVTFRTKQorCisjdW5kZWYgSU5JVElBTElaRV9QUkVGRVJFTkNFX0ZST01f TlNVU0VSREVGQVVMVFMKIH0KIAogdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVT dHJpbmdWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDMzM2ZlNWY5OGE3ZDY5 NDkwNzEyOTI2NzFlZWVlZDYyODJlZWQ2YWMuLmE0Mzg5OGI4NzgwM2FhZjdlODE3ODU3MTJjOGQ1 M2ZkYzM3MzMxYTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wOC0wNiAgTHVjaWFubyBXb2xmICA8bHVjaWFu by53b2xmQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBEZWZhdWx0IHNpemVzIGZvciBp bnB1dC10ZXh0IGFuZCB0ZXh0LWFyZWEgYXJlIGRpZmZlcmVudCB3aGVuIHJ1bm5pbmcgRFJUL1dU UgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE5OTAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbml0aWFs aXppbmcgVGVzdEZvbnRzIGluZm9ybWF0aW9uIGludG8gV1RSIGJpbmFyeS4gRG9pbmcgaXQKKyAg ICAgICAgbGF0ZXIgbGVhZHMgdG8gd3JvbmcgZm9udCBuYW1lcyB1c2FnZSAoRGVqYXZ1IFNlcmlm IGluc3RlYWQKKyAgICAgICAgb2YgTGliZXJhdGlvbiBTZXJpZikuCisKKyAgICAgICAgKiBXZWJL aXRUZXN0UnVubmVyL1RhcmdldC5wcmk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9xdC9t YWluLmNwcDoKKyAgICAgICAgKG1haW4pOgorCiAyMDEyLTA4LTA2ICBDYXJsb3MgR2FyY2lhIENh bXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXggbWFr ZSBkaXN0Y2hlY2suCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1RhcmdldC5w cmkgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1RhcmdldC5wcmkKaW5kZXggYjNiNWMyYzMzODAy MGYwMmJkMTBmNmNmYmI0MjU0ZWNkMmZmNzY2ZS4uMGU1NDUxNWViZmExMTdjOWViZWY5MjVmZmIz M2Q3MGZlMTIyOWFjNCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UYXJnZXQu cHJpCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGFyZ2V0LnByaQpAQCAtOCw2ICs4LDcg QEAgVEVNUExBVEUgPSBhcHAKIFRBUkdFVCA9IFdlYktpdFRlc3RSdW5uZXIKIAogSEVBREVSUyAr PSBcCisgICAgJCR7Uk9PVF9XRUJLSVRfRElSfS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9RdElu aXRpYWxpemVUZXN0Rm9udHMuaCBcCiAgICAgRXZlbnRTZW5kZXJQcm94eS5oIFwKICAgICBQbGF0 Zm9ybVdlYlZpZXcuaCBcCiAgICAgU3RyaW5nRnVuY3Rpb25zLmggXApAQCAtMTUsNiArMTYsNyBA QCBIRUFERVJTICs9IFwKICAgICBUZXN0SW52b2NhdGlvbi5oCiAKIFNPVVJDRVMgKz0gXAorICAg ICQke1JPT1RfV0VCS0lUX0RJUn0vVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvUXRJbml0aWFsaXpl VGVzdEZvbnRzLmNwcCBcCiAgICAgcXQvbWFpbi5jcHAgXAogICAgIHF0L0V2ZW50U2VuZGVyUHJv eHlRdC5jcHAgXAogICAgIHF0L1BsYXRmb3JtV2ViVmlld1F0LmNwcCBcCkBAIC0zMSw2ICszMywx MSBAQCBXRUJLSVQgKz0gd3RmIGphdmFzY3JpcHRjb3JlIHdlYmtpdDIKIAogREVGSU5FUyArPSBV U0VfU1lTVEVNX01BTExPQz0xCiAKK2NvbnRhaW5zKERFRklORVMsIEhBVkVfRk9OVENPTkZJRz0x KTogUEtHQ09ORklHICs9IGZvbnRjb25maWcKKworSU5DTFVERVBBVEggKz0gXAorICAgICQke1JP T1RfV0VCS0lUX0RJUn0vVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQKKwogUFJFRklYX0hFQURFUiA9 IFdlYktpdFRlc3RSdW5uZXJQcmVmaXguaAogKi1nKysqOlFNQUtFX0NYWEZMQUdTICs9ICItaW5j bHVkZSAkJFBSRUZJWF9IRUFERVIiCiAqLWNsYW5nKjpRTUFLRV9DWFhGTEFHUyArPSAiLWluY2x1 ZGUgJCRQUkVGSVhfSEVBREVSIgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9x dC9tYWluLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvbWFpbi5jcHAKaW5kZXggZDZk MjI4MDkxZjk3NDdhYjlkZTNmOGU4NGQ4NTQ3ZjQ1YjUxNTRmNS4uMWRhMTJhN2IyNmU2YjNlYTk2 MGQ5NDg4ZmM0YmY2ZTA0NTI4ZTIyNiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9xdC9tYWluLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL3F0L21haW4uY3BwCkBA IC0yNiw2ICsyNiw3IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAorI2luY2x1ZGUgIlF0SW5p dGlhbGl6ZVRlc3RGb250cy5oIgogI2luY2x1ZGUgIlRlc3RDb250cm9sbGVyLmgiCiAjaW5jbHVk ZSAicXF1aWNrd2Vidmlld19wLmgiCiAKQEAgLTExOCw2ICsxMTksOSBAQCBpbnQgbWFpbihpbnQg YXJnYywgY2hhcioqIGFyZ3YpCiAKICAgICBxcHV0ZW52KCJRVF9XRUJLSVRfVEhFTUVfTkFNRSIs ICJxc3R5bGUiKTsKIAorICAgIFdlYktpdDo6aW5pdGlhbGl6ZVRlc3RGb250cygpOworICAgIFFD b3JlQXBwbGljYXRpb246OnNldEF0dHJpYnV0ZShRdDo6QUFfVXNlOTZEcGksIHRydWUpOworCiAg ICAgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2V0RmxpY2thYmxlVmlld3BvcnRFbmFibGVk KGZhbHNlKTsKICAgICBRQXBwbGljYXRpb24gYXBwKGFyZ2MsIGFyZ3YpOwogICAgIExhdW5jaGVy IGxhdW5jaGVyKGFyZ2MsIGFyZ3YpOwo= 156717 2012-08-06 10:01:44 -0700 2012-08-06 12:41:43 -0700 Macro has been renamed bug-91990-20120806140120.patch text/plain 5396 luciano.wolf U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDg0NTBmNWQxZDliM2Fk NTAxZWU0YjczOGNlYWYzY2E0OWMwNzZkNy4uMjdhNDBjZDc3MzY2MTg2ZWI5Zjc4OTM1MjViNzFh Y2ExY2QzOTYzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTA2ICBMdWNp YW5vIFdvbGYgIDxsdWNpYW5vLndvbGZAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdIERl ZmF1bHQgc2l6ZXMgZm9yIGlucHV0LXRleHQgYW5kIHRleHQtYXJlYSBhcmUgZGlmZmVyZW50IHdo ZW4gcnVubmluZyBEUlQvV1RSCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05MTk5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdUUiB3YXNuJ3QgdXNpbmcgdGhlIHByb3BlciBmb250IHR5cGVzIHByb3ZpZGVk IGJ5IHRlc3Rmb250cyBkaXJlY3RvcnkuCisgICAgICAgIFRoZSBzYW1lIGFwcHJvYWNoIGFzIERS VCB3YXMgYXBwbGllZCBhbmQgbm93IGl0IHRha2VzIGluZm8gZnJvbSBRRm9udCB0bworICAgICAg ICB1cGRhdGUgdGhlIHN0b3JlIHZhcmlhYmxlLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1dl YlByZWZlcmVuY2VzUXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpzZXRTdHJpbmdWYWx1ZUlmSW5V c2VyRGVmYXVsdHMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJl ZmVyZW5jZXM6OnBsYXRmb3JtSW5pdGlhbGl6ZVN0b3JlKToKKwogMjAxMi0wOC0wNiAgQW5kcmFz IEJlY3NpICA8YW5kcmFzLmJlY3NpQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdW1dLMl0gUmVt b3ZlIHdvcmthcm91bmRzIGZyb20gaW5wdXQgZXZlbnQgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQcmVmZXJlbmNlc1F0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQcmVmZXJlbmNlc1F0LmNwcAppbmRleCBmYWU0YTJkNzY4 NWU2NGFmMDQwYjFjYzM5MDU2NGY0ZTVmMGY5Njc0Li5kOGYxYzc4MDEzODE0M2ExNTBlMDE0ZTRl OGMwZDY4OWI1NWU4ZTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv V2ViUHJlZmVyZW5jZXNRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dl YlByZWZlcmVuY2VzUXQuY3BwCkBAIC0yNSwxMSArMjUsMzkgQEAKIAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCisjaW5jbHVkZSA8UUZvbnQ+CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogCitzdGF0aWMgdm9pZCBzZXRTdHJpbmdWYWx1ZUlmSW5Vc2VyRGVm YXVsdHMoY29uc3QgU3RyaW5nJiBiYXNlS2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSwg Y29uc3QgUUhhc2g8U3RyaW5nLCBRRm9udDo6U3R5bGVIaW50PiBxRm9udEhpbnQpCit7CisgICAg Ly8gVXNlIHNhbWUgYXBwcm9hY2ggYXMgRHVtcFJlbmRlclRyZWUgZG9lcyAtIGdldCBmb250IGlu Zm8gZnJvbSBRRm9udC4KKyAgICBzdGF0aWMgUUZvbnQgZGVmYXVsdEZvbnQ7CisgICAgZGVmYXVs dEZvbnQuc2V0U3R5bGVIaW50KHFGb250SGludFtiYXNlS2V5XSk7CisgICAgc3RvcmUuc2V0U3Ry aW5nVmFsdWVGb3JLZXkoYmFzZUtleSwgZGVmYXVsdEZvbnQuZGVmYXVsdEZhbWlseSgpKTsKK30K Kwogdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFsaXplU3RvcmUoKQogeworICAg IGlmICghbV9pZGVudGlmaWVyKQorICAgICAgICByZXR1cm47CisKKyAgICBRSGFzaCA8U3RyaW5n LCBRRm9udDo6U3R5bGVIaW50PiBxRm9udEhpbnQ7CisKKyAgICBxRm9udEhpbnRbIlN0YW5kYXJk Rm9udEZhbWlseSJdID0gUUZvbnQ6OlNlcmlmOworICAgIHFGb250SGludFsiQ3Vyc2l2ZUZvbnRG YW1pbHkiXSA9IFFGb250OjpDdXJzaXZlOworICAgIHFGb250SGludFsiRmFudGFzeUZvbnRGYW1p bHkiXSA9IFFGb250OjpGYW50YXN5OworICAgIHFGb250SGludFsiRml4ZWRGb250RmFtaWx5Il0g PSBRRm9udDo6TW9ub3NwYWNlOworICAgIHFGb250SGludFsiU2Fuc1NlcmlmRm9udEZhbWlseSJd ID0gUUZvbnQ6OlNhbnNTZXJpZjsKKyAgICBxRm9udEhpbnRbIlNlcmlmRm9udEZhbWlseSJdID0g UUZvbnQ6OlNlcmlmOworICAgIHFGb250SGludFsiUGljdG9ncmFwaEZvbnRGYW1pbHkiXSA9IFFG b250OjpTZXJpZjsKKworI2RlZmluZSBJTklUSUFMSVpFX0ZPTlRfUFJFRkVSRU5DRVMoS2V5VXBw ZXIsIEtleUxvd2VyLCBUeXBlTmFtZSwgVHlwZSwgRGVmYXVsdFZhbHVlKSBcCisgICAgc2V0IyNU eXBlTmFtZSMjVmFsdWVJZkluVXNlckRlZmF1bHRzKFdlYlByZWZlcmVuY2VzS2V5OjpLZXlMb3dl ciMjS2V5KCksIG1fc3RvcmUsIHFGb250SGludCk7CisKKyAgICBGT1JfRUFDSF9XRUJLSVRfRk9O VF9GQU1JTFlfUFJFRkVSRU5DRShJTklUSUFMSVpFX0ZPTlRfUFJFRkVSRU5DRVMpCisKKyN1bmRl ZiBJTklUSUFMSVpFX0ZPTlRfUFJFRkVSRU5DRVMKIH0KIAogdm9pZCBXZWJQcmVmZXJlbmNlczo6 cGxhdGZvcm1VcGRhdGVTdHJpbmdWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJp bmcmKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDMzM2ZlNWY5OGE3ZDY5NDkwNzEyOTI2NzFlZWVlZDYyODJlZWQ2YWMuLmE0Mzg5OGI4NzgwM2Fh ZjdlODE3ODU3MTJjOGQ1M2ZkYzM3MzMxYTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wOC0wNiAgTHVjaWFu byBXb2xmICA8bHVjaWFuby53b2xmQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XSBEZWZh dWx0IHNpemVzIGZvciBpbnB1dC10ZXh0IGFuZCB0ZXh0LWFyZWEgYXJlIGRpZmZlcmVudCB3aGVu IHJ1bm5pbmcgRFJUL1dUUgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTE5OTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbml0aWFsaXppbmcgVGVzdEZvbnRzIGluZm9ybWF0aW9uIGludG8gV1RSIGJpbmFy eS4gRG9pbmcgaXQKKyAgICAgICAgbGF0ZXIgbGVhZHMgdG8gd3JvbmcgZm9udCBuYW1lcyB1c2Fn ZSAoRGVqYXZ1IFNlcmlmIGluc3RlYWQKKyAgICAgICAgb2YgTGliZXJhdGlvbiBTZXJpZikuCisK KyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1RhcmdldC5wcmk6CisgICAgICAgICogV2ViS2l0 VGVzdFJ1bm5lci9xdC9tYWluLmNwcDoKKyAgICAgICAgKG1haW4pOgorCiAyMDEyLTA4LTA2ICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLiBGaXggbWFrZSBkaXN0Y2hlY2suCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1RhcmdldC5wcmkgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1RhcmdldC5wcmkKaW5k ZXggYjNiNWMyYzMzODAyMGYwMmJkMTBmNmNmYmI0MjU0ZWNkMmZmNzY2ZS4uMGU1NDUxNWViZmEx MTdjOWViZWY5MjVmZmIzM2Q3MGZlMTIyOWFjNCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9UYXJnZXQucHJpCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGFyZ2V0LnBy aQpAQCAtOCw2ICs4LDcgQEAgVEVNUExBVEUgPSBhcHAKIFRBUkdFVCA9IFdlYktpdFRlc3RSdW5u ZXIKIAogSEVBREVSUyArPSBcCisgICAgJCR7Uk9PVF9XRUJLSVRfRElSfS9Ub29scy9EdW1wUmVu ZGVyVHJlZS9xdC9RdEluaXRpYWxpemVUZXN0Rm9udHMuaCBcCiAgICAgRXZlbnRTZW5kZXJQcm94 eS5oIFwKICAgICBQbGF0Zm9ybVdlYlZpZXcuaCBcCiAgICAgU3RyaW5nRnVuY3Rpb25zLmggXApA QCAtMTUsNiArMTYsNyBAQCBIRUFERVJTICs9IFwKICAgICBUZXN0SW52b2NhdGlvbi5oCiAKIFNP VVJDRVMgKz0gXAorICAgICQke1JPT1RfV0VCS0lUX0RJUn0vVG9vbHMvRHVtcFJlbmRlclRyZWUv cXQvUXRJbml0aWFsaXplVGVzdEZvbnRzLmNwcCBcCiAgICAgcXQvbWFpbi5jcHAgXAogICAgIHF0 L0V2ZW50U2VuZGVyUHJveHlRdC5jcHAgXAogICAgIHF0L1BsYXRmb3JtV2ViVmlld1F0LmNwcCBc CkBAIC0zMSw2ICszMywxMSBAQCBXRUJLSVQgKz0gd3RmIGphdmFzY3JpcHRjb3JlIHdlYmtpdDIK IAogREVGSU5FUyArPSBVU0VfU1lTVEVNX01BTExPQz0xCiAKK2NvbnRhaW5zKERFRklORVMsIEhB VkVfRk9OVENPTkZJRz0xKTogUEtHQ09ORklHICs9IGZvbnRjb25maWcKKworSU5DTFVERVBBVEgg Kz0gXAorICAgICQke1JPT1RfV0VCS0lUX0RJUn0vVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQKKwog UFJFRklYX0hFQURFUiA9IFdlYktpdFRlc3RSdW5uZXJQcmVmaXguaAogKi1nKysqOlFNQUtFX0NY WEZMQUdTICs9ICItaW5jbHVkZSAkJFBSRUZJWF9IRUFERVIiCiAqLWNsYW5nKjpRTUFLRV9DWFhG TEFHUyArPSAiLWluY2x1ZGUgJCRQUkVGSVhfSEVBREVSIgpkaWZmIC0tZ2l0IGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9xdC9tYWluLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvbWFp bi5jcHAKaW5kZXggZDZkMjI4MDkxZjk3NDdhYjlkZTNmOGU4NGQ4NTQ3ZjQ1YjUxNTRmNS4uMWRh MTJhN2IyNmU2YjNlYTk2MGQ5NDg4ZmM0YmY2ZTA0NTI4ZTIyNiAxMDA2NDQKLS0tIGEvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9xdC9tYWluLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L3F0L21haW4uY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKIAor I2luY2x1ZGUgIlF0SW5pdGlhbGl6ZVRlc3RGb250cy5oIgogI2luY2x1ZGUgIlRlc3RDb250cm9s bGVyLmgiCiAjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wLmgiCiAKQEAgLTExOCw2ICsxMTksOSBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAKICAgICBxcHV0ZW52KCJRVF9XRUJL SVRfVEhFTUVfTkFNRSIsICJxc3R5bGUiKTsKIAorICAgIFdlYktpdDo6aW5pdGlhbGl6ZVRlc3RG b250cygpOworICAgIFFDb3JlQXBwbGljYXRpb246OnNldEF0dHJpYnV0ZShRdDo6QUFfVXNlOTZE cGksIHRydWUpOworCiAgICAgUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2V0RmxpY2thYmxl Vmlld3BvcnRFbmFibGVkKGZhbHNlKTsKICAgICBRQXBwbGljYXRpb24gYXBwKGFyZ2MsIGFyZ3Yp OwogICAgIExhdW5jaGVyIGxhdW5jaGVyKGFyZ2MsIGFyZ3YpOwo= 156746 2012-08-06 12:41:50 -0700 2012-08-06 16:05:31 -0700 Patch for landing bug-91990-20120806164125.patch text/plain 5417 luciano.wolf U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTMwMDViNjI2YmExNTc3 ZjIxZWMwYmVlZTI2NzUxNWQ0MmJlYTEwNi4uMTYyNWJkZjMzYThjNGY2NjI0NmRkMTgwZGI5M2Vm NzBmMTgyZjliZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA4LTA2ICBMdWNp YW5vIFdvbGYgIDxsdWNpYW5vLndvbGZAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBbUXRdIERl ZmF1bHQgc2l6ZXMgZm9yIGlucHV0LXRleHQgYW5kIHRleHQtYXJlYSBhcmUgZGlmZmVyZW50IHdo ZW4gcnVubmluZyBEUlQvV1RSCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05MTk5MAorCisgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hy aXN0aWFuc2VuLgorCisgICAgICAgIFdUUiB3YXNuJ3QgdXNpbmcgdGhlIHByb3BlciBmb250IHR5 cGVzIHByb3ZpZGVkIGJ5IHRlc3Rmb250cyBkaXJlY3RvcnkuCisgICAgICAgIFRoZSBzYW1lIGFw cHJvYWNoIGFzIERSVCB3YXMgYXBwbGllZCBhbmQgbm93IGl0IHRha2VzIGluZm8gZnJvbSBRRm9u dCB0bworICAgICAgICB1cGRhdGUgdGhlIHN0b3JlIHZhcmlhYmxlLgorCisgICAgICAgICogVUlQ cm9jZXNzL3F0L1dlYlByZWZlcmVuY2VzUXQuY3BwOgorICAgICAgICAoV2ViS2l0OjpzZXRTdHJp bmdWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdl YktpdDo6V2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtSW5pdGlhbGl6ZVN0b3JlKToKKwogMjAxMi0w OC0wNiAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1dLMl1bR1RLXSBJbXByb3ZlbWVudHMgZm9yIHRoZSBuZXcgc3BlbGwtY2hlY2tpbmcgQVBJ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViUHJlZmVyZW5jZXNR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViUHJlZmVyZW5jZXNRdC5jcHAK aW5kZXggZmFlNGEyZDc2ODVlNjRhZjA0MGIxY2MzOTA1NjRmNGU1ZjBmOTY3NC4uZDhmMWM3ODAx MzgxNDNhMTUwZTAxNGU0ZThjMGQ2ODliNTVlOGUzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1dlYlByZWZlcmVuY2VzUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9XZWJQcmVmZXJlbmNlc1F0LmNwcApAQCAtMjUsMTEgKzI1LDM5IEBACiAK ICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJQcmVmZXJlbmNlcy5oIgorI2luY2x1 ZGUgPFFGb250PgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorc3RhdGljIHZvaWQgc2V0U3RyaW5n VmFsdWVJZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgYmFzZUtleSwgV2ViUHJlZmVyZW5j ZXNTdG9yZSYgc3RvcmUsIGNvbnN0IFFIYXNoPFN0cmluZywgUUZvbnQ6OlN0eWxlSGludD4gcUZv bnRIaW50KQoreworICAgIC8vIFVzZSBzYW1lIGFwcHJvYWNoIGFzIER1bXBSZW5kZXJUcmVlIGRv ZXMgLSBnZXQgZm9udCBpbmZvIGZyb20gUUZvbnQuCisgICAgc3RhdGljIFFGb250IGRlZmF1bHRG b250OworICAgIGRlZmF1bHRGb250LnNldFN0eWxlSGludChxRm9udEhpbnRbYmFzZUtleV0pOwor ICAgIHN0b3JlLnNldFN0cmluZ1ZhbHVlRm9yS2V5KGJhc2VLZXksIGRlZmF1bHRGb250LmRlZmF1 bHRGYW1pbHkoKSk7Cit9CisKIHZvaWQgV2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtSW5pdGlhbGl6 ZVN0b3JlKCkKIHsKKyAgICBpZiAoIW1faWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJuOworCisg ICAgUUhhc2ggPFN0cmluZywgUUZvbnQ6OlN0eWxlSGludD4gcUZvbnRIaW50OworCisgICAgcUZv bnRIaW50WyJTdGFuZGFyZEZvbnRGYW1pbHkiXSA9IFFGb250OjpTZXJpZjsKKyAgICBxRm9udEhp bnRbIkN1cnNpdmVGb250RmFtaWx5Il0gPSBRRm9udDo6Q3Vyc2l2ZTsKKyAgICBxRm9udEhpbnRb IkZhbnRhc3lGb250RmFtaWx5Il0gPSBRRm9udDo6RmFudGFzeTsKKyAgICBxRm9udEhpbnRbIkZp eGVkRm9udEZhbWlseSJdID0gUUZvbnQ6Ok1vbm9zcGFjZTsKKyAgICBxRm9udEhpbnRbIlNhbnNT ZXJpZkZvbnRGYW1pbHkiXSA9IFFGb250OjpTYW5zU2VyaWY7CisgICAgcUZvbnRIaW50WyJTZXJp ZkZvbnRGYW1pbHkiXSA9IFFGb250OjpTZXJpZjsKKyAgICBxRm9udEhpbnRbIlBpY3RvZ3JhcGhG b250RmFtaWx5Il0gPSBRRm9udDo6U2VyaWY7CisKKyNkZWZpbmUgSU5JVElBTElaRV9GT05UX1BS RUZFUkVOQ0VTKEtleVVwcGVyLCBLZXlMb3dlciwgVHlwZU5hbWUsIFR5cGUsIERlZmF1bHRWYWx1 ZSkgXAorICAgIHNldCMjVHlwZU5hbWUjI1ZhbHVlSWZJblVzZXJEZWZhdWx0cyhXZWJQcmVmZXJl bmNlc0tleTo6S2V5TG93ZXIjI0tleSgpLCBtX3N0b3JlLCBxRm9udEhpbnQpOworCisgICAgRk9S X0VBQ0hfV0VCS0lUX0ZPTlRfRkFNSUxZX1BSRUZFUkVOQ0UoSU5JVElBTElaRV9GT05UX1BSRUZF UkVOQ0VTKQorCisjdW5kZWYgSU5JVElBTElaRV9GT05UX1BSRUZFUkVOQ0VTCiB9CiAKIHZvaWQg V2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtVXBkYXRlU3RyaW5nVmFsdWVGb3JLZXkoY29uc3QgU3Ry aW5nJiwgY29uc3QgU3RyaW5nJikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCAwMjg0NjQ4MzMwYmYwNmJkZTMyNThhMjg0ZGVlODk4ZThhZTkwZTE5 Li45ZWY2ZDJkOTQ1ZDhmOWE4NDgxNDk2ZmUwOTkzZDYyNjg4NmM1OThhIDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIw MTItMDgtMDYgIEx1Y2lhbm8gV29sZiAgPGx1Y2lhbm8ud29sZkBvcGVuYm9zc2Eub3JnPgorCisg ICAgICAgIFtRdF0gRGVmYXVsdCBzaXplcyBmb3IgaW5wdXQtdGV4dCBhbmQgdGV4dC1hcmVhIGFy ZSBkaWZmZXJlbnQgd2hlbiBydW5uaW5nIERSVC9XVFIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxOTkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgS2Vu bmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgSW5pdGlhbGl6aW5nIFRlc3RGb250 cyBpbmZvcm1hdGlvbiBpbnRvIFdUUiBiaW5hcnkuIERvaW5nIGl0IAorICAgICAgICBsYXRlciBs ZWFkcyB0byB3cm9uZyBmb250IG5hbWVzIHVzYWdlIChEZWphdnUgU2VyaWYgaW5zdGVhZAorICAg ICAgICBvZiBMaWJlcmF0aW9uIFNlcmlmKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv VGFyZ2V0LnByaToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL3F0L21haW4uY3BwOgorICAg ICAgICAobWFpbik6CisKIDIwMTItMDgtMDYgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgbnJ3dDogY2xlYW4gdXAgbG9nZ2luZywgcGFydCAxCmRpZmYgLS1n aXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1RhcmdldC5wcmkgYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1RhcmdldC5wcmkKaW5kZXggYjNiNWMyYzMzODAyMGYwMmJkMTBmNmNmYmI0MjU0ZWNk MmZmNzY2ZS4uMGU1NDUxNWViZmExMTdjOWViZWY5MjVmZmIzM2Q3MGZlMTIyOWFjNCAxMDA2NDQK LS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UYXJnZXQucHJpCisrKyBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGFyZ2V0LnByaQpAQCAtOCw2ICs4LDcgQEAgVEVNUExBVEUgPSBhcHAKIFRB UkdFVCA9IFdlYktpdFRlc3RSdW5uZXIKIAogSEVBREVSUyArPSBcCisgICAgJCR7Uk9PVF9XRUJL SVRfRElSfS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9RdEluaXRpYWxpemVUZXN0Rm9udHMuaCBc CiAgICAgRXZlbnRTZW5kZXJQcm94eS5oIFwKICAgICBQbGF0Zm9ybVdlYlZpZXcuaCBcCiAgICAg U3RyaW5nRnVuY3Rpb25zLmggXApAQCAtMTUsNiArMTYsNyBAQCBIRUFERVJTICs9IFwKICAgICBU ZXN0SW52b2NhdGlvbi5oCiAKIFNPVVJDRVMgKz0gXAorICAgICQke1JPT1RfV0VCS0lUX0RJUn0v VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvUXRJbml0aWFsaXplVGVzdEZvbnRzLmNwcCBcCiAgICAg cXQvbWFpbi5jcHAgXAogICAgIHF0L0V2ZW50U2VuZGVyUHJveHlRdC5jcHAgXAogICAgIHF0L1Bs YXRmb3JtV2ViVmlld1F0LmNwcCBcCkBAIC0zMSw2ICszMywxMSBAQCBXRUJLSVQgKz0gd3RmIGph dmFzY3JpcHRjb3JlIHdlYmtpdDIKIAogREVGSU5FUyArPSBVU0VfU1lTVEVNX01BTExPQz0xCiAK K2NvbnRhaW5zKERFRklORVMsIEhBVkVfRk9OVENPTkZJRz0xKTogUEtHQ09ORklHICs9IGZvbnRj b25maWcKKworSU5DTFVERVBBVEggKz0gXAorICAgICQke1JPT1RfV0VCS0lUX0RJUn0vVG9vbHMv RHVtcFJlbmRlclRyZWUvcXQKKwogUFJFRklYX0hFQURFUiA9IFdlYktpdFRlc3RSdW5uZXJQcmVm aXguaAogKi1nKysqOlFNQUtFX0NYWEZMQUdTICs9ICItaW5jbHVkZSAkJFBSRUZJWF9IRUFERVIi CiAqLWNsYW5nKjpRTUFLRV9DWFhGTEFHUyArPSAiLWluY2x1ZGUgJCRQUkVGSVhfSEVBREVSIgpk aWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9tYWluLmNwcCBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvcXQvbWFpbi5jcHAKaW5kZXggZDZkMjI4MDkxZjk3NDdhYjlkZTNmOGU4 NGQ4NTQ3ZjQ1YjUxNTRmNS4uMWRhMTJhN2IyNmU2YjNlYTk2MGQ5NDg4ZmM0YmY2ZTA0NTI4ZTIy NiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9xdC9tYWluLmNwcAorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL3F0L21haW4uY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAKICNp bmNsdWRlICJjb25maWcuaCIKIAorI2luY2x1ZGUgIlF0SW5pdGlhbGl6ZVRlc3RGb250cy5oIgog I2luY2x1ZGUgIlRlc3RDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wLmgi CiAKQEAgLTExOCw2ICsxMTksOSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhcioqIGFyZ3YpCiAK ICAgICBxcHV0ZW52KCJRVF9XRUJLSVRfVEhFTUVfTkFNRSIsICJxc3R5bGUiKTsKIAorICAgIFdl YktpdDo6aW5pdGlhbGl6ZVRlc3RGb250cygpOworICAgIFFDb3JlQXBwbGljYXRpb246OnNldEF0 dHJpYnV0ZShRdDo6QUFfVXNlOTZEcGksIHRydWUpOworCiAgICAgUVF1aWNrV2ViVmlld0V4cGVy aW1lbnRhbDo6c2V0RmxpY2thYmxlVmlld3BvcnRFbmFibGVkKGZhbHNlKTsKICAgICBRQXBwbGlj YXRpb24gYXBwKGFyZ2MsIGFyZ3YpOwogICAgIExhdW5jaGVyIGxhdW5jaGVyKGFyZ2MsIGFyZ3Yp Owo=