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

Side by Side Diff: third_party/WebKit/Source/modules/eventsource/EventSource.cpp

Issue 2686503005: Remove SerializedScriptValue::serialize and ScriptValueSerializer::serializeWTFString. (Closed)
Patch Set: Merge branch 'master' into delete-ssv Created 3 years, 10 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
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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 void EventSource::didFailRedirectCheck() { 343 void EventSource::didFailRedirectCheck() {
344 DCHECK(m_loader); 344 DCHECK(m_loader);
345 345
346 abortConnectionAttempt(); 346 abortConnectionAttempt();
347 } 347 }
348 348
349 void EventSource::onMessageEvent(const AtomicString& eventType, 349 void EventSource::onMessageEvent(const AtomicString& eventType,
350 const String& data, 350 const String& data,
351 const AtomicString& lastEventId) { 351 const AtomicString& lastEventId) {
352 MessageEvent* e = MessageEvent::create(); 352 MessageEvent* e = MessageEvent::create();
353 e->initMessageEvent(eventType, false, false, 353 e->initMessageEvent(eventType, false, false, data, m_eventStreamOrigin,
354 SerializedScriptValue::serialize(data), 354 lastEventId, 0, nullptr);
355 m_eventStreamOrigin, lastEventId, 0, nullptr);
356 355
357 InspectorInstrumentation::willDispatchEventSourceEvent( 356 InspectorInstrumentation::willDispatchEventSourceEvent(
358 getExecutionContext(), this, eventType, lastEventId, data); 357 getExecutionContext(), this, eventType, lastEventId, data);
359 dispatchEvent(e); 358 dispatchEvent(e);
360 } 359 }
361 360
362 void EventSource::onReconnectionTimeSet(unsigned long long reconnectionTime) { 361 void EventSource::onReconnectionTimeSet(unsigned long long reconnectionTime) {
363 m_reconnectDelay = reconnectionTime; 362 m_reconnectDelay = reconnectionTime;
364 } 363 }
365 364
(...skipping 18 matching lines...) Expand all
384 383
385 DEFINE_TRACE(EventSource) { 384 DEFINE_TRACE(EventSource) {
386 visitor->trace(m_parser); 385 visitor->trace(m_parser);
387 visitor->trace(m_loader); 386 visitor->trace(m_loader);
388 EventTargetWithInlineData::trace(visitor); 387 EventTargetWithInlineData::trace(visitor);
389 ContextLifecycleObserver::trace(visitor); 388 ContextLifecycleObserver::trace(visitor);
390 EventSourceParser::Client::trace(visitor); 389 EventSourceParser::Client::trace(visitor);
391 } 390 }
392 391
393 } // namespace blink 392 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/events/MessageEvent.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698