64937 2011-07-21 06:36:41 -0700 Add more text input types for chromium 2011-07-28 21:19:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 penghuang webkit-unassigned bryeung eric suzhe webkit.review.bot oldest_to_newest 440373 0 penghuang 2011-07-21 06:36:41 -0700 Currently, webkit only exposes three text input types to chromium (None, Password, Text). We need more types. 440374 1 101580 penghuang 2011-07-21 06:38:47 -0700 Created attachment 101580 Add more text input types for chromium 440384 2 penghuang 2011-07-21 07:04:29 -0700 Hi Eric, I created a patch for this bug. Could you please review it? Thanks. 440389 3 101585 penghuang 2011-07-21 07:14:09 -0700 Created attachment 101585 Rebase patch on HEAD 440390 4 webkit.review.bot 2011-07-21 07:15:47 -0700 Attachment 101585 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/ChangeLog:4: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 440409 5 101591 penghuang 2011-07-21 07:56:27 -0700 Created attachment 101591 Fix the style issue 441769 6 penghuang 2011-07-25 11:45:54 -0700 Eris is on vocation. Anyone else could review my patch? Thanks. 441843 7 101591 fishd 2011-07-25 13:57:33 -0700 Comment on attachment 101591 Fix the style issue View in context: https://bugs.webkit.org/attachment.cgi?id=101591&action=review > Source/WebKit/chromium/public/WebTextInputType.h:47 > + WebTextInputTypeSearch, These ones seem a bit analogous to WebTextInputTypePassword, but that one has a rather verbose comment, and these ones do not. It seems like replicating that comment for each of these, and just changing password to email, etc., would be overkill. Maybe you should re-organize this so that it looks more like so: // Input caret is in a specific input field, an input method may be used only if // it's suitable for the specific input field. WebTextInputTypePassword, WebTextInputTypeEmail, WebTextInputTypeNumber, WebTextInputTypeTelephone, WebTextInputTypeURL, ^^^ no need for new lines between them, but you can still separate WebTextInputTypeNone and WebTextInputTypeText with new lines because those are conceptually quite different from the group of specific input types. > Source/WebKit/chromium/src/WebViewImpl.cpp:1485 > + if (input.isPasswordField()) maybe this should be a method on WebInputElement? also, when we are inside the WebKit implementation, we ordinarily just use WebCore directly instead of creating a WebKit API type in order to use the WebKit API. the code is often a bit lighterweight when we use WebCore directly. have you considered that? 441869 8 101911 penghuang 2011-07-25 14:36:06 -0700 Created attachment 101911 Fix review issues 441872 9 101913 penghuang 2011-07-25 14:39:20 -0700 Created attachment 101913 Fix review issues 443285 10 101913 webkit.review.bot 2011-07-27 19:57:34 -0700 Comment on attachment 101913 Fix review issues Clearing flags on attachment: 101913 Committed r91892: <http://trac.webkit.org/changeset/91892> 443286 11 webkit.review.bot 2011-07-27 19:57:39 -0700 All reviewed patches have been landed. Closing bug. 443295 12 suzhe 2011-07-27 20:31:43 -0700 This patch may break the support of elements with contenteditable attribute. Please help check it. 443497 13 penghuang 2011-07-28 08:02:56 -0700 (In reply to comment #12) > This patch may break the support of elements with contenteditable attribute. Please help check it. I tested it with contexteditable="true". The input method works fine with it. 443498 14 102260 penghuang 2011-07-28 08:04:09 -0700 Created attachment 102260 test page 443805 15 suzhe 2011-07-28 21:19:59 -0700 Yes, this patch is ok. Thanks. 101580 2011-07-21 06:38:47 -0700 2011-07-21 07:14:09 -0700 Add more text input types for chromium webkit-add-more-text-input-types.patch text/plain 6228 penghuang ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMTUxMTM1Yy4uYzc3N2Q0OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wNy0yMSAgUGVuZyBIdWFu ZyAgPHBlbmdodWFuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIG1vcmUgdGV4dCBpbnB1 dCB0eXBlcyBmb3IgY2hyb21pdW0uCisJaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY0OTM3CisKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHB1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2Vi VGV4dElucHV0VHlwZS5oOgorICAgICAgICAqIHNyYy9XZWJJbnB1dEVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJJbnB1dEVsZW1lbnQ6OmlzU2VhcmNoRmllbGQpOgorICAgICAgICAo V2ViS2l0OjpXZWJJbnB1dEVsZW1lbnQ6OmlzRW1haWxGaWVsZCk6CisgICAgICAgIChXZWJLaXQ6 OldlYklucHV0RWxlbWVudDo6aXNOdW1iZXJGaWVsZCk6CisgICAgICAgIChXZWJLaXQ6OldlYklu cHV0RWxlbWVudDo6aXNUZWxlcGhvbmVGaWVsZCk6CisgICAgICAgIChXZWJLaXQ6OldlYklucHV0 RWxlbWVudDo6aXNVUkxGaWVsZCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnRleHRJbnB1dFR5cGUpOgorCiAyMDExLTA3LTIw ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogbW92ZSBOZXR3b3JrIGxvZyB2aWV3IHRvIGFuIGlmcmFtZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFbGVtZW50LmggYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaAppbmRleCAzYWU2NTc4Li5i ZGZkNzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1 dEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEVs ZW1lbnQuaApAQCAtNTksNiArNTksMTEgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgICAgIFdF QktJVF9BUEkgYm9vbCBpc1RleHQoKSBjb25zdDsKICAgICAgICAgV0VCS0lUX0FQSSBib29sIGlz UGFzc3dvcmRGaWVsZCgpIGNvbnN0OwogICAgICAgICBXRUJLSVRfQVBJIGJvb2wgaXNJbWFnZUJ1 dHRvbigpIGNvbnN0OworICAgICAgICBXRUJLSVRfQVBJIGJvb2wgaXNTZWFyY2hGaWVsZCgpIGNv bnN0OworICAgICAgICBXRUJLSVRfQVBJIGJvb2wgaXNFbWFpbEZpZWxkKCkgY29uc3Q7CisgICAg ICAgIFdFQktJVF9BUEkgYm9vbCBpc051bWJlckZpZWxkKCkgY29uc3Q7CisgICAgICAgIFdFQktJ VF9BUEkgYm9vbCBpc1RlbGVwaG9uZUZpZWxkKCkgY29uc3Q7CisgICAgICAgIFdFQktJVF9BUEkg Ym9vbCBpc1VSTEZpZWxkKCkgY29uc3Q7CiAgICAgICAgIFdFQktJVF9BUEkgYm9vbCBhdXRvQ29t cGxldGUoKSBjb25zdDsKICAgICAgICAgV0VCS0lUX0FQSSBpbnQgbWF4TGVuZ3RoKCkgY29uc3Q7 CiAgICAgICAgIFdFQktJVF9BUEkgYm9vbCBpc0FjdGl2YXRlZFN1Ym1pdCgpIGNvbnN0OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVGV4dElucHV0VHlwZS5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVGV4dElucHV0VHlwZS5oCmluZGV4 IDI1OTJmNmYuLjcxMjlkNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlRleHRJbnB1dFR5cGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJUZXh0SW5wdXRUeXBlLmgKQEAgLTQ0LDggKzQ0LDE1IEBAIGVudW0gV2ViVGV4dElucHV0 VHlwZSB7CiAgICAgLy8gaXQncyBzdWl0YWJsZSBmb3IgcGFzc3dvcmQgaW5wdXQuCiAgICAgV2Vi VGV4dElucHV0VHlwZVBhc3N3b3JkLAogCi0gICAgLy8gRklYTUU6IEFkZCBtb3JlIHRleHQgaW5w dXQgdHlwZXMgd2hlbiBuZWNlc3NhcnksIGVnLiBOdW1iZXIsCi0gICAgLy8gRGF0ZSwgRW1haWws IFVSTCwgZXRjLgorICAgIFdlYlRleHRJbnB1dFR5cGVTZWFyY2gsCisKKyAgICBXZWJUZXh0SW5w dXRUeXBlRW1haWwsCisKKyAgICBXZWJUZXh0SW5wdXRUeXBlTnVtYmVyLAorCisgICAgV2ViVGV4 dElucHV0VHlwZVRlbGVwaG9uZSwKKworICAgIFdlYlRleHRJbnB1dFR5cGVVUkwsCiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYklucHV0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJ bnB1dEVsZW1lbnQuY3BwCmluZGV4IDVlN2ExY2YuLmMwY2FlMzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFbGVtZW50LmNwcApAQCAtNjAsNiArNjAsMzEgQEAg Ym9vbCBXZWJJbnB1dEVsZW1lbnQ6OmlzSW1hZ2VCdXR0b24oKSBjb25zdAogICAgIHJldHVybiBj b25zdFVud3JhcDxIVE1MSW5wdXRFbGVtZW50PigpLT5pc0ltYWdlQnV0dG9uKCk7CiB9CiAKK2Jv b2wgV2ViSW5wdXRFbGVtZW50Ojppc1NlYXJjaEZpZWxkKCkgY29uc3QKK3sKKyAgICByZXR1cm4g Y29uc3RVbndyYXA8SFRNTElucHV0RWxlbWVudD4oKS0+aXNTZWFyY2hGaWVsZCgpOworfQorCiti b29sIFdlYklucHV0RWxlbWVudDo6aXNFbWFpbEZpZWxkKCkgY29uc3QKK3sKKyAgICByZXR1cm4g Y29uc3RVbndyYXA8SFRNTElucHV0RWxlbWVudD4oKS0+aXNFbWFpbEZpZWxkKCk7Cit9CisKK2Jv b2wgV2ViSW5wdXRFbGVtZW50Ojppc051bWJlckZpZWxkKCkgY29uc3QKK3sKKyAgICByZXR1cm4g Y29uc3RVbndyYXA8SFRNTElucHV0RWxlbWVudD4oKS0+aXNOdW1iZXJGaWVsZCgpOworfQorCiti b29sIFdlYklucHV0RWxlbWVudDo6aXNUZWxlcGhvbmVGaWVsZCgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIGNvbnN0VW53cmFwPEhUTUxJbnB1dEVsZW1lbnQ+KCktPmlzVGVsZXBob25lRmllbGQoKTsK K30KKworYm9vbCBXZWJJbnB1dEVsZW1lbnQ6OmlzVVJMRmllbGQoKSBjb25zdAoreworICAgIHJl dHVybiBjb25zdFVud3JhcDxIVE1MSW5wdXRFbGVtZW50PigpLT5pc1VSTEZpZWxkKCk7Cit9CisK IGJvb2wgV2ViSW5wdXRFbGVtZW50OjphdXRvQ29tcGxldGUoKSBjb25zdAogewogICAgIHJldHVy biBjb25zdFVud3JhcDxIVE1MSW5wdXRFbGVtZW50PigpLT5zaG91bGRBdXRvY29tcGxldGUoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBhNWFjODBk Li5jZWRiMTE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CkBAIC0xNDcwLDMxICsxNDcwLDQ5IEBAIGJvb2wgV2ViVmlld0ltcGw6OmNvbXBvc2l0aW9uUmFu Z2Uoc2l6ZV90KiBsb2NhdGlvbiwgc2l6ZV90KiBsZW5ndGgpCiAKIFdlYlRleHRJbnB1dFR5cGUg V2ViVmlld0ltcGw6OnRleHRJbnB1dFR5cGUoKQogewotICAgIFdlYlRleHRJbnB1dFR5cGUgdHlw ZSA9IFdlYlRleHRJbnB1dFR5cGVOb25lOwotICAgIGNvbnN0IEZyYW1lKiBmb2N1c2VkID0gZm9j dXNlZFdlYkNvcmVGcmFtZSgpOwotICAgIGlmICghZm9jdXNlZCkKLSAgICAgICAgcmV0dXJuIHR5 cGU7CisgICAgTm9kZSogbm9kZSA9IGZvY3VzZWRXZWJDb3JlTm9kZSgpOworICAgIGlmICghbm9k ZSkKKyAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOwogCi0gICAgY29uc3QgRWRp dG9yKiBlZGl0b3IgPSBmb2N1c2VkLT5lZGl0b3IoKTsKLSAgICBpZiAoIWVkaXRvciB8fCAhZWRp dG9yLT5jYW5FZGl0KCkpCi0gICAgICAgIHJldHVybiB0eXBlOworICAgIGlmIChub2RlLT5ub2Rl VHlwZSgpID09IE5vZGU6OkVMRU1FTlRfTk9ERSkgeworICAgICAgICBFbGVtZW50KiBlbGVtZW50 ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpOworICAgICAgICBpZiAoZWxlbWVudC0+aGFz TG9jYWxOYW1lKEhUTUxOYW1lczo6aW5wdXRUYWcpKSB7CisgICAgICAgICAgICBXZWJJbnB1dEVs ZW1lbnQgaW5wdXQoc3RhdGljX2Nhc3Q8SFRNTElucHV0RWxlbWVudCo+KGVsZW1lbnQpKTsKKwor ICAgICAgICAgICAgaWYgKGlucHV0LmlzUmVhZE9ubHkoKSB8fCAhaW5wdXQuaXNFbmFibGVkKCkp CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOworCisgICAgICAg ICAgICBpZiAoaW5wdXQuaXNQYXNzd29yZEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJu IFdlYlRleHRJbnB1dFR5cGVQYXNzd29yZDsKKyAgICAgICAgICAgIGlmIChpbnB1dC5pc1NlYXJj aEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVTZWFyY2g7 CisgICAgICAgICAgICBpZiAoaW5wdXQuaXNFbWFpbEZpZWxkKCkpCisgICAgICAgICAgICAgICAg cmV0dXJuIFdlYlRleHRJbnB1dFR5cGVFbWFpbDsKKyAgICAgICAgICAgIGlmIChpbnB1dC5pc051 bWJlckZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOdW1i ZXI7CisgICAgICAgICAgICBpZiAoaW5wdXQuaXNUZWxlcGhvbmVGaWVsZCgpKQorICAgICAgICAg ICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlVGVsZXBob25lOworICAgICAgICAgICAgaWYg KGlucHV0LmlzVVJMRmllbGQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViVGV4dElucHV0 VHlwZVVSTDsKKyAgICAgICAgICAgIGlmIChpbnB1dC5pc1RleHRGaWVsZCgpKQorICAgICAgICAg ICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlVGV4dDsKKyAgICAgICAgICAgIHJldHVybiBX ZWJUZXh0SW5wdXRUeXBlTm9uZTsKKyAgICAgICAgfQogCi0gICAgRnJhbWVTZWxlY3Rpb24qIHNl bGVjdGlvbiA9IGZvY3VzZWQtPnNlbGVjdGlvbigpOwotICAgIGlmICghc2VsZWN0aW9uKQotICAg ICAgICByZXR1cm4gdHlwZTsKKyAgICAgICAgaWYgKGVsZW1lbnQtPmhhc0xvY2FsTmFtZShIVE1M TmFtZXM6OnRleHRhcmVhVGFnKSkgeworICAgICAgICAgICAgV2ViRm9ybUNvbnRyb2xFbGVtZW50 IHRleHRhcmVhKHN0YXRpY19jYXN0PEhUTUxGb3JtQ29udHJvbEVsZW1lbnQqPihlbGVtZW50KSk7 CiAKLSAgICBjb25zdCBOb2RlKiBub2RlID0gc2VsZWN0aW9uLT5zdGFydCgpLmNvbnRhaW5lck5v ZGUoKTsKLSAgICBpZiAoIW5vZGUpCi0gICAgICAgIHJldHVybiB0eXBlOworICAgICAgICAgICAg aWYgKHRleHRhcmVhLmlzUmVhZE9ubHkoKSB8fCAhdGV4dGFyZWEuaXNFbmFibGVkKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOworICAgICAgICAgICAgcmV0 dXJuIFdlYlRleHRJbnB1dFR5cGVUZXh0OworICAgICAgICB9CisgICAgfQogCi0gICAgLy8gRklY TUU6IFN1cHBvcnQgbW9yZSB0ZXh0IGlucHV0IHR5cGVzIHdoZW4gbmVjZXNzYXJ5LCBlZy4gTnVt YmVyLAotICAgIC8vIERhdGUsIEVtYWlsLCBVUkwsIGV0Yy4KLSAgICBpZiAoc2VsZWN0aW9uLT5p c0luUGFzc3dvcmRGaWVsZCgpKQotICAgICAgICB0eXBlID0gV2ViVGV4dElucHV0VHlwZVBhc3N3 b3JkOwotICAgIGVsc2UgaWYgKG5vZGUtPnNob3VsZFVzZUlucHV0TWV0aG9kKCkpCi0gICAgICAg IHR5cGUgPSBXZWJUZXh0SW5wdXRUeXBlVGV4dDsKKyAgICAvLyBGb3Igb3RoZXIgc2l0dWF0aW9u cy4KKyAgICBpZiAobm9kZS0+c2hvdWxkVXNlSW5wdXRNZXRob2QoKSkKKyAgICAgICAgcmV0dXJu IFdlYlRleHRJbnB1dFR5cGVUZXh0OwogCi0gICAgcmV0dXJuIHR5cGU7CisgICAgcmV0dXJuIFdl YlRleHRJbnB1dFR5cGVOb25lOwogfQogCiBXZWJSZWN0IFdlYlZpZXdJbXBsOjpjYXJldE9yU2Vs ZWN0aW9uQm91bmRzKCkK 101585 2011-07-21 07:14:09 -0700 2011-07-21 07:56:27 -0700 Rebase patch on HEAD webkit-add-more-text-input-types.patch text/plain 6258 penghuang ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMTZjMmQ2My4uZTBhMThjYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wNy0yMSAgUGVuZyBIdWFu ZyAgPHBlbmdodWFuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIG1vcmUgdGV4dCBpbnB1 dCB0eXBlcyBmb3IgY2hyb21pdW0KKwlodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQ5MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHB1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaDoKKyAgICAgICAgKiBwdWJsaWMvV2ViVGV4 dElucHV0VHlwZS5oOgorICAgICAgICAqIHNyYy9XZWJJbnB1dEVsZW1lbnQuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJJbnB1dEVsZW1lbnQ6OmlzU2VhcmNoRmllbGQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnB1dEVsZW1lbnQ6OmlzRW1haWxGaWVsZCk6CisgICAgICAgIChXZWJLaXQ6Oldl YklucHV0RWxlbWVudDo6aXNOdW1iZXJGaWVsZCk6CisgICAgICAgIChXZWJLaXQ6OldlYklucHV0 RWxlbWVudDo6aXNUZWxlcGhvbmVGaWVsZCk6CisgICAgICAgIChXZWJLaXQ6OldlYklucHV0RWxl bWVudDo6aXNVUkxGaWVsZCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnRleHRJbnB1dFR5cGUpOgorCiAyMDExLTA3LTIxICBW c2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1 bSBEZXZUb29sc10gUmVtb3ZlIHVudXNlZCBtZXRob2Qgc2V0QWdlbnRJZGVudGlmaWVyUHJlZml4 IGZyb20gV2ViRGV2VG9vbEFnZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViSW5wdXRFbGVtZW50LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJJbnB1dEVsZW1lbnQuaAppbmRleCAzYWU2NTc4Li5iZGZkNzllIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJJbnB1dEVsZW1lbnQuaApAQCAtNTksNiArNTks MTEgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAgICAgIFdFQktJVF9BUEkgYm9vbCBpc1RleHQo KSBjb25zdDsKICAgICAgICAgV0VCS0lUX0FQSSBib29sIGlzUGFzc3dvcmRGaWVsZCgpIGNvbnN0 OwogICAgICAgICBXRUJLSVRfQVBJIGJvb2wgaXNJbWFnZUJ1dHRvbigpIGNvbnN0OworICAgICAg ICBXRUJLSVRfQVBJIGJvb2wgaXNTZWFyY2hGaWVsZCgpIGNvbnN0OworICAgICAgICBXRUJLSVRf QVBJIGJvb2wgaXNFbWFpbEZpZWxkKCkgY29uc3Q7CisgICAgICAgIFdFQktJVF9BUEkgYm9vbCBp c051bWJlckZpZWxkKCkgY29uc3Q7CisgICAgICAgIFdFQktJVF9BUEkgYm9vbCBpc1RlbGVwaG9u ZUZpZWxkKCkgY29uc3Q7CisgICAgICAgIFdFQktJVF9BUEkgYm9vbCBpc1VSTEZpZWxkKCkgY29u c3Q7CiAgICAgICAgIFdFQktJVF9BUEkgYm9vbCBhdXRvQ29tcGxldGUoKSBjb25zdDsKICAgICAg ICAgV0VCS0lUX0FQSSBpbnQgbWF4TGVuZ3RoKCkgY29uc3Q7CiAgICAgICAgIFdFQktJVF9BUEkg Ym9vbCBpc0FjdGl2YXRlZFN1Ym1pdCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViVGV4dElucHV0VHlwZS5oIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViVGV4dElucHV0VHlwZS5oCmluZGV4IDI1OTJmNmYuLjcxMjlkNTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlRleHRJbnB1dFR5cGUu aAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0SW5wdXRUeXBlLmgK QEAgLTQ0LDggKzQ0LDE1IEBAIGVudW0gV2ViVGV4dElucHV0VHlwZSB7CiAgICAgLy8gaXQncyBz dWl0YWJsZSBmb3IgcGFzc3dvcmQgaW5wdXQuCiAgICAgV2ViVGV4dElucHV0VHlwZVBhc3N3b3Jk LAogCi0gICAgLy8gRklYTUU6IEFkZCBtb3JlIHRleHQgaW5wdXQgdHlwZXMgd2hlbiBuZWNlc3Nh cnksIGVnLiBOdW1iZXIsCi0gICAgLy8gRGF0ZSwgRW1haWwsIFVSTCwgZXRjLgorICAgIFdlYlRl eHRJbnB1dFR5cGVTZWFyY2gsCisKKyAgICBXZWJUZXh0SW5wdXRUeXBlRW1haWwsCisKKyAgICBX ZWJUZXh0SW5wdXRUeXBlTnVtYmVyLAorCisgICAgV2ViVGV4dElucHV0VHlwZVRlbGVwaG9uZSwK KworICAgIFdlYlRleHRJbnB1dFR5cGVVUkwsCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEVsZW1lbnQuY3BwCmluZGV4 IDVlN2ExY2YuLmMwY2FlMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYklucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi SW5wdXRFbGVtZW50LmNwcApAQCAtNjAsNiArNjAsMzEgQEAgYm9vbCBXZWJJbnB1dEVsZW1lbnQ6 OmlzSW1hZ2VCdXR0b24oKSBjb25zdAogICAgIHJldHVybiBjb25zdFVud3JhcDxIVE1MSW5wdXRF bGVtZW50PigpLT5pc0ltYWdlQnV0dG9uKCk7CiB9CiAKK2Jvb2wgV2ViSW5wdXRFbGVtZW50Ojpp c1NlYXJjaEZpZWxkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gY29uc3RVbndyYXA8SFRNTElucHV0 RWxlbWVudD4oKS0+aXNTZWFyY2hGaWVsZCgpOworfQorCitib29sIFdlYklucHV0RWxlbWVudDo6 aXNFbWFpbEZpZWxkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gY29uc3RVbndyYXA8SFRNTElucHV0 RWxlbWVudD4oKS0+aXNFbWFpbEZpZWxkKCk7Cit9CisKK2Jvb2wgV2ViSW5wdXRFbGVtZW50Ojpp c051bWJlckZpZWxkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gY29uc3RVbndyYXA8SFRNTElucHV0 RWxlbWVudD4oKS0+aXNOdW1iZXJGaWVsZCgpOworfQorCitib29sIFdlYklucHV0RWxlbWVudDo6 aXNUZWxlcGhvbmVGaWVsZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbnN0VW53cmFwPEhUTUxJ bnB1dEVsZW1lbnQ+KCktPmlzVGVsZXBob25lRmllbGQoKTsKK30KKworYm9vbCBXZWJJbnB1dEVs ZW1lbnQ6OmlzVVJMRmllbGQoKSBjb25zdAoreworICAgIHJldHVybiBjb25zdFVud3JhcDxIVE1M SW5wdXRFbGVtZW50PigpLT5pc1VSTEZpZWxkKCk7Cit9CisKIGJvb2wgV2ViSW5wdXRFbGVtZW50 OjphdXRvQ29tcGxldGUoKSBjb25zdAogewogICAgIHJldHVybiBjb25zdFVud3JhcDxIVE1MSW5w dXRFbGVtZW50PigpLT5zaG91bGRBdXRvY29tcGxldGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCAwNWFhYjQzLi42NDcyYzc5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0xNDcwLDMxICsxNDcwLDQ5 IEBAIGJvb2wgV2ViVmlld0ltcGw6OmNvbXBvc2l0aW9uUmFuZ2Uoc2l6ZV90KiBsb2NhdGlvbiwg c2l6ZV90KiBsZW5ndGgpCiAKIFdlYlRleHRJbnB1dFR5cGUgV2ViVmlld0ltcGw6OnRleHRJbnB1 dFR5cGUoKQogewotICAgIFdlYlRleHRJbnB1dFR5cGUgdHlwZSA9IFdlYlRleHRJbnB1dFR5cGVO b25lOwotICAgIGNvbnN0IEZyYW1lKiBmb2N1c2VkID0gZm9jdXNlZFdlYkNvcmVGcmFtZSgpOwot ICAgIGlmICghZm9jdXNlZCkKLSAgICAgICAgcmV0dXJuIHR5cGU7CisgICAgTm9kZSogbm9kZSA9 IGZvY3VzZWRXZWJDb3JlTm9kZSgpOworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuIFdl YlRleHRJbnB1dFR5cGVOb25lOwogCi0gICAgY29uc3QgRWRpdG9yKiBlZGl0b3IgPSBmb2N1c2Vk LT5lZGl0b3IoKTsKLSAgICBpZiAoIWVkaXRvciB8fCAhZWRpdG9yLT5jYW5FZGl0KCkpCi0gICAg ICAgIHJldHVybiB0eXBlOworICAgIGlmIChub2RlLT5ub2RlVHlwZSgpID09IE5vZGU6OkVMRU1F TlRfTk9ERSkgeworICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVu dCo+KG5vZGUpOworICAgICAgICBpZiAoZWxlbWVudC0+aGFzTG9jYWxOYW1lKEhUTUxOYW1lczo6 aW5wdXRUYWcpKSB7CisgICAgICAgICAgICBXZWJJbnB1dEVsZW1lbnQgaW5wdXQoc3RhdGljX2Nh c3Q8SFRNTElucHV0RWxlbWVudCo+KGVsZW1lbnQpKTsKKworICAgICAgICAgICAgaWYgKGlucHV0 LmlzUmVhZE9ubHkoKSB8fCAhaW5wdXQuaXNFbmFibGVkKCkpCisgICAgICAgICAgICAgICAgcmV0 dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOworCisgICAgICAgICAgICBpZiAoaW5wdXQuaXNQYXNz d29yZEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVQYXNz d29yZDsKKyAgICAgICAgICAgIGlmIChpbnB1dC5pc1NlYXJjaEZpZWxkKCkpCisgICAgICAgICAg ICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVTZWFyY2g7CisgICAgICAgICAgICBpZiAoaW5w dXQuaXNFbWFpbEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5 cGVFbWFpbDsKKyAgICAgICAgICAgIGlmIChpbnB1dC5pc051bWJlckZpZWxkKCkpCisgICAgICAg ICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOdW1iZXI7CisgICAgICAgICAgICBpZiAo aW5wdXQuaXNUZWxlcGhvbmVGaWVsZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0 SW5wdXRUeXBlVGVsZXBob25lOworICAgICAgICAgICAgaWYgKGlucHV0LmlzVVJMRmllbGQoKSkK KyAgICAgICAgICAgICAgICByZXR1cm4gV2ViVGV4dElucHV0VHlwZVVSTDsKKyAgICAgICAgICAg IGlmIChpbnB1dC5pc1RleHRGaWVsZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0 SW5wdXRUeXBlVGV4dDsKKyAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlTm9uZTsK KyAgICAgICAgfQogCi0gICAgRnJhbWVTZWxlY3Rpb24qIHNlbGVjdGlvbiA9IGZvY3VzZWQtPnNl bGVjdGlvbigpOwotICAgIGlmICghc2VsZWN0aW9uKQotICAgICAgICByZXR1cm4gdHlwZTsKKyAg ICAgICAgaWYgKGVsZW1lbnQtPmhhc0xvY2FsTmFtZShIVE1MTmFtZXM6OnRleHRhcmVhVGFnKSkg eworICAgICAgICAgICAgV2ViRm9ybUNvbnRyb2xFbGVtZW50IHRleHRhcmVhKHN0YXRpY19jYXN0 PEhUTUxGb3JtQ29udHJvbEVsZW1lbnQqPihlbGVtZW50KSk7CiAKLSAgICBOb2RlKiBub2RlID0g c2VsZWN0aW9uLT5zdGFydCgpLmNvbnRhaW5lck5vZGUoKTsKLSAgICBpZiAoIW5vZGUpCi0gICAg ICAgIHJldHVybiB0eXBlOworICAgICAgICAgICAgaWYgKHRleHRhcmVhLmlzUmVhZE9ubHkoKSB8 fCAhdGV4dGFyZWEuaXNFbmFibGVkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJ bnB1dFR5cGVOb25lOworICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVUZXh0Owor ICAgICAgICB9CisgICAgfQogCi0gICAgLy8gRklYTUU6IFN1cHBvcnQgbW9yZSB0ZXh0IGlucHV0 IHR5cGVzIHdoZW4gbmVjZXNzYXJ5LCBlZy4gTnVtYmVyLAotICAgIC8vIERhdGUsIEVtYWlsLCBV UkwsIGV0Yy4KLSAgICBpZiAoc2VsZWN0aW9uLT5pc0luUGFzc3dvcmRGaWVsZCgpKQotICAgICAg ICB0eXBlID0gV2ViVGV4dElucHV0VHlwZVBhc3N3b3JkOwotICAgIGVsc2UgaWYgKG5vZGUtPnNo b3VsZFVzZUlucHV0TWV0aG9kKCkpCi0gICAgICAgIHR5cGUgPSBXZWJUZXh0SW5wdXRUeXBlVGV4 dDsKKyAgICAvLyBGb3Igb3RoZXIgc2l0dWF0aW9ucy4KKyAgICBpZiAobm9kZS0+c2hvdWxkVXNl SW5wdXRNZXRob2QoKSkKKyAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVUZXh0OwogCi0g ICAgcmV0dXJuIHR5cGU7CisgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOwogfQogCiBX ZWJSZWN0IFdlYlZpZXdJbXBsOjpjYXJldE9yU2VsZWN0aW9uQm91bmRzKCkK 101591 2011-07-21 07:56:27 -0700 2011-07-25 14:36:06 -0700 Fix the style issue webkit-add-more-text-input-types.patch text/plain 6265 penghuang ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMTZjMmQ2My4uODU3MjExZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wNy0yMSAgUGVuZyBIdWFu ZyAgPHBlbmdodWFuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIG1vcmUgdGV4dCBpbnB1 dCB0eXBlcyBmb3IgY2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0OTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwdWJsaWMvV2ViSW5wdXRFbGVtZW50Lmg6CisgICAgICAgICogcHVibGlj L1dlYlRleHRJbnB1dFR5cGUuaDoKKyAgICAgICAgKiBzcmMvV2ViSW5wdXRFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViSW5wdXRFbGVtZW50Ojppc1NlYXJjaEZpZWxkKToKKyAgICAg ICAgKFdlYktpdDo6V2ViSW5wdXRFbGVtZW50Ojppc0VtYWlsRmllbGQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnB1dEVsZW1lbnQ6OmlzTnVtYmVyRmllbGQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJJbnB1dEVsZW1lbnQ6OmlzVGVsZXBob25lRmllbGQpOgorICAgICAgICAoV2ViS2l0OjpXZWJJ bnB1dEVsZW1lbnQ6OmlzVVJMRmllbGQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0ZXh0SW5wdXRUeXBlKToKKwogMjAxMS0w Ny0yMSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Q2hyb21pdW0gRGV2VG9vbHNdIFJlbW92ZSB1bnVzZWQgbWV0aG9kIHNldEFnZW50SWRlbnRpZmll clByZWZpeCBmcm9tIFdlYkRldlRvb2xBZ2VudC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vcHVibGljL1dlYklucHV0RWxlbWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViSW5wdXRFbGVtZW50LmgKaW5kZXggM2FlNjU3OC4uYmRmZDc5ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFbGVtZW50LmgKQEAgLTU5 LDYgKzU5LDExIEBAIG5hbWVzcGFjZSBXZWJLaXQgewogICAgICAgICBXRUJLSVRfQVBJIGJvb2wg aXNUZXh0KCkgY29uc3Q7CiAgICAgICAgIFdFQktJVF9BUEkgYm9vbCBpc1Bhc3N3b3JkRmllbGQo KSBjb25zdDsKICAgICAgICAgV0VCS0lUX0FQSSBib29sIGlzSW1hZ2VCdXR0b24oKSBjb25zdDsK KyAgICAgICAgV0VCS0lUX0FQSSBib29sIGlzU2VhcmNoRmllbGQoKSBjb25zdDsKKyAgICAgICAg V0VCS0lUX0FQSSBib29sIGlzRW1haWxGaWVsZCgpIGNvbnN0OworICAgICAgICBXRUJLSVRfQVBJ IGJvb2wgaXNOdW1iZXJGaWVsZCgpIGNvbnN0OworICAgICAgICBXRUJLSVRfQVBJIGJvb2wgaXNU ZWxlcGhvbmVGaWVsZCgpIGNvbnN0OworICAgICAgICBXRUJLSVRfQVBJIGJvb2wgaXNVUkxGaWVs ZCgpIGNvbnN0OwogICAgICAgICBXRUJLSVRfQVBJIGJvb2wgYXV0b0NvbXBsZXRlKCkgY29uc3Q7 CiAgICAgICAgIFdFQktJVF9BUEkgaW50IG1heExlbmd0aCgpIGNvbnN0OwogICAgICAgICBXRUJL SVRfQVBJIGJvb2wgaXNBY3RpdmF0ZWRTdWJtaXQoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlRleHRJbnB1dFR5cGUuaCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYlRleHRJbnB1dFR5cGUuaAppbmRleCAyNTkyZjZmLi43MTI5 ZDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0SW5w dXRUeXBlLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVGV4dElucHV0 VHlwZS5oCkBAIC00NCw4ICs0NCwxNSBAQCBlbnVtIFdlYlRleHRJbnB1dFR5cGUgewogICAgIC8v IGl0J3Mgc3VpdGFibGUgZm9yIHBhc3N3b3JkIGlucHV0LgogICAgIFdlYlRleHRJbnB1dFR5cGVQ YXNzd29yZCwKIAotICAgIC8vIEZJWE1FOiBBZGQgbW9yZSB0ZXh0IGlucHV0IHR5cGVzIHdoZW4g bmVjZXNzYXJ5LCBlZy4gTnVtYmVyLAotICAgIC8vIERhdGUsIEVtYWlsLCBVUkwsIGV0Yy4KKyAg ICBXZWJUZXh0SW5wdXRUeXBlU2VhcmNoLAorCisgICAgV2ViVGV4dElucHV0VHlwZUVtYWlsLAor CisgICAgV2ViVGV4dElucHV0VHlwZU51bWJlciwKKworICAgIFdlYlRleHRJbnB1dFR5cGVUZWxl cGhvbmUsCisKKyAgICBXZWJUZXh0SW5wdXRUeXBlVVJMLAogfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEVs ZW1lbnQuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFbGVtZW50LmNw cAppbmRleCA1ZTdhMWNmLi5jMGNhZTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJJbnB1dEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYklucHV0RWxlbWVudC5jcHAKQEAgLTYwLDYgKzYwLDMxIEBAIGJvb2wgV2ViSW5wdXRF bGVtZW50Ojppc0ltYWdlQnV0dG9uKCkgY29uc3QKICAgICByZXR1cm4gY29uc3RVbndyYXA8SFRN TElucHV0RWxlbWVudD4oKS0+aXNJbWFnZUJ1dHRvbigpOwogfQogCitib29sIFdlYklucHV0RWxl bWVudDo6aXNTZWFyY2hGaWVsZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbnN0VW53cmFwPEhU TUxJbnB1dEVsZW1lbnQ+KCktPmlzU2VhcmNoRmllbGQoKTsKK30KKworYm9vbCBXZWJJbnB1dEVs ZW1lbnQ6OmlzRW1haWxGaWVsZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbnN0VW53cmFwPEhU TUxJbnB1dEVsZW1lbnQ+KCktPmlzRW1haWxGaWVsZCgpOworfQorCitib29sIFdlYklucHV0RWxl bWVudDo6aXNOdW1iZXJGaWVsZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGNvbnN0VW53cmFwPEhU TUxJbnB1dEVsZW1lbnQ+KCktPmlzTnVtYmVyRmllbGQoKTsKK30KKworYm9vbCBXZWJJbnB1dEVs ZW1lbnQ6OmlzVGVsZXBob25lRmllbGQoKSBjb25zdAoreworICAgIHJldHVybiBjb25zdFVud3Jh cDxIVE1MSW5wdXRFbGVtZW50PigpLT5pc1RlbGVwaG9uZUZpZWxkKCk7Cit9CisKK2Jvb2wgV2Vi SW5wdXRFbGVtZW50Ojppc1VSTEZpZWxkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gY29uc3RVbndy YXA8SFRNTElucHV0RWxlbWVudD4oKS0+aXNVUkxGaWVsZCgpOworfQorCiBib29sIFdlYklucHV0 RWxlbWVudDo6YXV0b0NvbXBsZXRlKCkgY29uc3QKIHsKICAgICByZXR1cm4gY29uc3RVbndyYXA8 SFRNTElucHV0RWxlbWVudD4oKS0+c2hvdWxkQXV0b2NvbXBsZXRlKCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggMDVhYWI0My4uNjQ3MmM3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtMTQ3MCwzMSAr MTQ3MCw0OSBAQCBib29sIFdlYlZpZXdJbXBsOjpjb21wb3NpdGlvblJhbmdlKHNpemVfdCogbG9j YXRpb24sIHNpemVfdCogbGVuZ3RoKQogCiBXZWJUZXh0SW5wdXRUeXBlIFdlYlZpZXdJbXBsOjp0 ZXh0SW5wdXRUeXBlKCkKIHsKLSAgICBXZWJUZXh0SW5wdXRUeXBlIHR5cGUgPSBXZWJUZXh0SW5w dXRUeXBlTm9uZTsKLSAgICBjb25zdCBGcmFtZSogZm9jdXNlZCA9IGZvY3VzZWRXZWJDb3JlRnJh bWUoKTsKLSAgICBpZiAoIWZvY3VzZWQpCi0gICAgICAgIHJldHVybiB0eXBlOworICAgIE5vZGUq IG5vZGUgPSBmb2N1c2VkV2ViQ29yZU5vZGUoKTsKKyAgICBpZiAoIW5vZGUpCisgICAgICAgIHJl dHVybiBXZWJUZXh0SW5wdXRUeXBlTm9uZTsKIAotICAgIGNvbnN0IEVkaXRvciogZWRpdG9yID0g Zm9jdXNlZC0+ZWRpdG9yKCk7Ci0gICAgaWYgKCFlZGl0b3IgfHwgIWVkaXRvci0+Y2FuRWRpdCgp KQotICAgICAgICByZXR1cm4gdHlwZTsKKyAgICBpZiAobm9kZS0+bm9kZVR5cGUoKSA9PSBOb2Rl OjpFTEVNRU5UX05PREUpIHsKKyAgICAgICAgRWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0 PEVsZW1lbnQqPihub2RlKTsKKyAgICAgICAgaWYgKGVsZW1lbnQtPmhhc0xvY2FsTmFtZShIVE1M TmFtZXM6OmlucHV0VGFnKSkgeworICAgICAgICAgICAgV2ViSW5wdXRFbGVtZW50IGlucHV0KHN0 YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihlbGVtZW50KSk7CisKKyAgICAgICAgICAgIGlm IChpbnB1dC5pc1JlYWRPbmx5KCkgfHwgIWlucHV0LmlzRW5hYmxlZCgpKQorICAgICAgICAgICAg ICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlTm9uZTsKKworICAgICAgICAgICAgaWYgKGlucHV0 LmlzUGFzc3dvcmRGaWVsZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRU eXBlUGFzc3dvcmQ7CisgICAgICAgICAgICBpZiAoaW5wdXQuaXNTZWFyY2hGaWVsZCgpKQorICAg ICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlU2VhcmNoOworICAgICAgICAgICAg aWYgKGlucHV0LmlzRW1haWxGaWVsZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0 SW5wdXRUeXBlRW1haWw7CisgICAgICAgICAgICBpZiAoaW5wdXQuaXNOdW1iZXJGaWVsZCgpKQor ICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlTnVtYmVyOworICAgICAgICAg ICAgaWYgKGlucHV0LmlzVGVsZXBob25lRmllbGQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4g V2ViVGV4dElucHV0VHlwZVRlbGVwaG9uZTsKKyAgICAgICAgICAgIGlmIChpbnB1dC5pc1VSTEZp ZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVVUkw7CisgICAg ICAgICAgICBpZiAoaW5wdXQuaXNUZXh0RmllbGQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4g V2ViVGV4dElucHV0VHlwZVRleHQ7CisgICAgICAgICAgICByZXR1cm4gV2ViVGV4dElucHV0VHlw ZU5vbmU7CisgICAgICAgIH0KIAotICAgIEZyYW1lU2VsZWN0aW9uKiBzZWxlY3Rpb24gPSBmb2N1 c2VkLT5zZWxlY3Rpb24oKTsKLSAgICBpZiAoIXNlbGVjdGlvbikKLSAgICAgICAgcmV0dXJuIHR5 cGU7CisgICAgICAgIGlmIChlbGVtZW50LT5oYXNMb2NhbE5hbWUoSFRNTE5hbWVzOjp0ZXh0YXJl YVRhZykpIHsKKyAgICAgICAgICAgIFdlYkZvcm1Db250cm9sRWxlbWVudCB0ZXh0YXJlYShzdGF0 aWNfY2FzdDxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Kj4oZWxlbWVudCkpOwogCi0gICAgTm9kZSog bm9kZSA9IHNlbGVjdGlvbi0+c3RhcnQoKS5jb250YWluZXJOb2RlKCk7Ci0gICAgaWYgKCFub2Rl KQotICAgICAgICByZXR1cm4gdHlwZTsKKyAgICAgICAgICAgIGlmICh0ZXh0YXJlYS5pc1JlYWRP bmx5KCkgfHwgIXRleHRhcmVhLmlzRW5hYmxlZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBX ZWJUZXh0SW5wdXRUeXBlTm9uZTsKKyAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBl VGV4dDsKKyAgICAgICAgfQorICAgIH0KIAotICAgIC8vIEZJWE1FOiBTdXBwb3J0IG1vcmUgdGV4 dCBpbnB1dCB0eXBlcyB3aGVuIG5lY2Vzc2FyeSwgZWcuIE51bWJlciwKLSAgICAvLyBEYXRlLCBF bWFpbCwgVVJMLCBldGMuCi0gICAgaWYgKHNlbGVjdGlvbi0+aXNJblBhc3N3b3JkRmllbGQoKSkK LSAgICAgICAgdHlwZSA9IFdlYlRleHRJbnB1dFR5cGVQYXNzd29yZDsKLSAgICBlbHNlIGlmIChu b2RlLT5zaG91bGRVc2VJbnB1dE1ldGhvZCgpKQotICAgICAgICB0eXBlID0gV2ViVGV4dElucHV0 VHlwZVRleHQ7CisgICAgLy8gRm9yIG90aGVyIHNpdHVhdGlvbnMuCisgICAgaWYgKG5vZGUtPnNo b3VsZFVzZUlucHV0TWV0aG9kKCkpCisgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlVGV4 dDsKIAotICAgIHJldHVybiB0eXBlOworICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlTm9uZTsK IH0KIAogV2ViUmVjdCBXZWJWaWV3SW1wbDo6Y2FyZXRPclNlbGVjdGlvbkJvdW5kcygpCg== 101911 2011-07-25 14:36:06 -0700 2011-07-25 14:39:20 -0700 Fix review issues webkit.patch text/plain 4575 penghuang ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNTRkNDQ5My4uMTNmNTZlZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMS0wNy0yNSAgUGVuZyBIdWFu ZyAgPHBlbmdodWFuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIG1vcmUgdGV4dCBpbnB1 dCB0eXBlcyBmb3IgY2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0OTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwdWJsaWMvV2ViVGV4dElucHV0VHlwZS5oOgorICAgICAgICAqIHNyYy9X ZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0ZXh0SW5wdXRU eXBlKToKKwogMjAxMS0wNy0yMyAgQWxvayBQcml5YWRhcnNoaSAgPGFsb2twQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBTd2l0Y2hpbmcgb2ZmIGFjY2VsZXJhdGlvbiBmb3Igc21hbGwgY2FudmFz IGJyb2tlIGdwdSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViVGV4dElucHV0VHlwZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi VGV4dElucHV0VHlwZS5oCmluZGV4IDI1OTJmNmYuLmZiYTgyMTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlRleHRJbnB1dFR5cGUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0SW5wdXRUeXBlLmgKQEAgLTQwLDEyICs0MCwx NCBAQCBlbnVtIFdlYlRleHRJbnB1dFR5cGUgewogICAgIC8vIElucHV0IGNhcmV0IGlzIGluIGEg bm9ybWFsIGVkaXRhYmxlIG5vZGUsIGFueSBpbnB1dCBtZXRob2QgY2FuIGJlIHVzZWQuCiAgICAg V2ViVGV4dElucHV0VHlwZVRleHQsCiAKLSAgICAvLyBJbnB1dCBjYXJldCBpcyBpbiBhIHBhc3N3 b3JkIGJveCwgYW4gaW5wdXQgbWV0aG9kIG1heSBiZSB1c2VkIG9ubHkgaWYKLSAgICAvLyBpdCdz IHN1aXRhYmxlIGZvciBwYXNzd29yZCBpbnB1dC4KKyAgICAvLyBJbnB1dCBjYXJldCBpcyBpbiBh IHNwZWNpZmljIGlucHV0IGZpZWxkLCBhbmQgaW5wdXQgbWV0aG9kIG1heSBiZSB1c2VkCisgICAg Ly8gb25seSBpZiBpdCdzIHN1aXRhYmxlIGZvciB0aGUgc3BlY2lmaXggaW5wdXQgZmllbGQuCiAg ICAgV2ViVGV4dElucHV0VHlwZVBhc3N3b3JkLAotCi0gICAgLy8gRklYTUU6IEFkZCBtb3JlIHRl eHQgaW5wdXQgdHlwZXMgd2hlbiBuZWNlc3NhcnksIGVnLiBOdW1iZXIsCi0gICAgLy8gRGF0ZSwg RW1haWwsIFVSTCwgZXRjLgorICAgIFdlYlRleHRJbnB1dFR5cGVTZWFyY2gsCisgICAgV2ViVGV4 dElucHV0VHlwZUVtYWlsLAorICAgIFdlYlRleHRJbnB1dFR5cGVOdW1iZXIsCisgICAgV2ViVGV4 dElucHV0VHlwZVRlbGVwaG9uZSwKKyAgICBXZWJUZXh0SW5wdXRUeXBlVVJMLAogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKaW5kZXggMGVhOTgyZS4uMTE4YjVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNjYsNiArNjYsNyBAQAogI2luY2x1ZGUgIkhUTUxJbnB1 dEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRN TE5hbWVzLmgiCisjaW5jbHVkZSAiSFRNTFRleHRBcmVhRWxlbWVudC5oIgogI2luY2x1ZGUgIkhp dFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIkltYWdlQnVmZmVy LmgiCkBAIC0xNDUzLDMxICsxNDU0LDQ5IEBAIGJvb2wgV2ViVmlld0ltcGw6OmNvbXBvc2l0aW9u UmFuZ2Uoc2l6ZV90KiBsb2NhdGlvbiwgc2l6ZV90KiBsZW5ndGgpCiAKIFdlYlRleHRJbnB1dFR5 cGUgV2ViVmlld0ltcGw6OnRleHRJbnB1dFR5cGUoKQogewotICAgIFdlYlRleHRJbnB1dFR5cGUg dHlwZSA9IFdlYlRleHRJbnB1dFR5cGVOb25lOwotICAgIGNvbnN0IEZyYW1lKiBmb2N1c2VkID0g Zm9jdXNlZFdlYkNvcmVGcmFtZSgpOwotICAgIGlmICghZm9jdXNlZCkKLSAgICAgICAgcmV0dXJu IHR5cGU7CisgICAgTm9kZSogbm9kZSA9IGZvY3VzZWRXZWJDb3JlTm9kZSgpOworICAgIGlmICgh bm9kZSkKKyAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOwogCi0gICAgY29uc3Qg RWRpdG9yKiBlZGl0b3IgPSBmb2N1c2VkLT5lZGl0b3IoKTsKLSAgICBpZiAoIWVkaXRvciB8fCAh ZWRpdG9yLT5jYW5FZGl0KCkpCi0gICAgICAgIHJldHVybiB0eXBlOworICAgIGlmIChub2RlLT5u b2RlVHlwZSgpID09IE5vZGU6OkVMRU1FTlRfTk9ERSkgeworICAgICAgICBFbGVtZW50KiBlbGVt ZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpOworICAgICAgICBpZiAoZWxlbWVudC0+ aGFzTG9jYWxOYW1lKEhUTUxOYW1lczo6aW5wdXRUYWcpKSB7CisgICAgICAgICAgICBIVE1MSW5w dXRFbGVtZW50KiBpbnB1dCA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihlbGVtZW50 KTsKKworICAgICAgICAgICAgaWYgKGlucHV0LT5yZWFkT25seSgpIHx8IGlucHV0LT5kaXNhYmxl ZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlTm9uZTsKKworICAg ICAgICAgICAgaWYgKGlucHV0LT5pc1Bhc3N3b3JkRmllbGQoKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gV2ViVGV4dElucHV0VHlwZVBhc3N3b3JkOworICAgICAgICAgICAgaWYgKGlucHV0LT5p c1NlYXJjaEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVT ZWFyY2g7CisgICAgICAgICAgICBpZiAoaW5wdXQtPmlzRW1haWxGaWVsZCgpKQorICAgICAgICAg ICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlRW1haWw7CisgICAgICAgICAgICBpZiAoaW5w dXQtPmlzTnVtYmVyRmllbGQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViVGV4dElucHV0 VHlwZU51bWJlcjsKKyAgICAgICAgICAgIGlmIChpbnB1dC0+aXNUZWxlcGhvbmVGaWVsZCgpKQor ICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlVGVsZXBob25lOworICAgICAg ICAgICAgaWYgKGlucHV0LT5pc1VSTEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdl YlRleHRJbnB1dFR5cGVVUkw7CisgICAgICAgICAgICBpZiAoaW5wdXQtPmlzVGV4dEZpZWxkKCkp CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVUZXh0OworICAgICAgICAg ICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOworICAgICAgICB9CiAKLSAgICBGcmFtZVNl bGVjdGlvbiogc2VsZWN0aW9uID0gZm9jdXNlZC0+c2VsZWN0aW9uKCk7Ci0gICAgaWYgKCFzZWxl Y3Rpb24pCi0gICAgICAgIHJldHVybiB0eXBlOworICAgICAgICBpZiAoZWxlbWVudC0+aGFzTG9j YWxOYW1lKEhUTUxOYW1lczo6dGV4dGFyZWFUYWcpKSB7CisgICAgICAgICAgICBIVE1MVGV4dEFy ZWFFbGVtZW50KiB0ZXh0YXJlYSA9IHN0YXRpY19jYXN0PEhUTUxUZXh0QXJlYUVsZW1lbnQqPihl bGVtZW50KTsKIAotICAgIE5vZGUqIG5vZGUgPSBzZWxlY3Rpb24tPnN0YXJ0KCkuY29udGFpbmVy Tm9kZSgpOwotICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIHR5cGU7CisgICAgICAgICAg ICBpZiAodGV4dGFyZWEtPnJlYWRPbmx5KCkgfHwgdGV4dGFyZWEtPmRpc2FibGVkKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOworICAgICAgICAgICAgcmV0 dXJuIFdlYlRleHRJbnB1dFR5cGVUZXh0OworICAgICAgICB9CisgICAgfQogCi0gICAgLy8gRklY TUU6IFN1cHBvcnQgbW9yZSB0ZXh0IGlucHV0IHR5cGVzIHdoZW4gbmVjZXNzYXJ5LCBlZy4gTnVt YmVyLAotICAgIC8vIERhdGUsIEVtYWlsLCBVUkwsIGV0Yy4KLSAgICBpZiAoc2VsZWN0aW9uLT5p c0luUGFzc3dvcmRGaWVsZCgpKQotICAgICAgICB0eXBlID0gV2ViVGV4dElucHV0VHlwZVBhc3N3 b3JkOwotICAgIGVsc2UgaWYgKG5vZGUtPnNob3VsZFVzZUlucHV0TWV0aG9kKCkpCi0gICAgICAg IHR5cGUgPSBXZWJUZXh0SW5wdXRUeXBlVGV4dDsKKyAgICAvLyBGb3Igb3RoZXIgc2l0dWF0aW9u cy4KKyAgICBpZiAobm9kZS0+c2hvdWxkVXNlSW5wdXRNZXRob2QoKSkKKyAgICAgICAgcmV0dXJu IFdlYlRleHRJbnB1dFR5cGVUZXh0OwogCi0gICAgcmV0dXJuIHR5cGU7CisgICAgcmV0dXJuIFdl YlRleHRJbnB1dFR5cGVOb25lOwogfQogCiBXZWJSZWN0IFdlYlZpZXdJbXBsOjpjYXJldE9yU2Vs ZWN0aW9uQm91bmRzKCkK 101913 2011-07-25 14:39:20 -0700 2011-07-27 19:57:34 -0700 Fix review issues webkit.patch text/plain 4575 penghuang ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNTRkNDQ5My4uMTNmNTZlZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMS0wNy0yNSAgUGVuZyBIdWFu ZyAgPHBlbmdodWFuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIG1vcmUgdGV4dCBpbnB1 dCB0eXBlcyBmb3IgY2hyb21pdW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY0OTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBwdWJsaWMvV2ViVGV4dElucHV0VHlwZS5oOgorICAgICAgICAqIHNyYy9X ZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjp0ZXh0SW5wdXRU eXBlKToKKwogMjAxMS0wNy0yMyAgQWxvayBQcml5YWRhcnNoaSAgPGFsb2twQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBTd2l0Y2hpbmcgb2ZmIGFjY2VsZXJhdGlvbiBmb3Igc21hbGwgY2FudmFz IGJyb2tlIGdwdSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViVGV4dElucHV0VHlwZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi VGV4dElucHV0VHlwZS5oCmluZGV4IDI1OTJmNmYuLjQyOGNmNTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlRleHRJbnB1dFR5cGUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJUZXh0SW5wdXRUeXBlLmgKQEAgLTQwLDEyICs0MCwx NCBAQCBlbnVtIFdlYlRleHRJbnB1dFR5cGUgewogICAgIC8vIElucHV0IGNhcmV0IGlzIGluIGEg bm9ybWFsIGVkaXRhYmxlIG5vZGUsIGFueSBpbnB1dCBtZXRob2QgY2FuIGJlIHVzZWQuCiAgICAg V2ViVGV4dElucHV0VHlwZVRleHQsCiAKLSAgICAvLyBJbnB1dCBjYXJldCBpcyBpbiBhIHBhc3N3 b3JkIGJveCwgYW4gaW5wdXQgbWV0aG9kIG1heSBiZSB1c2VkIG9ubHkgaWYKLSAgICAvLyBpdCdz IHN1aXRhYmxlIGZvciBwYXNzd29yZCBpbnB1dC4KKyAgICAvLyBJbnB1dCBjYXJldCBpcyBpbiBh IHNwZWNpZmljIGlucHV0IGZpZWxkLCBhbmQgaW5wdXQgbWV0aG9kIG1heSBiZSB1c2VkCisgICAg Ly8gb25seSBpZiBpdCdzIHN1aXRhYmxlIGZvciB0aGUgc3BlY2lmaWMgaW5wdXQgZmllbGQuCiAg ICAgV2ViVGV4dElucHV0VHlwZVBhc3N3b3JkLAotCi0gICAgLy8gRklYTUU6IEFkZCBtb3JlIHRl eHQgaW5wdXQgdHlwZXMgd2hlbiBuZWNlc3NhcnksIGVnLiBOdW1iZXIsCi0gICAgLy8gRGF0ZSwg RW1haWwsIFVSTCwgZXRjLgorICAgIFdlYlRleHRJbnB1dFR5cGVTZWFyY2gsCisgICAgV2ViVGV4 dElucHV0VHlwZUVtYWlsLAorICAgIFdlYlRleHRJbnB1dFR5cGVOdW1iZXIsCisgICAgV2ViVGV4 dElucHV0VHlwZVRlbGVwaG9uZSwKKyAgICBXZWJUZXh0SW5wdXRUeXBlVVJMLAogfTsKIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKaW5kZXggMGVhOTgyZS4uMTE4YjVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNjYsNiArNjYsNyBAQAogI2luY2x1ZGUgIkhUTUxJbnB1 dEVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTWVkaWFFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRN TE5hbWVzLmgiCisjaW5jbHVkZSAiSFRNTFRleHRBcmVhRWxlbWVudC5oIgogI2luY2x1ZGUgIkhp dFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJJbWFnZS5oIgogI2luY2x1ZGUgIkltYWdlQnVmZmVy LmgiCkBAIC0xNDUzLDMxICsxNDU0LDQ5IEBAIGJvb2wgV2ViVmlld0ltcGw6OmNvbXBvc2l0aW9u UmFuZ2Uoc2l6ZV90KiBsb2NhdGlvbiwgc2l6ZV90KiBsZW5ndGgpCiAKIFdlYlRleHRJbnB1dFR5 cGUgV2ViVmlld0ltcGw6OnRleHRJbnB1dFR5cGUoKQogewotICAgIFdlYlRleHRJbnB1dFR5cGUg dHlwZSA9IFdlYlRleHRJbnB1dFR5cGVOb25lOwotICAgIGNvbnN0IEZyYW1lKiBmb2N1c2VkID0g Zm9jdXNlZFdlYkNvcmVGcmFtZSgpOwotICAgIGlmICghZm9jdXNlZCkKLSAgICAgICAgcmV0dXJu IHR5cGU7CisgICAgTm9kZSogbm9kZSA9IGZvY3VzZWRXZWJDb3JlTm9kZSgpOworICAgIGlmICgh bm9kZSkKKyAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOwogCi0gICAgY29uc3Qg RWRpdG9yKiBlZGl0b3IgPSBmb2N1c2VkLT5lZGl0b3IoKTsKLSAgICBpZiAoIWVkaXRvciB8fCAh ZWRpdG9yLT5jYW5FZGl0KCkpCi0gICAgICAgIHJldHVybiB0eXBlOworICAgIGlmIChub2RlLT5u b2RlVHlwZSgpID09IE5vZGU6OkVMRU1FTlRfTk9ERSkgeworICAgICAgICBFbGVtZW50KiBlbGVt ZW50ID0gc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG5vZGUpOworICAgICAgICBpZiAoZWxlbWVudC0+ aGFzTG9jYWxOYW1lKEhUTUxOYW1lczo6aW5wdXRUYWcpKSB7CisgICAgICAgICAgICBIVE1MSW5w dXRFbGVtZW50KiBpbnB1dCA9IHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQqPihlbGVtZW50 KTsKKworICAgICAgICAgICAgaWYgKGlucHV0LT5yZWFkT25seSgpIHx8IGlucHV0LT5kaXNhYmxl ZCgpKQorICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlTm9uZTsKKworICAg ICAgICAgICAgaWYgKGlucHV0LT5pc1Bhc3N3b3JkRmllbGQoKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gV2ViVGV4dElucHV0VHlwZVBhc3N3b3JkOworICAgICAgICAgICAgaWYgKGlucHV0LT5p c1NlYXJjaEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVT ZWFyY2g7CisgICAgICAgICAgICBpZiAoaW5wdXQtPmlzRW1haWxGaWVsZCgpKQorICAgICAgICAg ICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlRW1haWw7CisgICAgICAgICAgICBpZiAoaW5w dXQtPmlzTnVtYmVyRmllbGQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViVGV4dElucHV0 VHlwZU51bWJlcjsKKyAgICAgICAgICAgIGlmIChpbnB1dC0+aXNUZWxlcGhvbmVGaWVsZCgpKQor ICAgICAgICAgICAgICAgIHJldHVybiBXZWJUZXh0SW5wdXRUeXBlVGVsZXBob25lOworICAgICAg ICAgICAgaWYgKGlucHV0LT5pc1VSTEZpZWxkKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIFdl YlRleHRJbnB1dFR5cGVVUkw7CisgICAgICAgICAgICBpZiAoaW5wdXQtPmlzVGV4dEZpZWxkKCkp CisgICAgICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVUZXh0OworICAgICAgICAg ICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOworICAgICAgICB9CiAKLSAgICBGcmFtZVNl bGVjdGlvbiogc2VsZWN0aW9uID0gZm9jdXNlZC0+c2VsZWN0aW9uKCk7Ci0gICAgaWYgKCFzZWxl Y3Rpb24pCi0gICAgICAgIHJldHVybiB0eXBlOworICAgICAgICBpZiAoZWxlbWVudC0+aGFzTG9j YWxOYW1lKEhUTUxOYW1lczo6dGV4dGFyZWFUYWcpKSB7CisgICAgICAgICAgICBIVE1MVGV4dEFy ZWFFbGVtZW50KiB0ZXh0YXJlYSA9IHN0YXRpY19jYXN0PEhUTUxUZXh0QXJlYUVsZW1lbnQqPihl bGVtZW50KTsKIAotICAgIE5vZGUqIG5vZGUgPSBzZWxlY3Rpb24tPnN0YXJ0KCkuY29udGFpbmVy Tm9kZSgpOwotICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIHR5cGU7CisgICAgICAgICAg ICBpZiAodGV4dGFyZWEtPnJlYWRPbmx5KCkgfHwgdGV4dGFyZWEtPmRpc2FibGVkKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIFdlYlRleHRJbnB1dFR5cGVOb25lOworICAgICAgICAgICAgcmV0 dXJuIFdlYlRleHRJbnB1dFR5cGVUZXh0OworICAgICAgICB9CisgICAgfQogCi0gICAgLy8gRklY TUU6IFN1cHBvcnQgbW9yZSB0ZXh0IGlucHV0IHR5cGVzIHdoZW4gbmVjZXNzYXJ5LCBlZy4gTnVt YmVyLAotICAgIC8vIERhdGUsIEVtYWlsLCBVUkwsIGV0Yy4KLSAgICBpZiAoc2VsZWN0aW9uLT5p c0luUGFzc3dvcmRGaWVsZCgpKQotICAgICAgICB0eXBlID0gV2ViVGV4dElucHV0VHlwZVBhc3N3 b3JkOwotICAgIGVsc2UgaWYgKG5vZGUtPnNob3VsZFVzZUlucHV0TWV0aG9kKCkpCi0gICAgICAg IHR5cGUgPSBXZWJUZXh0SW5wdXRUeXBlVGV4dDsKKyAgICAvLyBGb3Igb3RoZXIgc2l0dWF0aW9u cy4KKyAgICBpZiAobm9kZS0+c2hvdWxkVXNlSW5wdXRNZXRob2QoKSkKKyAgICAgICAgcmV0dXJu IFdlYlRleHRJbnB1dFR5cGVUZXh0OwogCi0gICAgcmV0dXJuIHR5cGU7CisgICAgcmV0dXJuIFdl YlRleHRJbnB1dFR5cGVOb25lOwogfQogCiBXZWJSZWN0IFdlYlZpZXdJbXBsOjpjYXJldE9yU2Vs ZWN0aW9uQm91bmRzKCkK 102260 2011-07-28 08:04:09 -0700 2011-07-28 08:04:09 -0700 test page input.html text/html 2868 penghuang PGh0bWw+CiAgPGhlYWQ+CiAgPHNjcmlwdCBzcmM9Img1dXRpbHMuanMiPjwvc2NyaXB0PgogIDxz Y3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KICBmdW5jdGlvbiB0aW1lb3V0KCkgewogICAg dmFyIGVkaXRhYmxlID0gZG9jdW1lbnQuYWN0aXZlRWxlbWVudC5pc0NvbnRlbnRFZGl0YWJsZSA/ ICJFZGl0YWJsZSIgOiAiTm9FZGl0YWJsZSI7CiAgICB2YXIgZm9jdXMgPSBkb2N1bWVudC5oYXNG b2N1cygpID8gImhhc0ZvY3VzIiA6ICJOb0ZvY3VzIjsKICAgIGNvbnNvbGUubG9nKGVkaXRhYmxl ICsgIiAiICsgZm9jdXMpCiAgICB3aW5kb3cuc2V0VGltZW91dCgidGltZW91dCgpIiwgMzAwMCk7 CiAgfQogIGZ1bmN0aW9uIGluaXQoKSB7CiAgICB2YXIgZWRpdGFibGUgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgnZWRpdGFibGUnKTsKICAKICAgIGFkZEV2ZW50KGVkaXRhYmxlLCAnYmx1cics IGZ1bmN0aW9uICgpIHsKICAgICAgLy8gbGFtZSB0aGF0IHdlJ3JlIGhvb2tpbmcgdGhlIGJsdXIg ZXZlbnQKICAgICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0oJ2NvbnRlbnRlZGl0YWJsZScsIHRoaXMu aW5uZXJIVE1MKTsKICAgICAgLy8gZG9jdW1lbnQuZGVzaWduTW9kZSA9ICdvZmYnOwogICAgfSk7 CgogICAgYWRkRXZlbnQoZWRpdGFibGUsICdmb2N1cycsIGZ1bmN0aW9uICgpIHsKICAgICAgLy8g ZG9jdW1lbnQuZGVzaWduTW9kZSA9ICdvbic7CiAgICB9KTsKCiAgICBhZGRFdmVudChkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgnY2xlYXInKSwgJ2NsaWNrJywgZnVuY3Rpb24gKCkgewogICAgICBs b2NhbFN0b3JhZ2UuY2xlYXIoKTsKICAgICAgd2luZG93LmxvY2F0aW9uID0gd2luZG93LmxvY2F0 aW9uOyAvLyByZWZyZXNoCiAgICB9KTsKCiAgICBpZiAobG9jYWxTdG9yYWdlLmdldEl0ZW0oJ2Nv bnRlbnRlZGl0YWJsZScpKSB7CiAgICAgIGVkaXRhYmxlLmlubmVySFRNTCA9IGxvY2FsU3RvcmFn ZS5nZXRJdGVtKCdjb250ZW50ZWRpdGFibGUnKTsKICAgIH0KICB9CiAgPC9zY3JpcHQ+CiAgPC9o ZWFkPgogIDxib2R5IG9ubG9hZD0naW5pdCgpOycgZGlzYWJsZWQ9InRydWUiID4KICAgIDxicj48 aW5wdXQgdHlwZT10ZXh0IC8+IHRleHQKICAgIDxicj48aW5wdXQgdHlwZT1wYXNzd29yZCAvPiBw YXNzd29yZAogICAgPGJyPjxpbnB1dCB0eXBlPWNoZWNrYm94IC8+IGNoZWNrYm94CiAgICA8YnI+ PGlucHV0IHR5cGU9cmFkaW8gLz4gcmFkaW8KICAgIDxicj48aW5wdXQgdHlwZT1idXR0b24gLz4g YnV0dG9uCiAgICA8YnI+PGlucHV0IHR5cGU9c3VibWl0IC8+IHN1Ym1pdAogICAgPGJyPjxpbnB1 dCB0eXBlPXJlc2V0IC8+IHJlc2V0CiAgICA8YnI+PGlucHV0IHR5cGU9ZmlsZSAvPiBmaWxlCiAg ICA8YnI+PGlucHV0IHR5cGU9aGlkZGVuIC8+IGhpZGRlbgogICAgPGJyPjxpbnB1dCB0eXBlPWlt YWdlIC8+IGltYWdlCiAgICA8YnI+PGlucHV0IHR5cGU9ZGF0ZXRpbWUgLz4gZGF0ZXRpbWUKICAg IDxicj48aW5wdXQgdHlwZT1kYXRldGltZS1sb2NhbCAvPiBkYXRldGltZS1sb2NhbAogICAgPGJy PjxpbnB1dCB0eXBlPWRhdGUgLz4gZGF0ZQogICAgPGJyPjxpbnB1dCB0eXBlPW1vbnRoIC8+IG1v dGgKICAgIDxicj48aW5wdXQgdHlwZT10aW1lIC8+IHRpbWUKICAgIDxicj48aW5wdXQgdHlwZT13 ZWVrIC8+IHdlZWsKICAgIDxicj48aW5wdXQgdHlwZT1udW1iZXIgLz4gbnVtYmVyCiAgICA8YnI+ PGlucHV0IHR5cGU9cmFuZ2UgLz4gcmFuZ2UKICAgIDxicj48aW5wdXQgdHlwZT1lbWFpbCAvPiBl bWFpbAogICAgPGJyPjxpbnB1dCB0eXBlPXVybCAvPiB1cmwKICAgIDxicj48aW5wdXQgdHlwZT1z ZWFyY2ggLz4gc2VhcmNoCiAgICA8YnI+PGlucHV0IHR5cGU9dGVsIC8+IHRlbAogICAgPGJyPjxp bnB1dCB0eXBlPWNvbG9yIC8+IGNvbG9yCiAgICA8YnI+PGlucHV0IHR5cGU9dGV4dCByZWFkb25s eT0icmVhZG9ubHkiIC8+IHRleHQgcmVhZG9ubHkKICAgIDxicj48aW5wdXQgdHlwZT10ZXh0IGRp c2FibGVkPSJ0cnVlIiAvPiB0ZXh0IGRpc2FibGVkCiAgICA8YnI+PHRleHRhcmVhPjwvdGV4dGFy ZWE+IHRleHRhcmVhCiAgICA8YnI+PHRleHRhcmVhIGRpc2FibGVkPSJ0cnVlIj48L3RleHRhcmVh PiB0ZXh0YXJlYSBkaXNhYmxlZAogICAgPGJyPjx0ZXh0YXJlYSByZWFkb25seT0idHJ1ZSI+PC90 ZXh0YXJlYT4gdGV4dGFyZWEgcmVhZG9ubHkKICAgIAogICAgPGFydGljbGU+CiAgICAgIDxzZWN0 aW9uPgogICAgICAgIDxwPkFueSBlbGVtZW50cyB3aXRoIHRoZSA8Y29kZT5jb250ZW50ZWRpdGFi bGU8L2NvZGU+IGF0dHJpYnV0ZSBzZXQgd2lsbCBoYXZlIGEgZ3JleSBvdXRsaW5lIGFzIHlvdSBo b3ZlciBvdmVyLiBGZWVsIGZyZWUgdG8gZWRpdCBhbmQgY2hhbmdlIHRoZWlyIGNvbnRlbnRzLiAg SSdtIHVzaW5nIGxvY2FsIHN0b3JhZ2UgdG8gbWFpbnRhaW4geW91ciBjaGFuZ2VzLjwvcD4KICAg ICAgPC9zZWN0aW9uPgogICAgICA8c2VjdGlvbiBpZD0iZWRpdGFibGUiIGNvbnRlbnRlZGl0YWJs ZT0idHJ1ZSI+CiAgICAgICAgPGgyPkdvIGFoZWFkLCBlZGl0IGF3YXkhPC9oMj4KICAgICAgICA8 cD5IZXJlJ3MgYSB0eXBpY2FsIHBhcmFncmFwaCBlbGVtZW50PC9wPgogICAgICAgIDxvbD4KICAg ICAgICAgIDxsaT5hbmQgbm93IGEgbGlzdDwvbGk+CiAgICAgICAgICA8bGk+d2l0aCBvbmx5PC9s aT4KICAgICAgICAgIDxsaT50aHJlZSBpdGVtczwvbGk+CiAgICAgICAgPC9vbD4KICAgICAgPC9z ZWN0aW9uPgogICAgICA8ZGl2PgogICAgICAgIDxpbnB1dCB0eXBlPSJidXR0b24iIGlkPSJjbGVh ciIgdmFsdWU9IkNsZWFyIGNoYW5nZXMiIC8+CiAgICAgIDwvZGl2PgogICAgPC9hcnRpY2xlPgog IDwvYm9keT4KPC9odG1sPgoK