Changeset 87463 in webkit


Ignore:
Timestamp:
May 26, 2011 7:22:41 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-26 Leandro Gracia Gil <​leandrogracia@chromium.org>

Reviewed by Dmitry Titov.

Add missing compile guards for WebWorkers in WebKit.
​https://bugs.webkit.org/show_bug.cgi?id=61536

  • src/DatabaseObserver.cpp: (WebCore::DatabaseObserver::canEstablishDatabase):
  • src/LocalFileSystemChromium.cpp: (WebCore::openFileSystemHelper):
  • src/PlatformBridge.cpp:
  • src/WebFileSystemCallbacksImpl.cpp: (WebKit::WebFileSystemCallbacksImpl::didOpenFileSystem):
  • src/WorkerAsyncFileSystemChromium.cpp:
  • src/WorkerAsyncFileSystemChromium.h:
  • src/WorkerAsyncFileWriterChromium.cpp:
  • src/WorkerAsyncFileWriterChromium.h:
  • src/WorkerFileSystemCallbacksBridge.cpp:
  • src/WorkerFileSystemCallbacksBridge.h:
  • src/WorkerFileWriterCallbacksBridge.cpp:
  • src/WorkerFileWriterCallbacksBridge.h:
Location:
trunk/Source/WebKit/chromium
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r87454 r87463  
     12011-05-26  Leandro Gracia Gil  <leandrogracia@chromium.org>
     2
     3        Reviewed by Dmitry Titov.
     4
     5        Add missing compile guards for WebWorkers in WebKit.
     6        https://bugs.webkit.org/show_bug.cgi?id=61536
     7
     8        * src/DatabaseObserver.cpp:
     9        (WebCore::DatabaseObserver::canEstablishDatabase):
     10        * src/LocalFileSystemChromium.cpp:
     11        (WebCore::openFileSystemHelper):
     12        * src/PlatformBridge.cpp:
     13        * src/WebFileSystemCallbacksImpl.cpp:
     14        (WebKit::WebFileSystemCallbacksImpl::didOpenFileSystem):
     15        * src/WorkerAsyncFileSystemChromium.cpp:
     16        * src/WorkerAsyncFileSystemChromium.h:
     17        * src/WorkerAsyncFileWriterChromium.cpp:
     18        * src/WorkerAsyncFileWriterChromium.h:
     19        * src/WorkerFileSystemCallbacksBridge.cpp:
     20        * src/WorkerFileSystemCallbacksBridge.h:
     21        * src/WorkerFileWriterCallbacksBridge.cpp:
     22        * src/WorkerFileWriterCallbacksBridge.h:
     23
    1242011-05-26  Evan Martin  <evan@chromium.org>
    225

  • trunk/Source/WebKit/chromium/src/DatabaseObserver.cpp

    r85703 r87463  
    6363            return webView->permissionClient()->allowDatabase(webFrame, name, displayName, estimatedSize);
    6464    } else {
     65#if ENABLE(WORKERS)
    6566        WorkerContext* workerContext = static_cast<WorkerContext*>(scriptExecutionContext);
    6667        WorkerLoaderProxy* workerLoaderProxy = &workerContext->thread()->workerLoaderProxy();
    6768        WebWorkerBase* webWorker = static_cast<WebWorkerBase*>(workerLoaderProxy);
    6869        return webWorker->allowDatabase(0, name, displayName, estimatedSize);
     70#else
     71        ASSERT_NOT_REACHED();
     72#endif
    6973    }
    7074

  • trunk/Source/WebKit/chromium/src/LocalFileSystemChromium.cpp

    r86356 r87463  
    9090            webFrame->client()->openFileSystem(webFrame, static_cast<WebFileSystem::Type>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks, type));
    9191    } else {
     92#if ENABLE(WORKERS)
    9293        WorkerContext* workerContext = static_cast<WorkerContext*>(context);
    9394        WorkerLoaderProxy* workerLoaderProxy = &workerContext->thread()->workerLoaderProxy();
    … …  
    9798        else
    9899            webWorker->openFileSystemForWorker(static_cast<WebFileSystem::Type>(type), size, create == CreateIfNotPresent, new WebFileSystemCallbacksImpl(callbacks, type, context, synchronous), synchronous);
     100#else
     101        ASSERT_NOT_REACHED();
     102#endif
    99103    }
    100104

  • trunk/Source/WebKit/chromium/src/PlatformBridge.cpp

    r87001 r87463  
    10481048}
    10491049
     1050#if ENABLE(WORKERS)
    10501051WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
    10511052{
    10521053    return WebWorkerClientImpl::createWorkerContextProxy(worker);
    10531054}
     1055#endif
    10541056
    10551057} // namespace WebCore

  • trunk/Source/WebKit/chromium/src/WebFileSystemCallbacksImpl.cpp

    r81599 r87463  
    8888void WebFileSystemCallbacksImpl::didOpenFileSystem(const WebString& name, const WebString& path)
    8989{
    90     if (m_context && m_context->isWorkerContext())
     90    // This object is intended to delete itself on exit.
     91    OwnPtr<WebFileSystemCallbacksImpl> callbacks = adoptPtr(this);
     92
     93#if ENABLE(WORKERS)
     94    if (m_context && m_context->isWorkerContext()) {
    9195        m_callbacks->didOpenFileSystem(name, WorkerAsyncFileSystemChromium::create(m_context, m_type, path, m_synchronous));
    92     else
    93         m_callbacks->didOpenFileSystem(name, AsyncFileSystemChromium::create(m_type, path));
    94     delete this;
     96        return;
     97    }
     98#endif
     99    m_callbacks->didOpenFileSystem(name, AsyncFileSystemChromium::create(m_type, path));
    95100}
    96101

  • trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.cpp

    r78362 r87463  
    3232#include "WorkerAsyncFileSystemChromium.h"
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "AsyncFileSystemCallbacks.h"

  • trunk/Source/WebKit/chromium/src/WorkerAsyncFileSystemChromium.h

    r78362 r87463  
    3232#define WorkerAsyncFileSystemChromium_h
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "AsyncFileSystem.h"

  • trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.cpp

    r72711 r87463  
    3232#include "WorkerAsyncFileWriterChromium.h"
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "AsyncFileSystem.h"

  • trunk/Source/WebKit/chromium/src/WorkerAsyncFileWriterChromium.h

    r72711 r87463  
    3232#define WorkerAsyncFileWriterChromium_h
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "AsyncFileWriter.h"

  • trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp

    r85165 r87463  
    3232#include "WorkerFileSystemCallbacksBridge.h"
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "CrossThreadTask.h"

  • trunk/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.h

    r82540 r87463  
    3232#define WorkerFileSystemCallbacksBridge_h
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "PlatformString.h"

  • trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp

    r86067 r87463  
    3232#include "WorkerFileWriterCallbacksBridge.h"
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "AsyncFileWriterClient.h"

  • trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.h

    r81567 r87463  
    3232#define WorkerFileWriterCallbacksBridge_h
    3333
    34 #if ENABLE(FILE_SYSTEM)
     34#if ENABLE(FILE_SYSTEM) && ENABLE(WORKERS)
    3535
    3636#include "WebFileError.h"
Note: See TracChangeset for help on using the changeset viewer.