Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: Source/core/page/EventSource.cpp

Issue 21262003: Remove String::adopt(Vector<UChar>) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix typo Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/htmlediting.cpp ('k') | Source/core/platform/text/win/LocaleWin.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Ericsson AB. All rights reserved. 2 * Copyright (C) 2009, 2012 Ericsson AB. All rights reserved.
3 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011, Code Aurora Forum. All rights reserved. 4 * Copyright (C) 2011, Code Aurora Forum. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 } 408 }
409 409
410 void EventSource::stop() 410 void EventSource::stop()
411 { 411 {
412 close(); 412 close();
413 } 413 }
414 414
415 PassRefPtr<MessageEvent> EventSource::createMessageEvent() 415 PassRefPtr<MessageEvent> EventSource::createMessageEvent()
416 { 416 {
417 RefPtr<MessageEvent> event = MessageEvent::create(); 417 RefPtr<MessageEvent> event = MessageEvent::create();
418 event->initMessageEvent(m_eventName.isEmpty() ? eventNames().messageEvent : AtomicString(m_eventName), false, false, SerializedScriptValue::create(String::a dopt(m_data)), m_eventStreamOrigin, m_lastEventId, 0, nullptr); 418 event->initMessageEvent(m_eventName.isEmpty() ? eventNames().messageEvent : AtomicString(m_eventName), false, false, SerializedScriptValue::create(String(m_ data)), m_eventStreamOrigin, m_lastEventId, 0, nullptr);
419 m_data.clear();
419 return event.release(); 420 return event.release();
420 } 421 }
421 422
422 EventTargetData* EventSource::eventTargetData() 423 EventTargetData* EventSource::eventTargetData()
423 { 424 {
424 return &m_eventTargetData; 425 return &m_eventTargetData;
425 } 426 }
426 427
427 EventTargetData* EventSource::ensureEventTargetData() 428 EventTargetData* EventSource::ensureEventTargetData()
428 { 429 {
429 return &m_eventTargetData; 430 return &m_eventTargetData;
430 } 431 }
431 432
432 } // namespace WebCore 433 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/htmlediting.cpp ('k') | Source/core/platform/text/win/LocaleWin.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698