110538 2013-02-21 17:39:24 -0800 Threaded HTML parser fails resources/plain-text-unsafe.dat 2013-02-22 19:30:32 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106127 1 abarth tonyg eric esprehn+autocc ojan.autocc tonyg webkit.review.bot oldest_to_newest 839073 0 abarth 2013-02-21 17:39:24 -0800 resources/plain-text-unsafe.dat: 15 16 17 18 21 Looks like a problem with replacing null characters in foreign content. It's a slight pain to run these tests in the threaded parser at the moment. 839082 1 tonyg 2013-02-21 17:45:32 -0800 I've been wondering why we weren't seeing any failures due to the missing setForceNullCharacterReplacement() call. If you clue me in as to the easiest way to run these tests with the threaded parser, I'm happy to fix this tomorrow. 839095 2 189652 abarth 2013-02-21 17:54:30 -0800 Created attachment 189652 Hacks to be able to run the html5lib tests On my machine, runner.html times out, so you also need to break it down into smaller pieces. (The document.write path is faster than the data URL path.) 840104 3 189858 tonyg 2013-02-22 16:38:04 -0800 Created attachment 189858 Patch 840113 4 189858 eric 2013-02-22 16:42:30 -0800 Comment on attachment 189858 Patch LGTM. Don't we also need to do null character replacement in textArea and a couple others? 840114 5 189858 eric 2013-02-22 16:43:18 -0800 Comment on attachment 189858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189858&action=review > Source/WebCore/html/parser/BackgroundHTMLParser.cpp:117 > + const String& tagName = token.data(); Is there not a name() accessor? 840117 6 189858 abarth 2013-02-22 16:44:14 -0800 Comment on attachment 189858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189858&action=review > Source/WebCore/html/parser/BackgroundHTMLParser.cpp:115 > +static inline bool tokenExitsSVG(const CompactHTMLToken& token) Darin would tell us that static and inline are redundant here. :) 840120 7 189858 eric 2013-02-22 16:45:43 -0800 Comment on attachment 189858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189858&action=review >> Source/WebCore/html/parser/BackgroundHTMLParser.cpp:115 >> +static inline bool tokenExitsSVG(const CompactHTMLToken& token) > > Darin would tell us that static and inline are redundant here. :) Really? 840125 8 tonyg 2013-02-22 16:49:57 -0800 (In reply to comment #7) > (From update of attachment 189858 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189858&action=review > > >> Source/WebCore/html/parser/BackgroundHTMLParser.cpp:115 > >> +static inline bool tokenExitsSVG(const CompactHTMLToken& token) > > > > Darin would tell us that static and inline are redundant here. :) > > Really? Surprising to me too. I'm interested in the explanation. > Don't we also need to do null character replacement in textArea and a couple others? Yeah, those tags kick us into TextMode, hence the remaining FIXME. > Is there not a name() accessor? No, these are CompactHTMLTokens, everything is in data(). The other accessors would just be an assertion on the correct type and a return of m_data. 840151 9 abarth 2013-02-22 17:17:08 -0800 (In reply to comment #8) > (In reply to comment #7) > > (From update of attachment 189858 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=189858&action=review > > > > >> Source/WebCore/html/parser/BackgroundHTMLParser.cpp:115 > > >> +static inline bool tokenExitsSVG(const CompactHTMLToken& token) > > > > > > Darin would tell us that static and inline are redundant here. :) > > > > Really? > > Surprising to me too. I'm interested in the explanation. Yeah, they both just mean "give this function internal linkage" in this context. 840153 10 189858 eric 2013-02-22 17:19:23 -0800 Comment on attachment 189858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=189858&action=review >>>>> Source/WebCore/html/parser/BackgroundHTMLParser.cpp:115 >>>>> +static inline bool tokenExitsSVG(const CompactHTMLToken& token) >>>> >>>> Darin would tell us that static and inline are redundant here. :) >>> >>> Really? >> >> Surprising to me too. I'm interested in the explanation. > > Yeah, they both just mean "give this function internal linkage" in this context. So what you're saying is that "inline" is meaningless? (outside of aliasing to static for a free function in a .cpp file?) 840158 11 abarth 2013-02-22 17:28:24 -0800 (In reply to comment #10) > (From update of attachment 189858 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=189858&action=review > > >>>>> Source/WebCore/html/parser/BackgroundHTMLParser.cpp:115 > >>>>> +static inline bool tokenExitsSVG(const CompactHTMLToken& token) > >>>> > >>>> Darin would tell us that static and inline are redundant here. :) > >>> > >>> Really? > >> > >> Surprising to me too. I'm interested in the explanation. > > > > Yeah, they both just mean "give this function internal linkage" in this context. > > So what you're saying is that "inline" is meaningless? (outside of aliasing to static for a free function in a .cpp file?) Not always. Consider the following situation: class A { XXX void f(); }; void A::f() { } We can't use "static" for XXX because that would mean f wouldn't get a |this| parameter. We can, however, use "inline" to give A::f internal linkage. 840161 12 189873 tonyg 2013-02-22 17:33:19 -0800 Created attachment 189873 Patch for landing 840169 13 tonyg 2013-02-22 17:34:40 -0800 Interesting. It makes sense now that I think about it. Anyway, I killed the "inline" in front of those methods. 840261 14 189873 webkit.review.bot 2013-02-22 19:30:28 -0800 Comment on attachment 189873 Patch for landing Clearing flags on attachment: 189873 Committed r143830: <http://trac.webkit.org/changeset/143830> 840262 15 webkit.review.bot 2013-02-22 19:30:32 -0800 All reviewed patches have been landed. Closing bug. 189652 2013-02-21 17:54:30 -0800 2013-02-22 16:38:00 -0800 Hacks to be able to run the html5lib tests ttt text/plain 2729 abarth Y29tbWl0IDhjZjc1ODM3NmZkNDRkY2MxZmVkZjg3MDZjMGUzMjFhMWM1YjYyN2YKQXV0aG9yOiBB ZGFtIEJhcnRoIDxhYmFydGhAY2xlYXJ6ZW4+CkRhdGU6ICAgVGh1IEZlYiAyMSAxNzozODo0NiAy MDEzIC0wODAwCgogICAgaGFja3MgdG8gYmUgYWJsZSB0byBydW4gdGhlIHRlc3RzCgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcmVzb3VyY2VzL3J1bm5lci5qcyBiL0xheW91dFRl c3RzL2h0bWw1bGliL3Jlc291cmNlcy9ydW5uZXIuanMKaW5kZXggMjM0ODQ2ZC4uNGE0ZjRkOCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcmVzb3VyY2VzL3J1bm5lci5qcworKysg Yi9MYXlvdXRUZXN0cy9odG1sNWxpYi9yZXNvdXJjZXMvcnVubmVyLmpzCkBAIC00Nyw3ICs0Nyw3 IEBAIHZhciB0ZXN0cyA9IFtdLAogaWZyYW1lLmNvbnRlbnRXaW5kb3cuZG9jdW1lbnQub3Blbigp CiBpZnJhbWUuY29udGVudFdpbmRvdy5kb2N1bWVudC53cml0ZSgiVGVzdCIpOwogaWZyYW1lLmNv bnRlbnRXaW5kb3cuZG9jdW1lbnQuY2xvc2UoKTsKLXZhciB3cml0ZSA9IGlmcmFtZS5jb250ZW50 V2luZG93LmRvY3VtZW50Lmxhc3RDaGlsZC5sYXN0Q2hpbGQubGFzdENoaWxkICE9PSBudWxsOwor dmFyIHdyaXRlID0gZmFsc2U7IC8vIGlmcmFtZS5jb250ZW50V2luZG93LmRvY3VtZW50Lmxhc3RD aGlsZC5sYXN0Q2hpbGQubGFzdENoaWxkICE9PSBudWxsOwogdmFyIGlnbm9yZVRpdGxlID0gaWZy YW1lLmNvbnRlbnRXaW5kb3cuZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoInRpdGxlIilb MF0gIT09IHVuZGVmaW5lZDsKIAogd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKCkKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0bWw1bGliL3J1bm5lci5odG1sIGIvTGF5b3V0VGVzdHMvaHRtbDVs aWIvcnVubmVyLmh0bWwKaW5kZXggYjVkODBlOC4uOTQ1NWU0ZiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaHRtbDVsaWIvcnVubmVyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVu bmVyLmh0bWwKQEAgLTEsMjggKzEsNyBAQAogPCFkb2N0eXBlIGh0bWw+CiA8c2NyaXB0PgogdmFy IHRlc3RfZmlsZXMgPSBbCi0gICdyZXNvdXJjZXMvYWRvcHRpb24wMS5kYXQnLAotICAncmVzb3Vy Y2VzL2Fkb3B0aW9uMDIuZGF0JywKLSAgJ3Jlc291cmNlcy9jb21tZW50czAxLmRhdCcsCi0gICdy ZXNvdXJjZXMvZG9jdHlwZTAxLmRhdCcsCi0gICdyZXNvdXJjZXMvZG9tanMtdW5zYWZlLmRhdCcs Ci0gICdyZXNvdXJjZXMvZW50aXRpZXMwMS5kYXQnLAotICAncmVzb3VyY2VzL2VudGl0aWVzMDIu ZGF0JywKLSAgJ3Jlc291cmNlcy9odG1sNXRlc3QtY29tLmRhdCcsCi0gICdyZXNvdXJjZXMvaW5i b2R5MDEuZGF0JywKLSAgJ3Jlc291cmNlcy9pc2luZGV4LmRhdCcsCi0gICdyZXNvdXJjZXMvcGVu ZGluZy1zcGVjLWNoYW5nZXMtcGxhaW4tdGV4dC11bnNhZmUuZGF0JywKLSAgJ3Jlc291cmNlcy9w ZW5kaW5nLXNwZWMtY2hhbmdlcy5kYXQnLAogICAncmVzb3VyY2VzL3BsYWluLXRleHQtdW5zYWZl LmRhdCcsCi0gICdyZXNvdXJjZXMvc2NyaXB0ZGF0YTAxLmRhdCcsCi0gICdyZXNvdXJjZXMvc2Ny aXB0ZWQvYWRvcHRpb24wMS5kYXQnLAotICAncmVzb3VyY2VzL3NjcmlwdGVkL2Fyay5kYXQnLAot ICAncmVzb3VyY2VzL3NjcmlwdGVkL3dlYmtpdDAxLmRhdCcsCi0gICdyZXNvdXJjZXMvdGFibGVz MDEuZGF0JywKLSAgJ3Jlc291cmNlcy90ZXN0c19pbm5lckhUTUxfMS5kYXQnLAotICAncmVzb3Vy Y2VzL3RyaWNreTAxLmRhdCcsCi0gICdyZXNvdXJjZXMvd2Via2l0MDEuZGF0JywKLSAgJ3Jlc291 cmNlcy93ZWJraXQwMi5kYXQnLAogXTsKIDwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Li4vcmVzb3Vy Y2VzL2R1bXAtYXMtbWFya3VwLmpzPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNlck9wdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9wYXJzZXIvSFRNTFBhcnNlck9wdGlvbnMuY3BwCmluZGV4IDBmYzc5NTMuLjk3NGY5OGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxQYXJzZXJPcHRpb25zLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VyT3B0aW9ucy5jcHAK QEAgLTQzLDcgKzQzLDcgQEAgSFRNTFBhcnNlck9wdGlvbnM6OkhUTUxQYXJzZXJPcHRpb25zKERv Y3VtZW50KiBkb2N1bWVudCkKICNpZiBFTkFCTEUoVEhSRUFERURfSFRNTF9QQVJTRVIpCiAgICAg Ly8gV2UgZm9yY2UgdGhlIG1haW4tdGhyZWFkIHBhcnNlciBmb3IgYWJvdXQ6YmxhbmssIGphdmFz Y3JpcHQ6IGFuZCBkYXRhOiB1cmxzIGZvciBjb21wYXRpYmlsaXR5CiAgICAgLy8gd2l0aCBoaXN0 b3JpY2FsIHN5bmNocm9ub3VzIGxvYWRpbmcvcGFyc2luZyBiZWhhdmlvciBvZiB0aG9zZSBzY2hl bWVzLgotICAgIHVzZVRocmVhZGluZyA9IHNldHRpbmdzICYmIHNldHRpbmdzLT50aHJlYWRlZEhU TUxQYXJzZXIoKSAmJiAhZG9jdW1lbnQtPnVybCgpLmlzQmxhbmtVUkwoKSAmJiAhZG9jdW1lbnQt PnVybCgpLnByb3RvY29sSXNEYXRhKCk7CisgICAgdXNlVGhyZWFkaW5nID0gc2V0dGluZ3MgJiYg c2V0dGluZ3MtPnRocmVhZGVkSFRNTFBhcnNlcigpICYmICFkb2N1bWVudC0+dXJsKCkuaXNCbGFu a1VSTCgpOwogI2Vsc2UKICAgICB1c2VUaHJlYWRpbmcgPSBmYWxzZTsKICNlbmRpZgo= 189858 2013-02-22 16:38:04 -0800 2013-02-22 17:33:17 -0800 Patch bug-110538-20130222163423.patch text/plain 4582 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTRiZjVjMDQwZDE4NTA5 OTBjZDYwMGJlN2E0M2E0YjdlNjEwODA4NS4uNTVjMWJhZjhmMzdlMDhjN2ZjN2Y4YzQzMzIzODFh NWFlMDkzMjZjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIyICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGhyZWFkZWQgSFRN TCBwYXJzZXIgZmFpbHMgcmVzb3VyY2VzL3BsYWluLXRleHQtdW5zYWZlLmRhdAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwNTM4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoLCB0 aGUgYmFja2dyb3VuZCBIVE1MIHBhcnNlciBwYXNzZXMgYWxsIHRlc3RzIGluIHBsYWluLXRleHQt dW5zYWZlLmRhdC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBjb3ZlcmVkIGJ5IGV4 aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJz ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9rZW5FeGl0c1NWRyk6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OnRva2VuRXhpdHNNYXRoKToKKyAgICAgICAgKFdlYkNv cmU6OkJhY2tncm91bmRIVE1MUGFyc2VyOjpzaW11bGF0ZVRyZWVCdWlsZGVyKToKKwogMjAxMy0w Mi0yMiAgSnVzdGluIFNjaHVoICA8anNjaHVoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW5k ZXJBcmVuYSBtYXNraW5nIGhhcyBsb3cgZW50cm9weQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwCmluZGV4IGYzNzA1MmQxOWQ5MWQ1 ZWI3NmQ1Y2MwN2E1NWJhYWJhZTRlMmE4NjQuLjc0ZDQ4MjU3YmJhNDcwZTZhNTg0YzQ4OTdlMTRj ODA1NzFhZjAwZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0JhY2tn cm91bmRIVE1MUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9CYWNr Z3JvdW5kSFRNTFBhcnNlci5jcHAKQEAgLTExMiw2ICsxMTIsMjMgQEAgc3RhdGljIGlubGluZSBi b29sIHRva2VuRXhpdHNGb3JlaWduQ29udGVudChjb25zdCBDb21wYWN0SFRNTFRva2VuJiB0b2tl bikKICAgICAgICAgfHwgKHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBmb250VGFnKSAmJiAodG9r ZW4uZ2V0QXR0cmlidXRlSXRlbShjb2xvckF0dHIpIHx8IHRva2VuLmdldEF0dHJpYnV0ZUl0ZW0o ZmFjZUF0dHIpIHx8IHRva2VuLmdldEF0dHJpYnV0ZUl0ZW0oc2l6ZUF0dHIpKSk7CiB9CiAKK3N0 YXRpYyBpbmxpbmUgYm9vbCB0b2tlbkV4aXRzU1ZHKGNvbnN0IENvbXBhY3RIVE1MVG9rZW4mIHRv a2VuKQoreworICAgIGNvbnN0IFN0cmluZyYgdGFnTmFtZSA9IHRva2VuLmRhdGEoKTsKKyAgICBy ZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UodGFnTmFtZSwgU1ZHTmFtZXM6OmZvcmVpZ25PYmplY3RU YWcubG9jYWxOYW1lKCkpOworfQorCitzdGF0aWMgaW5saW5lIGJvb2wgdG9rZW5FeGl0c01hdGgo Y29uc3QgQ29tcGFjdEhUTUxUb2tlbiYgdG9rZW4pCit7CisgICAgLy8gRklYTUU6IFRoaXMgaXMg Y29waWVkIGZyb20gSFRNTEVsZW1lbnRTdGFjazo6aXNNYXRoTUxUZXh0SW50ZWdyYXRpb25Qb2lu dCBhbmQgY2hhbmdlZCB0byB1c2UgdGhyZWFkU2FmZU1hdGNoLgorICAgIGNvbnN0IFN0cmluZyYg dGFnTmFtZSA9IHRva2VuLmRhdGEoKTsKKyAgICByZXR1cm4gdGhyZWFkU2FmZU1hdGNoKHRhZ05h bWUsIE1hdGhNTE5hbWVzOjptaVRhZykKKyAgICAgICAgfHwgdGhyZWFkU2FmZU1hdGNoKHRhZ05h bWUsIE1hdGhNTE5hbWVzOjptb1RhZykKKyAgICAgICAgfHwgdGhyZWFkU2FmZU1hdGNoKHRhZ05h bWUsIE1hdGhNTE5hbWVzOjptblRhZykKKyAgICAgICAgfHwgdGhyZWFkU2FmZU1hdGNoKHRhZ05h bWUsIE1hdGhNTE5hbWVzOjptc1RhZykKKyAgICAgICAgfHwgdGhyZWFkU2FmZU1hdGNoKHRhZ05h bWUsIE1hdGhNTE5hbWVzOjptdGV4dFRhZyk7Cit9CisKIHN0YXRpYyBjb25zdCBzaXplX3QgcGVu ZGluZ1Rva2VuTGltaXQgPSAxMDAwOwogCiBCYWNrZ3JvdW5kSFRNTFBhcnNlcjo6QmFja2dyb3Vu ZEhUTUxQYXJzZXIoUGFzc1JlZlB0cjxXZWFrUmVmZXJlbmNlPEJhY2tncm91bmRIVE1MUGFyc2Vy PiA+IHJlZmVyZW5jZSwgUGFzc093blB0cjxDb25maWd1cmF0aW9uPiBjb25maWcpCkBAIC0xNzks OCArMTk2LDggQEAgYm9vbCBCYWNrZ3JvdW5kSFRNTFBhcnNlcjo6c2ltdWxhdGVUcmVlQnVpbGRl cihjb25zdCBDb21wYWN0SFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgICAgIG1fbmFtZXNwYWNl U3RhY2suYXBwZW5kKE1hdGhNTCk7CiAgICAgICAgIGlmIChpbkZvcmVpZ25Db250ZW50KCkgJiYg dG9rZW5FeGl0c0ZvcmVpZ25Db250ZW50KHRva2VuKSkKICAgICAgICAgICAgIG1fbmFtZXNwYWNl U3RhY2sucmVtb3ZlTGFzdCgpOwotICAgICAgICAvLyBGSVhNRTogU3VwcG9ydCB0YWdzIHRoYXQg ZXhpdCBNYXRoTUwuCi0gICAgICAgIGlmIChtX25hbWVzcGFjZVN0YWNrLmxhc3QoKSA9PSBTVkcg JiYgZXF1YWxJZ25vcmluZ0Nhc2UodGFnTmFtZSwgU1ZHTmFtZXM6OmZvcmVpZ25PYmplY3RUYWcu bG9jYWxOYW1lKCkpKQorICAgICAgICBpZiAoKG1fbmFtZXNwYWNlU3RhY2subGFzdCgpID09IFNW RyAmJiB0b2tlbkV4aXRzU1ZHKHRva2VuKSkKKyAgICAgICAgICAgIHx8IChtX25hbWVzcGFjZVN0 YWNrLmxhc3QoKSA9PSBNYXRoTUwgJiYgdG9rZW5FeGl0c01hdGgodG9rZW4pKSkKICAgICAgICAg ICAgIG1fbmFtZXNwYWNlU3RhY2suYXBwZW5kKEhUTUwpOwogICAgICAgICBpZiAoIWluRm9yZWln bkNvbnRlbnQoKSkgewogICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMganVzdCBhIGNvcHkg b2YgVG9rZW5pemVyOjp1cGRhdGVTdGF0ZUZvciB3aGljaCB1c2VzIHRocmVhZFNhZmVNYXRjaGVz LgpAQCAtMjAyLDEwICsyMTksMTAgQEAgYm9vbCBCYWNrZ3JvdW5kSFRNTFBhcnNlcjo6c2ltdWxh dGVUcmVlQnVpbGRlcihjb25zdCBDb21wYWN0SFRNTFRva2VuJiB0b2tlbikKIAogICAgIGlmICh0 b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpFbmRUYWcpIHsKICAgICAgICAgY29uc3QgU3RyaW5n JiB0YWdOYW1lID0gdG9rZW4uZGF0YSgpOwotICAgICAgICAvLyBGSVhNRTogU3VwcG9ydCB0YWdz IHRoYXQgZXhpdCBNYXRoTUwuCiAgICAgICAgIGlmICgobV9uYW1lc3BhY2VTdGFjay5sYXN0KCkg PT0gU1ZHICYmIHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBTVkdOYW1lczo6c3ZnVGFnKSkKICAg ICAgICAgICAgIHx8IChtX25hbWVzcGFjZVN0YWNrLmxhc3QoKSA9PSBNYXRoTUwgJiYgdGhyZWFk U2FmZU1hdGNoKHRhZ05hbWUsIE1hdGhNTE5hbWVzOjptYXRoVGFnKSkKLSAgICAgICAgICAgIHx8 IChtX25hbWVzcGFjZVN0YWNrLmNvbnRhaW5zKFNWRykgJiYgbV9uYW1lc3BhY2VTdGFjay5sYXN0 KCkgPT0gSFRNTCAmJiBlcXVhbElnbm9yaW5nQ2FzZSh0YWdOYW1lLCBTVkdOYW1lczo6Zm9yZWln bk9iamVjdFRhZy5sb2NhbE5hbWUoKSkpKQorICAgICAgICAgICAgfHwgKG1fbmFtZXNwYWNlU3Rh Y2suY29udGFpbnMoU1ZHKSAmJiBtX25hbWVzcGFjZVN0YWNrLmxhc3QoKSA9PSBIVE1MICYmIHRv a2VuRXhpdHNTVkcodG9rZW4pKQorICAgICAgICAgICAgfHwgKG1fbmFtZXNwYWNlU3RhY2suY29u dGFpbnMoTWF0aE1MKSAmJiBtX25hbWVzcGFjZVN0YWNrLmxhc3QoKSA9PSBIVE1MICYmIHRva2Vu RXhpdHNNYXRoKHRva2VuKSkpCiAgICAgICAgICAgICBtX25hbWVzcGFjZVN0YWNrLnJlbW92ZUxh c3QoKTsKICAgICAgICAgaWYgKHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBzY3JpcHRUYWcpKSB7 CiAgICAgICAgICAgICBpZiAoIWluRm9yZWlnbkNvbnRlbnQoKSkKQEAgLTIxNCw3ICsyMzEsOCBA QCBib29sIEJhY2tncm91bmRIVE1MUGFyc2VyOjpzaW11bGF0ZVRyZWVCdWlsZGVyKGNvbnN0IENv bXBhY3RIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICB9CiAgICAgfQogCi0gICAgLy8gRklYTUU6 IE5lZWQgdG8gc2V0IHNldEZvcmNlTnVsbENoYXJhY3RlclJlcGxhY2VtZW50IGJhc2VkIG9uIG1f aW5Gb3JlaWduQ29udGVudCBhcyB3ZWxsLgorICAgIC8vIEZJWE1FOiBBbHNvIHNldEZvcmNlTnVs bENoYXJhY3RlclJlcGxhY2VtZW50IHdoZW4gaW4gdGV4dCBtb2RlLgorICAgIG1fdG9rZW5pemVy LT5zZXRGb3JjZU51bGxDaGFyYWN0ZXJSZXBsYWNlbWVudChpbkZvcmVpZ25Db250ZW50KCkpOwog ICAgIG1fdG9rZW5pemVyLT5zZXRTaG91bGRBbGxvd0NEQVRBKGluRm9yZWlnbkNvbnRlbnQoKSk7 CiAgICAgcmV0dXJuIHRydWU7CiB9Cg== 189873 2013-02-22 17:33:19 -0800 2013-02-22 19:30:28 -0800 Patch for landing bug-110538-20130222172938.patch text/plain 5021 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjE0OWRkNDEyYmNhMjFm ZDFjM2M4MTA5NTMzMDQ3MjVjY2Y0YzQ5NS4uZTcxNDI5MDQ3ZDE0MzQyMDUwZDA5ODJkMDFlNmI0 ZmEwNWEzMjE2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAyLTIyICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGhyZWFkZWQgSFRN TCBwYXJzZXIgZmFpbHMgcmVzb3VyY2VzL3BsYWluLXRleHQtdW5zYWZlLmRhdAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwNTM4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgV2l0aCB0aGlzIHBhdGNoLCB0aGUg YmFja2dyb3VuZCBIVE1MIHBhcnNlciBwYXNzZXMgYWxsIHRlc3RzIGluIHBsYWluLXRleHQtdW5z YWZlLmRhdC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBjb3ZlcmVkIGJ5IGV4aXN0 aW5nIHRlc3RzLgorCisgICAgICAgICogaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6dG9rZW5FeGl0c1NWRyk6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKFdlYkNvcmU6OnRva2VuRXhpdHNNYXRoKToKKyAgICAgICAgKFdlYkNvcmU6 OkJhY2tncm91bmRIVE1MUGFyc2VyOjpzaW11bGF0ZVRyZWVCdWlsZGVyKToKKwogMjAxMy0wMi0y MiAgRGltaXRyaSBHbGF6a292ICA8ZGdsYXprb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJF R1JFU1NJT04ocjEzMDA4OSk6IFNjcm9sbGJhciB0aHVtYiBubyBsb25nZXIgcmUtcmVuZGVyZWQg b24gaG92ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0JhY2tncm91 bmRIVE1MUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0JhY2tncm91bmRI VE1MUGFyc2VyLmNwcAppbmRleCBmMzcwNTJkMTlkOTFkNWViNzZkNWNjMDdhNTViYWFiYWU0ZTJh ODY0Li41NmU0N2ZjZGMzNjAyZjlhYjE0MzU5NjMzMjI3NDFhZGYyMGVkM2UwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwCkBA IC02MSw3ICs2MSw3IEBAIHN0YXRpYyB2b2lkIGNoZWNrVGhhdFByZWxvYWRzQXJlU2FmZVRvU2Vu ZFRvQW5vdGhlclRocmVhZChjb25zdCBQcmVsb2FkUmVxdWVzdFN0CiAKICNlbmRpZgogCi1zdGF0 aWMgaW5saW5lIGJvb2wgdG9rZW5FeGl0c0ZvcmVpZ25Db250ZW50KGNvbnN0IENvbXBhY3RIVE1M VG9rZW4mIHRva2VuKQorc3RhdGljIGJvb2wgdG9rZW5FeGl0c0ZvcmVpZ25Db250ZW50KGNvbnN0 IENvbXBhY3RIVE1MVG9rZW4mIHRva2VuKQogewogICAgIC8vIEZJWE1FOiBUaGlzIGlzIGNvcGll ZCBmcm9tIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1Rva2VuSW5Gb3JlaWduQ29udGVudCBhbmQg Y2hhbmdlZCB0byB1c2UgdGhyZWFkU2FmZU1hdGNoLgogICAgIGNvbnN0IFN0cmluZyYgdGFnTmFt ZSA9IHRva2VuLmRhdGEoKTsKQEAgLTExMiw2ICsxMTIsMjMgQEAgc3RhdGljIGlubGluZSBib29s IHRva2VuRXhpdHNGb3JlaWduQ29udGVudChjb25zdCBDb21wYWN0SFRNTFRva2VuJiB0b2tlbikK ICAgICAgICAgfHwgKHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBmb250VGFnKSAmJiAodG9rZW4u Z2V0QXR0cmlidXRlSXRlbShjb2xvckF0dHIpIHx8IHRva2VuLmdldEF0dHJpYnV0ZUl0ZW0oZmFj ZUF0dHIpIHx8IHRva2VuLmdldEF0dHJpYnV0ZUl0ZW0oc2l6ZUF0dHIpKSk7CiB9CiAKK3N0YXRp YyBib29sIHRva2VuRXhpdHNTVkcoY29uc3QgQ29tcGFjdEhUTUxUb2tlbiYgdG9rZW4pCit7Cisg ICAgY29uc3QgU3RyaW5nJiB0YWdOYW1lID0gdG9rZW4uZGF0YSgpOworICAgIHJldHVybiBlcXVh bElnbm9yaW5nQ2FzZSh0YWdOYW1lLCBTVkdOYW1lczo6Zm9yZWlnbk9iamVjdFRhZy5sb2NhbE5h bWUoKSk7Cit9CisKK3N0YXRpYyBib29sIHRva2VuRXhpdHNNYXRoKGNvbnN0IENvbXBhY3RIVE1M VG9rZW4mIHRva2VuKQoreworICAgIC8vIEZJWE1FOiBUaGlzIGlzIGNvcGllZCBmcm9tIEhUTUxF bGVtZW50U3RhY2s6OmlzTWF0aE1MVGV4dEludGVncmF0aW9uUG9pbnQgYW5kIGNoYW5nZWQgdG8g dXNlIHRocmVhZFNhZmVNYXRjaC4KKyAgICBjb25zdCBTdHJpbmcmIHRhZ05hbWUgPSB0b2tlbi5k YXRhKCk7CisgICAgcmV0dXJuIHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBNYXRoTUxOYW1lczo6 bWlUYWcpCisgICAgICAgIHx8IHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBNYXRoTUxOYW1lczo6 bW9UYWcpCisgICAgICAgIHx8IHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBNYXRoTUxOYW1lczo6 bW5UYWcpCisgICAgICAgIHx8IHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBNYXRoTUxOYW1lczo6 bXNUYWcpCisgICAgICAgIHx8IHRocmVhZFNhZmVNYXRjaCh0YWdOYW1lLCBNYXRoTUxOYW1lczo6 bXRleHRUYWcpOworfQorCiBzdGF0aWMgY29uc3Qgc2l6ZV90IHBlbmRpbmdUb2tlbkxpbWl0ID0g MTAwMDsKIAogQmFja2dyb3VuZEhUTUxQYXJzZXI6OkJhY2tncm91bmRIVE1MUGFyc2VyKFBhc3NS ZWZQdHI8V2Vha1JlZmVyZW5jZTxCYWNrZ3JvdW5kSFRNTFBhcnNlcj4gPiByZWZlcmVuY2UsIFBh c3NPd25QdHI8Q29uZmlndXJhdGlvbj4gY29uZmlnKQpAQCAtMTc5LDggKzE5Niw4IEBAIGJvb2wg QmFja2dyb3VuZEhUTUxQYXJzZXI6OnNpbXVsYXRlVHJlZUJ1aWxkZXIoY29uc3QgQ29tcGFjdEhU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBtX25hbWVzcGFjZVN0YWNrLmFwcGVuZChNYXRo TUwpOwogICAgICAgICBpZiAoaW5Gb3JlaWduQ29udGVudCgpICYmIHRva2VuRXhpdHNGb3JlaWdu Q29udGVudCh0b2tlbikpCiAgICAgICAgICAgICBtX25hbWVzcGFjZVN0YWNrLnJlbW92ZUxhc3Qo KTsKLSAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgdGFncyB0aGF0IGV4aXQgTWF0aE1MLgotICAg ICAgICBpZiAobV9uYW1lc3BhY2VTdGFjay5sYXN0KCkgPT0gU1ZHICYmIGVxdWFsSWdub3JpbmdD YXNlKHRhZ05hbWUsIFNWR05hbWVzOjpmb3JlaWduT2JqZWN0VGFnLmxvY2FsTmFtZSgpKSkKKyAg ICAgICAgaWYgKChtX25hbWVzcGFjZVN0YWNrLmxhc3QoKSA9PSBTVkcgJiYgdG9rZW5FeGl0c1NW Ryh0b2tlbikpCisgICAgICAgICAgICB8fCAobV9uYW1lc3BhY2VTdGFjay5sYXN0KCkgPT0gTWF0 aE1MICYmIHRva2VuRXhpdHNNYXRoKHRva2VuKSkpCiAgICAgICAgICAgICBtX25hbWVzcGFjZVN0 YWNrLmFwcGVuZChIVE1MKTsKICAgICAgICAgaWYgKCFpbkZvcmVpZ25Db250ZW50KCkpIHsKICAg ICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIGp1c3QgYSBjb3B5IG9mIFRva2VuaXplcjo6dXBk YXRlU3RhdGVGb3Igd2hpY2ggdXNlcyB0aHJlYWRTYWZlTWF0Y2hlcy4KQEAgLTIwMiwxMCArMjE5 LDEwIEBAIGJvb2wgQmFja2dyb3VuZEhUTUxQYXJzZXI6OnNpbXVsYXRlVHJlZUJ1aWxkZXIoY29u c3QgQ29tcGFjdEhUTUxUb2tlbiYgdG9rZW4pCiAKICAgICBpZiAodG9rZW4udHlwZSgpID09IEhU TUxUb2tlbjo6RW5kVGFnKSB7CiAgICAgICAgIGNvbnN0IFN0cmluZyYgdGFnTmFtZSA9IHRva2Vu LmRhdGEoKTsKLSAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgdGFncyB0aGF0IGV4aXQgTWF0aE1M LgogICAgICAgICBpZiAoKG1fbmFtZXNwYWNlU3RhY2subGFzdCgpID09IFNWRyAmJiB0aHJlYWRT YWZlTWF0Y2godGFnTmFtZSwgU1ZHTmFtZXM6OnN2Z1RhZykpCiAgICAgICAgICAgICB8fCAobV9u YW1lc3BhY2VTdGFjay5sYXN0KCkgPT0gTWF0aE1MICYmIHRocmVhZFNhZmVNYXRjaCh0YWdOYW1l LCBNYXRoTUxOYW1lczo6bWF0aFRhZykpCi0gICAgICAgICAgICB8fCAobV9uYW1lc3BhY2VTdGFj ay5jb250YWlucyhTVkcpICYmIG1fbmFtZXNwYWNlU3RhY2subGFzdCgpID09IEhUTUwgJiYgZXF1 YWxJZ25vcmluZ0Nhc2UodGFnTmFtZSwgU1ZHTmFtZXM6OmZvcmVpZ25PYmplY3RUYWcubG9jYWxO YW1lKCkpKSkKKyAgICAgICAgICAgIHx8IChtX25hbWVzcGFjZVN0YWNrLmNvbnRhaW5zKFNWRykg JiYgbV9uYW1lc3BhY2VTdGFjay5sYXN0KCkgPT0gSFRNTCAmJiB0b2tlbkV4aXRzU1ZHKHRva2Vu KSkKKyAgICAgICAgICAgIHx8IChtX25hbWVzcGFjZVN0YWNrLmNvbnRhaW5zKE1hdGhNTCkgJiYg bV9uYW1lc3BhY2VTdGFjay5sYXN0KCkgPT0gSFRNTCAmJiB0b2tlbkV4aXRzTWF0aCh0b2tlbikp KQogICAgICAgICAgICAgbV9uYW1lc3BhY2VTdGFjay5yZW1vdmVMYXN0KCk7CiAgICAgICAgIGlm ICh0aHJlYWRTYWZlTWF0Y2godGFnTmFtZSwgc2NyaXB0VGFnKSkgewogICAgICAgICAgICAgaWYg KCFpbkZvcmVpZ25Db250ZW50KCkpCkBAIC0yMTQsNyArMjMxLDggQEAgYm9vbCBCYWNrZ3JvdW5k SFRNTFBhcnNlcjo6c2ltdWxhdGVUcmVlQnVpbGRlcihjb25zdCBDb21wYWN0SFRNTFRva2VuJiB0 b2tlbikKICAgICAgICAgfQogICAgIH0KIAotICAgIC8vIEZJWE1FOiBOZWVkIHRvIHNldCBzZXRG b3JjZU51bGxDaGFyYWN0ZXJSZXBsYWNlbWVudCBiYXNlZCBvbiBtX2luRm9yZWlnbkNvbnRlbnQg YXMgd2VsbC4KKyAgICAvLyBGSVhNRTogQWxzbyBzZXRGb3JjZU51bGxDaGFyYWN0ZXJSZXBsYWNl bWVudCB3aGVuIGluIHRleHQgbW9kZS4KKyAgICBtX3Rva2VuaXplci0+c2V0Rm9yY2VOdWxsQ2hh cmFjdGVyUmVwbGFjZW1lbnQoaW5Gb3JlaWduQ29udGVudCgpKTsKICAgICBtX3Rva2VuaXplci0+ c2V0U2hvdWxkQWxsb3dDREFUQShpbkZvcmVpZ25Db250ZW50KCkpOwogICAgIHJldHVybiB0cnVl OwogfQo=