diff options
author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 20:53:35 +0000 |
---|---|---|
committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 20:53:35 +0000 |
commit | db32931f6800e91b0d6fa5ddf7c21d4b39d98c3f (patch) | |
tree | ea4054d5a2744cdad9b3818b5adec45ae77e2948 | |
parent | 163f82413015e71e0cf99bfa60e8a0c1adeefa2c (diff) | |
download | chromium_src-db32931f6800e91b0d6fa5ddf7c21d4b39d98c3f.zip chromium_src-db32931f6800e91b0d6fa5ddf7c21d4b39d98c3f.tar.gz chromium_src-db32931f6800e91b0d6fa5ddf7c21d4b39d98c3f.tar.bz2 |
Fixed style nits.
Style fixes to reflect belated review feedback on http://codereview.chromium.org/340036.
BUG=26233
TEST=None
Review URL: http://codereview.chromium.org/342064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30630 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | webkit/api/public/WebKitClient.h | 2 | ||||
-rw-r--r-- | webkit/api/public/WebSharedWorker.h | 5 | ||||
-rw-r--r-- | webkit/api/public/WebSharedWorkerRepository.h | 3 | ||||
-rw-r--r-- | webkit/api/src/SharedWorkerRepository.cpp | 15 |
4 files changed, 13 insertions, 12 deletions
diff --git a/webkit/api/public/WebKitClient.h b/webkit/api/public/WebKitClient.h index 7c2634b..a489d04 100644 --- a/webkit/api/public/WebKitClient.h +++ b/webkit/api/public/WebKitClient.h @@ -230,7 +230,9 @@ namespace WebKit { // sandbox isn't active). virtual bool sandboxEnabled() = 0; + // Shared Workers ------------------------------------------------------ + virtual WebSharedWorkerRepository* sharedWorkerRepository() = 0; // Sudden Termination -------------------------------------------------- diff --git a/webkit/api/public/WebSharedWorker.h b/webkit/api/public/WebSharedWorker.h index 6a9aef3..37f0ad6 100644 --- a/webkit/api/public/WebSharedWorker.h +++ b/webkit/api/public/WebSharedWorker.h @@ -32,7 +32,6 @@ #define WebSharedWorker_h #include "WebCommon.h" -#include "WebVector.h" namespace WebKit { class ScriptExecutionContext; @@ -44,10 +43,10 @@ namespace WebKit { // Since SharedWorkers communicate entirely through MessagePorts this interface only contains APIs for starting up a SharedWorker. class WebSharedWorker { public: - virtual ~WebSharedWorker() {}; + virtual ~WebSharedWorker() {} // Returns false if the thread hasn't been started yet (script loading has not taken place). - // TODO(atwilson): Remove this when we move the initial script loading into the worker process. + // FIXME(atwilson): Remove this when we move the initial script loading into the worker process. virtual bool isStarted() = 0; virtual void startWorkerContext(const WebURL& scriptURL, diff --git a/webkit/api/public/WebSharedWorkerRepository.h b/webkit/api/public/WebSharedWorkerRepository.h index a1dbedc..b37b47a 100644 --- a/webkit/api/public/WebSharedWorkerRepository.h +++ b/webkit/api/public/WebSharedWorkerRepository.h @@ -32,7 +32,6 @@ #define WebSharedWorkerRepository_h #include "WebCommon.h" -#include "WebVector.h" namespace WebKit { class WebString; @@ -42,7 +41,7 @@ namespace WebKit { class WebSharedWorkerRepository { public: // Unique identifier for the parent document of a worker (unique within a given process). - typedef uintptr_t DocumentID; + typedef unsigned long long DocumentID; // Connects the passed SharedWorker object with the specified worker thread. // Caller is responsible for freeing the returned object. Returns null if a SharedWorker with that name already exists but with a different URL. diff --git a/webkit/api/src/SharedWorkerRepository.cpp b/webkit/api/src/SharedWorkerRepository.cpp index 69dc3ee..ddc6238 100644 --- a/webkit/api/src/SharedWorkerRepository.cpp +++ b/webkit/api/src/SharedWorkerRepository.cpp @@ -61,9 +61,9 @@ using WebKit::WebSharedWorkerRepository; class SharedWorkerScriptLoader : public RefCounted<SharedWorkerScriptLoader>, private WorkerScriptLoaderClient { public: SharedWorkerScriptLoader(PassRefPtr<SharedWorker> worker, PassOwnPtr<MessagePortChannel> port, PassOwnPtr<WebSharedWorker> webWorker) - : m_worker(worker), - m_webWorker(webWorker), - m_port(port) + : m_worker(worker) + , m_webWorker(webWorker) + , m_port(port) { } @@ -85,7 +85,8 @@ void SharedWorkerScriptLoader::load(const KURL& url) } // Extracts a WebMessagePortChannel from a MessagePortChannel. -static WebMessagePortChannel* getWebPort(PassOwnPtr<MessagePortChannel> port) { +static WebMessagePortChannel* getWebPort(PassOwnPtr<MessagePortChannel> port) +{ // Extract the WebMessagePortChannel to send to the worker. PlatformMessagePortChannel* platformChannel = port->channel(); WebMessagePortChannel* webPort = platformChannel->webChannelRelease(); @@ -109,7 +110,7 @@ void SharedWorkerScriptLoader::notifyFinished() bool SharedWorkerRepository::isAvailable() { // SharedWorkers are disabled for now until the implementation is further along. - // TODO(atwilson): Add code to check for a runtime flag like so: + // FIXME(atwilson): Add code to check for a runtime flag like so: // return commandLineFlag && WebKit::webKitClient()->sharedWorkerRepository(); return false; } @@ -145,14 +146,14 @@ void SharedWorkerRepository::connect(PassRefPtr<SharedWorker> worker, PassOwnPtr void SharedWorkerRepository::documentDetached(Document* document) { - WebKit::WebSharedWorkerRepository* repo = WebKit::webKitClient()->sharedWorkerRepository(); + WebSharedWorkerRepository* repo = WebKit::webKitClient()->sharedWorkerRepository(); if (repo) repo->documentDetached(getId(document)); } bool SharedWorkerRepository::hasSharedWorkers(Document* document) { - WebKit::WebSharedWorkerRepository* repo = WebKit::webKitClient()->sharedWorkerRepository(); + WebSharedWorkerRepository* repo = WebKit::webKitClient()->sharedWorkerRepository(); return repo && repo->hasSharedWorkers(getId(document)); } |