Changeset 164112 in webkit


Ignore:
Timestamp:
Feb 14, 2014 11:38:17 AM (10 years ago)
Author:
mitz@apple.com
Message:

Stop using PLATFORM(MAC) in WebKit2/PluginProcess except where it means “OS X but not iOS”
​https://bugs.webkit.org/show_bug.cgi?id=128802

Reviewed by Darin Adler.

  • PluginProcess/PluginControllerProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::PluginControllerProxy::PluginControllerProxy):
(WebKit::PluginControllerProxy::paint):

  • PluginProcess/PluginControllerProxy.h: Ditto.
  • PluginProcess/PluginControllerProxy.messages.in: Ditto.
  • PluginProcess/PluginProcess.cpp:

(WebKit::PluginProcess::PluginProcess): Ditto.
(WebKit::PluginProcess::netscapePluginModule): Added && !PLATFORM(IOS) around Mac-specific
quirk.
(WebKit::PluginProcess::createWebProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN)
around use of Mach-based IPC.

  • PluginProcess/PluginProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA), and to

USE(APPKIT) around override of stopRunLoop, which is implemented using AppKit.

  • PluginProcess/PluginProcess.messages.in: Removed PLATFORM(MAC) guard around

SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.

  • PluginProcess/WebProcessConnection.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::WebProcessConnection::createPluginInternal):
