Bug 920425 part.4 Use mozilla::WidgetEvent::AsScriptErrorEvent() r=smaug

This commit is contained in:
Masayuki Nakano 2013-10-18 15:10:21 +09:00
Родитель 513b2976fe
Коммит 33967dade7
2 изменённых файлов: 4 добавлений и 6 удалений

Просмотреть файл

@ -578,7 +578,7 @@ nsDOMEvent::DuplicatePrivateData()
case NS_SCRIPT_ERROR_EVENT: case NS_SCRIPT_ERROR_EVENT:
{ {
InternalScriptErrorEvent* oldScriptErrorEvent = InternalScriptErrorEvent* oldScriptErrorEvent =
static_cast<InternalScriptErrorEvent*>(mEvent); mEvent->AsScriptErrorEvent();
InternalScriptErrorEvent* scriptErrorEvent = InternalScriptErrorEvent* scriptErrorEvent =
new InternalScriptErrorEvent(false, msg); new InternalScriptErrorEvent(false, msg);
scriptErrorEvent->AssignScriptErrorEventData(*oldScriptErrorEvent, true); scriptErrorEvent->AssignScriptErrorEventData(*oldScriptErrorEvent, true);

Просмотреть файл

@ -176,11 +176,9 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent)
Optional<uint32_t> columnNumber; Optional<uint32_t> columnNumber;
NS_ENSURE_TRUE(aEvent, NS_ERROR_UNEXPECTED); NS_ENSURE_TRUE(aEvent, NS_ERROR_UNEXPECTED);
WidgetEvent* event = aEvent->GetInternalNSEvent(); InternalScriptErrorEvent* scriptEvent =
if (event->message == NS_LOAD_ERROR && aEvent->GetInternalNSEvent()->AsScriptErrorEvent();
event->eventStructType == NS_SCRIPT_ERROR_EVENT) { if (scriptEvent && scriptEvent->message == NS_LOAD_ERROR) {
InternalScriptErrorEvent *scriptEvent =
static_cast<InternalScriptErrorEvent*>(event);
errorMsg = scriptEvent->errorMsg; errorMsg = scriptEvent->errorMsg;
msgOrEvent.SetAsString() = static_cast<nsAString*>(&errorMsg); msgOrEvent.SetAsString() = static_cast<nsAString*>(&errorMsg);