95108 2012-08-27 11:28:24 -0700 [Skia/Chromium] Remove use of deprecated Skia names 2012-08-27 14:22:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P3 Normal --- 1 bsalomon bsalomon cc-bugs jamesr senorblanco webkit.review.bot oldest_to_newest 705433 0 bsalomon 2012-08-27 11:28:24 -0700 [Skia/Chromium] Remove use of deprecated Skia names 705437 1 160757 bsalomon 2012-08-27 11:30:26 -0700 Created attachment 160757 Patch 705440 2 160757 senorblanco 2012-08-27 11:32:07 -0700 Comment on attachment 160757 Patch Looks good, bots willing. r=me 705441 3 160759 bsalomon 2012-08-27 11:32:59 -0700 Created attachment 160759 Patch 705443 4 bsalomon 2012-08-27 11:34:24 -0700 Hey Stephen, My first patch had some bad spacing in the Changelog file that I fixed in the second patch. 705456 5 160759 senorblanco 2012-08-27 11:45:22 -0700 Comment on attachment 160759 Patch OK. r=me 705521 6 160759 webkit.review.bot 2012-08-27 12:32:53 -0700 Comment on attachment 160759 Patch Rejecting attachment 160759 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: e/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 Even up WTF::String to CString functions When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/13616284 705549 7 160785 bsalomon 2012-08-27 12:59:45 -0700 Created attachment 160785 Patch 705550 8 bsalomon 2012-08-27 13:00:56 -0700 The last patch failed due to a Changelog conflict. I'm not sure why; I svn updated just before running webkit-patch. I any event the new patch is the same as the old patch (just against a later Changelog). 705672 9 160785 webkit.review.bot 2012-08-27 14:22:07 -0700 Comment on attachment 160785 Patch Clearing flags on attachment: 160785 Committed r126795: <http://trac.webkit.org/changeset/126795> 705673 10 webkit.review.bot 2012-08-27 14:22:10 -0700 All reviewed patches have been landed. Closing bug. 160757 2012-08-27 11:30:26 -0700 2012-08-27 11:32:56 -0700 Patch bug-95108-20120827143018.patch text/plain 4922 bsalomon SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjc3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTI3ICBCcmlhbiBT YWxvbW9uICA8YnNhbG9tb25AZ29vZ2xlLmNvbT4KKworICAgICAgICBbU2tpYS9DaHJvbWl1bV0g UmVtb3ZlIHVzZSBvZiBkZXByZWNhdGVkIFNraWEgbmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAga1NraWE4ODg4X1BNX0dyUGl4ZWxDb25maWcgaGFz IGJlZW4gZGVwcmVjYXRlZCBpbiBmYXZvciBvZiBrU2tpYTg4ODhfR3JQaXhlbENvbmZpZy4KKwlT a0dyVGV4dHVyZVBpeGVsUmVmIGhhcyBiZWVuIGRlcHJlY2F0ZWQgaW4gZmF2b3Igb2YgU2tHclBp eGVsUmVmLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMgKGltYWdlIGZpbHRl ciBhbmQgY2FudmFzIHRlc3RzKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0ZyYW1lQnVmZmVyU2tQaWN0dXJlQ2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpjcmVhdGVBY2NlbGVyYXRlZENhbnZhcyk6CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5jcHA6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Y3JlYXRlQWNjZWxlcmF0ZWRDYW52YXMpOgorCiAyMDEyLTA4LTI3ICBW aWN0b3IgQ2FyYnVuZSAgPHZpY3RvckByb3NlZHUub3JnPgogCiAgICAgICAgIENyYXNoIHdoZW4g dHJ5aW5nIHRvIHJlbmRlciBlbXB0eSBjdWVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9GcmFtZUJ1ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVy ZVVwZGF0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0ZyYW1lQnVmZmVyU2tQaWN0dXJlQ2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRl ci5jcHAJKHJldmlzaW9uIDEyNjc3NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0ZyYW1lQnVmZmVyU2tQaWN0dXJlQ2FudmFzTGF5ZXJUZXh0dXJlVXBkYXRl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwLDcgKzUwLDcgQEAgc3RhdGljIFBhc3NPd25QdHI8 U2tDYW52YXM+IGNyZWF0ZUFjY2VsZQogICAgIHRleHR1cmVEZXNjLmZGbGFncyA9IGtSZW5kZXJU YXJnZXRfR3JQbGF0Zm9ybVRleHR1cmVGbGFnOwogICAgIHRleHR1cmVEZXNjLmZXaWR0aCA9IGNh bnZhc1NpemUud2lkdGgoKTsKICAgICB0ZXh0dXJlRGVzYy5mSGVpZ2h0ID0gY2FudmFzU2l6ZS5o ZWlnaHQoKTsKLSAgICB0ZXh0dXJlRGVzYy5mQ29uZmlnID0ga1NraWE4ODg4X1BNX0dyUGl4ZWxD b25maWc7CisgICAgdGV4dHVyZURlc2MuZkNvbmZpZyA9IGtTa2lhODg4OF9HclBpeGVsQ29uZmln OwogICAgIHRleHR1cmVEZXNjLmZUZXh0dXJlSGFuZGxlID0gdGV4dHVyZUlkOwogICAgIFNrQXV0 b1RVbnJlZjxHclRleHR1cmU+IHRhcmdldChnckNvbnRleHQtPmNyZWF0ZVBsYXRmb3JtVGV4dHVy ZSh0ZXh0dXJlRGVzYykpOwogICAgIFNrQXV0b1RVbnJlZjxTa0RldmljZT4gZGV2aWNlKG5ldyBT a0dwdURldmljZShnckNvbnRleHQsIHRhcmdldC5nZXQoKSkpOwpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vY2MvQ0NSZW5kZXJTdXJmYWNlRmlsdGVycy5jcHAJKHJldmlzaW9uIDEyNjc3NCkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFj ZUZpbHRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw3ICszNCw3IEBACiAjaW5jbHVkZSAi U2tDYW52YXMuaCIKICNpbmNsdWRlICJTa0NvbG9yTWF0cml4RmlsdGVyLmgiCiAjaW5jbHVkZSAi U2tHcHVEZXZpY2UuaCIKLSNpbmNsdWRlICJTa0dyVGV4dHVyZVBpeGVsUmVmLmgiCisjaW5jbHVk ZSAiU2tHclBpeGVsUmVmLmgiCiAjaW5jbHVkZSAiU2tNYWduaWZpZXJJbWFnZUZpbHRlci5oIgog I2luY2x1ZGUgPHB1YmxpYy9XZWJGaWx0ZXJPcGVyYXRpb24uaD4KICNpbmNsdWRlIDxwdWJsaWMv V2ViRmlsdGVyT3BlcmF0aW9ucy5oPgpAQCAtMjY1LDEyICsyNjUsMTIgQEAgcHVibGljOgogICAg ICAgICBHclBsYXRmb3JtVGV4dHVyZURlc2MgcGxhdGZvcm1UZXh0dXJlRGVzY3JpcHRpb247CiAg ICAgICAgIHBsYXRmb3JtVGV4dHVyZURlc2NyaXB0aW9uLmZXaWR0aCA9IHNpemUud2lkdGgoKTsK ICAgICAgICAgcGxhdGZvcm1UZXh0dXJlRGVzY3JpcHRpb24uZkhlaWdodCA9IHNpemUuaGVpZ2h0 KCk7Ci0gICAgICAgIHBsYXRmb3JtVGV4dHVyZURlc2NyaXB0aW9uLmZDb25maWcgPSBrU2tpYTg4 ODhfUE1fR3JQaXhlbENvbmZpZzsKKyAgICAgICAgcGxhdGZvcm1UZXh0dXJlRGVzY3JpcHRpb24u ZkNvbmZpZyA9IGtTa2lhODg4OF9HclBpeGVsQ29uZmlnOwogICAgICAgICBwbGF0Zm9ybVRleHR1 cmVEZXNjcmlwdGlvbi5mVGV4dHVyZUhhbmRsZSA9IHRleHR1cmVJZDsKICAgICAgICAgU2tBdXRv VFVucmVmPEdyVGV4dHVyZT4gdGV4dHVyZShnckNvbnRleHQtPmNyZWF0ZVBsYXRmb3JtVGV4dHVy ZShwbGF0Zm9ybVRleHR1cmVEZXNjcmlwdGlvbikpOwogICAgICAgICAvLyBQbGFjZSB0aGUgcGxh dGZvcm0gdGV4dHVyZSBpbnNpZGUgYW4gU2tCaXRtYXAuCiAgICAgICAgIG1fc291cmNlLnNldENv bmZpZyhTa0JpdG1hcDo6a0FSR0JfODg4OF9Db25maWcsIHNpemUud2lkdGgoKSwgc2l6ZS5oZWln aHQoKSk7Ci0gICAgICAgIG1fc291cmNlLnNldFBpeGVsUmVmKG5ldyBTa0dyVGV4dHVyZVBpeGVs UmVmKHRleHR1cmUuZ2V0KCkpKS0+dW5yZWYoKTsKKyAgICAgICAgbV9zb3VyY2Uuc2V0UGl4ZWxS ZWYobmV3IFNrR3JQaXhlbFJlZih0ZXh0dXJlLmdldCgpKSktPnVucmVmKCk7CiAgICAgfQogCiAg ICAgfkZpbHRlckJ1ZmZlclN0YXRlKCkgeyB9CkBAIC0yODMsNyArMjgzLDcgQEAgcHVibGljOgog ICAgICAgICBkZXNjLmZTYW1wbGVDbnQgPSAwOwogICAgICAgICBkZXNjLmZXaWR0aCA9IG1fc291 cmNlLndpZHRoKCk7CiAgICAgICAgIGRlc2MuZkhlaWdodCA9IG1fc291cmNlLmhlaWdodCgpOwot ICAgICAgICBkZXNjLmZDb25maWcgPSBrU2tpYTg4ODhfUE1fR3JQaXhlbENvbmZpZzsKKyAgICAg ICAgZGVzYy5mQ29uZmlnID0ga1NraWE4ODg4X0dyUGl4ZWxDb25maWc7CiAgICAgICAgIGZvciAo aW50IGkgPSAwOyBpIDwgc2NyYXRjaENvdW50OyArK2kpIHsKICAgICAgICAgICAgIEdyQXV0b1Nj cmF0Y2hUZXh0dXJlIHNjcmF0Y2hUZXh0dXJlKG1fZ3JDb250ZXh0LCBkZXNjLCBHckNvbnRleHQ6 OmtFeGFjdF9TY3JhdGNoVGV4TWF0Y2gpOwogICAgICAgICAgICAgbV9zY3JhdGNoVGV4dHVyZXNb aV0ucmVzZXQoc2NyYXRjaFRleHR1cmUuZGV0YWNoKCkpOwpAQCAtMzA4LDcgKzMwOCw3IEBAIHB1 YmxpYzoKICAgICAgICAgbV9jYW52YXMucmVzZXQoMCk7CiAgICAgICAgIG1fZGV2aWNlLnJlc2V0 KDApOwogCi0gICAgICAgIG1fc291cmNlLnNldFBpeGVsUmVmKG5ldyBTa0dyVGV4dHVyZVBpeGVs UmVmKG1fc2NyYXRjaFRleHR1cmVzW21fY3VycmVudFRleHR1cmVdLmdldCgpKSktPnVucmVmKCk7 CisgICAgICAgIG1fc291cmNlLnNldFBpeGVsUmVmKG5ldyBTa0dyUGl4ZWxSZWYobV9zY3JhdGNo VGV4dHVyZXNbbV9jdXJyZW50VGV4dHVyZV0uZ2V0KCkpKS0+dW5yZWYoKTsKICAgICAgICAgbV9j dXJyZW50VGV4dHVyZSA9IDEgLSBtX2N1cnJlbnRUZXh0dXJlOwogICAgIH0KIApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VC dWZmZXJTa2lhLmNwcAkocmV2aXNpb24gMTI2Nzc0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04 NSw3ICs4NSw3IEBAIHN0YXRpYyBTa0NhbnZhcyogY3JlYXRlQWNjZWxlcmF0ZWRDYW52YXMKICAg ICBkZXNjLmZTYW1wbGVDbnQgPSAwOwogICAgIGRlc2MuZldpZHRoID0gc2l6ZS53aWR0aCgpOwog ICAgIGRlc2MuZkhlaWdodCA9IHNpemUuaGVpZ2h0KCk7Ci0gICAgZGVzYy5mQ29uZmlnID0ga1Nr aWE4ODg4X1BNX0dyUGl4ZWxDb25maWc7CisgICAgZGVzYy5mQ29uZmlnID0ga1NraWE4ODg4X0dy UGl4ZWxDb25maWc7CiAgICAgU2tBdXRvVFVucmVmPEdyVGV4dHVyZT4gdGV4dHVyZShnci0+Y3Jl YXRlVW5jYWNoZWRUZXh0dXJlKGRlc2MsIDAsIDApKTsKICAgICBpZiAoIXRleHR1cmUuZ2V0KCkp CiAgICAgICAgIHJldHVybiAwOwo= 160759 2012-08-27 11:32:59 -0700 2012-08-27 12:59:42 -0700 Patch bug-95108-20120827143251.patch text/plain 4929 bsalomon SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjc3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTI3ICBCcmlhbiBT YWxvbW9uICA8YnNhbG9tb25AZ29vZ2xlLmNvbT4KKworICAgICAgICBbU2tpYS9DaHJvbWl1bV0g UmVtb3ZlIHVzZSBvZiBkZXByZWNhdGVkIFNraWEgbmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAga1NraWE4ODg4X1BNX0dyUGl4ZWxDb25maWcgaGFz IGJlZW4gZGVwcmVjYXRlZCBpbiBmYXZvciBvZiBrU2tpYTg4ODhfR3JQaXhlbENvbmZpZy4KKyAg ICAgICAgU2tHclRleHR1cmVQaXhlbFJlZiBoYXMgYmVlbiBkZXByZWNhdGVkIGluIGZhdm9yIG9m IFNrR3JQaXhlbFJlZi4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzIChpbWFn ZSBmaWx0ZXIgYW5kIGNhbnZhcyB0ZXN0cykuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9GcmFtZUJ1ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQWNjZWxlcmF0ZWRDYW52YXMpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMu Y3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFjY2VsZXJhdGVkQ2FudmFzKToKKwogMjAxMi0w OC0yNyAgVmljdG9yIENhcmJ1bmUgIDx2aWN0b3JAcm9zZWR1Lm9yZz4KIAogICAgICAgICBDcmFz aCB3aGVuIHRyeWluZyB0byByZW5kZXIgZW1wdHkgY3VlcwpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRnJhbWVCdWZmZXJTa1BpY3R1cmVDYW52YXNMYXll clRleHR1cmVVcGRhdGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9GcmFtZUJ1ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVy ZVVwZGF0ZXIuY3BwCShyZXZpc2lvbiAxMjY3NzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9GcmFtZUJ1ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVy ZVVwZGF0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCw3ICs1MCw3IEBAIHN0YXRpYyBQYXNz T3duUHRyPFNrQ2FudmFzPiBjcmVhdGVBY2NlbGUKICAgICB0ZXh0dXJlRGVzYy5mRmxhZ3MgPSBr UmVuZGVyVGFyZ2V0X0dyUGxhdGZvcm1UZXh0dXJlRmxhZzsKICAgICB0ZXh0dXJlRGVzYy5mV2lk dGggPSBjYW52YXNTaXplLndpZHRoKCk7CiAgICAgdGV4dHVyZURlc2MuZkhlaWdodCA9IGNhbnZh c1NpemUuaGVpZ2h0KCk7Ci0gICAgdGV4dHVyZURlc2MuZkNvbmZpZyA9IGtTa2lhODg4OF9QTV9H clBpeGVsQ29uZmlnOworICAgIHRleHR1cmVEZXNjLmZDb25maWcgPSBrU2tpYTg4ODhfR3JQaXhl bENvbmZpZzsKICAgICB0ZXh0dXJlRGVzYy5mVGV4dHVyZUhhbmRsZSA9IHRleHR1cmVJZDsKICAg ICBTa0F1dG9UVW5yZWY8R3JUZXh0dXJlPiB0YXJnZXQoZ3JDb250ZXh0LT5jcmVhdGVQbGF0Zm9y bVRleHR1cmUodGV4dHVyZURlc2MpKTsKICAgICBTa0F1dG9UVW5yZWY8U2tEZXZpY2U+IGRldmlj ZShuZXcgU2tHcHVEZXZpY2UoZ3JDb250ZXh0LCB0YXJnZXQuZ2V0KCkpKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZp bHRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3BwCShyZXZpc2lvbiAxMjY3NzQp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1JlbmRl clN1cmZhY2VGaWx0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsNyBAQAogI2lu Y2x1ZGUgIlNrQ2FudmFzLmgiCiAjaW5jbHVkZSAiU2tDb2xvck1hdHJpeEZpbHRlci5oIgogI2lu Y2x1ZGUgIlNrR3B1RGV2aWNlLmgiCi0jaW5jbHVkZSAiU2tHclRleHR1cmVQaXhlbFJlZi5oIgor I2luY2x1ZGUgIlNrR3JQaXhlbFJlZi5oIgogI2luY2x1ZGUgIlNrTWFnbmlmaWVySW1hZ2VGaWx0 ZXIuaCIKICNpbmNsdWRlIDxwdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmg+CiAjaW5jbHVkZSA8 cHVibGljL1dlYkZpbHRlck9wZXJhdGlvbnMuaD4KQEAgLTI2NSwxMiArMjY1LDEyIEBAIHB1Ymxp YzoKICAgICAgICAgR3JQbGF0Zm9ybVRleHR1cmVEZXNjIHBsYXRmb3JtVGV4dHVyZURlc2NyaXB0 aW9uOwogICAgICAgICBwbGF0Zm9ybVRleHR1cmVEZXNjcmlwdGlvbi5mV2lkdGggPSBzaXplLndp ZHRoKCk7CiAgICAgICAgIHBsYXRmb3JtVGV4dHVyZURlc2NyaXB0aW9uLmZIZWlnaHQgPSBzaXpl LmhlaWdodCgpOwotICAgICAgICBwbGF0Zm9ybVRleHR1cmVEZXNjcmlwdGlvbi5mQ29uZmlnID0g a1NraWE4ODg4X1BNX0dyUGl4ZWxDb25maWc7CisgICAgICAgIHBsYXRmb3JtVGV4dHVyZURlc2Ny aXB0aW9uLmZDb25maWcgPSBrU2tpYTg4ODhfR3JQaXhlbENvbmZpZzsKICAgICAgICAgcGxhdGZv cm1UZXh0dXJlRGVzY3JpcHRpb24uZlRleHR1cmVIYW5kbGUgPSB0ZXh0dXJlSWQ7CiAgICAgICAg IFNrQXV0b1RVbnJlZjxHclRleHR1cmU+IHRleHR1cmUoZ3JDb250ZXh0LT5jcmVhdGVQbGF0Zm9y bVRleHR1cmUocGxhdGZvcm1UZXh0dXJlRGVzY3JpcHRpb24pKTsKICAgICAgICAgLy8gUGxhY2Ug dGhlIHBsYXRmb3JtIHRleHR1cmUgaW5zaWRlIGFuIFNrQml0bWFwLgogICAgICAgICBtX3NvdXJj ZS5zZXRDb25maWcoU2tCaXRtYXA6OmtBUkdCXzg4ODhfQ29uZmlnLCBzaXplLndpZHRoKCksIHNp emUuaGVpZ2h0KCkpOwotICAgICAgICBtX3NvdXJjZS5zZXRQaXhlbFJlZihuZXcgU2tHclRleHR1 cmVQaXhlbFJlZih0ZXh0dXJlLmdldCgpKSktPnVucmVmKCk7CisgICAgICAgIG1fc291cmNlLnNl dFBpeGVsUmVmKG5ldyBTa0dyUGl4ZWxSZWYodGV4dHVyZS5nZXQoKSkpLT51bnJlZigpOwogICAg IH0KIAogICAgIH5GaWx0ZXJCdWZmZXJTdGF0ZSgpIHsgfQpAQCAtMjgzLDcgKzI4Myw3IEBAIHB1 YmxpYzoKICAgICAgICAgZGVzYy5mU2FtcGxlQ250ID0gMDsKICAgICAgICAgZGVzYy5mV2lkdGgg PSBtX3NvdXJjZS53aWR0aCgpOwogICAgICAgICBkZXNjLmZIZWlnaHQgPSBtX3NvdXJjZS5oZWln aHQoKTsKLSAgICAgICAgZGVzYy5mQ29uZmlnID0ga1NraWE4ODg4X1BNX0dyUGl4ZWxDb25maWc7 CisgICAgICAgIGRlc2MuZkNvbmZpZyA9IGtTa2lhODg4OF9HclBpeGVsQ29uZmlnOwogICAgICAg ICBmb3IgKGludCBpID0gMDsgaSA8IHNjcmF0Y2hDb3VudDsgKytpKSB7CiAgICAgICAgICAgICBH ckF1dG9TY3JhdGNoVGV4dHVyZSBzY3JhdGNoVGV4dHVyZShtX2dyQ29udGV4dCwgZGVzYywgR3JD b250ZXh0OjprRXhhY3RfU2NyYXRjaFRleE1hdGNoKTsKICAgICAgICAgICAgIG1fc2NyYXRjaFRl eHR1cmVzW2ldLnJlc2V0KHNjcmF0Y2hUZXh0dXJlLmRldGFjaCgpKTsKQEAgLTMwOCw3ICszMDgs NyBAQCBwdWJsaWM6CiAgICAgICAgIG1fY2FudmFzLnJlc2V0KDApOwogICAgICAgICBtX2Rldmlj ZS5yZXNldCgwKTsKIAotICAgICAgICBtX3NvdXJjZS5zZXRQaXhlbFJlZihuZXcgU2tHclRleHR1 cmVQaXhlbFJlZihtX3NjcmF0Y2hUZXh0dXJlc1ttX2N1cnJlbnRUZXh0dXJlXS5nZXQoKSkpLT51 bnJlZigpOworICAgICAgICBtX3NvdXJjZS5zZXRQaXhlbFJlZihuZXcgU2tHclBpeGVsUmVmKG1f c2NyYXRjaFRleHR1cmVzW21fY3VycmVudFRleHR1cmVdLmdldCgpKSktPnVucmVmKCk7CiAgICAg ICAgIG1fY3VycmVudFRleHR1cmUgPSAxIC0gbV9jdXJyZW50VGV4dHVyZTsKICAgICB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lh LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJldmlzaW9uIDEyNjc3NCkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtODUsNyArODUsNyBAQCBzdGF0aWMgU2tDYW52YXMqIGNyZWF0ZUFjY2VsZXJhdGVkQ2Fu dmFzCiAgICAgZGVzYy5mU2FtcGxlQ250ID0gMDsKICAgICBkZXNjLmZXaWR0aCA9IHNpemUud2lk dGgoKTsKICAgICBkZXNjLmZIZWlnaHQgPSBzaXplLmhlaWdodCgpOwotICAgIGRlc2MuZkNvbmZp ZyA9IGtTa2lhODg4OF9QTV9HclBpeGVsQ29uZmlnOworICAgIGRlc2MuZkNvbmZpZyA9IGtTa2lh ODg4OF9HclBpeGVsQ29uZmlnOwogICAgIFNrQXV0b1RVbnJlZjxHclRleHR1cmU+IHRleHR1cmUo Z3ItPmNyZWF0ZVVuY2FjaGVkVGV4dHVyZShkZXNjLCAwLCAwKSk7CiAgICAgaWYgKCF0ZXh0dXJl LmdldCgpKQogICAgICAgICByZXR1cm4gMDsK 160785 2012-08-27 12:59:45 -0700 2012-08-27 14:22:07 -0700 Patch bug-95108-20120827155937.patch text/plain 4950 bsalomon SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNjc4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA4LTI3ICBCcmlhbiBT YWxvbW9uICA8YnNhbG9tb25AZ29vZ2xlLmNvbT4KKworICAgICAgICBbU2tpYS9DaHJvbWl1bV0g UmVtb3ZlIHVzZSBvZiBkZXByZWNhdGVkIFNraWEgbmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAga1NraWE4ODg4X1BNX0dyUGl4ZWxDb25maWcgaGFz IGJlZW4gZGVwcmVjYXRlZCBpbiBmYXZvciBvZiBrU2tpYTg4ODhfR3JQaXhlbENvbmZpZy4KKyAg ICAgICAgU2tHclRleHR1cmVQaXhlbFJlZiBoYXMgYmVlbiBkZXByZWNhdGVkIGluIGZhdm9yIG9m IFNrR3JQaXhlbFJlZi4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzIChpbWFn ZSBmaWx0ZXIgYW5kIGNhbnZhcyB0ZXN0cykuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9GcmFtZUJ1ZmZlclNrUGljdHVyZUNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQWNjZWxlcmF0ZWRDYW52YXMpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMu Y3BwOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFjY2VsZXJhdGVkQ2FudmFzKToKKwogMjAxMi0w OC0yNyAgS2V2aW4gRnVuayAgPGtldmluLmZ1bmtAa2RhYi5jb20+CiAKICAgICAgICAgRml4IGNv bXBpbGF0aW9uIHdoZW4gYm90aCBPUyhXSU5DRSkgYW5kIFBMQVRGT1JNKFFUKSBhcmUgdHJ1ZQpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRnJhbWVCdWZm ZXJTa1BpY3R1cmVDYW52YXNMYXllclRleHR1cmVVcGRhdGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9GcmFtZUJ1ZmZlclNrUGlj dHVyZUNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIuY3BwCShyZXZpc2lvbiAxMjY3ODQpCisrKyBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9GcmFtZUJ1ZmZlclNrUGlj dHVyZUNhbnZhc0xheWVyVGV4dHVyZVVwZGF0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCw3 ICs1MCw3IEBAIHN0YXRpYyBQYXNzT3duUHRyPFNrQ2FudmFzPiBjcmVhdGVBY2NlbGUKICAgICB0 ZXh0dXJlRGVzYy5mRmxhZ3MgPSBrUmVuZGVyVGFyZ2V0X0dyUGxhdGZvcm1UZXh0dXJlRmxhZzsK ICAgICB0ZXh0dXJlRGVzYy5mV2lkdGggPSBjYW52YXNTaXplLndpZHRoKCk7CiAgICAgdGV4dHVy ZURlc2MuZkhlaWdodCA9IGNhbnZhc1NpemUuaGVpZ2h0KCk7Ci0gICAgdGV4dHVyZURlc2MuZkNv bmZpZyA9IGtTa2lhODg4OF9QTV9HclBpeGVsQ29uZmlnOworICAgIHRleHR1cmVEZXNjLmZDb25m aWcgPSBrU2tpYTg4ODhfR3JQaXhlbENvbmZpZzsKICAgICB0ZXh0dXJlRGVzYy5mVGV4dHVyZUhh bmRsZSA9IHRleHR1cmVJZDsKICAgICBTa0F1dG9UVW5yZWY8R3JUZXh0dXJlPiB0YXJnZXQoZ3JD b250ZXh0LT5jcmVhdGVQbGF0Zm9ybVRleHR1cmUodGV4dHVyZURlc2MpKTsKICAgICBTa0F1dG9U VW5yZWY8U2tEZXZpY2U+IGRldmljZShuZXcgU2tHcHVEZXZpY2UoZ3JDb250ZXh0LCB0YXJnZXQu Z2V0KCkpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDUmVuZGVyU3VyZmFjZUZpbHRlcnMu Y3BwCShyZXZpc2lvbiAxMjY3ODQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9jYy9DQ1JlbmRlclN1cmZhY2VGaWx0ZXJzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzQsNyArMzQsNyBAQAogI2luY2x1ZGUgIlNrQ2FudmFzLmgiCiAjaW5jbHVkZSAiU2tDb2xv ck1hdHJpeEZpbHRlci5oIgogI2luY2x1ZGUgIlNrR3B1RGV2aWNlLmgiCi0jaW5jbHVkZSAiU2tH clRleHR1cmVQaXhlbFJlZi5oIgorI2luY2x1ZGUgIlNrR3JQaXhlbFJlZi5oIgogI2luY2x1ZGUg IlNrTWFnbmlmaWVySW1hZ2VGaWx0ZXIuaCIKICNpbmNsdWRlIDxwdWJsaWMvV2ViRmlsdGVyT3Bl cmF0aW9uLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYkZpbHRlck9wZXJhdGlvbnMuaD4KQEAgLTI2 NSwxMiArMjY1LDEyIEBAIHB1YmxpYzoKICAgICAgICAgR3JQbGF0Zm9ybVRleHR1cmVEZXNjIHBs YXRmb3JtVGV4dHVyZURlc2NyaXB0aW9uOwogICAgICAgICBwbGF0Zm9ybVRleHR1cmVEZXNjcmlw dGlvbi5mV2lkdGggPSBzaXplLndpZHRoKCk7CiAgICAgICAgIHBsYXRmb3JtVGV4dHVyZURlc2Ny aXB0aW9uLmZIZWlnaHQgPSBzaXplLmhlaWdodCgpOwotICAgICAgICBwbGF0Zm9ybVRleHR1cmVE ZXNjcmlwdGlvbi5mQ29uZmlnID0ga1NraWE4ODg4X1BNX0dyUGl4ZWxDb25maWc7CisgICAgICAg IHBsYXRmb3JtVGV4dHVyZURlc2NyaXB0aW9uLmZDb25maWcgPSBrU2tpYTg4ODhfR3JQaXhlbENv bmZpZzsKICAgICAgICAgcGxhdGZvcm1UZXh0dXJlRGVzY3JpcHRpb24uZlRleHR1cmVIYW5kbGUg PSB0ZXh0dXJlSWQ7CiAgICAgICAgIFNrQXV0b1RVbnJlZjxHclRleHR1cmU+IHRleHR1cmUoZ3JD b250ZXh0LT5jcmVhdGVQbGF0Zm9ybVRleHR1cmUocGxhdGZvcm1UZXh0dXJlRGVzY3JpcHRpb24p KTsKICAgICAgICAgLy8gUGxhY2UgdGhlIHBsYXRmb3JtIHRleHR1cmUgaW5zaWRlIGFuIFNrQml0 bWFwLgogICAgICAgICBtX3NvdXJjZS5zZXRDb25maWcoU2tCaXRtYXA6OmtBUkdCXzg4ODhfQ29u ZmlnLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOwotICAgICAgICBtX3NvdXJjZS5zZXRQ aXhlbFJlZihuZXcgU2tHclRleHR1cmVQaXhlbFJlZih0ZXh0dXJlLmdldCgpKSktPnVucmVmKCk7 CisgICAgICAgIG1fc291cmNlLnNldFBpeGVsUmVmKG5ldyBTa0dyUGl4ZWxSZWYodGV4dHVyZS5n ZXQoKSkpLT51bnJlZigpOwogICAgIH0KIAogICAgIH5GaWx0ZXJCdWZmZXJTdGF0ZSgpIHsgfQpA QCAtMjgzLDcgKzI4Myw3IEBAIHB1YmxpYzoKICAgICAgICAgZGVzYy5mU2FtcGxlQ250ID0gMDsK ICAgICAgICAgZGVzYy5mV2lkdGggPSBtX3NvdXJjZS53aWR0aCgpOwogICAgICAgICBkZXNjLmZI ZWlnaHQgPSBtX3NvdXJjZS5oZWlnaHQoKTsKLSAgICAgICAgZGVzYy5mQ29uZmlnID0ga1NraWE4 ODg4X1BNX0dyUGl4ZWxDb25maWc7CisgICAgICAgIGRlc2MuZkNvbmZpZyA9IGtTa2lhODg4OF9H clBpeGVsQ29uZmlnOwogICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IHNjcmF0Y2hDb3VudDsg KytpKSB7CiAgICAgICAgICAgICBHckF1dG9TY3JhdGNoVGV4dHVyZSBzY3JhdGNoVGV4dHVyZSht X2dyQ29udGV4dCwgZGVzYywgR3JDb250ZXh0OjprRXhhY3RfU2NyYXRjaFRleE1hdGNoKTsKICAg ICAgICAgICAgIG1fc2NyYXRjaFRleHR1cmVzW2ldLnJlc2V0KHNjcmF0Y2hUZXh0dXJlLmRldGFj aCgpKTsKQEAgLTMwOCw3ICszMDgsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fY2FudmFzLnJlc2V0 KDApOwogICAgICAgICBtX2RldmljZS5yZXNldCgwKTsKIAotICAgICAgICBtX3NvdXJjZS5zZXRQ aXhlbFJlZihuZXcgU2tHclRleHR1cmVQaXhlbFJlZihtX3NjcmF0Y2hUZXh0dXJlc1ttX2N1cnJl bnRUZXh0dXJlXS5nZXQoKSkpLT51bnJlZigpOworICAgICAgICBtX3NvdXJjZS5zZXRQaXhlbFJl ZihuZXcgU2tHclBpeGVsUmVmKG1fc2NyYXRjaFRleHR1cmVzW21fY3VycmVudFRleHR1cmVdLmdl dCgpKSktPnVucmVmKCk7CiAgICAgICAgIG1fY3VycmVudFRleHR1cmUgPSAxIC0gbV9jdXJyZW50 VGV4dHVyZTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAJKHJldmlzaW9uIDEyNjc4 NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJT a2lhLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUsNyArODUsNyBAQCBzdGF0aWMgU2tDYW52YXMq IGNyZWF0ZUFjY2VsZXJhdGVkQ2FudmFzCiAgICAgZGVzYy5mU2FtcGxlQ250ID0gMDsKICAgICBk ZXNjLmZXaWR0aCA9IHNpemUud2lkdGgoKTsKICAgICBkZXNjLmZIZWlnaHQgPSBzaXplLmhlaWdo dCgpOwotICAgIGRlc2MuZkNvbmZpZyA9IGtTa2lhODg4OF9QTV9HclBpeGVsQ29uZmlnOworICAg IGRlc2MuZkNvbmZpZyA9IGtTa2lhODg4OF9HclBpeGVsQ29uZmlnOwogICAgIFNrQXV0b1RVbnJl ZjxHclRleHR1cmU+IHRleHR1cmUoZ3ItPmNyZWF0ZVVuY2FjaGVkVGV4dHVyZShkZXNjLCAwLCAw KSk7CiAgICAgaWYgKCF0ZXh0dXJlLmdldCgpKQogICAgICAgICByZXR1cm4gMDsK