(WebKit::WebProcessConnection::createPlugin):

Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r164111 r164112  
     12014-02-14  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in WebKit2/PluginProcess except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128802
     5
     6        Reviewed by Darin Adler.
     7
     8        * PluginProcess/PluginControllerProxy.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     9        (WebKit::PluginControllerProxy::PluginControllerProxy):
     10        (WebKit::PluginControllerProxy::paint):
     11        * PluginProcess/PluginControllerProxy.h: Ditto.
     12        * PluginProcess/PluginControllerProxy.messages.in: Ditto.
     13        * PluginProcess/PluginProcess.cpp:
     14        (WebKit::PluginProcess::PluginProcess): Ditto.
     15        (WebKit::PluginProcess::netscapePluginModule): Added && !PLATFORM(IOS) around Mac-specific
     16        quirk.
     17        (WebKit::PluginProcess::createWebProcessConnection): Changed PLATFORM(MAC) to OS(DARWIN)
     18        around use of Mach-based IPC.
     19        * PluginProcess/PluginProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA), and to
     20        USE(APPKIT) around override of stopRunLoop, which is implemented using AppKit.
     21        * PluginProcess/PluginProcess.messages.in: Removed PLATFORM(MAC) guard around
     22        SetProcessSuppressionEnabled. Changed it to PLATFORM(COCOA) around SetQOS.
     23        * PluginProcess/WebProcessConnection.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     24        (WebKit::WebProcessConnection::createPluginInternal):
     25        (WebKit::WebProcessConnection::createPlugin):
     26
    1272014-02-14  Anders Carlsson  <andersca@apple.com>
    228

  • trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

    r163079 r164112  
    4747#include <wtf/text/WTFString.h>
    4848
    49 #if PLATFORM(MAC)
     49#if PLATFORM(COCOA)
    5050#include "LayerHostingContext.h"
    5151#endif
    … …  
    6767    , m_waitingForDidUpdate(false)
    6868    , m_pluginCanceledManualStreamLoad(false)
    69 #if PLATFORM(MAC)
     69#if PLATFORM(COCOA)
    7070    , m_isComplexTextInputEnabled(false)
    7171#endif
    … …  
    179179    auto graphicsContext = m_backingStore->createGraphicsContext();
    180180
    181 #if PLATFORM(MAC)
     181#if PLATFORM(COCOA)
    182182    // FIXME: We should really call applyDeviceScaleFactor instead of scale, but that ends up calling into WKSI
    183183    // which we currently don't have initiated in the plug-in process.

  • trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h

    r162139 r164112  
    6767    bool wantsWheelEvents() const;
    6868
    69 #if PLATFORM(MAC)
     69#if PLATFORM(COCOA)
    7070    uint32_t remoteLayerClientID() const;
    7171#endif
    … …  
    9999    virtual void didFailToInitializePlugin() override;
    100100
    101 #if PLATFORM(MAC)
     101#if PLATFORM(COCOA)
    102102    virtual void pluginFocusOrWindowFocusChanged(bool) override;
    103103    virtual void setComplexTextInputState(PluginComplexTextInputState) override;
    … …  
    147147    void getPluginScriptableNPObject(uint64_t& pluginScriptableNPObjectID);
    148148
    149 #if PLATFORM(MAC)
     149#if PLATFORM(COCOA)
    150150    void windowFocusChanged(bool);
    151151    void windowAndViewFramesChanged(const WebCore::IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);
    … …  
    200200    bool m_pluginCanceledManualStreamLoad;
    201201
    202 #if PLATFORM(MAC)
     202#if PLATFORM(COCOA)
    203203    // Whether complex text input is enabled for this plug-in.
    204204    bool m_isComplexTextInputEnabled;

  • trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in

    r161148 r164112  
    9696    GetPluginScriptableNPObject() -> (uint64_t pluginScriptableNPObjectID)
    9797
    98 #if PLATFORM(MAC)
     98#if PLATFORM(COCOA)
    9999    # Send the complex text input to the plug-in.
    100100    SendComplexTextInput(String textInput)

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

    r163591 r164112  
    4141#include <wtf/RunLoop.h>
    4242
    43 #if PLATFORM(MAC)
     43#if PLATFORM(MAC) && !PLATFORM(IOS)
    4444#include <crt_externs.h>
    4545#endif
    … …  
    5858    : m_supportsAsynchronousPluginInitialization(false)
    5959    , m_minimumLifetimeTimer(RunLoop::main(), this, &PluginProcess::minimumLifetimeTimerFired)
    60 #if PLATFORM(MAC)
     60#if PLATFORM(COCOA)
    6161    , m_compositingRenderServerPort(MACH_PORT_NULL)
    6262#endif
    … …  
    107107        m_pluginModule = NetscapePluginModule::getOrCreate(m_pluginPath);
    108108
    109 #if PLATFORM(MAC)
     109#if PLATFORM(MAC) && !PLATFORM(IOS)
    110110        if (m_pluginModule) {
    111111            if (m_pluginModule->pluginQuirks().contains(PluginQuirks::PrognameShouldBeWebKitPluginHost))
    … …  
    154154    bool didHaveAnyWebProcessConnections = !m_webProcessConnections.isEmpty();
    155155
    156 #if PLATFORM(MAC)
     156#if OS(DARWIN)
    157157    // Create the listening port.
    158158    mach_port_t listeningPort;
    … …  
    227227}
    228228
    229 #if !PLATFORM(MAC)
     229#if !PLATFORM(COCOA)
    230230void PluginProcess::initializeProcessName(const ChildProcessInitializationParameters&)
    231231{

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.h

    r163591 r164112  
    5252    const String& pluginPath() const { return m_pluginPath; }
    5353
    54 #if PLATFORM(MAC)
     54#if PLATFORM(COCOA)
    5555    void setModalWindowIsShowing(bool);
    5656    void setFullscreenWindowIsShowing(bool);
    … …  
    7777    void platformInitializeProcess(const ChildProcessInitializationParameters&);
    7878
    79 #if PLATFORM(MAC)
     79#if USE(APPKIT)
    8080    virtual void stopRunLoop() override;
    8181#endif
    … …  
    103103    String m_pluginPath;
    104104
    105 #if PLATFORM(MAC)
     105#if PLATFORM(COCOA)
    106106    String m_pluginBundleIdentifier;
    107107#endif
    … …  
    114114    RunLoop::Timer<PluginProcess> m_minimumLifetimeTimer;
    115115
    116 #if PLATFORM(MAC)
     116#if PLATFORM(COCOA)
    117117    // The Mach port used for accelerated compositing.
    118118    mach_port_t m_compositingRenderServerPort;

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.messages.in

    r162578 r164112  
    4040    ClearSiteData(Vector<String> sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
    4141
    42 #if PLATFORM(MAC)
    4342    SetProcessSuppressionEnabled(bool flag)
     43#if PLATFORM(COCOA)
    4444    SetQOS(int latencyQOS, int throughputQOS)
    4545#endif

  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp

    r164015 r164112  
    225225
    226226    wantsWheelEvents = pluginControllerProxyPtr->wantsWheelEvents();
    227 #if PLATFORM(MAC)
     227#if PLATFORM(COCOA)
    228228    remoteLayerClientID = pluginControllerProxyPtr->remoteLayerClientID();
    229229#else
    … …  
    248248       
    249249        // If its initialization is complete then we need to respond to this message with the correct information about its creation.
    250 #if PLATFORM(MAC)
     250#if PLATFORM(COCOA)
    251251        reply->send(true, pluginControllerProxy->wantsWheelEvents(), pluginControllerProxy->remoteLayerClientID());
    252252#else
Note: See TracChangeset for help on using the changeset viewer.