OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
3 * Copyright (C) 2013 Google Inc. All rights reserved. | 3 * Copyright (C) 2013 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 26 matching lines...) Expand all Loading... | |
37 #include "heap/Handle.h" | 37 #include "heap/Handle.h" |
38 #include "wtf/PassRefPtr.h" | 38 #include "wtf/PassRefPtr.h" |
39 #include "wtf/RefCounted.h" | 39 #include "wtf/RefCounted.h" |
40 #include "wtf/RefPtr.h" | 40 #include "wtf/RefPtr.h" |
41 #include "wtf/text/WTFString.h" | 41 #include "wtf/text/WTFString.h" |
42 | 42 |
43 namespace WebCore { | 43 namespace WebCore { |
44 | 44 |
45 class ScriptArguments; | 45 class ScriptArguments; |
46 | 46 |
47 class WorkerConsole FINAL : public RefCountedWillBeRefCountedGarbageCollected<Wo rkerConsole>, public ConsoleBase, public ScriptWrappable { | 47 class WorkerConsole FINAL : public ConsoleBase, |
48 #if !ENABLE(OILPAN) | |
49 public RefCounted<WorkerConsole>, | |
Mads Ager (chromium)
2014/03/20 14:20:01
You used a 4-space indent in the other files. Cons
| |
50 #endif | |
51 public ScriptWrappable { | |
48 public: | 52 public: |
49 using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::ref; | 53 #if !ENABLE(OILPAN) |
50 using RefCountedWillBeRefCountedGarbageCollected<WorkerConsole>::deref; | 54 using RefCounted<WorkerConsole>::ref; |
55 using RefCounted<WorkerConsole>::deref; | |
56 #endif | |
51 | 57 |
52 static PassRefPtrWillBeRawPtr<WorkerConsole> create(WorkerGlobalScope* scope ) | 58 static PassRefPtrWillBeRawPtr<WorkerConsole> create(WorkerGlobalScope* scope ) |
53 { | 59 { |
54 return adoptRefWillBeRefCountedGarbageCollected(new WorkerConsole(scope) ); | 60 return adoptRefWillBeNoop(new WorkerConsole(scope)); |
55 } | 61 } |
56 virtual ~WorkerConsole(); | 62 virtual ~WorkerConsole(); |
57 | 63 |
58 void trace(Visitor*); | 64 void trace(Visitor*) OVERRIDE; |
59 | 65 |
60 protected: | 66 protected: |
61 virtual ExecutionContext* context() OVERRIDE; | 67 virtual ExecutionContext* context() OVERRIDE; |
62 virtual void reportMessageToClient(MessageLevel, const String& message, Pass RefPtr<ScriptCallStack>) OVERRIDE; | 68 virtual void reportMessageToClient(MessageLevel, const String& message, Pass RefPtr<ScriptCallStack>) OVERRIDE; |
63 | 69 |
64 private: | 70 private: |
65 explicit WorkerConsole(WorkerGlobalScope*); | 71 explicit WorkerConsole(WorkerGlobalScope*); |
66 | 72 |
73 #if !ENABLE(OILPAN) | |
67 virtual void refConsole() OVERRIDE { ref(); } | 74 virtual void refConsole() OVERRIDE { ref(); } |
68 virtual void derefConsole() OVERRIDE { deref(); } | 75 virtual void derefConsole() OVERRIDE { deref(); } |
76 #endif | |
69 | 77 |
70 RawPtrWillBeMember<WorkerGlobalScope> m_scope; | 78 RawPtrWillBeMember<WorkerGlobalScope> m_scope; |
71 }; | 79 }; |
72 | 80 |
73 } // namespace WebCore | 81 } // namespace WebCore |
74 | 82 |
75 #endif // WorkerConsole_h | 83 #endif // WorkerConsole_h |
OLD | NEW |