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

Side by Side Diff: third_party/WebKit/WebCore/dom/Worker.cpp

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « third_party/WebKit/WebCore/dom/Worker.h ('k') | third_party/WebKit/WebCore/dom/WorkerContext.h » ('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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 26 matching lines...) Expand all
37 #include "EventException.h" 37 #include "EventException.h"
38 #include "EventListener.h" 38 #include "EventListener.h"
39 #include "EventNames.h" 39 #include "EventNames.h"
40 #include "ExceptionCode.h" 40 #include "ExceptionCode.h"
41 #include "Frame.h" 41 #include "Frame.h"
42 #include "FrameLoader.h" 42 #include "FrameLoader.h"
43 #include "MessageEvent.h" 43 #include "MessageEvent.h"
44 #include "SecurityOrigin.h" 44 #include "SecurityOrigin.h"
45 #include "WorkerContext.h" 45 #include "WorkerContext.h"
46 #include "WorkerMessagingProxy.h" 46 #include "WorkerMessagingProxy.h"
47 #include "WorkerTask.h"
48 #include "WorkerThread.h" 47 #include "WorkerThread.h"
49 #include <wtf/MainThread.h> 48 #include <wtf/MainThread.h>
50 49
51 namespace WebCore { 50 namespace WebCore {
52 51
53 Worker::Worker(const String& url, Document* doc, ExceptionCode& ec) 52 Worker::Worker(const String& url, Document* doc, ExceptionCode& ec)
54 : ActiveDOMObject(doc, this) 53 : ActiveDOMObject(doc, this)
55 , m_messagingProxy(new WorkerMessagingProxy(doc, this)) 54 , m_messagingProxy(new WorkerMessagingProxy(doc, this))
56 { 55 {
57 m_scriptURL = doc->completeURL(url); 56 m_scriptURL = doc->completeURL(url);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 } 195 }
197 196
198 return !event->defaultPrevented(); 197 return !event->defaultPrevented();
199 } 198 }
200 199
201 } // namespace WebCore 200 } // namespace WebCore
202 201
203 #endif // ENABLE(WORKERS) 202 #endif // ENABLE(WORKERS)
204 203
205 204
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/dom/Worker.h ('k') | third_party/WebKit/WebCore/dom/WorkerContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698