| OLD | NEW | 
|---|
| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 90     if (context->isDocument()) { | 90     if (context->isDocument()) { | 
| 91         Document* document = toDocument(context); | 91         Document* document = toDocument(context); | 
| 92         shouldBypassMainWorldContentSecurityPolicy = document->frame()->script()
     .shouldBypassMainWorldContentSecurityPolicy(); | 92         shouldBypassMainWorldContentSecurityPolicy = document->frame()->script()
     .shouldBypassMainWorldContentSecurityPolicy(); | 
| 93     } | 93     } | 
| 94     if (!shouldBypassMainWorldContentSecurityPolicy && !context->contentSecurity
     Policy()->allowConnectToSource(fullURL)) { | 94     if (!shouldBypassMainWorldContentSecurityPolicy && !context->contentSecurity
     Policy()->allowConnectToSource(fullURL)) { | 
| 95         // We can safely expose the URL to JavaScript, as this exception is gene
     rate synchronously before any redirects take place. | 95         // We can safely expose the URL to JavaScript, as this exception is gene
     rate synchronously before any redirects take place. | 
| 96         exceptionState.throwSecurityError("Refused to connect to '" + fullURL.el
     idedString() + "' because it violates the document's Content Security Policy."); | 96         exceptionState.throwSecurityError("Refused to connect to '" + fullURL.el
     idedString() + "' because it violates the document's Content Security Policy."); | 
| 97         return nullptr; | 97         return nullptr; | 
| 98     } | 98     } | 
| 99 | 99 | 
| 100     RefPtrWillBeRawPtr<EventSource> source = adoptRefCountedWillBeRefCountedGarb
     ageCollected(new EventSource(context, fullURL, eventSourceInit)); | 100     RefPtrWillBeRawPtr<EventSource> source = adoptRefWillBeRefCountedGarbageColl
     ected(new EventSource(context, fullURL, eventSourceInit)); | 
| 101 | 101 | 
| 102     source->setPendingActivity(source.get()); | 102     source->setPendingActivity(source.get()); | 
| 103     source->scheduleInitialConnect(); | 103     source->scheduleInitialConnect(); | 
| 104     source->suspendIfNeeded(); | 104     source->suspendIfNeeded(); | 
| 105 | 105 | 
| 106     return source.release(); | 106     return source.release(); | 
| 107 } | 107 } | 
| 108 | 108 | 
| 109 EventSource::~EventSource() | 109 EventSource::~EventSource() | 
| 110 { | 110 { | 
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 426 | 426 | 
| 427 PassRefPtr<MessageEvent> EventSource::createMessageEvent() | 427 PassRefPtr<MessageEvent> EventSource::createMessageEvent() | 
| 428 { | 428 { | 
| 429     RefPtr<MessageEvent> event = MessageEvent::create(); | 429     RefPtr<MessageEvent> event = MessageEvent::create(); | 
| 430     event->initMessageEvent(m_eventName.isEmpty() ? EventTypeNames::message : m_
     eventName, false, false, SerializedScriptValue::create(String(m_data)), m_eventS
     treamOrigin, m_lastEventId, 0, nullptr); | 430     event->initMessageEvent(m_eventName.isEmpty() ? EventTypeNames::message : m_
     eventName, false, false, SerializedScriptValue::create(String(m_data)), m_eventS
     treamOrigin, m_lastEventId, 0, nullptr); | 
| 431     m_data.clear(); | 431     m_data.clear(); | 
| 432     return event.release(); | 432     return event.release(); | 
| 433 } | 433 } | 
| 434 | 434 | 
| 435 } // namespace WebCore | 435 } // namespace WebCore | 
| OLD | NEW | 
|---|