30527 2009-10-19 12:31:21 -0700 [Win] event.dataTransfer.types is NULL but should be the list formats set in the dragstart event 2010-01-18 09:20:40 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 dbates webkit-unassigned aroben dcheng manisandro oldest_to_newest 155834 0 dbates 2009-10-19 12:31:21 -0700 Following up from my comment on bug #30266. On Windows, event.dataTransfer.types is NULL on a successful drop despite any formats set in the dragstart event. According to section 7.9.2 of the HTML 5 spec (http://dev.w3.org/html5/spec/Overview.html#the-dragevent-and-datatransfer-interfaces), it should be the list of the formats that were set in the dragstart event. 155836 1 41438 dbates 2009-10-19 12:31:43 -0700 Created attachment 41438 Example 171260 2 manisandro 2009-12-13 16:11:27 -0800 Actually it seems to work if the registered content type is text/plain, but seems to fail for other basic ones (text/html) for example. 181854 3 aroben 2010-01-18 06:21:38 -0800 *** Bug 33738 has been marked as a duplicate of this bug. *** 181886 4 46826 dcheng 2010-01-18 08:57:57 -0800 Created attachment 46826 Patch 181889 5 46826 aroben 2010-01-18 09:03:37 -0800 Comment on attachment 46826 Patch There are a couple of conflict markers in your ChangeLogs. I'll take care of them before landing. Thanks! 181897 6 aroben 2010-01-18 09:20:40 -0800 Committed r53410: <http://trac.webkit.org/changeset/53410> 41438 2009-10-19 12:31:43 -0700 2009-10-19 12:31:43 -0700 Example self-contained-test.html text/html 9693 dbates PGh0bWw+CjxoZWFkPgo8c2NyaXB0PgovLyBUYWtlbiBmcm9tIExheW91dFRlc3RzL2Zhc3QvanMv cmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzCmZ1bmN0aW9uIGRlc2NyaXB0aW9uKG1zZykKewogICAg Ly8gRm9yIE1TSUUgNiBjb21wYXRpYmlsaXR5CiAgICB2YXIgc3BhbiA9IGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoInNwYW4iKTsKICAgIHNwYW4uaW5uZXJIVE1MID0gJzxwPicgKyBtc2cgKyAnPC9w PjxwPk9uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiPHNwYW4gY2xhc3M9InBh c3MiPlBBU1M8L3NwYW4+IiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIjxzcGFuIGNsYXNzPSJwYXNz Ij5URVNUIENPTVBMRVRFPC9zcGFuPiIuPC9wPic7CiAgICB2YXIgZGVzY3JpcHRpb24gPSBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiZGVzY3JpcHRpb24iKTsKICAgIGlmIChkZXNjcmlwdGlvbi5m aXJzdENoaWxkKQogICAgICAgIGRlc2NyaXB0aW9uLnJlcGxhY2VDaGlsZChzcGFuLCBkZXNjcmlw dGlvbi5maXJzdENoaWxkKTsKICAgIGVsc2UKICAgICAgICBkZXNjcmlwdGlvbi5hcHBlbmRDaGls ZChzcGFuKTsKfQoKZnVuY3Rpb24gZGVidWcobXNnKQp7CiAgICB2YXIgc3BhbiA9IGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25z b2xlIikuYXBwZW5kQ2hpbGQoc3Bhbik7IC8vIGluc2VydCBpdCBmaXJzdCBzbyBYSFRNTCBrbm93 cyB0aGUgbmFtZXNwYWNlCiAgICBzcGFuLmlubmVySFRNTCA9IG1zZyArICc8YnIgLz4nOwp9Cgpm dW5jdGlvbiBlc2NhcGVIVE1MKHRleHQpCnsKICAgIHJldHVybiB0ZXh0LnJlcGxhY2UoLyYvZywg IiZhbXA7IikucmVwbGFjZSgvPC9nLCAiJmx0OyIpOwp9CgpmdW5jdGlvbiB0ZXN0UGFzc2VkKG1z ZykKewogICAgZGVidWcoJzxzcGFuPjxzcGFuIGNsYXNzPSJwYXNzIj5QQVNTPC9zcGFuPiAnICsg ZXNjYXBlSFRNTChtc2cpICsgJzwvc3Bhbj4nKTsKfQoKZnVuY3Rpb24gdGVzdEZhaWxlZChtc2cp CnsKICAgIGRlYnVnKCc8c3Bhbj48c3BhbiBjbGFzcz0iZmFpbCI+RkFJTDwvc3Bhbj4gJyArIGVz Y2FwZUhUTUwobXNnKSArICc8L3NwYW4+Jyk7Cn0KCmZ1bmN0aW9uIGFyZUFycmF5c0VxdWFsKF9h LCBfYikKewogICAgaWYgKF9hLmxlbmd0aCAhPT0gX2IubGVuZ3RoKQogICAgICAgIHJldHVybiBm YWxzZTsKICAgIGZvciAodmFyIGkgPSAwOyBpIDwgX2EubGVuZ3RoOyBpKyspCiAgICAgICAgaWYg KF9hW2ldICE9PSBfYltpXSkKICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgcmV0dXJuIHRy dWU7Cn0KCmZ1bmN0aW9uIGlzTWludXNaZXJvKG4pCnsKICAgIC8vIHRoZSBvbmx5IHdheSB0byB0 ZWxsIDAgZnJvbSAtMCBpbiBKUyBpcyB0aGUgZmFjdCB0aGF0IDEvLTAgaXMKICAgIC8vIC1JbmZp bml0eSBpbnN0ZWFkIG9mIEluZmluaXR5CiAgICByZXR1cm4gbiA9PT0gMCAmJiAxL24gPCAwOwp9 CgpmdW5jdGlvbiBpc1Jlc3VsdENvcnJlY3QoX2FjdHVhbCwgX2V4cGVjdGVkKQp7CiAgICBpZiAo X2V4cGVjdGVkID09PSAwKQogICAgICAgIHJldHVybiBfYWN0dWFsID09PSBfZXhwZWN0ZWQgJiYg KDEvX2FjdHVhbCkgPT09ICgxL19leHBlY3RlZCk7CiAgICBpZiAoX2FjdHVhbCA9PT0gX2V4cGVj dGVkKQogICAgICAgIHJldHVybiB0cnVlOwogICAgaWYgKHR5cGVvZihfZXhwZWN0ZWQpID09ICJu dW1iZXIiICYmIGlzTmFOKF9leHBlY3RlZCkpCiAgICAgICAgcmV0dXJuIHR5cGVvZihfYWN0dWFs KSA9PSAibnVtYmVyIiAmJiBpc05hTihfYWN0dWFsKTsKICAgIGlmIChPYmplY3QucHJvdG90eXBl LnRvU3RyaW5nLmNhbGwoX2V4cGVjdGVkKSA9PSBPYmplY3QucHJvdG90eXBlLnRvU3RyaW5nLmNh bGwoW10pKQogICAgICAgIHJldHVybiBhcmVBcnJheXNFcXVhbChfYWN0dWFsLCBfZXhwZWN0ZWQp OwogICAgcmV0dXJuIGZhbHNlOwp9CgpmdW5jdGlvbiBzdHJpbmdpZnkodikKewogICAgaWYgKHYg PT09IDAgJiYgMS92IDwgMCkKICAgICAgICByZXR1cm4gIi0wIjsKICAgIGVsc2UgcmV0dXJuICIi ICsgdjsKfQoKZnVuY3Rpb24gc2hvdWxkQmUoX2EsIF9iKQp7CiAgaWYgKHR5cGVvZiBfYSAhPSAi c3RyaW5nIiB8fCB0eXBlb2YgX2IgIT0gInN0cmluZyIpCiAgICBkZWJ1ZygiV0FSTjogc2hvdWxk QmUoKSBleHBlY3RzIHN0cmluZyBhcmd1bWVudHMiKTsKICB2YXIgZXhjZXB0aW9uOwogIHZhciBf YXY7CiAgdHJ5IHsKICAgICBfYXYgPSBldmFsKF9hKTsKICB9IGNhdGNoIChlKSB7CiAgICAgZXhj ZXB0aW9uID0gZTsKICB9CiAgdmFyIF9idiA9IGV2YWwoX2IpOwoKICBpZiAoZXhjZXB0aW9uKQog ICAgdGVzdEZhaWxlZChfYSArICIgc2hvdWxkIGJlICIgKyBfYnYgKyAiLiBUaHJldyBleGNlcHRp b24gIiArIGV4Y2VwdGlvbik7CiAgZWxzZSBpZiAoaXNSZXN1bHRDb3JyZWN0KF9hdiwgX2J2KSkK ICAgIHRlc3RQYXNzZWQoX2EgKyAiIGlzICIgKyBfYik7CiAgZWxzZSBpZiAodHlwZW9mKF9hdikg PT0gdHlwZW9mKF9idikpCiAgICB0ZXN0RmFpbGVkKF9hICsgIiBzaG91bGQgYmUgIiArIF9idiAr ICIuIFdhcyAiICsgc3RyaW5naWZ5KF9hdikgKyAiLiIpOwogIGVsc2UKICAgIHRlc3RGYWlsZWQo X2EgKyAiIHNob3VsZCBiZSAiICsgX2J2ICsgIiAob2YgdHlwZSAiICsgdHlwZW9mIF9idiArICIp LiBXYXMgIiArIF9hdiArICIgKG9mIHR5cGUgIiArIHR5cGVvZiBfYXYgKyAiKS4iKTsKfQoKZnVu Y3Rpb24gc2hvdWxkQmVUcnVlKF9hKSB7IHNob3VsZEJlKF9hLCAidHJ1ZSIpOyB9CmZ1bmN0aW9u IHNob3VsZEJlRmFsc2UoX2EpIHsgc2hvdWxkQmUoX2EsICJmYWxzZSIpOyB9CmZ1bmN0aW9uIHNo b3VsZEJlTmFOKF9hKSB7IHNob3VsZEJlKF9hLCAiTmFOIik7IH0KZnVuY3Rpb24gc2hvdWxkQmVO dWxsKF9hKSB7IHNob3VsZEJlKF9hLCAibnVsbCIpOyB9CgpmdW5jdGlvbiBzaG91bGRCZUVxdWFs VG9TdHJpbmcoYSwgYikKewogIHZhciB1bmV2YWxlZFN0cmluZyA9ICciJyArIGIucmVwbGFjZSgv Ii9nLCAiXCIiKSArICciJzsKICBzaG91bGRCZShhLCB1bmV2YWxlZFN0cmluZyk7Cn0KCmZ1bmN0 aW9uIHNob3VsZEV2YWx1YXRlVG8oYWN0dWFsLCBleHBlY3RlZCkgewogIC8vIEEgZ2VuZXJhbC1w dXJwb3NlIGNvbXBhcmF0b3IuICAnYWN0dWFsJyBzaG91bGQgYmUgYSBzdHJpbmcgdG8gYmUKICAv LyBldmFsdWF0ZWQsIGFzIGZvciBzaG91bGRCZSgpLiAnZXhwZWN0ZWQnIG1heSBiZSBhbnkgdHlw ZSBhbmQgd2lsbCBiZQogIC8vIHVzZWQgd2l0aG91dCBiZWluZyBldmFsJ2VkLgogIGlmIChleHBl Y3RlZCA9PSBudWxsKSB7CiAgICAvLyBEbyB0aGlzIGJlZm9yZSB0aGUgb2JqZWN0IHRlc3QsIHNp bmNlIG51bGwgaXMgb2YgdHlwZSAnb2JqZWN0Jy4KICAgIHNob3VsZEJlTnVsbChhY3R1YWwpOwog IH0gZWxzZSBpZiAodHlwZW9mIGV4cGVjdGVkID09ICJ1bmRlZmluZWQiKSB7CiAgICBzaG91bGRC ZVVuZGVmaW5lZChhY3R1YWwpOwogIH0gZWxzZSBpZiAodHlwZW9mIGV4cGVjdGVkID09ICJmdW5j dGlvbiIpIHsKICAgIC8vIEFsbCB0aGlzIGZ1c3MgaXMgdG8gYXZvaWQgdGhlIHN0cmluZy1hcmcg d2FybmluZyBmcm9tIHNob3VsZEJlKCkuCiAgICB0cnkgewogICAgICBhY3R1YWxWYWx1ZSA9IGV2 YWwoYWN0dWFsKTsKICAgIH0gY2F0Y2ggKGUpIHsKICAgICAgdGVzdEZhaWxlZCgiRXZhbHVhdGlu ZyAiICsgYWN0dWFsICsgIjogVGhyZXcgZXhjZXB0aW9uICIgKyBlKTsKICAgICAgcmV0dXJuOwog ICAgfQogICAgc2hvdWxkQmUoIiciICsgYWN0dWFsVmFsdWUudG9TdHJpbmcoKS5yZXBsYWNlKC9c bi9nLCAiIikgKyAiJyIsCiAgICAgICAgICAgICAiJyIgKyBleHBlY3RlZC50b1N0cmluZygpLnJl cGxhY2UoL1xuL2csICIiKSArICInIik7CiAgfSBlbHNlIGlmICh0eXBlb2YgZXhwZWN0ZWQgPT0g Im9iamVjdCIpIHsKICAgIHNob3VsZEJlVHJ1ZShhY3R1YWwgKyAiID09ICciICsgZXhwZWN0ZWQg KyAiJyIpOwogIH0gZWxzZSBpZiAodHlwZW9mIGV4cGVjdGVkID09ICJzdHJpbmciKSB7CiAgICBz aG91bGRCZShhY3R1YWwsIGV4cGVjdGVkKTsKICB9IGVsc2UgaWYgKHR5cGVvZiBleHBlY3RlZCA9 PSAiYm9vbGVhbiIpIHsKICAgIHNob3VsZEJlKCJ0eXBlb2YgIiArIGFjdHVhbCwgIidib29sZWFu JyIpOwogICAgaWYgKGV4cGVjdGVkKQogICAgICBzaG91bGRCZVRydWUoYWN0dWFsKTsKICAgIGVs c2UKICAgICAgc2hvdWxkQmVGYWxzZShhY3R1YWwpOwogIH0gZWxzZSBpZiAodHlwZW9mIGV4cGVj dGVkID09ICJudW1iZXIiKSB7CiAgICBzaG91bGRCZShhY3R1YWwsIHN0cmluZ2lmeShleHBlY3Rl ZCkpOwogIH0gZWxzZSB7CiAgICBkZWJ1ZyhleHBlY3RlZCArICIgaXMgdW5rbm93biB0eXBlICIg KyB0eXBlb2YgZXhwZWN0ZWQpOwogICAgc2hvdWxkQmVUcnVlKGFjdHVhbCwgIiciICArZXhwZWN0 ZWQudG9TdHJpbmcoKSArICInIik7CiAgfQp9CgpmdW5jdGlvbiBzaG91bGRCZVVuZGVmaW5lZChf YSkKewogIHZhciBleGNlcHRpb247CiAgdmFyIF9hdjsKICB0cnkgewogICAgIF9hdiA9IGV2YWwo X2EpOwogIH0gY2F0Y2ggKGUpIHsKICAgICBleGNlcHRpb24gPSBlOwogIH0KCiAgaWYgKGV4Y2Vw dGlvbikKICAgIHRlc3RGYWlsZWQoX2EgKyAiIHNob3VsZCBiZSB1bmRlZmluZWQuIFRocmV3IGV4 Y2VwdGlvbiAiICsgZXhjZXB0aW9uKTsKICBlbHNlIGlmICh0eXBlb2YgX2F2ID09ICJ1bmRlZmlu ZWQiKQogICAgdGVzdFBhc3NlZChfYSArICIgaXMgdW5kZWZpbmVkLiIpOwogIGVsc2UKICAgIHRl c3RGYWlsZWQoX2EgKyAiIHNob3VsZCBiZSB1bmRlZmluZWQuIFdhcyAiICsgX2F2KTsKfQoKCmZ1 bmN0aW9uIHNob3VsZFRocm93KF9hLCBfZSkKewogIHZhciBleGNlcHRpb247CiAgdmFyIF9hdjsK ICB0cnkgewogICAgIF9hdiA9IGV2YWwoX2EpOwogIH0gY2F0Y2ggKGUpIHsKICAgICBleGNlcHRp b24gPSBlOwogIH0KCiAgdmFyIF9ldjsKICBpZiAoX2UpCiAgICAgIF9ldiA9ICBldmFsKF9lKTsK CiAgaWYgKGV4Y2VwdGlvbikgewogICAgaWYgKHR5cGVvZiBfZSA9PSAidW5kZWZpbmVkIiB8fCBl eGNlcHRpb24gPT0gX2V2KQogICAgICB0ZXN0UGFzc2VkKF9hICsgIiB0aHJldyBleGNlcHRpb24g IiArIGV4Y2VwdGlvbiArICIuIik7CiAgICBlbHNlCiAgICAgIHRlc3RGYWlsZWQoX2EgKyAiIHNo b3VsZCB0aHJvdyAiICsgKHR5cGVvZiBfZSA9PSAidW5kZWZpbmVkIiA/ICJhbiBleGNlcHRpb24i IDogX2V2KSArICIuIFRocmV3IGV4Y2VwdGlvbiAiICsgZXhjZXB0aW9uICsgIi4iKTsKICB9IGVs c2UgaWYgKHR5cGVvZiBfYXYgPT0gInVuZGVmaW5lZCIpCiAgICB0ZXN0RmFpbGVkKF9hICsgIiBz aG91bGQgdGhyb3cgIiArICh0eXBlb2YgX2UgPT0gInVuZGVmaW5lZCIgPyAiYW4gZXhjZXB0aW9u IiA6IF9ldikgKyAiLiBXYXMgdW5kZWZpbmVkLiIpOwogIGVsc2UKICAgIHRlc3RGYWlsZWQoX2Eg KyAiIHNob3VsZCB0aHJvdyAiICsgKHR5cGVvZiBfZSA9PSAidW5kZWZpbmVkIiA/ICJhbiBleGNl cHRpb24iIDogX2V2KSArICIuIFdhcyAiICsgX2F2ICsgIi4iKTsKfQoKZnVuY3Rpb24gZ2MoKSB7 CiAgICBpZiAodHlwZW9mIEdDQ29udHJvbGxlciAhPT0gInVuZGVmaW5lZCIpCiAgICAgICAgR0ND b250cm9sbGVyLmNvbGxlY3QoKTsKICAgIGVsc2UgewogICAgICAgIGZ1bmN0aW9uIGdjUmVjKG4p IHsKICAgICAgICAgICAgaWYgKG4gPCAxKQogICAgICAgICAgICAgICAgcmV0dXJuIHt9OwogICAg ICAgICAgICB2YXIgdGVtcCA9IHtpOiAiYWIiICsgaSArIChpIC8gMTAwMDAwKX07CiAgICAgICAg ICAgIHRlbXAgKz0gImZvbyI7CiAgICAgICAgICAgIGdjUmVjKG4tMSk7CiAgICAgICAgfQogICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgMTAwMDsgaSsrKQogICAgICAgICAgICBnY1JlYygxMCkK ICAgIH0KfQo8L3NjcmlwdD4KPHN0eWxlPgojZHJvcFRhcmdldCwgI2RyYWdNZSB7IHRleHQtYWxp Z246IGNlbnRlcjsgZGlzcGxheTogdGFibGUtY2VsbDsgdmVydGljYWwtYWxpZ246IG1pZGRsZSB9 CiNkcm9wVGFyZ2V0IHt3aWR0aDogMjU2cHg7IGhlaWdodDogMjU2cHg7IGJvcmRlcjogMXB4IGRh c2hlZH0KI2RyYWdNZSB7LXdlYmtpdC11c2VyLWRyYWc6IGVsZW1lbnQ7IC13ZWJraXQtdXNlci1z ZWxlY3Q6IG5vbmU7IGJhY2tncm91bmQ6ICNmZjAwMDA7IHdpZHRoOiA2NHB4OyBoZWlnaHQ6IDY0 cHg7IGNvbG9yOiB3aGl0ZX0KLyogVGhlIGZvbGxvd2luZyBzdHlsZXMgdGFrZW4gZnJvbSBMYXlv dXRUZXN0cy9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcy4gKi8KLnBhc3MgeyBm b250LXdlaWdodDogYm9sZDsgY29sb3I6IGdyZWVuOyB9Ci5mYWlsIHsgZm9udC13ZWlnaHQ6IGJv bGQ7IGNvbG9yOiByZWQ7IH0KI2NvbnNvbGUgeyB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7IGZvbnQt ZmFtaWx5OiBtb25vc3BhY2U7IH0KPC9zdHlsZT4KPHNjcmlwdD4KICAgIHZhciBkcmFnTWU7CiAg ICB2YXIgZHJvcFRhcmdldDsKICAgIHZhciBjb25zb2xlRWxtOwogICAgdmFyIGV2ZW50OwogICAg CiAgICB2YXIgRk9STUFUX1RZUEUgPSAndGV4dCc7CiAgICB2YXIgQUxMT1dFRF9FRkZFQ1QgPSAn Y29weSc7CiAgICB2YXIgRFJPUF9FRkZFQ1QgPSAnY29weSc7CiAgICAKICAgIHdpbmRvdy5vbmxv YWQgPSBmdW5jdGlvbigpCiAgICB7CiAgICAgICAgZHJhZ01lID0gZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImRyYWdNZSIpOwogICAgICAgIGRyb3BUYXJnZXQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiZHJvcFRhcmdldCIpOwogICAgICAgIGNvbnNvbGVFbG0gPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgiY29uc29sZSIpOwogICAgICAgIAogICAgICAgIGlmICghZHJhZ01lIHx8ICFkcm9w VGFyZ2V0IHx8ICFjb25zb2xlRWxtKQogICAgICAgICAgICByZXR1cm47CiAgICAgICAgCiAgICAg ICAgZHJhZ01lLm9uZHJhZ3N0YXJ0ID0gZHJhZ1N0YXJ0OwogICAgICAgIGRyYWdNZS5vbmRyYWdl bmQgPSBkcmFnRW5kOwogICAgICAgIAogICAgICAgIGRyb3BUYXJnZXQub25kcmFnZW50ZXIgPSBk cmFnRW50ZXJlZDsKICAgICAgICBkcm9wVGFyZ2V0Lm9uZHJhZ292ZXIgPSBkcmFnT3ZlcjsKICAg ICAgICBkcm9wVGFyZ2V0Lm9uZHJvcCA9IGRyb3A7CiAgICAgICAgCiAgICAgICAgcnVuVGVzdCgp OwogICAgfQogICAgCiAgICBmdW5jdGlvbiBkcmFnU3RhcnQoZSkKICAgIHsKICAgICAgICBldmVu dCA9IGU7CiAgICAgICAgZS5kYXRhVHJhbnNmZXIuZWZmZWN0QWxsb3dlZCA9IEFMTE9XRURfRUZG RUNUOwogICAgICAgIGUuZGF0YVRyYW5zZmVyLnNldERhdGEoRk9STUFUX1RZUEUsIGUudGFyZ2V0 LnRleHRDb250ZW50KTsKICAgIH0KICAgIAogICAgZnVuY3Rpb24gZHJhZ0VuZChlKQogICAgewog ICAgICAgIHJldHVybjsKICAgIH0KICAgIAogICAgZnVuY3Rpb24gZHJhZ0VudGVyZWQoZSkKICAg IHsKICAgICAgICBkcmFnRW50ZXJlZEFuZFVwZGF0ZWQoZSk7CiAgICB9CiAgICAKICAgIGZ1bmN0 aW9uIGRyYWdPdmVyKGUpCiAgICB7CiAgICAgICAgZHJhZ0VudGVyZWRBbmRVcGRhdGVkKGUpOwog ICAgfQogICAgCiAgICBmdW5jdGlvbiBkcmFnRW50ZXJlZEFuZFVwZGF0ZWQoZSkKICAgIHsKICAg ICAgICBldmVudCA9IGU7CiAgICAgICAgZS5kYXRhVHJhbnNmZXIuZHJvcEVmZmVjdCA9IERST1Bf RUZGRUNUOwogICAgICAgIGNhbmNlbERyYWcoZSk7CiAgICB9CiAgICAKICAgIGZ1bmN0aW9uIGRy b3AoZSkKICAgIHsKICAgICAgICBjaGVja0Zvcm1hdFR5cGUoZSk7CiAgICAgICAgY2FuY2VsRHJh ZyhlKTsKICAgIH0KICAgIAogICAgZnVuY3Rpb24gY2FuY2VsRHJhZyhlKQogICAgewogICAgICAg IGlmIChlLnByZXZlbnREZWZhdWx0KQogICAgICAgICAgICBlLnByZXZlbnREZWZhdWx0KCk7CiAg ICAgICAgZWxzZSB7CiAgICAgICAgICAgIC8vIEFzc3VtZSB0aGlzIHNjcmlwdCBpcyBleGVjdXRp bmcgd2l0aGluIEludGVybmV0IEV4cGxvcmVyCiAgICAgICAgICAgIGUucmV0dXJuVmFsdWUgPSBm YWxzZTsKICAgICAgICB9CiAgICB9CiAgICAKICAgIGZ1bmN0aW9uIGNoZWNrRm9ybWF0VHlwZShl KQogICAgewogICAgICAgIGV2ZW50ID0gZTsKICAgICAgICB2YXIgZm9ybWF0VHlwZXMgPSBlLmRh dGFUcmFuc2Zlci50eXBlczsgLy8gVGhpcyBsaW5lIGNhdXNlcyB0aGUgY3Jhc2guCiAgICAgICAg c2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdldmVudC5kYXRhVHJhbnNmZXIudHlwZXNbMF0nLCBGT1JN QVRfVFlQRSk7CiAgICB9CgogICAgZnVuY3Rpb24gcnVuVGVzdCgpCiAgICB7CiAgICAgICAgaWYg KCF3aW5kb3cuZXZlbnRTZW5kZXIpCiAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgCiAg ICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKICAgICAgICAgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOwogICAgICAgICAgICAKICAgICAgICB2YXIgc3Rh cnRYID0gZHJhZ01lLm9mZnNldExlZnQgKyAxMDsKICAgICAgICB2YXIgc3RhcnRZID0gZHJhZ01l Lm9mZnNldFRvcCArIGRyYWdNZS5vZmZzZXRIZWlnaHQgLyAyOwogICAgICAgIHZhciBlbmRYID0g ZHJvcFRhcmdldC5vZmZzZXRMZWZ0ICsgMTA7CiAgICAgICAgdmFyIGVuZFkgPSBkcm9wVGFyZ2V0 Lm9mZnNldFRvcCArIGRyb3BUYXJnZXQub2Zmc2V0SGVpZ2h0IC8gMjsKICAgICAgICAKICAgICAg ICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhzdGFydFgsIHN0YXJ0WSk7CiAgICAgICAgZXZlbnRT ZW5kZXIubW91c2VEb3duKCk7CiAgICAgICAgZXZlbnRTZW5kZXIubGVhcEZvcndhcmQoMTAwKTsK ICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhlbmRYLCBlbmRZKTsKICAgICAgICBldmVu dFNlbmRlci5tb3VzZVVwKCk7CiAgICAgICAgCiAgICAgICAgdmFyIHRlc3RDb250YWluZXIgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgidGVzdC1jb250YWluZXIiKTsKICAgICAgICBpZiAodGVz dENvbnRhaW5lcikKICAgICAgICAgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZCh0ZXN0Q29u dGFpbmVyKTsKICAgICAgICBkZWJ1ZygnPGJyIC8+PHNwYW4gY2xhc3M9InBhc3MiPlRFU1QgQ09N UExFVEU8L3NwYW4+Jyk7CiAgICB9Cjwvc2NyaXB0Pgo8L2hlYWQ+Cjxib2R5PgogICAgPHAgaWQ9 ImRlc2NyaXB0aW9uIj48L3A+CiAgICA8ZGl2IGlkPSJ0ZXN0LWNvbnRhaW5lciI+CiAgICAgICAg PGRpdiBpZD0iZHJvcFRhcmdldCI+RHJvcCB0aGUgcmVkIHNxdWFyZSBvbnRvIG1lLjwvZGl2Pgog ICAgICAgIDxoci8+CiAgICAgICAgPHA+SXRlbXMgdGhhdCBjYW4gYmUgZHJhZ2dlZCB0byB0aGUg ZHJvcCB0YXJnZXQ6PC9wPgogICAgICAgIDxkaXYgaWQ9ImRyYWdNZSIgZHJhZ2dhYmxlPSJ0cnVl Ij5TcXVhcmU8L2Rpdj4KICAgICAgICA8aHIvPgogICAgPC9kaXY+CiAgICA8ZGl2IGlkPSJjb25z b2xlIj48L2Rpdj4KICAgIDxzY3JpcHQ+CiAgICAgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdCBj aGVja3MgdGhhdCBvbiBhIHN1Y2Nlc3NmdWwgZHJvcCB3ZSBjYW4gYWNjZXNzIDxjb2RlPmV2ZW50 LmRhdGFUcmFuc2Zlci50eXBlczwvY29kZT4gd2l0aG91dCBjcmFzaGluZy4iKTsKICAgICAgICB2 YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKICAgIDwvc2NyaXB0Pgo8L2JvZHk+CjwvaHRt bD4K 46826 2010-01-18 08:57:57 -0800 2010-01-18 09:03:37 -0800 Patch ClipboardWinPatch.txt text/plain 5873 dcheng SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzQwOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDEtMTUgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0Bnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERh dGFUcmFuc2ZlciBpbnRlcmZhY2UgYnJva2VuIG9uIFdpbmRvd3MtLXR5cGVzIG1lbWJlciBpcyBh bHdheXMKKyAgICAgICAgdW5kZWZpbmVkLCBhbmQgZ2V0RGF0YSgpIGRvZXMgbm90IHdvcmsuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMzczOAorCisg ICAgICAgICogcGxhdGZvcm0vd2luL0NsaXBib2FyZFdpbi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjphZGRNaW1lVHlwZXNGb3JGb3JtYXQpOiBwYXNzIEZPUk1BVEVUQyBhcyBhIGNvbnN0IHJlZi4K KyAgICAgICAgKFdlYkNvcmU6OkNsaXBib2FyZFdpbjo6dHlwZXMpOiBmaXggY2FsbHMgdG8gSUVu dW1GT1JNQVRFVEMuCisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRXaW46Omhhc0RhdGEpOiBm aXggY2FsbHMgdG8gSUVudW1GT1JNQVRFVEMuCisKIDIwMTAtMDEtMTggIFRvciBBcm5lIFZlc3Ri w7ggIDx0b3IuYXJuZS52ZXN0Ym9Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNp bW9uIEhhdXNtYW5uLgpAQCAtNzIzLDYgKzczNiw3IEBACiAgICAgICAgIChXZWJDb3JlOjpnZXRW aXN1YWwpOgogICAgICAgICAoV2ViQ29yZTo6c2NyZWVuUmVjdCk6CiAKKz4+Pj4+Pj4gLnI1MzQw OAogMjAxMC0wMS0xNSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3dpbi9DbGlw Ym9hcmRXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vd2luL0NsaXBib2Fy ZFdpbi5jcHAJKHJldmlzaW9uIDUzMzQ5KQorKysgV2ViQ29yZS9wbGF0Zm9ybS93aW4vQ2xpcGJv YXJkV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTM0LDcgKzUzNCw3IEBAIGJvb2wgQ2xpcGJv YXJkV2luOjpzZXREYXRhKGNvbnN0IFN0cmluZyYKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0 YXRpYyB2b2lkIGFkZE1pbWVUeXBlc0ZvckZvcm1hdChIYXNoU2V0PFN0cmluZz4mIHJlc3VsdHMs IEZPUk1BVEVUQyYgZm9ybWF0KQorc3RhdGljIHZvaWQgYWRkTWltZVR5cGVzRm9yRm9ybWF0KEhh c2hTZXQ8U3RyaW5nPiYgcmVzdWx0cywgY29uc3QgRk9STUFURVRDJiBmb3JtYXQpCiB7CiAgICAg Ly8gVVJMIGFuZCBUZXh0IGFyZSBwcm92aWRlZCBmb3IgY29tcGF0aWJpbGl0eSB3aXRoIElFJ3Mg bW9kZWwKICAgICBpZiAoZm9ybWF0LmNmRm9ybWF0ID09IHVybEZvcm1hdCgpLT5jZkZvcm1hdCB8 fCBmb3JtYXQuY2ZGb3JtYXQgPT0gdXJsV0Zvcm1hdCgpLT5jZkZvcm1hdCkgewpAQCAtNTYwLDcg KzU2MCw3IEBAIEhhc2hTZXQ8U3RyaW5nPiBDbGlwYm9hcmRXaW46OnR5cGVzKCkgY28KIAogICAg IENPTVB0cjxJRW51bUZPUk1BVEVUQz4gaXRyOwogCi0gICAgaWYgKEZBSUxFRChtX2RhdGFPYmpl Y3QtPkVudW1Gb3JtYXRFdGMoMCwgJml0cikpKQorICAgIGlmIChGQUlMRUQobV9kYXRhT2JqZWN0 LT5FbnVtRm9ybWF0RXRjKERBVEFESVJfR0VULCAmaXRyKSkpCiAgICAgICAgIHJldHVybiByZXN1 bHRzOwogCiAgICAgaWYgKCFpdHIpCkBAIC01NjgsNyArNTY4LDggQEAgSGFzaFNldDxTdHJpbmc+ IENsaXBib2FyZFdpbjo6dHlwZXMoKSBjbwogCiAgICAgRk9STUFURVRDIGRhdGE7CiAKLSAgICB3 aGlsZSAoU1VDQ0VFREVEKGl0ci0+TmV4dCgxLCAmZGF0YSwgMCkpKSB7CisgICAgLy8gSUVudW1G T1JNQVRFVEM6Ok5leHQgcmV0dXJucyBTX0ZBTFNFIGlmIHRoZXJlIGFyZSBubyBtb3JlIGl0ZW1z LgorICAgIHdoaWxlIChpdHItPk5leHQoMSwgJmRhdGEsIDApID09IFNfT0spIHsKICAgICAgICAg YWRkTWltZVR5cGVzRm9yRm9ybWF0KHJlc3VsdHMsIGRhdGEpOwogICAgIH0KIApAQCAtNzgxLDcg Kzc4Miw3IEBAIGJvb2wgQ2xpcGJvYXJkV2luOjpoYXNEYXRhKCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCiAgICAgQ09NUHRyPElFbnVtRk9STUFURVRDPiBpdHI7Ci0gICAgaWYgKEZBSUxFRCht X2RhdGFPYmplY3QtPkVudW1Gb3JtYXRFdGMoMCwgJml0cikpKQorICAgIGlmIChGQUlMRUQobV9k YXRhT2JqZWN0LT5FbnVtRm9ybWF0RXRjKERBVEFESVJfR0VULCAmaXRyKSkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAogICAgIGlmICghaXRyKQpAQCAtNzg5LDcgKzc5MCw4IEBAIGJvb2wgQ2xp cGJvYXJkV2luOjpoYXNEYXRhKCkKIAogICAgIEZPUk1BVEVUQyBkYXRhOwogCi0gICAgaWYgKFNV Q0NFRURFRChpdHItPk5leHQoMSwgJmRhdGEsIDApKSkgeworICAgIC8vIElFbnVtRk9STUFURVRD OjpOZXh0IHJldHVybnMgU19GQUxTRSBpZiB0aGVyZSBhcmUgbm8gbW9yZSBpdGVtcy4KKyAgICBp ZiAoaXRyLT5OZXh0KDEsICZkYXRhLCAwKSA9PSBTX09LKSB7CiAgICAgICAgIC8vIFRoZXJlIGlz IGF0IGxlYXN0IG9uZSBpdGVtIGluIHRoZSBJRGF0YU9iamVjdAogICAgICAgICByZXR1cm4gdHJ1 ZTsKICAgICB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MzQwOCkKKysrIExheW91dFRlc3RzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEwLTAxLTE4ICBEYW5pZWwg Q2hlbmcgIDxkY2hlbmdAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBOZWVkIGEgc2hvcnQgZGVzY3JpcHRpb24gYW5kIGJ1ZyBVUkwg KE9PUFMhKQorCisgICAgICAgICogZmFzdC9ldmVudHMvZHJhZy1hbmQtZHJvcC1kYXRhVHJhbnNm ZXItdHlwZXMtbm9jcmFzaC1leHBlY3RlZC50eHQ6IFVwZGF0ZWQgdGVzdCBleHBlY3RhdGlvbnMu CisgICAgICAgICogZmFzdC9ldmVudHMvZHJhZy1hbmQtZHJvcC1kYXRhVHJhbnNmZXItdHlwZXMt bm9jcmFzaC5odG1sOiBBZGRlZCB0ZXN0IGNhc2VzLgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9T a2lwcGVkOiBSZS1lbmFibGVkIGZhc3QvZXZlbnRzL2RyYWctYW5kLWRyb3AtZGF0YVRyYW5zZmVy LXR5cGVzLW5vY3Jhc2guaHRtbAorCiAyMDEwLTAxLTE3ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxv c3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgRXJpYyBTZWlkZWwu CkBAIC0xODEsNiArMTkxLDcgQEAKICAgICAgICAgKiBmYXN0L2Nzcy9jb3VudGVycy9hZGRpbmct bm9kZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KICAgICAgICAgKiBmYXN0L2Nzcy9jb3VudGVycy9h ZGRpbmctbm9kZXMuaHRtbDogQWRkZWQuCiAKKz4+Pj4+Pj4gLnI1MzQwOAogMjAxMC0wMS0xNSAg RGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBmbGFrZXkg dGVzdC4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2RyYWctYW5kLWRyb3AtZGF0YVRy YW5zZmVyLXR5cGVzLW5vY3Jhc2gtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2Zhc3QvZXZlbnRzL2RyYWctYW5kLWRyb3AtZGF0YVRyYW5zZmVyLXR5cGVzLW5vY3Jhc2gt ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA1MzM0OSkKKysrIExheW91dFRlc3RzL2Zhc3QvZXZlbnRz L2RyYWctYW5kLWRyb3AtZGF0YVRyYW5zZmVyLXR5cGVzLW5vY3Jhc2gtZXhwZWN0ZWQudHh0CSh3 b3JraW5nIGNvcHkpCkBAIC00LDYgKzQsNyBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBz ZXJpZXMgb2YgIlBBCiAKIAogUEFTUyBldmVudC5kYXRhVHJhbnNmZXIudHlwZXMgY29udGFpbnMg Zm9ybWF0ICJ0ZXh0L3BsYWluIgorUEFTUyBldmVudC5kYXRhVHJhbnNmZXIuZ2V0RGF0YSgidGV4 dC9wbGFpbiIpIGNvbnRhaW5zICJTcXVhcmUiCiAKIFRFU1QgQ09NUExFVEUKIApJbmRleDogTGF5 b3V0VGVzdHMvZmFzdC9ldmVudHMvZHJhZy1hbmQtZHJvcC1kYXRhVHJhbnNmZXItdHlwZXMtbm9j cmFzaC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2RyYWctYW5k LWRyb3AtZGF0YVRyYW5zZmVyLXR5cGVzLW5vY3Jhc2guaHRtbAkocmV2aXNpb24gNTMzNDkpCisr KyBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcmFnLWFuZC1kcm9wLWRhdGFUcmFuc2Zlci10eXBl cy1ub2NyYXNoLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTg5LDYgKzg5LDExIEBACiAgICAgICAg ICAgICB0ZXN0RmFpbGVkKCdldmVudC5kYXRhVHJhbnNmZXIudHlwZXMgc2hvdWxkIGNvbnRhaW4g Zm9ybWF0ICInICsgRk9STUFUX1RZUEUgKyAnIiwgYnV0IGl0IGRvZXMgbm90LicpOwogICAgICAg ICBlbHNlCiAgICAgICAgICAgICB0ZXN0UGFzc2VkKCdldmVudC5kYXRhVHJhbnNmZXIudHlwZXMg Y29udGFpbnMgZm9ybWF0ICInICsgRk9STUFUX1RZUEUgKyAnIicpOworCisgICAgICAgIGlmIChl dmVudC5kYXRhVHJhbnNmZXIuZ2V0RGF0YShGT1JNQVRfVFlQRSkgIT0gJ1NxdWFyZScpCisgICAg ICAgICAgICB0ZXN0RmFpbGVkKCdldmVudC5kYXRhVHJhbnNmZXIuZ2V0RGF0YSgiJyArIEZPUk1B VF9UWVBFICsgJyIpIHNob3VsZCBjb250YWluICJTcXVhcmUiLCBidXQgaXQgZG9lcyBub3QuJyk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRlc3RQYXNzZWQoJ2V2ZW50LmRhdGFUcmFuc2Zl ci5nZXREYXRhKCInICsgRk9STUFUX1RZUEUgKyAnIikgY29udGFpbnMgIlNxdWFyZSInKTsKICAg ICB9CiAKICAgICBmdW5jdGlvbiBydW5UZXN0KCkKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3Jt L3dpbi9Ta2lwcGVkCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lw cGVkCShyZXZpc2lvbiA1MzM0OSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVk CSh3b3JraW5nIGNvcHkpCkBAIC0xMDksOSArMTA5LDYgQEAgZWRpdGluZy9zZWxlY3Rpb24vZHJh Zy1pbi1pZnJhbWUuaHRtbAogZmFzdC9ldmVudHMvZHJhZy1pbi1mcmFtZXMuaHRtbAogZmFzdC9l dmVudHMvc3RhbmRhbG9uZS1pbWFnZS1kcmFnLXRvLWVkaXRhYmxlLmh0bWwKIAotIyBFdmVudC5k YXRhVHJhbnNmZXIudHlwZXMgZG9lcyBub3QgYmVoYXZlIGNvcnJlY3RseSAoaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNTI3KQotZmFzdC9ldmVudHMvZHJhZy1hbmQt ZHJvcC1kYXRhVHJhbnNmZXItdHlwZXMtbm9jcmFzaC5odG1sCi0KICMgPHJkYXI6Ly9wcm9ibGVt LzU2NDM2NzU+IHdpbmRvdy5zY3JvbGxUbyBzY3JvbGxzIGEgd2luZG93IHdpdGggbm8gc2Nyb2xs YmFycwogZmFzdC9ldmVudHMvYXR0ZW1wdC1zY3JvbGwtd2l0aC1uby1zY3JvbGxiYXJzLmh0bWwK IAo=