Source/WebKit/chromium/src/WebSharedWorkerImpl.h - Issue 10270006: Merge 113138

Side by Side Diff: Source/WebKit/chromium/src/WebSharedWorkerImpl.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:

« no previous file with comments | « Source/WebCore/workers/WorkerMessagingProxy.cpp ('k') | Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »

OLD	NEW
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 Loading...
79 virtual void postMessageToPageInspector(const WTF::String&);	79 virtual void postMessageToPageInspector(const WTF::String&);

80 virtual void updateInspectorStateCookie(const WTF::String&);	80 virtual void updateInspectorStateCookie(const WTF::String&);

81 virtual void confirmMessageFromWorkerObject(bool);	81 virtual void confirmMessageFromWorkerObject(bool);

82 virtual void reportPendingActivity(bool);	82 virtual void reportPendingActivity(bool);

83 virtual void workerContextClosed();	83 virtual void workerContextClosed();

84 virtual void workerContextDestroyed();	84 virtual void workerContextDestroyed();

85 virtual WebView* view() const { return m_webView; }	85 virtual WebView* view() const { return m_webView; }

86	86

87 // WebCore::WorkerLoaderProxy methods:	87 // WebCore::WorkerLoaderProxy methods:

88 virtual void postTaskToLoader(PassOwnPtr<WebCore::ScriptExecutionContext::Ta sk>);	88 virtual void postTaskToLoader(PassOwnPtr<WebCore::ScriptExecutionContext::Ta sk>);

89 virtual void postTaskForModeToWorkerContext(	89 virtual bool postTaskForModeToWorkerContext(

90 PassOwnPtr<WebCore::ScriptExecutionContext::Task>, const WTF::String& mo de);	90 PassOwnPtr<WebCore::ScriptExecutionContext::Task>, const WTF::String& mo de);

91	91

92 // WebFrameClient methods to support resource loading thru the 'shadow page' .	92 // WebFrameClient methods to support resource loading thru the 'shadow page' .

93 virtual void didCreateDataSource(WebFrame, WebDataSource);	93 virtual void didCreateDataSource(WebFrame, WebDataSource);

94 virtual WebApplicationCacheHost* createApplicationCacheHost(WebFrame, WebAp plicationCacheHostClient);	94 virtual WebApplicationCacheHost* createApplicationCacheHost(WebFrame, WebAp plicationCacheHostClient);

95	95

96	96

97 // WebSharedWorker methods:	97 // WebSharedWorker methods:

98 virtual bool isStarted();	98 virtual bool isStarted();

99	99

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
177	177

178 WebSharedWorkerClient* m_client;	178 WebSharedWorkerClient* m_client;

179 bool m_pauseWorkerContextOnStart;	179 bool m_pauseWorkerContextOnStart;

180 };	180 };

181	181

182 } // namespace WebKit	182 } // namespace WebKit

183	183

184 #endif // ENABLE(SHARED_WORKERS)	184 #endif // ENABLE(SHARED_WORKERS)

185	185

186 #endif	186 #endif

OLD	NEW