зеркало из https://github.com/mozilla/pjs.git
Backout changeset 3985e7570ab6 (Bug 673301) due to permaorange in M1 (OSX).
This commit is contained in:
Родитель
8f6f3c8cf8
Коммит
094c9f5000
|
@ -428,8 +428,6 @@ nsClipboard::PasteboardDictFromTransferable(nsITransferable* aTransferable)
|
|||
nsCOMPtr<nsISupports> genericDataWrapper;
|
||||
rv = aTransferable->GetTransferData(flavorStr, getter_AddRefs(genericDataWrapper), &dataSize);
|
||||
nsPrimitiveHelpers::CreateDataFromPrimitive(flavorStr, genericDataWrapper, &data, dataSize);
|
||||
if (!data)
|
||||
continue;
|
||||
|
||||
NSString* nativeString = [NSString stringWithCharacters:(const unichar*)data length:(dataSize / sizeof(PRUnichar))];
|
||||
// be nice to Carbon apps, normalize the receiver's contents using Form C.
|
||||
|
|
|
@ -110,7 +110,6 @@ _CHROME_FILES += native_menus_window.xul \
|
|||
test_key_event_counts.xul \
|
||||
test_bug596600.xul \
|
||||
window_bug596600.xul \
|
||||
test_bug673301.xul \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
|
||||
type="text/css"?>
|
||||
|
||||
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"/>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
|
||||
|
||||
<body xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none"/>
|
||||
</body>
|
||||
|
||||
<script type="application/javascript">
|
||||
var clipboard = Components.classes["@mozilla.org/widget/clipboard;1"]
|
||||
.getService(Components.interfaces.nsIClipboard);
|
||||
|
||||
var transferable = Components.classes['@mozilla.org/widget/transferable;1']
|
||||
.createInstance(Components.interfaces.nsITransferable);
|
||||
|
||||
transferable.addDataFlavor("text/unicode");
|
||||
transferable.setTransferData("text/unicode", document, 4);
|
||||
|
||||
clipboard.setData(transferable, null, Components.interfaces.nsIClipboard.kGlobalClipboard);
|
||||
|
||||
SimpleTest.ok(true, "Didn't crash setting non-text data for text/unicode type");
|
||||
</script>
|
||||
</window>
|
Загрузка…
Ссылка в новой задаче