40274 2010-06-07 18:55:30 -0700 Fix script-after-frameset test in HTML5 parser 2010-06-09 10:05:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39259 1 tonyg tonyg abarth eric webkit.review.bot oldest_to_newest 235084 0 tonyg 2010-06-07 18:55:30 -0700 Fix script-after-frameset test in HTML5 parser 235087 1 58099 tonyg 2010-06-07 19:00:05 -0700 Created attachment 58099 Patch 235089 2 tonyg 2010-06-07 19:01:36 -0700 Let me know if you like this approach. If you don't think it makes sense to add InsertionMode here, another alternative would be to just add an afterFrameset boolean (similar to what HTMLTokenizer::scriptHandler did). 235090 3 webkit.review.bot 2010-06-07 19:03:42 -0700 Attachment 58099 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebCore/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:10: Line contains tab character. [whitespace/tab] [5] WebCore/ChangeLog:11: Line contains tab character. [whitespace/tab] [5] Total errors found: 4 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 235119 4 58108 tonyg 2010-06-07 20:59:23 -0700 Created attachment 58108 Fix tabs in ChangeLog 235130 5 58108 eric 2010-06-07 22:12:52 -0700 Comment on attachment 58108 Fix tabs in ChangeLog WebCore/ChangeLog:13 + No new tests because covered by existing test. You should give some example test. WebCore/html/HTML5TreeBuilder.h:65 + // FIXME: Move this to HTML5Parser once it is created. There is no HTML5Parser. :) This is the right place for this. This patch looks perfect, except for the comment. 235138 6 eric 2010-06-07 22:44:28 -0700 I think I confused you earlier with my talk of HTML5Parser vs. HTML5Tokenizer, etc. CurrentName (PlannedName) New design: HTML5Tokenizer (HTMLParser) HTML5Lexer (probably will stay HTMLLexer, might be HTMLTokenizer) InputStreamPreprocesser (will keep its name) SegmentedString (will keep its name) HTML5TreeBuilder (HTMLTreeBuilder -- spec also calls this "parser" and "tree builder" interchangeably) HTML5ScriptRunner (HTMLScriptRunner, maybe HTMLScriptScheduler?) Old design: HTMLTokenizer (LegacyHTMLParser or LegacyHTMLTokenizer) SegmentedString (will keep) HTMLParser (LegacyHTMLTreeBuilder) So it's confusing to talk about "HTMLParser" since it could mean lots of things. "Tokenizer" is a horrible name for the current class hierarchy. We have prefixed all our new classes with HTML5 to separate them from the old system. 235273 7 58143 tonyg 2010-06-08 09:14:50 -0700 Created attachment 58143 Patch 235274 8 tonyg 2010-06-08 09:15:51 -0700 (In reply to comment #5) > (From update of attachment 58108 [details]) > WebCore/ChangeLog:13 > + No new tests because covered by existing test. > You should give some example test. Done. > > WebCore/html/HTML5TreeBuilder.h:65 > + // FIXME: Move this to HTML5Parser once it is created. > There is no HTML5Parser. :) This is the right place for this. > Done. > This patch looks perfect, except for the comment. 235276 9 tonyg 2010-06-08 09:16:35 -0700 (In reply to comment #6) > I think I confused you earlier with my talk of HTML5Parser vs. HTML5Tokenizer, etc. > > CurrentName (PlannedName) > > New design: > > HTML5Tokenizer (HTMLParser) > HTML5Lexer (probably will stay HTMLLexer, might be HTMLTokenizer) > InputStreamPreprocesser (will keep its name) > SegmentedString (will keep its name) > HTML5TreeBuilder (HTMLTreeBuilder -- spec also calls this "parser" and "tree builder" interchangeably) > HTML5ScriptRunner (HTMLScriptRunner, maybe HTMLScriptScheduler?) > > Old design: > > HTMLTokenizer (LegacyHTMLParser or LegacyHTMLTokenizer) > SegmentedString (will keep) > HTMLParser (LegacyHTMLTreeBuilder) > > So it's confusing to talk about "HTMLParser" since it could mean lots of things. "Tokenizer" is a horrible name for the current class hierarchy. We have prefixed all our new classes with HTML5 to separate them from the old system. Got it now. Thank you. 235301 10 58143 abarth 2010-06-08 10:07:02 -0700 Comment on attachment 58143 Patch WebCore/html/HTML5TreeBuilder.h:65 + enum InsertionMode { Sadly, this might eventually need to be public. Let's keep it private for as long as we can. WebCore/html/HTML5TreeBuilder.h:77 + InsertionMode insertionMode() const { return m_insertionMode; } I'm not sure these private getters/setters are needed, but ok. 235843 11 58143 abarth 2010-06-09 10:05:27 -0700 Comment on attachment 58143 Patch Clearing flags on attachment: 58143 Committed r60897: <http://trac.webkit.org/changeset/60897> 235844 12 abarth 2010-06-09 10:05:35 -0700 All reviewed patches have been landed. Closing bug. 58099 2010-06-07 19:00:05 -0700 2010-06-07 20:59:18 -0700 Patch bug-40274-20100607190004.patch text/plain 3956 tonyg ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTkwNWRhYTFmZDQ0MDU0MzczNTY4OTc3NjQyMjA3NzVlNmYxMTRlNi4uMTVmNGNmMGMxOTk4ZjA4 OTdiMGE0Y2FmNTRlYmU2YzYyMjhhNDgwNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0wNyAgVG9u eSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBzY3JpcHQtYWZ0ZXItZnJhbWVzZXQgdGVz dCBpbiBIVE1MNSBwYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwMjc0CisKKwlUaGUgb2xkIEhUTUxUb2tlbml6ZXIgZW5mb3JjZWQgdGhpcyBp biBzY3JpcHRIYW5kbGVyKCkuIFdlIGRvbid0IHVzZQorCXRoYXQgY29kZSBhbnltb3JlLCBzbyBp dCBuZWVkcyB0byBiZSBpbXBsZW1lbnRlZC4gVGhlIHNwZWMgZG9lcyB0aGlzCisJYXMgYSBwYXJ0 IG9mICJpbnNlcnRpb24gbW9kZSItPiJhZnRlciBmcmFtZXNldCIsIHNvIHRoaXMgYWRkcyBhCisJ dGVudGF0aXZlIEluc2VydGlvbk1vZGUgZW51bSBpbnN0ZWFkIG9mIGEgb25lLW9mZiBib29sZWFu LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVz dC4KKworICAgICAgICAqIGh0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MNVRyZWVCdWlsZGVyOjpIVE1MNVRyZWVCdWlsZGVyKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUw1VHJlZUJ1aWxkZXI6OnBhc3NUb2tlblRvTGVnYWN5UGFyc2VyKToKKyAgICAgICAg KiBodG1sL0hUTUw1VHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VHJlZUJ1 aWxkZXI6Oik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRyZWVCdWlsZGVyOjpzZXRJbnNlcnRp b25Nb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VHJlZUJ1aWxkZXI6Omluc2VydGlvbk1v ZGUpOgorCiAyMDEwLTA2LTA3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwv SFRNTDVUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHAK aW5kZXggZDk5NzY1YTI0YzgzMDVjM2QzMTg5Yzg4NjJhMzgwNWIwMmJmMzY2OC4uYTg3N2Q3ZTM4 ZDJiYzI5NjAwZDgzNjRiZDgxODM1NzE4NTkyMjIzYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1s L0hUTUw1VHJlZUJ1aWxkZXIuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVy LmNwcApAQCAtNDYsNiArNDYsNyBAQCBIVE1MNVRyZWVCdWlsZGVyOjpIVE1MNVRyZWVCdWlsZGVy KEhUTUw1TGV4ZXIqIGxleGVyLCBIVE1MRG9jdW1lbnQqIGRvY3VtZW50LCBibwogICAgIDogbV9k b2N1bWVudChkb2N1bWVudCkKICAgICAsIG1fcmVwb3J0RXJyb3JzKHJlcG9ydEVycm9ycykKICAg ICAsIG1faXNQYXVzZWQoZmFsc2UpCisgICAgLCBtX2luc2VydGlvbk1vZGUoSW5pdGlhbCkKICAg ICAsIG1fbGV4ZXIobGV4ZXIpCiAgICAgLCBtX2xlZ2FjeUhUTUxQYXJzZXIobmV3IEhUTUxQYXJz ZXIoZG9jdW1lbnQsIHJlcG9ydEVycm9ycykpCiAgICAgLCBtX2xhc3RTY3JpcHRFbGVtZW50U3Rh cnRMaW5lKHVuaW5pdGlhbGl6ZWRMaW5lTnVtYmVyVmFsdWUpCkBAIC0xNjcsMTQgKzE2OCwxNSBA QCBQYXNzUmVmUHRyPE5vZGU+IEhUTUw1VHJlZUJ1aWxkZXI6OnBhc3NUb2tlblRvTGVnYWN5UGFy c2VyKEhUTUw1VG9rZW4mIHRva2VuKQogICAgICAgICAgICAgbV9sZXhlci0+c2tpcExlYWRpbmdO ZXdMaW5lRm9yTGlzdGluZygpOwogICAgIH0KICAgICBpZiAodG9rZW4udHlwZSgpID09IEhUTUw1 VG9rZW46OkVuZFRhZykgewotICAgICAgICBpZiAob2xkU3R5bGVUb2tlbi50YWdOYW1lID09IHNj cmlwdFRhZykgeworICAgICAgICBpZiAob2xkU3R5bGVUb2tlbi50YWdOYW1lID09IHNjcmlwdFRh ZyAmJiBpbnNlcnRpb25Nb2RlKCkgIT0gQWZ0ZXJGcmFtZXNldCkgewogICAgICAgICAgICAgaWYg KG1fbGFzdFNjcmlwdEVsZW1lbnQpIHsKICAgICAgICAgICAgICAgICBBU1NFUlQobV9sYXN0U2Ny aXB0RWxlbWVudFN0YXJ0TGluZSAhPSB1bmluaXRpYWxpemVkTGluZU51bWJlclZhbHVlKTsKICAg ICAgICAgICAgICAgICBoYW5kbGVTY3JpcHRFbmRUYWcobV9sYXN0U2NyaXB0RWxlbWVudC5nZXQo KSwgbV9sYXN0U2NyaXB0RWxlbWVudFN0YXJ0TGluZSk7CiAgICAgICAgICAgICAgICAgbV9sYXN0 U2NyaXB0RWxlbWVudCA9IDA7CiAgICAgICAgICAgICAgICAgbV9sYXN0U2NyaXB0RWxlbWVudFN0 YXJ0TGluZSA9IHVuaW5pdGlhbGl6ZWRMaW5lTnVtYmVyVmFsdWU7CiAgICAgICAgICAgICB9Ci0g ICAgICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChvbGRTdHlsZVRva2VuLnRhZ05hbWUgPT0gZnJh bWVzZXRUYWcpCisgICAgICAgICAgICBzZXRJbnNlcnRpb25Nb2RlKEFmdGVyRnJhbWVzZXQpOwog ICAgIH0KICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2UoKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNv cmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmggYi9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRl ci5oCmluZGV4IDY4MmU0NjAyYTgwOTcyNmI2NmRlNGVlYWUzMjIyNzkxOGYyZDhiZGEuLjdmYjg4 OTFkNjlhY2RmYzMxOTEwNjEzMWQ2ODczYWE0ODgwNTYxYzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aHRtbC9IVE1MNVRyZWVCdWlsZGVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxk ZXIuaApAQCAtNTksMTUgKzU5LDMwIEBAIHB1YmxpYzoKICAgICB2b2lkIGZpbmlzaGVkKCk7CiAK IHByaXZhdGU6CisgICAgLy8gUmVwcmVzZW50cyBIVE1MNSAiaW5zZXJ0aW9uIG1vZGUiCisgICAg Ly8gaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDUvc3ludGF4Lmh0bWwjaW5zZXJ0aW9uLW1vZGUK KyAgICAvLyBGSVhNRTogSW1wbGVtZW50IHJlbWFpbmRlciBvZiBzdGF0ZXMuCisgICAgLy8gRklY TUU6IE1vdmUgdGhpcyB0byBIVE1MNVBhcnNlciBvbmNlIGl0IGlzIGNyZWF0ZWQuCisgICAgZW51 bSBJbnNlcnRpb25Nb2RlIHsKKyAgICAgICAgSW5pdGlhbCwKKyAgICAgICAgQWZ0ZXJGcmFtZXNl dCwKKyAgICB9OworCiAgICAgUGFzc1JlZlB0cjxOb2RlPiBwYXNzVG9rZW5Ub0xlZ2FjeVBhcnNl cihIVE1MNVRva2VuJik7CiAgICAgUGFzc1JlZlB0cjxOb2RlPiBwcm9jZXNzVG9rZW4oSFRNTDVU b2tlbiYsIFVDaGFyIGN1cnJlbnRDaGFyYWN0ZXIgPSAwKTsKICAgICAKICAgICB2b2lkIGhhbmRs ZVNjcmlwdFN0YXJ0VGFnKCk7CiAgICAgdm9pZCBoYW5kbGVTY3JpcHRFbmRUYWcoRWxlbWVudCos IGludCBzY3JpcHRTdGFydExpbmUpOwogCisgICAgdm9pZCBzZXRJbnNlcnRpb25Nb2RlKEluc2Vy dGlvbk1vZGUgdmFsdWUpIHsgbV9pbnNlcnRpb25Nb2RlID0gdmFsdWU7IH0KKyAgICBJbnNlcnRp b25Nb2RlIGluc2VydGlvbk1vZGUoKSBjb25zdCB7IHJldHVybiBtX2luc2VydGlvbk1vZGU7IH0K KwogICAgIERvY3VtZW50KiBtX2RvY3VtZW50OyAvLyBUaGlzIGlzIG9ubHkgdXNlZCBieSB0aGUg bV9sZWdhY3lQYXJzZXIgZm9yIG5vdy4KICAgICBib29sIG1fcmVwb3J0RXJyb3JzOwogICAgIGJv b2wgbV9pc1BhdXNlZDsKKworICAgIEluc2VydGlvbk1vZGUgbV9pbnNlcnRpb25Nb2RlOworCiAg ICAgLy8gSFRNTDUgc3BlYyByZXF1aXJlcyB0aGF0IHdlIGJlIGFibGUgdG8gY2hhbmdlIHRoZSBz dGF0ZSBvZiB0aGUgbGV4ZXIKICAgICAvLyBmcm9tIHdpdGhpbiBwYXJzZXIgYWN0aW9ucy4KICAg ICBIVE1MNUxleGVyKiBtX2xleGVyOwo= 58108 2010-06-07 20:59:23 -0700 2010-06-08 09:14:45 -0700 Fix tabs in ChangeLog bug-40274-20100607205922.patch text/plain 3984 tonyg ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTkwNWRhYTFmZDQ0MDU0MzczNTY4OTc3NjQyMjA3NzVlNmYxMTRlNi4uNzg2MTNiNTNhOTc1Mzc3 NDlmNjM0MzVkZTgwMDkzY2Y2OTA3ZmM5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0wNyAgVG9u eSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBzY3JpcHQtYWZ0ZXItZnJhbWVzZXQgdGVz dCBpbiBIVE1MNSBwYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwMjc0CisKKyAgICAgICAgVGhlIG9sZCBIVE1MVG9rZW5pemVyIGVuZm9yY2Vk IHRoaXMgaW4gc2NyaXB0SGFuZGxlcigpLiBXZSBkb24ndCB1c2UKKyAgICAgICAgdGhhdCBjb2Rl IGFueW1vcmUsIHNvIGl0IG5lZWRzIHRvIGJlIGltcGxlbWVudGVkLiBUaGUgc3BlYyBkb2VzIHRo aXMKKyAgICAgICAgYXMgYSBwYXJ0IG9mICJpbnNlcnRpb24gbW9kZSItPiJhZnRlciBmcmFtZXNl dCIsIHNvIHRoaXMgYWRkcyBhCisgICAgICAgIHRlbnRhdGl2ZSBJbnNlcnRpb25Nb2RlIGVudW0g aW5zdGVhZCBvZiBhIG9uZS1vZmYgYm9vbGVhbi4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVj YXVzZSBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3QuCisKKyAgICAgICAgKiBodG1sL0hUTUw1VHJl ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVUcmVlQnVpbGRlcjo6SFRNTDVU cmVlQnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRyZWVCdWlsZGVyOjpwYXNzVG9r ZW5Ub0xlZ2FjeVBhcnNlcik6CisgICAgICAgICogaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MNVRyZWVCdWlsZGVyOjopOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTDVUcmVlQnVpbGRlcjo6c2V0SW5zZXJ0aW9uTW9kZSk6CisgICAgICAgIChXZWJDb3JlOjpI VE1MNVRyZWVCdWlsZGVyOjppbnNlcnRpb25Nb2RlKToKKwogMjAxMC0wNi0wNyAgQWRhbSBCYXJ0 aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29y ZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwCmluZGV4IGQ5OTc2NWEyNGM4MzA1YzNkMzE4OWM4 ODYyYTM4MDViMDJiZjM2NjguLmE4NzdkN2UzOGQyYmMyOTYwMGQ4MzY0YmQ4MTgzNTcxODU5MjIy M2IgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmNwcAorKysgYi9X ZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHAKQEAgLTQ2LDYgKzQ2LDcgQEAgSFRNTDVU cmVlQnVpbGRlcjo6SFRNTDVUcmVlQnVpbGRlcihIVE1MNUxleGVyKiBsZXhlciwgSFRNTERvY3Vt ZW50KiBkb2N1bWVudCwgYm8KICAgICA6IG1fZG9jdW1lbnQoZG9jdW1lbnQpCiAgICAgLCBtX3Jl cG9ydEVycm9ycyhyZXBvcnRFcnJvcnMpCiAgICAgLCBtX2lzUGF1c2VkKGZhbHNlKQorICAgICwg bV9pbnNlcnRpb25Nb2RlKEluaXRpYWwpCiAgICAgLCBtX2xleGVyKGxleGVyKQogICAgICwgbV9s ZWdhY3lIVE1MUGFyc2VyKG5ldyBIVE1MUGFyc2VyKGRvY3VtZW50LCByZXBvcnRFcnJvcnMpKQog ICAgICwgbV9sYXN0U2NyaXB0RWxlbWVudFN0YXJ0TGluZSh1bmluaXRpYWxpemVkTGluZU51bWJl clZhbHVlKQpAQCAtMTY3LDE0ICsxNjgsMTUgQEAgUGFzc1JlZlB0cjxOb2RlPiBIVE1MNVRyZWVC dWlsZGVyOjpwYXNzVG9rZW5Ub0xlZ2FjeVBhcnNlcihIVE1MNVRva2VuJiB0b2tlbikKICAgICAg ICAgICAgIG1fbGV4ZXItPnNraXBMZWFkaW5nTmV3TGluZUZvckxpc3RpbmcoKTsKICAgICB9CiAg ICAgaWYgKHRva2VuLnR5cGUoKSA9PSBIVE1MNVRva2VuOjpFbmRUYWcpIHsKLSAgICAgICAgaWYg KG9sZFN0eWxlVG9rZW4udGFnTmFtZSA9PSBzY3JpcHRUYWcpIHsKKyAgICAgICAgaWYgKG9sZFN0 eWxlVG9rZW4udGFnTmFtZSA9PSBzY3JpcHRUYWcgJiYgaW5zZXJ0aW9uTW9kZSgpICE9IEFmdGVy RnJhbWVzZXQpIHsKICAgICAgICAgICAgIGlmIChtX2xhc3RTY3JpcHRFbGVtZW50KSB7CiAgICAg ICAgICAgICAgICAgQVNTRVJUKG1fbGFzdFNjcmlwdEVsZW1lbnRTdGFydExpbmUgIT0gdW5pbml0 aWFsaXplZExpbmVOdW1iZXJWYWx1ZSk7CiAgICAgICAgICAgICAgICAgaGFuZGxlU2NyaXB0RW5k VGFnKG1fbGFzdFNjcmlwdEVsZW1lbnQuZ2V0KCksIG1fbGFzdFNjcmlwdEVsZW1lbnRTdGFydExp bmUpOwogICAgICAgICAgICAgICAgIG1fbGFzdFNjcmlwdEVsZW1lbnQgPSAwOwogICAgICAgICAg ICAgICAgIG1fbGFzdFNjcmlwdEVsZW1lbnRTdGFydExpbmUgPSB1bmluaXRpYWxpemVkTGluZU51 bWJlclZhbHVlOwogICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAgIH0gZWxzZSBpZiAo b2xkU3R5bGVUb2tlbi50YWdOYW1lID09IGZyYW1lc2V0VGFnKQorICAgICAgICAgICAgc2V0SW5z ZXJ0aW9uTW9kZShBZnRlckZyYW1lc2V0KTsKICAgICB9CiAgICAgcmV0dXJuIHJlc3VsdC5yZWxl YXNlKCk7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5oIGIv V2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuaAppbmRleCA2ODJlNDYwMmE4MDk3MjZiNjZk ZTRlZWFlMzIyMjc5MThmMmQ4YmRhLi43ZmI4ODkxZDY5YWNkZmMzMTkxMDYxMzFkNjg3M2FhNDg4 MDU2MWM4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5oCisrKyBi L1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmgKQEAgLTU5LDE1ICs1OSwzMCBAQCBwdWJs aWM6CiAgICAgdm9pZCBmaW5pc2hlZCgpOwogCiBwcml2YXRlOgorICAgIC8vIFJlcHJlc2VudHMg SFRNTDUgImluc2VydGlvbiBtb2RlIgorICAgIC8vIGh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw1 L3N5bnRheC5odG1sI2luc2VydGlvbi1tb2RlCisgICAgLy8gRklYTUU6IEltcGxlbWVudCByZW1h aW5kZXIgb2Ygc3RhdGVzLgorICAgIC8vIEZJWE1FOiBNb3ZlIHRoaXMgdG8gSFRNTDVQYXJzZXIg b25jZSBpdCBpcyBjcmVhdGVkLgorICAgIGVudW0gSW5zZXJ0aW9uTW9kZSB7CisgICAgICAgIElu aXRpYWwsCisgICAgICAgIEFmdGVyRnJhbWVzZXQsCisgICAgfTsKKwogICAgIFBhc3NSZWZQdHI8 Tm9kZT4gcGFzc1Rva2VuVG9MZWdhY3lQYXJzZXIoSFRNTDVUb2tlbiYpOwogICAgIFBhc3NSZWZQ dHI8Tm9kZT4gcHJvY2Vzc1Rva2VuKEhUTUw1VG9rZW4mLCBVQ2hhciBjdXJyZW50Q2hhcmFjdGVy ID0gMCk7CiAgICAgCiAgICAgdm9pZCBoYW5kbGVTY3JpcHRTdGFydFRhZygpOwogICAgIHZvaWQg aGFuZGxlU2NyaXB0RW5kVGFnKEVsZW1lbnQqLCBpbnQgc2NyaXB0U3RhcnRMaW5lKTsKIAorICAg IHZvaWQgc2V0SW5zZXJ0aW9uTW9kZShJbnNlcnRpb25Nb2RlIHZhbHVlKSB7IG1faW5zZXJ0aW9u TW9kZSA9IHZhbHVlOyB9CisgICAgSW5zZXJ0aW9uTW9kZSBpbnNlcnRpb25Nb2RlKCkgY29uc3Qg eyByZXR1cm4gbV9pbnNlcnRpb25Nb2RlOyB9CisKICAgICBEb2N1bWVudCogbV9kb2N1bWVudDsg Ly8gVGhpcyBpcyBvbmx5IHVzZWQgYnkgdGhlIG1fbGVnYWN5UGFyc2VyIGZvciBub3cuCiAgICAg Ym9vbCBtX3JlcG9ydEVycm9yczsKICAgICBib29sIG1faXNQYXVzZWQ7CisKKyAgICBJbnNlcnRp b25Nb2RlIG1faW5zZXJ0aW9uTW9kZTsKKwogICAgIC8vIEhUTUw1IHNwZWMgcmVxdWlyZXMgdGhh dCB3ZSBiZSBhYmxlIHRvIGNoYW5nZSB0aGUgc3RhdGUgb2YgdGhlIGxleGVyCiAgICAgLy8gZnJv bSB3aXRoaW4gcGFyc2VyIGFjdGlvbnMuCiAgICAgSFRNTDVMZXhlciogbV9sZXhlcjsK 58143 2010-06-08 09:14:50 -0700 2010-06-09 10:05:27 -0700 Patch bug-40274-20100608091448.patch text/plain 3954 tonyg ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmU2MTBlZTNjYzdhZTE4YjZiZDVmZmUxNzk3Y2MwMDE3NTg1MGI0OC4uNzEwNjIxOGVjN2E1YmRl ODJjNDU0NWU1YzVhYWRkYTI2NTE5OWZkZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMC0wNi0wOCAgVG9u eSBHZW50aWxjb3JlICA8dG9ueWdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBzY3JpcHQtYWZ0ZXItZnJhbWVzZXQgdGVz dCBpbiBIVE1MNSBwYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQwMjc0CisKKyAgICAgICAgVGhlIG9sZCBIVE1MVG9rZW5pemVyIGVuZm9yY2Vk IHRoaXMgaW4gc2NyaXB0SGFuZGxlcigpLiBXZSBkb24ndCB1c2UKKyAgICAgICAgdGhhdCBjb2Rl IGFueW1vcmUsIHNvIGl0IG5lZWRzIHRvIGJlIGltcGxlbWVudGVkLiBUaGUgc3BlYyBkb2VzIHRo aXMKKyAgICAgICAgYXMgYSBwYXJ0IG9mICJpbnNlcnRpb24gbW9kZSItPiJhZnRlciBmcmFtZXNl dCIsIHNvIHRoaXMgYWRkcyBhbgorICAgICAgICBJbnNlcnRpb25Nb2RlIGVudW0gaW5zdGVhZCBv ZiBhIG9uZS1vZmYgYm9vbGVhbi4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBjb3Zl cmVkIGJ5IGZhc3QvdG9rZW5pemVyL3NjcmlwdC1hZnRlci1mcmFtZXNldC5odG1sCisKKyAgICAg ICAgKiBodG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVU cmVlQnVpbGRlcjo6SFRNTDVUcmVlQnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRy ZWVCdWlsZGVyOjpwYXNzVG9rZW5Ub0xlZ2FjeVBhcnNlcik6CisgICAgICAgICogaHRtbC9IVE1M NVRyZWVCdWlsZGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRyZWVCdWlsZGVyOjopOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTDVUcmVlQnVpbGRlcjo6c2V0SW5zZXJ0aW9uTW9kZSk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MNVRyZWVCdWlsZGVyOjppbnNlcnRpb25Nb2RlKToKKwogMjAx MC0wNi0wOCAgQW5kcmFzIEJlY3NpICA8YWJlY3NpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXggYWZ0ZXIgcjYwNzg1LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1s L0hUTUw1VHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3Bw CmluZGV4IDk1ODFhNmM5ZmViMzkyYjZhMjJmN2IzMGFjN2U1YzUyOTM5MTE5MGYuLjY4NzZiNjcw MTRjNmU3MGFhODNiNDc2YWNjMjJiMGVjYjQzY2ZmMTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRt bC9IVE1MNVRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRl ci5jcHAKQEAgLTQ2LDYgKzQ2LDcgQEAgSFRNTDVUcmVlQnVpbGRlcjo6SFRNTDVUcmVlQnVpbGRl cihIVE1MNUxleGVyKiBsZXhlciwgSFRNTERvY3VtZW50KiBkb2N1bWVudCwgYm8KICAgICA6IG1f ZG9jdW1lbnQoZG9jdW1lbnQpCiAgICAgLCBtX3JlcG9ydEVycm9ycyhyZXBvcnRFcnJvcnMpCiAg ICAgLCBtX2lzUGF1c2VkKGZhbHNlKQorICAgICwgbV9pbnNlcnRpb25Nb2RlKEluaXRpYWwpCiAg ICAgLCBtX2xleGVyKGxleGVyKQogICAgICwgbV9sZWdhY3lIVE1MUGFyc2VyKG5ldyBIVE1MUGFy c2VyKGRvY3VtZW50LCByZXBvcnRFcnJvcnMpKQogICAgICwgbV9sYXN0U2NyaXB0RWxlbWVudFN0 YXJ0TGluZSh1bmluaXRpYWxpemVkTGluZU51bWJlclZhbHVlKQpAQCAtMTY4LDE0ICsxNjksMTUg QEAgUGFzc1JlZlB0cjxOb2RlPiBIVE1MNVRyZWVCdWlsZGVyOjpwYXNzVG9rZW5Ub0xlZ2FjeVBh cnNlcihIVE1MNVRva2VuJiB0b2tlbikKICAgICAgICAgICAgIG1fbGV4ZXItPnNraXBMZWFkaW5n TmV3TGluZUZvckxpc3RpbmcoKTsKICAgICB9CiAgICAgaWYgKHRva2VuLnR5cGUoKSA9PSBIVE1M NVRva2VuOjpFbmRUYWcpIHsKLSAgICAgICAgaWYgKG9sZFN0eWxlVG9rZW4udGFnTmFtZSA9PSBz Y3JpcHRUYWcpIHsKKyAgICAgICAgaWYgKG9sZFN0eWxlVG9rZW4udGFnTmFtZSA9PSBzY3JpcHRU YWcgJiYgaW5zZXJ0aW9uTW9kZSgpICE9IEFmdGVyRnJhbWVzZXQpIHsKICAgICAgICAgICAgIGlm IChtX2xhc3RTY3JpcHRFbGVtZW50KSB7CiAgICAgICAgICAgICAgICAgQVNTRVJUKG1fbGFzdFNj cmlwdEVsZW1lbnRTdGFydExpbmUgIT0gdW5pbml0aWFsaXplZExpbmVOdW1iZXJWYWx1ZSk7CiAg ICAgICAgICAgICAgICAgaGFuZGxlU2NyaXB0RW5kVGFnKG1fbGFzdFNjcmlwdEVsZW1lbnQuZ2V0 KCksIG1fbGFzdFNjcmlwdEVsZW1lbnRTdGFydExpbmUpOwogICAgICAgICAgICAgICAgIG1fbGFz dFNjcmlwdEVsZW1lbnQgPSAwOwogICAgICAgICAgICAgICAgIG1fbGFzdFNjcmlwdEVsZW1lbnRT dGFydExpbmUgPSB1bmluaXRpYWxpemVkTGluZU51bWJlclZhbHVlOwogICAgICAgICAgICAgfQot ICAgICAgICB9CisgICAgICAgIH0gZWxzZSBpZiAob2xkU3R5bGVUb2tlbi50YWdOYW1lID09IGZy YW1lc2V0VGFnKQorICAgICAgICAgICAgc2V0SW5zZXJ0aW9uTW9kZShBZnRlckZyYW1lc2V0KTsK ICAgICB9CiAgICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CiB9CmRpZmYgLS1naXQgYS9XZWJD b3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5oIGIvV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxk ZXIuaAppbmRleCA2ODJlNDYwMmE4MDk3MjZiNjZkZTRlZWFlMzIyMjc5MThmMmQ4YmRhLi4wYWRj ZDU2MmEyMmYzZTUxMDI1NWJlMTgzNzk0ZWM5NWRjNDlhMTIyIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2h0bWwvSFRNTDVUcmVlQnVpbGRlci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWls ZGVyLmgKQEAgLTU5LDE1ICs1OSwyOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBmaW5pc2hlZCgpOwog CiBwcml2YXRlOgorICAgIC8vIFJlcHJlc2VudHMgSFRNTDUgImluc2VydGlvbiBtb2RlIgorICAg IC8vIGh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw1L3N5bnRheC5odG1sI2luc2VydGlvbi1tb2Rl CisgICAgLy8gRklYTUU6IEltcGxlbWVudCByZW1haW5kZXIgb2Ygc3RhdGVzLgorICAgIGVudW0g SW5zZXJ0aW9uTW9kZSB7CisgICAgICAgIEluaXRpYWwsCisgICAgICAgIEFmdGVyRnJhbWVzZXQs CisgICAgfTsKKwogICAgIFBhc3NSZWZQdHI8Tm9kZT4gcGFzc1Rva2VuVG9MZWdhY3lQYXJzZXIo SFRNTDVUb2tlbiYpOwogICAgIFBhc3NSZWZQdHI8Tm9kZT4gcHJvY2Vzc1Rva2VuKEhUTUw1VG9r ZW4mLCBVQ2hhciBjdXJyZW50Q2hhcmFjdGVyID0gMCk7CiAgICAgCiAgICAgdm9pZCBoYW5kbGVT Y3JpcHRTdGFydFRhZygpOwogICAgIHZvaWQgaGFuZGxlU2NyaXB0RW5kVGFnKEVsZW1lbnQqLCBp bnQgc2NyaXB0U3RhcnRMaW5lKTsKIAorICAgIHZvaWQgc2V0SW5zZXJ0aW9uTW9kZShJbnNlcnRp b25Nb2RlIHZhbHVlKSB7IG1faW5zZXJ0aW9uTW9kZSA9IHZhbHVlOyB9CisgICAgSW5zZXJ0aW9u TW9kZSBpbnNlcnRpb25Nb2RlKCkgY29uc3QgeyByZXR1cm4gbV9pbnNlcnRpb25Nb2RlOyB9CisK ICAgICBEb2N1bWVudCogbV9kb2N1bWVudDsgLy8gVGhpcyBpcyBvbmx5IHVzZWQgYnkgdGhlIG1f bGVnYWN5UGFyc2VyIGZvciBub3cuCiAgICAgYm9vbCBtX3JlcG9ydEVycm9yczsKICAgICBib29s IG1faXNQYXVzZWQ7CisKKyAgICBJbnNlcnRpb25Nb2RlIG1faW5zZXJ0aW9uTW9kZTsKKwogICAg IC8vIEhUTUw1IHNwZWMgcmVxdWlyZXMgdGhhdCB3ZSBiZSBhYmxlIHRvIGNoYW5nZSB0aGUgc3Rh dGUgb2YgdGhlIGxleGVyCiAgICAgLy8gZnJvbSB3aXRoaW4gcGFyc2VyIGFjdGlvbnMuCiAgICAg SFRNTDVMZXhlciogbV9sZXhlcjsK