80375 2012-03-05 21:04:55 -0800 Make CSSStyleSelector::convertToLength() behave more like CSSPrimitiveValue::convertToLength(). 2012-03-06 15:07:11 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson eric kling macpherson menard webkit.review.bot oldest_to_newest 571438 0 macpherson 2012-03-05 21:04:55 -0800 Make CSSStyleSelector::convertToLength() behave more like CSSPrimitiveValue::convertToLength(). 571441 1 130279 macpherson 2012-03-05 21:17:08 -0800 Created attachment 130279 Patch 571458 2 130279 eric 2012-03-05 21:58:38 -0800 Comment on attachment 130279 Patch I like this, but we should just early return now, since we don't need to fal through to the return l. Do we know if this has a perf effect? (I kinda doubt it would). 572143 3 macpherson 2012-03-06 14:09:00 -0800 I agree, but didn't change this function too much because I expect it to disappear entirely in a follow-up patch. 572189 4 130279 webkit.review.bot 2012-03-06 15:07:07 -0800 Comment on attachment 130279 Patch Clearing flags on attachment: 130279 Committed r109964: <http://trac.webkit.org/changeset/109964> 572190 5 webkit.review.bot 2012-03-06 15:07:11 -0800 All reviewed patches have been landed. Closing bug. 130279 2012-03-05 21:17:08 -0800 2012-03-06 15:07:07 -0800 Patch bug-80375-20120306161705.patch text/plain 10506 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwOTg0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTA1ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWFrZSBDU1NT dHlsZVNlbGVjdG9yOjpjb252ZXJ0VG9MZW5ndGgoKSBiZWhhdmUgbW9yZSBsaWtlIENTU1ByaW1p dGl2ZVZhbHVlOjpjb252ZXJ0VG9MZW5ndGgoKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC8gY2xlYW51cCBvbmx5LgorCisgICAg ICAgIFRoaXMgcGF0Y2ggcmVtb3ZlcyB0aGUgYm9vbCogb2sgcGFyYW1ldGVyIGZyb20gQ1NTU3R5 bGVTZWxlY3RvcidzIGNvbnZlcnRUb0xlbmd0aCwKKyAgICAgICAgYW5kIGluc3RlYWQgdXNlcyB0 aGUgcmVjZW50bHkgYWRkZWQgTGVuZ3RoKFVuZGVmaW5lZCkgdmFsdWUgdG8gaW5kaWNhdGUgZmFp bHVyZS4KKyAgICAgICAgVGhpcyBwYXZlcyB0aGUgd2F5IGZvciBhIGZ1dHVyZSBwYXRjaCB0aGF0 IHdpbGwgY2FsbCBwcmltaXRpdmVWYWx1ZS0+Y29udmVydFRvTGVuZ3RoIGRpcmVjdGx5LgorCisg ICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NT U3R5bGVTZWxlY3Rvcjo6Y29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KToKKwogMjAxMi0wMy0w NSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZHJl c3MgcmV2aWV3IGNvbW1lbnRzIGZyb20gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgwMzY4CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CShyZXZpc2lvbiAxMDk4MzYpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rv ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1MTgsMTkgKzI1MTgsMTcgQEAgdm9pZCBSdWxlU2V0 OjpzaHJpbmtUb0ZpdCgpCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAvLyB0aGlz IGlzIG1vc3RseSBib3Jpbmcgc3R1ZmYgb24gaG93IHRvIGFwcGx5IGEgY2VydGFpbiBydWxlIHRv IHRoZSByZW5kZXJzdHlsZS4uLgogCi1zdGF0aWMgTGVuZ3RoIGNvbnZlcnRUb0xlbmd0aChDU1NQ cmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUsIFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVy U3R5bGUqIHJvb3RTdHlsZSwgYm9vbCB0b0Zsb2F0LCBkb3VibGUgbXVsdGlwbGllciA9IDEsIGJv b2wgKm9rID0gMCkKK3N0YXRpYyBMZW5ndGggY29udmVydFRvTGVuZ3RoKENTU1ByaW1pdGl2ZVZh bHVlKiBwcmltaXRpdmVWYWx1ZSwgUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9v dFN0eWxlLCBib29sIHRvRmxvYXQsIGRvdWJsZSBtdWx0aXBsaWVyID0gMSkKIHsKICAgICAvLyBU aGlzIGZ1bmN0aW9uIGlzIHRvbGVyYW50IG9mIGEgbnVsbCBzdHlsZSB2YWx1ZS4gVGhlIG9ubHkg cGxhY2Ugc3R5bGUgaXMgdXNlZCBpcyBpbgogICAgIC8vIGxlbmd0aCBtZWFzdXJlbWVudHMsIGxp a2UgJ2VtcycgYW5kICdweCcuIEFuZCBpbiB0aG9zZSBjYXNlcyBzdHlsZSBpcyBvbmx5IHVzZWQK ICAgICAvLyB3aGVuIHRoZSB1bml0cyBhcmUgRU1TIG9yIEVYUy4gU28gd2Ugd2lsbCBqdXN0IGZh aWwgaW4gdGhvc2UgY2FzZXMuCiAgICAgTGVuZ3RoIGw7CiAgICAgaWYgKCFwcmltaXRpdmVWYWx1 ZSkgewotICAgICAgICBpZiAob2spCi0gICAgICAgICAgICAqb2sgPSBmYWxzZTsKKyAgICAgICAg bCA9IExlbmd0aChVbmRlZmluZWQpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICghc3R5bGUg JiYgcHJpbWl0aXZlVmFsdWUtPmlzRm9udFJlbGF0aXZlTGVuZ3RoKCkpIHsKLSAgICAgICAgICAg IGlmIChvaykKLSAgICAgICAgICAgICAgICAqb2sgPSBmYWxzZTsKKyAgICAgICAgICAgIGwgPSBM ZW5ndGgoVW5kZWZpbmVkKTsKICAgICAgICAgfSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNM ZW5ndGgoKSkgewogICAgICAgICAgICAgaWYgKHRvRmxvYXQpCiAgICAgICAgICAgICAgICAgbCA9 IExlbmd0aChwcmltaXRpdmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aDxkb3VibGU+KHN0eWxlLCByb290 U3R5bGUsIG11bHRpcGxpZXIpLCBGaXhlZCk7CkBAIC0yNTQwLDIwICsyNTM4LDIwIEBAIHN0YXRp YyBMZW5ndGggY29udmVydFRvTGVuZ3RoKENTU1ByaW1pdGkKICAgICAgICAgICAgIGwgPSBMZW5n dGgocHJpbWl0aXZlVmFsdWUtPmdldERvdWJsZVZhbHVlKCksIFBlcmNlbnQpOwogICAgICAgICBl bHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNOdW1iZXIoKSkKICAgICAgICAgICAgIGwgPSBMZW5n dGgocHJpbWl0aXZlVmFsdWUtPmdldERvdWJsZVZhbHVlKCkgKiAxMDAuMCwgUGVyY2VudCk7Ci0g ICAgICAgIGVsc2UgaWYgKG9rKQotICAgICAgICAgICAgKm9rID0gZmFsc2U7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGwgPSBMZW5ndGgoVW5kZWZpbmVkKTsKICAgICB9CiAgICAgcmV0dXJu IGw7CiB9CiAKLXN0YXRpYyBMZW5ndGggY29udmVydFRvSW50TGVuZ3RoKENTU1ByaW1pdGl2ZVZh bHVlKiBwcmltaXRpdmVWYWx1ZSwgUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9v dFN0eWxlLCBkb3VibGUgbXVsdGlwbGllciA9IDEsIGJvb2wgKm9rID0gMCkKK3N0YXRpYyBMZW5n dGggY29udmVydFRvSW50TGVuZ3RoKENTU1ByaW1pdGl2ZVZhbHVlKiBwcmltaXRpdmVWYWx1ZSwg UmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcm9vdFN0eWxlLCBkb3VibGUgbXVsdGlw bGllciA9IDEpCiB7Ci0gICAgcmV0dXJuIGNvbnZlcnRUb0xlbmd0aChwcmltaXRpdmVWYWx1ZSwg c3R5bGUsIHJvb3RTdHlsZSwgZmFsc2UsIG11bHRpcGxpZXIsIG9rKTsKKyAgICByZXR1cm4gY29u dmVydFRvTGVuZ3RoKHByaW1pdGl2ZVZhbHVlLCBzdHlsZSwgcm9vdFN0eWxlLCBmYWxzZSwgbXVs dGlwbGllcik7CiB9CiAKLXN0YXRpYyBMZW5ndGggY29udmVydFRvRmxvYXRMZW5ndGgoQ1NTUHJp bWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZhbHVlLCBSZW5kZXJTdHlsZSogc3R5bGUsIFJlbmRlclN0 eWxlKiByb290U3R5bGUsIGRvdWJsZSBtdWx0aXBsaWVyID0gMSwgYm9vbCAqb2sgPSAwKQorc3Rh dGljIExlbmd0aCBjb252ZXJ0VG9GbG9hdExlbmd0aChDU1NQcmltaXRpdmVWYWx1ZSogcHJpbWl0 aXZlVmFsdWUsIFJlbmRlclN0eWxlKiBzdHlsZSwgUmVuZGVyU3R5bGUqIHJvb3RTdHlsZSwgZG91 YmxlIG11bHRpcGxpZXIgPSAxKQogewotICAgIHJldHVybiBjb252ZXJ0VG9MZW5ndGgocHJpbWl0 aXZlVmFsdWUsIHN0eWxlLCByb290U3R5bGUsIHRydWUsIG11bHRpcGxpZXIsIG9rKTsKKyAgICBy ZXR1cm4gY29udmVydFRvTGVuZ3RoKHByaW1pdGl2ZVZhbHVlLCBzdHlsZSwgcm9vdFN0eWxlLCB0 cnVlLCBtdWx0aXBsaWVyKTsKIH0KIAogdGVtcGxhdGUgPGJvb2wgYXBwbHlGaXJzdD4KQEAgLTM0 NzksOSArMzQ3Nyw4IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQK ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICBib29sIG9rID0gdHJ1ZTsKLSAgICAgICAgICAgIExlbmd0aCBtYXJx dWVlTGVuZ3RoID0gY29udmVydFRvSW50TGVuZ3RoKHByaW1pdGl2ZVZhbHVlLCBzdHlsZSgpLCBt X3Jvb3RFbGVtZW50U3R5bGUsIDEsICZvayk7Ci0gICAgICAgICAgICBpZiAob2spCisgICAgICAg ICAgICBMZW5ndGggbWFycXVlZUxlbmd0aCA9IGNvbnZlcnRUb0ludExlbmd0aChwcmltaXRpdmVW YWx1ZSwgc3R5bGUoKSwgbV9yb290RWxlbWVudFN0eWxlLCAxKTsKKyAgICAgICAgICAgIGlmICgh bWFycXVlZUxlbmd0aC5pc1VuZGVmaW5lZCgpKQogICAgICAgICAgICAgICAgIG1fc3R5bGUtPnNl dE1hcnF1ZWVJbmNyZW1lbnQobWFycXVlZUxlbmd0aCk7CiAgICAgICAgIH0KICAgICAgICAgcmV0 dXJuOwpAQCAtNTA5MiwyMiArNTA4OSwyMSBAQCBib29sIENTU1N0eWxlU2VsZWN0b3I6OmNyZWF0 ZVRyYW5zZm9ybU9wCiAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpU cmFuc2xhdGVUcmFuc2Zvcm1PcGVyYXRpb246CiAgICAgICAgICAgICBjYXNlIFdlYktpdENTU1Ry YW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVYVHJhbnNmb3JtT3BlcmF0aW9uOgogICAgICAgICAgICAg Y2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6VHJhbnNsYXRlWVRyYW5zZm9ybU9wZXJhdGlv bjogewotICAgICAgICAgICAgICAgIGJvb2wgb2sgPSB0cnVlOwogICAgICAgICAgICAgICAgIExl bmd0aCB0eCA9IExlbmd0aCgwLCBGaXhlZCk7CiAgICAgICAgICAgICAgICAgTGVuZ3RoIHR5ID0g TGVuZ3RoKDAsIEZpeGVkKTsKICAgICAgICAgICAgICAgICBpZiAodHJhbnNmb3JtVmFsdWUtPm9w ZXJhdGlvblR5cGUoKSA9PSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6VHJhbnNsYXRlWVRyYW5z Zm9ybU9wZXJhdGlvbikKLSAgICAgICAgICAgICAgICAgICAgdHkgPSBjb252ZXJ0VG9GbG9hdExl bmd0aChmaXJzdFZhbHVlLCBzdHlsZSwgcm9vdFN0eWxlLCB6b29tRmFjdG9yLCAmb2spOworICAg ICAgICAgICAgICAgICAgICB0eSA9IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKGZpcnN0VmFsdWUsIHN0 eWxlLCByb290U3R5bGUsIHpvb21GYWN0b3IpOwogICAgICAgICAgICAgICAgIGVsc2UgewotICAg ICAgICAgICAgICAgICAgICB0eCA9IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKGZpcnN0VmFsdWUsIHN0 eWxlLCByb290U3R5bGUsIHpvb21GYWN0b3IsICZvayk7CisgICAgICAgICAgICAgICAgICAgIHR4 ID0gY29udmVydFRvRmxvYXRMZW5ndGgoZmlyc3RWYWx1ZSwgc3R5bGUsIHJvb3RTdHlsZSwgem9v bUZhY3Rvcik7CiAgICAgICAgICAgICAgICAgICAgIGlmICh0cmFuc2Zvcm1WYWx1ZS0+b3BlcmF0 aW9uVHlwZSgpICE9IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVYVHJhbnNmb3Jt T3BlcmF0aW9uKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodHJhbnNmb3JtVmFsdWUt Pmxlbmd0aCgpID4gMSkgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIENTU1ByaW1pdGl2 ZVZhbHVlKiBzZWNvbmRWYWx1ZSA9IHN0YXRpY19jYXN0PENTU1ByaW1pdGl2ZVZhbHVlKj4odHJh bnNmb3JtVmFsdWUtPml0ZW1XaXRob3V0Qm91bmRzQ2hlY2soMSkpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHR5ID0gY29udmVydFRvRmxvYXRMZW5ndGgoc2Vjb25kVmFsdWUsIHN0eWxl LCByb290U3R5bGUsIHpvb21GYWN0b3IsICZvayk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdHkgPSBjb252ZXJ0VG9GbG9hdExlbmd0aChzZWNvbmRWYWx1ZSwgc3R5bGUsIHJvb3RTdHls ZSwgem9vbUZhY3Rvcik7CiAgICAgICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBpZiAoIW9rKQor ICAgICAgICAgICAgICAgIGlmICh0eC5pc1VuZGVmaW5lZCgpIHx8IHR5LmlzVW5kZWZpbmVkKCkp CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAgIG9w ZXJhdGlvbnMub3BlcmF0aW9ucygpLmFwcGVuZChUcmFuc2xhdGVUcmFuc2Zvcm1PcGVyYXRpb246 OmNyZWF0ZSh0eCwgdHksIExlbmd0aCgwLCBGaXhlZCksIGdldFRyYW5zZm9ybU9wZXJhdGlvblR5 cGUodHJhbnNmb3JtVmFsdWUtPm9wZXJhdGlvblR5cGUoKSkpKTsKQEAgLTUxMTUsMjkgKzUxMTEs MjggQEAgYm9vbCBDU1NTdHlsZVNlbGVjdG9yOjpjcmVhdGVUcmFuc2Zvcm1PcAogICAgICAgICAg ICAgfQogICAgICAgICAgICAgY2FzZSBXZWJLaXRDU1NUcmFuc2Zvcm1WYWx1ZTo6VHJhbnNsYXRl WlRyYW5zZm9ybU9wZXJhdGlvbjoKICAgICAgICAgICAgIGNhc2UgV2ViS2l0Q1NTVHJhbnNmb3Jt VmFsdWU6OlRyYW5zbGF0ZTNEVHJhbnNmb3JtT3BlcmF0aW9uOiB7Ci0gICAgICAgICAgICAgICAg Ym9vbCBvayA9IHRydWU7CiAgICAgICAgICAgICAgICAgTGVuZ3RoIHR4ID0gTGVuZ3RoKDAsIEZp eGVkKTsKICAgICAgICAgICAgICAgICBMZW5ndGggdHkgPSBMZW5ndGgoMCwgRml4ZWQpOwogICAg ICAgICAgICAgICAgIExlbmd0aCB0eiA9IExlbmd0aCgwLCBGaXhlZCk7CiAgICAgICAgICAgICAg ICAgaWYgKHRyYW5zZm9ybVZhbHVlLT5vcGVyYXRpb25UeXBlKCkgPT0gV2ViS2l0Q1NTVHJhbnNm b3JtVmFsdWU6OlRyYW5zbGF0ZVpUcmFuc2Zvcm1PcGVyYXRpb24pCi0gICAgICAgICAgICAgICAg ICAgIHR6ID0gY29udmVydFRvRmxvYXRMZW5ndGgoZmlyc3RWYWx1ZSwgc3R5bGUsIHJvb3RTdHls ZSwgem9vbUZhY3RvciwgJm9rKTsKKyAgICAgICAgICAgICAgICAgICAgdHogPSBjb252ZXJ0VG9G bG9hdExlbmd0aChmaXJzdFZhbHVlLCBzdHlsZSwgcm9vdFN0eWxlLCB6b29tRmFjdG9yKTsKICAg ICAgICAgICAgICAgICBlbHNlIGlmICh0cmFuc2Zvcm1WYWx1ZS0+b3BlcmF0aW9uVHlwZSgpID09 IFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpUcmFuc2xhdGVZVHJhbnNmb3JtT3BlcmF0aW9uKQot ICAgICAgICAgICAgICAgICAgICB0eSA9IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKGZpcnN0VmFsdWUs IHN0eWxlLCByb290U3R5bGUsIHpvb21GYWN0b3IsICZvayk7CisgICAgICAgICAgICAgICAgICAg IHR5ID0gY29udmVydFRvRmxvYXRMZW5ndGgoZmlyc3RWYWx1ZSwgc3R5bGUsIHJvb3RTdHlsZSwg em9vbUZhY3Rvcik7CiAgICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAg IHR4ID0gY29udmVydFRvRmxvYXRMZW5ndGgoZmlyc3RWYWx1ZSwgc3R5bGUsIHJvb3RTdHlsZSwg em9vbUZhY3RvciwgJm9rKTsKKyAgICAgICAgICAgICAgICAgICAgdHggPSBjb252ZXJ0VG9GbG9h dExlbmd0aChmaXJzdFZhbHVlLCBzdHlsZSwgcm9vdFN0eWxlLCB6b29tRmFjdG9yKTsKICAgICAg ICAgICAgICAgICAgICAgaWYgKHRyYW5zZm9ybVZhbHVlLT5vcGVyYXRpb25UeXBlKCkgIT0gV2Vi S2l0Q1NTVHJhbnNmb3JtVmFsdWU6OlRyYW5zbGF0ZVhUcmFuc2Zvcm1PcGVyYXRpb24pIHsKICAg ICAgICAgICAgICAgICAgICAgICAgIGlmICh0cmFuc2Zvcm1WYWx1ZS0+bGVuZ3RoKCkgPiAyKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHRoaXJkVmFs dWUgPSBzdGF0aWNfY2FzdDxDU1NQcmltaXRpdmVWYWx1ZSo+KHRyYW5zZm9ybVZhbHVlLT5pdGVt V2l0aG91dEJvdW5kc0NoZWNrKDIpKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB0eiA9 IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKHRoaXJkVmFsdWUsIHN0eWxlLCByb290U3R5bGUsIHpvb21G YWN0b3IsICZvayk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHogPSBjb252ZXJ0VG9G bG9hdExlbmd0aCh0aGlyZFZhbHVlLCBzdHlsZSwgcm9vdFN0eWxlLCB6b29tRmFjdG9yKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh0cmFu c2Zvcm1WYWx1ZS0+bGVuZ3RoKCkgPiAxKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Q1NTUHJpbWl0aXZlVmFsdWUqIHNlY29uZFZhbHVlID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZl VmFsdWUqPih0cmFuc2Zvcm1WYWx1ZS0+aXRlbVdpdGhvdXRCb3VuZHNDaGVjaygxKSk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgdHkgPSBjb252ZXJ0VG9GbG9hdExlbmd0aChzZWNvbmRW YWx1ZSwgc3R5bGUsIHJvb3RTdHlsZSwgem9vbUZhY3RvciwgJm9rKTsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB0eSA9IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKHNlY29uZFZhbHVlLCBzdHls ZSwgcm9vdFN0eWxlLCB6b29tRmFjdG9yKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAg IGlmICghb2spCisgICAgICAgICAgICAgICAgaWYgKHR4LmlzVW5kZWZpbmVkKCkgfHwgdHkuaXNV bmRlZmluZWQoKSB8fCB0ei5pc1VuZGVmaW5lZCgpKQogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAKICAgICAgICAgICAgICAgICBvcGVyYXRpb25zLm9wZXJhdGlvbnMoKS5hcHBl bmQoVHJhbnNsYXRlVHJhbnNmb3JtT3BlcmF0aW9uOjpjcmVhdGUodHgsIHR5LCB0eiwgZ2V0VHJh bnNmb3JtT3BlcmF0aW9uVHlwZSh0cmFuc2Zvcm1WYWx1ZS0+b3BlcmF0aW9uVHlwZSgpKSkpOwpA QCAtNTIzMywxOCArNTIyOCwxNiBAQCBib29sIENTU1N0eWxlU2VsZWN0b3I6OmNyZWF0ZVRyYW5z Zm9ybU9wCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBjYXNlIFdlYktpdENTU1RyYW5zZm9ybVZhbHVlOjpQZXJzcGVjdGl2ZVRyYW5zZm9ybU9wZXJh dGlvbjogewotICAgICAgICAgICAgICAgIGJvb2wgb2sgPSB0cnVlOwogICAgICAgICAgICAgICAg IExlbmd0aCBwID0gTGVuZ3RoKDAsIEZpeGVkKTsKICAgICAgICAgICAgICAgICBpZiAoZmlyc3RW YWx1ZS0+aXNMZW5ndGgoKSkKLSAgICAgICAgICAgICAgICAgICAgcCA9IGNvbnZlcnRUb0Zsb2F0 TGVuZ3RoKGZpcnN0VmFsdWUsIHN0eWxlLCByb290U3R5bGUsIHpvb21GYWN0b3IsICZvayk7Cisg ICAgICAgICAgICAgICAgICAgIHAgPSBjb252ZXJ0VG9GbG9hdExlbmd0aChmaXJzdFZhbHVlLCBz dHlsZSwgcm9vdFN0eWxlLCB6b29tRmFjdG9yKTsKICAgICAgICAgICAgICAgICBlbHNlIHsKICAg ICAgICAgICAgICAgICAgICAgLy8gVGhpcyBpcyBhIHF1aXJrIHRoYXQgc2hvdWxkIGdvIGF3YXkg d2hlbiAzZCB0cmFuc2Zvcm1zIGFyZSBmaW5hbGl6ZWQuCiAgICAgICAgICAgICAgICAgICAgIGRv dWJsZSB2YWwgPSBmaXJzdFZhbHVlLT5nZXREb3VibGVWYWx1ZSgpOwotICAgICAgICAgICAgICAg ICAgICBvayA9IHZhbCA+PSAwOwotICAgICAgICAgICAgICAgICAgICBwID0gTGVuZ3RoKGNsYW1w VG9Qb3NpdGl2ZUludGVnZXIodmFsKSwgRml4ZWQpOworICAgICAgICAgICAgICAgICAgICBwID0g dmFsID49IDAgPyBMZW5ndGgoY2xhbXBUb1Bvc2l0aXZlSW50ZWdlcih2YWwpLCBGaXhlZCkgOiBM ZW5ndGgoVW5kZWZpbmVkKTsKICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICBp ZiAoIW9rKQorICAgICAgICAgICAgICAgIGlmIChwLmlzVW5kZWZpbmVkKCkpCiAgICAgICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgICAgIG9wZXJhdGlvbnMub3Bl cmF0aW9ucygpLmFwcGVuZChQZXJzcGVjdGl2ZVRyYW5zZm9ybU9wZXJhdGlvbjo6Y3JlYXRlKHAp KTsKQEAgLTU1OTAsMTIgKzU1ODMsMTEgQEAgYm9vbCBDU1NTdHlsZVNlbGVjdG9yOjpjcmVhdGVG aWx0ZXJPcGVyYQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBX ZWJLaXRDU1NGaWx0ZXJWYWx1ZTo6Qmx1ckZpbHRlck9wZXJhdGlvbjogewotICAgICAgICAgICAg Ym9vbCBvayA9IHRydWU7CiAgICAgICAgICAgICBMZW5ndGggc3RkRGV2aWF0aW9uID0gTGVuZ3Ro KDAsIEZpeGVkKTsKICAgICAgICAgICAgIGlmIChmaWx0ZXJWYWx1ZS0+bGVuZ3RoKCkgPj0gMSkg ewotICAgICAgICAgICAgICAgIHN0ZERldmlhdGlvbiA9IGNvbnZlcnRUb0Zsb2F0TGVuZ3RoKGZp cnN0VmFsdWUsIHN0eWxlLCByb290U3R5bGUsIHpvb21GYWN0b3IsICZvayk7CisgICAgICAgICAg ICAgICAgc3RkRGV2aWF0aW9uID0gY29udmVydFRvRmxvYXRMZW5ndGgoZmlyc3RWYWx1ZSwgc3R5 bGUsIHJvb3RTdHlsZSwgem9vbUZhY3Rvcik7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBp ZiAoIW9rKQorICAgICAgICAgICAgaWYgKHN0ZERldmlhdGlvbi5pc1VuZGVmaW5lZCgpKQogICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICAgICAgb3BlcmF0aW9ucy5vcGVy YXRpb25zKCkuYXBwZW5kKEJsdXJGaWx0ZXJPcGVyYXRpb246OmNyZWF0ZShzdGREZXZpYXRpb24s IG9wZXJhdGlvblR5cGUpKTsK