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

Side by Side Diff: Source/WebKit/chromium/src/WebWorkerClientImpl.h

Issue 10270006: Merge 113138 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 #if ENABLE(INSPECTOR) 80 #if ENABLE(INSPECTOR)
81 virtual void connectToInspector(WebCore::WorkerContextProxy::PageInspector*) OVERRIDE; 81 virtual void connectToInspector(WebCore::WorkerContextProxy::PageInspector*) OVERRIDE;
82 virtual void disconnectFromInspector() OVERRIDE; 82 virtual void disconnectFromInspector() OVERRIDE;
83 virtual void sendMessageToInspector(const String&) OVERRIDE; 83 virtual void sendMessageToInspector(const String&) OVERRIDE;
84 virtual void postMessageToPageInspector(const String&) OVERRIDE; 84 virtual void postMessageToPageInspector(const String&) OVERRIDE;
85 virtual void updateInspectorStateCookie(const String&) OVERRIDE; 85 virtual void updateInspectorStateCookie(const String&) OVERRIDE;
86 #endif 86 #endif
87 // WebCore::WorkerLoaderProxy methods: 87 // WebCore::WorkerLoaderProxy methods:
88 virtual void postTaskToLoader(PassOwnPtr<WebCore::ScriptExecutionContext::Ta sk>) OVERRIDE; 88 virtual void postTaskToLoader(PassOwnPtr<WebCore::ScriptExecutionContext::Ta sk>) OVERRIDE;
89 virtual void postTaskForModeToWorkerContext(PassOwnPtr<WebCore::ScriptExecut ionContext::Task>, const String& mode) OVERRIDE; 89 virtual bool postTaskForModeToWorkerContext(PassOwnPtr<WebCore::ScriptExecut ionContext::Task>, const String& mode) OVERRIDE;
90 90
91 // WebCore::WorkerObjectProxy methods: 91 // WebCore::WorkerObjectProxy methods:
92 virtual void postMessageToWorkerObject(PassRefPtr<WebCore::SerializedScriptV alue>, PassOwnPtr<WebCore::MessagePortChannelArray>) OVERRIDE; 92 virtual void postMessageToWorkerObject(PassRefPtr<WebCore::SerializedScriptV alue>, PassOwnPtr<WebCore::MessagePortChannelArray>) OVERRIDE;
93 virtual void postExceptionToWorkerObject(const String& errorMessage, int lin eNumber, const String& sourceURL) OVERRIDE; 93 virtual void postExceptionToWorkerObject(const String& errorMessage, int lin eNumber, const String& sourceURL) OVERRIDE;
94 94
95 virtual void postConsoleMessageToWorkerObject(WebCore::MessageSource, WebCor e::MessageType, WebCore::MessageLevel, 95 virtual void postConsoleMessageToWorkerObject(WebCore::MessageSource, WebCor e::MessageType, WebCore::MessageLevel,
96 const String& message, int lin eNumber, const String& sourceURL) OVERRIDE; 96 const String& message, int lin eNumber, const String& sourceURL) OVERRIDE;
97 virtual void confirmMessageFromWorkerObject(bool) OVERRIDE; 97 virtual void confirmMessageFromWorkerObject(bool) OVERRIDE;
98 virtual void reportPendingActivity(bool) OVERRIDE; 98 virtual void reportPendingActivity(bool) OVERRIDE;
99 virtual void workerContextClosed() OVERRIDE; 99 virtual void workerContextClosed() OVERRIDE;
(...skipping 18 matching lines...) Expand all
118 // Guard against context from being destroyed before a worker exits. 118 // Guard against context from being destroyed before a worker exits.
119 RefPtr<WebCore::ScriptExecutionContext> m_scriptExecutionContext; 119 RefPtr<WebCore::ScriptExecutionContext> m_scriptExecutionContext;
120 WebFrameImpl* m_webFrame; 120 WebFrameImpl* m_webFrame;
121 }; 121 };
122 122
123 } // namespace WebKit; 123 } // namespace WebKit;
124 124
125 #endif // ENABLE(WORKERS) 125 #endif // ENABLE(WORKERS)
126 126
127 #endif 127 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp ('k') | Source/WebKit/chromium/src/WebWorkerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698