31360 2009-11-11 10:22:33 -0800 [Chromium] Upstream fixes to SocketStreamHandles 2009-11-12 21:05:45 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 japhet japhet ukai oldest_to_newest 162539 0 japhet 2009-11-11 10:22:33 -0800 http://trac.webkit.org/changeset/50811 removed some methods from SocketStreamHandleClient that we exposed in the Chromium API. Remove them there too. 162545 1 42975 japhet 2009-11-11 10:26:29 -0800 Created attachment 42975 patch 162549 2 42975 dglazkov 2009-11-11 10:32:40 -0800 Comment on attachment 42975 patch r=me. 163176 3 42975 commit-queue 2009-11-12 19:06:32 -0800 Comment on attachment 42975 patch Rejecting patch 42975 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Dimitri Glazkov', '--force']" exit_code: 1 Last 500 characters of output: ebKit/chromium/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/chromium/src/SocketStreamHandle.cpp Hunk #1 FAILED at 60. Hunk #2 FAILED at 108. Hunk #3 FAILED at 119. Hunk #4 FAILED at 231. 4 out of 4 hunks FAILED -- saving rejects to file WebKit/chromium/src/SocketStreamHandle.cpp.rej patching file WebKit/chromium/public/WebSocketStreamHandleClient.h Hunk #1 FAILED at 43. 1 out of 1 hunk FAILED -- saving rejects to file WebKit/chromium/public/WebSocketStreamHandleClient.h.rej 163205 4 ukai 2009-11-12 21:05:45 -0800 Landed at r50820 42975 2009-11-11 10:26:29 -0800 2009-11-12 19:06:32 -0800 patch patch.txt text/plain 3242 japhet SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTA4MTcpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsMTkgQEAKIDIwMDktMTEtMTEgIE5hdGUg Q2hhcGluICA8amFwaGV0QGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC81 MDgxMSByZW1vdmVkIHNvbWUgbWV0aG9kcyBmcm9tCisgICAgICAgIHBsYXRmb3JtL25ldHdvcmsv U29ja2V0U3RyZWFtSGFuZGxlQ2xpZW50LmgsIHNvIHJlbW92ZSB0aGVtCisgICAgICAgIGhlcmUg dG9vLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z MTM2MAorCisgICAgICAgICogcHVibGljL1dlYlNvY2tldFN0cmVhbUhhbmRsZUNsaWVudC5oOgor ICAgICAgICAqIHNyYy9Tb2NrZXRTdHJlYW1IYW5kbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U29ja2V0U3RyZWFtSGFuZGxlSW50ZXJuYWw6OnNlbmQpOgorCisyMDA5LTExLTExICBOYXRlIENo YXBpbiAgPGphcGhldEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBT ZWlkZWwuCiAKICAgICAgICAgUmVtb3ZlIHNvbWUgYWRkaXRpb25hbCByZWZlcmVuY2VzIHRvIGRy YWdTb3VyY2VNb3ZlZFRvKCkgbm90CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1NvY2tldFN0 cmVhbUhhbmRsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9Tb2NrZXRT dHJlYW1IYW5kbGUuY3BwCShyZXZpc2lvbiA1MDgwNykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMv U29ja2V0U3RyZWFtSGFuZGxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjAsOCArNjAsNiBAQAog ICAgIGludCBzZW5kKGNvbnN0IGNoYXIqLCBpbnQpOwogICAgIHZvaWQgY2xvc2UoKTsKIAotICAg IHZpcnR1YWwgdm9pZCB3aWxsT3BlblN0cmVhbShXZWJTb2NrZXRTdHJlYW1IYW5kbGUqLCBjb25z dCBXZWJVUkwmKTsKLQogICAgIHZpcnR1YWwgdm9pZCBkaWRPcGVuU3RyZWFtKFdlYlNvY2tldFN0 cmVhbUhhbmRsZSosIGludCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZFNlbmREYXRhKFdlYlNvY2tl dFN0cmVhbUhhbmRsZSosIGludCk7CiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVEYXRhKFdl YlNvY2tldFN0cmVhbUhhbmRsZSosIGNvbnN0IFdlYkRhdGEmKTsKQEAgLTExMCw4ICsxMDgsNiBA QAogICAgIGlmIChtX3NvY2tldC0+c2VuZCh3ZWJkYXRhKSkgewogICAgICAgICBtX3BlbmRpbmdB bW91bnRTZW50ICs9IGxlbjsKICAgICAgICAgTE9HKE5ldHdvcmssICJzZW50Iik7Ci0gICAgICAg IGlmIChtX2hhbmRsZSAmJiBtX2hhbmRsZS0+bV9jbGllbnQpCi0gICAgICAgICAgICBtX2hhbmRs ZS0+bV9jbGllbnQtPndpbGxTZW5kRGF0YShtX2hhbmRsZSwgd2ViZGF0YS5kYXRhKCksIHdlYmRh dGEuc2l6ZSgpKTsKICAgICAgICAgcmV0dXJuIGxlbjsKICAgICB9CiAgICAgTE9HKE5ldHdvcmss ICJidXN5LiBidWZmZXJpbmciKTsKQEAgLTEyMywxNyArMTE5LDcgQEAKICAgICBMT0coTmV0d29y aywgImNsb3NlIik7CiAgICAgbV9zb2NrZXQtPmNsb3NlKCk7CiB9Ci0KLXZvaWQgU29ja2V0U3Ry ZWFtSGFuZGxlSW50ZXJuYWw6OndpbGxPcGVuU3RyZWFtKFdlYlNvY2tldFN0cmVhbUhhbmRsZSog c29ja2V0SGFuZGxlLCBjb25zdCBXZWJVUkwmIHVybCkKLXsKLSAgICBMT0coTmV0d29yaywgIndp bGxPcGVuU3RyZWFtIik7Ci0gICAgaWYgKG1faGFuZGxlICYmIG1fc29ja2V0LmdldCgpKSB7Ci0g ICAgICAgIEFTU0VSVChzb2NrZXRIYW5kbGUgPT0gbV9zb2NrZXQuZ2V0KCkpOwotICAgICAgICBp ZiAobV9oYW5kbGUtPm1fY2xpZW50KQotICAgICAgICAgICAgbV9oYW5kbGUtPm1fY2xpZW50LT53 aWxsT3BlblN0cmVhbShtX2hhbmRsZSwgdXJsKTsKLSAgICB9Ci19Ci0KKyAgICAKIHZvaWQgU29j a2V0U3RyZWFtSGFuZGxlSW50ZXJuYWw6OmRpZE9wZW5TdHJlYW0oV2ViU29ja2V0U3RyZWFtSGFu ZGxlKiBzb2NrZXRIYW5kbGUsIGludCBtYXhQZW5kaW5nU2VuZEFsbG93ZWQpCiB7CiAgICAgTE9H KE5ldHdvcmssICJTb2NrZXRTdHJlYW1IYW5kbGVJbnRlcm5hbDo6ZGlkT3BlbiAlZCIsCkBAIC0y NDUsMTIgKzIzMSw2IEBACiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBTb2NrZXRT dHJlYW1IYW5kbGU6OnJlY2VpdmVkQ2FuY2VsbGF0aW9uKGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlJiBjaGFsbGVuZ2UpCi17Ci0gICAgaWYgKG1fY2xpZW50KQotICAgICAgICBtX2NsaWVu dC0+cmVjZWl2ZWRDYW5jZWxsYXRpb24odGhpcywgY2hhbGxlbmdlKTsKLX0KLQogfSAgLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmICAvLyBFTkFCTEUoV0VCX1NPQ0tFVFMpCkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlNvY2tldFN0cmVhbUhhbmRsZUNsaWVudC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViU29ja2V0U3RyZWFtSGFuZGxlQ2xp ZW50LmgJKHJldmlzaW9uIDUwODA3KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJTb2Nr ZXRTdHJlYW1IYW5kbGVDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsOSArNDMsNiBAQAog Y2xhc3MgV2ViU29ja2V0U3RyZWFtSGFuZGxlQ2xpZW50IHsKIHB1YmxpYzoKIAotICAgIC8vIENh bGxlZCB3aGVuIFdlYlNvY2tldFN0cmVhbUhhbmRsZSBpcyBnb2luZyB0byBvcGVuIHRoZSBVUkwu Ci0gICAgdmlydHVhbCB2b2lkIHdpbGxPcGVuU3RyZWFtKFdlYlNvY2tldFN0cmVhbUhhbmRsZSos IGNvbnN0IFdlYlVSTCYpID0gMDsKLQogICAgIC8vIENhbGxlZCB3aGVuIFNvY2tldCBTdHJlYW0g aXMgb3BlbmVkLgogICAgIHZpcnR1YWwgdm9pZCBkaWRPcGVuU3RyZWFtKFdlYlNvY2tldFN0cmVh bUhhbmRsZSosIGludCAvKiBtYXhQZW5kaW5nU2VuZEFsbG93ZWQgKi8pID0gMDsKIAo=