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: Source/core/workers/AbstractWorker.cpp

Issue 17236004: Update AbstractWorker, Worker and SharedWorker to match the spec (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move back ActiveDOMObject to AbstractWorker.h Created 7 years, 6 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/workers/AbstractWorker.h ('k') | Source/core/workers/AbstractWorker.idl » ('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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 25 matching lines...) Expand all
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "core/dom/ScriptExecutionContext.h" 37 #include "core/dom/ScriptExecutionContext.h"
38 #include "core/page/ContentSecurityPolicy.h" 38 #include "core/page/ContentSecurityPolicy.h"
39 #include "weborigin/SecurityOrigin.h" 39 #include "weborigin/SecurityOrigin.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 AbstractWorker::AbstractWorker(ScriptExecutionContext* context) 43 AbstractWorker::AbstractWorker(ScriptExecutionContext* context)
44 : ActiveDOMObject(context) 44 : ActiveDOMObject(context)
45 { 45 {
46 ScriptWrappable::init(this);
47 } 46 }
48 47
49 AbstractWorker::~AbstractWorker() 48 AbstractWorker::~AbstractWorker()
50 { 49 {
51 } 50 }
52 51
53 void AbstractWorker::contextDestroyed() 52 void AbstractWorker::contextDestroyed()
54 { 53 {
55 ActiveDOMObject::contextDestroyed(); 54 ActiveDOMObject::contextDestroyed();
56 } 55 }
57 56
58 KURL AbstractWorker::resolveURL(const String& url, ExceptionCode& ec) 57 KURL AbstractWorker::resolveURL(const String& url, ExceptionCode& ec)
59 { 58 {
60 if (url.isEmpty()) { 59 if (url.isEmpty()) {
61 ec = SYNTAX_ERR; 60 ec = SYNTAX_ERR;
62 return KURL(); 61 return KURL();
63 } 62 }
64 63
65 // FIXME: This should use the dynamic global scope (bug #27887) 64 // FIXME: This should use the dynamic global scope (bug #27887)
(...skipping 20 matching lines...) Expand all
86 { 85 {
87 return &m_eventTargetData; 86 return &m_eventTargetData;
88 } 87 }
89 88
90 EventTargetData* AbstractWorker::ensureEventTargetData() 89 EventTargetData* AbstractWorker::ensureEventTargetData()
91 { 90 {
92 return &m_eventTargetData; 91 return &m_eventTargetData;
93 } 92 }
94 93
95 } // namespace WebCore 94 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/workers/AbstractWorker.h ('k') | Source/core/workers/AbstractWorker.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698