Changeset 164358 in webkit


Ignore:
Timestamp:
Feb 19, 2014 12:12:24 AM (10 years ago)
Author:
mitz@apple.com
Message:

Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
​https://bugs.webkit.org/show_bug.cgi?id=129029

Reviewed by Mark Rowe.

Source/JavaScriptCore:

  • API/JSValueRef.cpp:

(JSValueUnprotect):

  • jit/ExecutableAllocatorFixedVMPool.cpp:

Source/WebCore:

  • accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
(WebCore::AccessibilityRenderObject::visiblePositionForPoint):

  • config.h:
  • editing/Editor.cpp:

(WebCore::Editor::copyURL):

  • editing/EditorCommand.cpp:

(WebCore::createCommandMap):

  • editing/TypingCommand.cpp:

(WebCore::TypingCommand::markMisspellingsAfterTyping):

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::loadArchive):

  • page/AlternativeTextClient.h:
  • page/EventHandler.cpp:
  • page/PageGroup.cpp:

(WebCore::PageGroup::captionPreferences):

  • page/scrolling/ScrollingStateScrollingNode.cpp:

(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):

  • page/scrolling/ScrollingStateScrollingNode.h:
  • page/scrolling/ScrollingTree.h:
  • page/scrolling/ThreadedScrollingTree.cpp:
  • page/scrolling/ThreadedScrollingTree.h:
  • platform/DragData.h:
  • platform/FileSystem.cpp:
  • platform/MemoryPressureHandler.cpp:
  • platform/Pasteboard.h:
  • platform/PlatformMouseEvent.h:

(WebCore::PlatformMouseEvent::PlatformMouseEvent):

  • platform/PlatformPasteboard.h:
  • platform/PlatformScreen.h:
  • platform/Scrollbar.cpp:

(WebCore::Scrollbar::supportsUpdateOnSecondaryThread):

  • platform/SuddenTermination.h:
  • platform/ThreadGlobalData.cpp:

(WebCore::ThreadGlobalData::ThreadGlobalData):
(WebCore::ThreadGlobalData::destroy):

  • platform/ThreadGlobalData.h:
  • platform/audio/mac/AudioDestinationMac.cpp:
  • platform/audio/mac/AudioFileReaderMac.cpp:
  • platform/audio/mac/AudioSessionMac.cpp:
  • platform/graphics/DisplayRefreshMonitor.h:
  • platform/graphics/FloatPoint.h:
  • platform/graphics/FloatRect.h:
  • platform/graphics/FloatSize.h:
  • platform/graphics/IntRect.h:
  • platform/graphics/IntSize.h:
  • platform/graphics/MediaPlayer.cpp:

(WebCore::installedMediaEngines):

  • platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::utiFromMIMEType):

  • platform/graphics/cg/PDFDocumentImage.h:
  • platform/graphics/cocoa/FontPlatformDataCocoa.mm:
  • platform/graphics/mac/GraphicsContextMac.mm:

(WebCore::GraphicsContext::drawLineForDocumentMarker):

  • platform/graphics/opengl/Extensions3DOpenGL.cpp:

(WebCore::Extensions3DOpenGL::supportsExtension):
(WebCore::Extensions3DOpenGL::drawBuffersEXT):

  • platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:

(WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):

  • platform/mac/KeyEventMac.mm:
  • platform/network/NetworkStateNotifier.h:
  • platform/network/cf/CookieJarCFNet.cpp:
  • platform/network/cf/ResourceRequest.h:
  • platform/network/cf/ResourceRequestCFNet.cpp:
  • platform/network/cf/SocketStreamHandleCFNet.cpp:

(WebCore::SocketStreamHandle::reportErrorToClient):

  • platform/text/TextEncodingRegistry.cpp:

(WebCore::extendTextCodecMaps):

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::allowsIndependentlyCompositedFrames):
(WebCore::RenderLayerCompositor::requiresCompositingForAnimation):

Source/WebKit2:

  • PluginProcess/PluginProcess.cpp:

(WebKit::PluginProcess::netscapePluginModule):

  • Shared/API/c/WKDeprecatedFunctions.cpp:
  • Shared/WebPreferencesStore.h:
  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]):

  • UIProcess/PageClient.h:
  • UIProcess/Scrolling/RemoteScrollingTree.cpp:
  • UIProcess/Scrolling/RemoteScrollingTree.h:
  • UIProcess/WebContext.h:
  • UIProcess/WebInspectorProxy.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didChangeBackForwardList):
(WebKit::WebPageProxy::pageDidScroll):
(WebKit::WebPageProxy::resetStateAfterProcessExited):
(WebKit::WebPageProxy::creationParameters):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • UIProcess/mac/WebContextMac.mm:

(WebKit::WebContext::platformInitializeWebProcess):

  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:

(WKBundlePageSetTopOverhangImage):
(WKBundlePageSetBottomOverhangImage):

  • WebProcess/WebPage/PageBanner.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setDeviceScaleFactor):
(WebKit::WebPage::mainFrameDidLayout):
(WebKit::WebPage::beginPrinting):
(WebKit::WebPage::drawRectToImage):
(WebKit::WebPage::drawPagesToPDF):

  • WebProcess/WebPage/WebPage.messages.in:
  • config.h:

Source/WTF:

  • wtf/FeatureDefines.h:
  • wtf/Platform.h:
  • wtf/Threading.cpp:
  • wtf/text/cf/StringImplCF.cpp:

(garbageCollectionEnabled):

Location:
trunk/Source
Files:
77 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSValueRef.cpp

    r163844 r164358  
    4545#include <algorithm> // for std::min
    4646
    47 #if PLATFORM(MAC) && !PLATFORM(IOS)
     47#if PLATFORM(MAC)
    4848#include <mach-o/dyld.h>
    4949#endif
    … …  
    5151using namespace JSC;
    5252
    53 #if PLATFORM(MAC) && !PLATFORM(IOS)
     53#if PLATFORM(MAC)
    5454static bool evernoteHackNeeded()
    5555{
    … …  
    444444void JSValueUnprotect(JSContextRef ctx, JSValueRef value)
    445445{
    446 #if PLATFORM(MAC) && !PLATFORM(IOS)
     446#if PLATFORM(MAC)
    447447    if ((!value || !ctx) && evernoteHackNeeded())
    448448        return;

  • trunk/Source/JavaScriptCore/ChangeLog

    r164354 r164358  
     12014-02-19  Dan Bernstein  <mitz@apple.com>
     2
     3        Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
     4        https://bugs.webkit.org/show_bug.cgi?id=129029
     5
     6        Reviewed by Mark Rowe.
     7
     8        * API/JSValueRef.cpp:
     9        (JSValueUnprotect):
     10        * jit/ExecutableAllocatorFixedVMPool.cpp:
     11
    1122014-02-18  Filip Pizlo  <fpizlo@apple.com>
    213

  • trunk/Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp

    r163844 r164358  
    4646#endif
    4747
    48 #if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
     48#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
    4949// MADV_FREE_REUSABLE does not work for JIT memory on older OSes so use MADV_FREE in that case.
    5050#define WTF_USE_MADV_FREE_FOR_JIT_MEMORY 1

  • trunk/Source/WTF/ChangeLog

    r164357 r164358  
     12014-02-19  Dan Bernstein  <mitz@apple.com>
     2
     3        Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
     4        https://bugs.webkit.org/show_bug.cgi?id=129029
     5
     6        Reviewed by Mark Rowe.
     7
     8        * wtf/FeatureDefines.h:
     9        * wtf/Platform.h:
     10        * wtf/Threading.cpp:
     11        * wtf/text/cf/StringImplCF.cpp:
     12        (garbageCollectionEnabled):
     13
    1142014-02-18  Dan Bernstein  <mitz@apple.com>
    215

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r164131 r164358  
    160160
    161161/* --------- Apple MAC port (not IOS) --------- */
    162 #if PLATFORM(MAC) && !PLATFORM(IOS)
     162#if PLATFORM(MAC)
    163163
    164164#if !defined(ENABLE_CSS_IMAGE_SET)
    … …  
    237237#endif
    238238
    239 #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
     239#endif /* PLATFORM(MAC) */
    240240
    241241/* --------- Apple Windows port --------- */

  • trunk/Source/WTF/wtf/Platform.h

    r164357 r164358  
    467467#endif
    468468
    469 #if PLATFORM(MAC) && !PLATFORM(IOS)
     469#if PLATFORM(MAC)
    470470
    471471#define WTF_USE_APPKIT 1
    … …  
    484484#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
    485485
    486 #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
     486#endif /* PLATFORM(MAC) */
    487487
    488488#if OS(DARWIN) && !PLATFORM(GTK)
    … …  
    940940#endif
    941941
    942 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || ((PLATFORM(MAC) && !PLATFORM(IOS)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
     942#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
    943943#define WTF_USE_COREMEDIA 1
    944944#define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
    945945#endif
    946946
    947 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || ((PLATFORM(MAC) && !PLATFORM(IOS)) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
     947#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
    948948#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
    949949#endif
    950950
    951 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || (((PLATFORM(MAC) && !PLATFORM(IOS)) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
     951#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
    952952#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
    953953#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
    954954#endif
    955955
    956 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || ((PLATFORM(MAC) && !PLATFORM(IOS)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
     956#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
    957957#define HAVE_AVFOUNDATION_LOADER_DELEGATE 1
    958958#endif
    959959
    960 #if (PLATFORM(MAC) && !PLATFORM(IOS)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
     960#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    961961#define WTF_USE_VIDEOTOOLBOX 1
    962962#endif
    … …  
    970970#endif
    971971
    972 #if PLATFORM(MAC) && !PLATFORM(IOS)
     972#if PLATFORM(MAC)
    973973#define WTF_USE_COREAUDIO 1
    974974#endif
    … …  
    988988#define WTF_USE_UNIFIED_TEXT_CHECKING 1
    989989#endif
    990 #if !PLATFORM(IOS) && PLATFORM(MAC)
     990#if PLATFORM(MAC)
    991991#define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
    992992#endif
    993993
    994 #if PLATFORM(MAC) && !PLATFORM(IOS)
     994#if PLATFORM(MAC)
    995995/* Some platforms provide UI for suggesting autocorrection. */
    996996#define WTF_USE_AUTOCORRECTION_PANEL 1
    … …  
    10301030#endif
    10311031
    1032 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     1032#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    10331033#define HAVE_NS_ACTIVITY 1
    10341034#endif

  • trunk/Source/WTF/wtf/Threading.cpp

    r163288 r164358  
    8787}
    8888
    89 #if PLATFORM(MAC) && !PLATFORM(IOS) || PLATFORM(WIN)
     89#if PLATFORM(MAC) || PLATFORM(WIN)
    9090
    9191// For ABI compatibility with Safari on Mac / Windows: Safari uses the private

  • trunk/Source/WTF/wtf/text/cf/StringImplCF.cpp

    r158479 r164358  
    3030#include <wtf/Threading.h>
    3131
    32 #if PLATFORM(MAC) && !PLATFORM(IOS)
     32#if PLATFORM(MAC)
    3333#include <objc/objc-auto.h>
    3434#endif
    … …  
    3636static inline bool garbageCollectionEnabled()
    3737{
    38 #if PLATFORM(MAC) && !PLATFORM(IOS)
     38#if PLATFORM(MAC)
    3939    return objc_collectingEnabled();
    4040#else

  • trunk/Source/WebCore/ChangeLog

    r164357 r164358  
     12014-02-19  Dan Bernstein  <mitz@apple.com>
     2
     3        Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
     4        https://bugs.webkit.org/show_bug.cgi?id=129029
     5
     6        Reviewed by Mark Rowe.
     7
     8        * accessibility/AccessibilityRenderObject.cpp:
     9        (WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
     10        (WebCore::AccessibilityRenderObject::visiblePositionForPoint):
     11        * config.h:
     12        * editing/Editor.cpp:
     13        (WebCore::Editor::copyURL):
     14        * editing/EditorCommand.cpp:
     15        (WebCore::createCommandMap):
     16        * editing/TypingCommand.cpp:
     17        (WebCore::TypingCommand::markMisspellingsAfterTyping):
     18        * loader/FrameLoader.cpp:
     19        (WebCore::FrameLoader::loadArchive):
     20        * page/AlternativeTextClient.h:
     21        * page/EventHandler.cpp:
     22        * page/PageGroup.cpp:
     23        (WebCore::PageGroup::captionPreferences):
     24        * page/scrolling/ScrollingStateScrollingNode.cpp:
     25        (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
     26        * page/scrolling/ScrollingStateScrollingNode.h:
     27        * page/scrolling/ScrollingTree.h:
     28        * page/scrolling/ThreadedScrollingTree.cpp:
     29        * page/scrolling/ThreadedScrollingTree.h:
     30        * platform/DragData.h:
     31        * platform/FileSystem.cpp:
     32        * platform/MemoryPressureHandler.cpp:
     33        * platform/Pasteboard.h:
     34        * platform/PlatformMouseEvent.h:
     35        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
     36        * platform/PlatformPasteboard.h:
     37        * platform/PlatformScreen.h:
     38        * platform/Scrollbar.cpp:
     39        (WebCore::Scrollbar::supportsUpdateOnSecondaryThread):
     40        * platform/SuddenTermination.h:
     41        * platform/ThreadGlobalData.cpp:
     42        (WebCore::ThreadGlobalData::ThreadGlobalData):
     43        (WebCore::ThreadGlobalData::destroy):
     44        * platform/ThreadGlobalData.h:
     45        * platform/audio/mac/AudioDestinationMac.cpp:
     46        * platform/audio/mac/AudioFileReaderMac.cpp:
     47        * platform/audio/mac/AudioSessionMac.cpp:
     48        * platform/graphics/DisplayRefreshMonitor.h:
     49        * platform/graphics/FloatPoint.h:
     50        * platform/graphics/FloatRect.h:
     51        * platform/graphics/FloatSize.h:
     52        * platform/graphics/IntRect.h:
     53        * platform/graphics/IntSize.h:
     54        * platform/graphics/MediaPlayer.cpp:
     55        (WebCore::installedMediaEngines):
     56        * platform/graphics/cg/ImageBufferCG.cpp:
     57        (WebCore::utiFromMIMEType):
     58        * platform/graphics/cg/PDFDocumentImage.h:
     59        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     60        * platform/graphics/mac/GraphicsContextMac.mm:
     61        (WebCore::GraphicsContext::drawLineForDocumentMarker):
     62        * platform/graphics/opengl/Extensions3DOpenGL.cpp:
     63        (WebCore::Extensions3DOpenGL::supportsExtension):
     64        (WebCore::Extensions3DOpenGL::drawBuffersEXT):
     65        * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
     66        (WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
     67        * platform/mac/KeyEventMac.mm:
     68        * platform/network/NetworkStateNotifier.h:
     69        * platform/network/cf/CookieJarCFNet.cpp:
     70        * platform/network/cf/ResourceRequest.h:
     71        * platform/network/cf/ResourceRequestCFNet.cpp:
     72        * platform/network/cf/SocketStreamHandleCFNet.cpp:
     73        (WebCore::SocketStreamHandle::reportErrorToClient):
     74        * platform/text/TextEncodingRegistry.cpp:
     75        (WebCore::extendTextCodecMaps):
     76        * rendering/RenderLayerCompositor.cpp:
     77        (WebCore::RenderLayerCompositor::allowsIndependentlyCompositedFrames):
     78        (WebCore::RenderLayerCompositor::requiresCompositingForAnimation):
     79
    1802014-02-18  Dan Bernstein  <mitz@apple.com>
    281

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r163725 r164358  
    19641964    }
    19651965   
    1966 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1966#if PLATFORM(MAC)
    19671967    return m_renderer->view().frameView().contentsToScreen(pixelSnappedIntRect(ourrect));
    19681968#else
    … …  
    20052005    while (1) {
    20062006        LayoutPoint ourpoint;
    2007 #if PLATFORM(MAC) && !PLATFORM(IOS)
     2007#if PLATFORM(MAC)
    20082008        ourpoint = frameView->screenToContents(point);
    20092009#else

  • trunk/Source/WebCore/config.h

    r162621 r164358  
    101101#endif
    102102
    103 #if PLATFORM(MAC) && !PLATFORM(IOS)
     103#if PLATFORM(MAC)
    104104#define WTF_USE_NEW_THEME 1
    105105#endif

  • trunk/Source/WebCore/editing/Editor.cpp

    r164357 r164358  
    554554}
    555555
    556 #if !(PLATFORM(MAC) && !PLATFORM(IOS))
     556#if !PLATFORM(MAC)
    557557
    558558String Editor::plainTextFromPasteboard(const PasteboardPlainText& text)
    … …  
    14031403    pasteboardURL.title = title;
    14041404
    1405 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1405#if PLATFORM(MAC)
    14061406    fillInUserVisibleForm(pasteboardURL);
    14071407#endif

  • trunk/Source/WebCore/editing/EditorCommand.cpp

    r163232 r164358  
    11021102}
    11031103
    1104 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1104#if PLATFORM(MAC)
    11051105static bool executeTakeFindStringFromSelection(Frame& frame, Event*, EditorCommandSource, const String&)
    11061106{
    … …  
    13221322}
    13231323
    1324 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1324#if PLATFORM(MAC)
    13251325static bool enabledTakeFindStringFromSelection(Frame& frame, Event*, EditorCommandSource)
    13261326{
    … …  
    16291629#endif
    16301630
    1631 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1631#if PLATFORM(MAC)
    16321632        { "TakeFindStringFromSelection", { executeTakeFindStringFromSelection, supportedFromMenuOrKeyBinding, enabledTakeFindStringFromSelection, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
    16331633#endif

  • trunk/Source/WebCore/editing/TypingCommand.cpp

    r163725 r164358  
    292292    Frame& frame = this->frame();
    293293
    294 #if PLATFORM(MAC) && !PLATFORM(IOS)
     294#if PLATFORM(MAC)
    295295    if (!frame.editor().isContinuousSpellCheckingEnabled()
    296296        && !frame.editor().isAutomaticQuoteSubstitutionEnabled()

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r164254 r164358  
    924924   
    925925    ResourceRequest request(mainResource->url());
    926 #if PLATFORM(MAC) && !PLATFORM(IOS)
     926#if PLATFORM(MAC)
    927927    request.applyWebArchiveHackForMail();
    928928#endif

  • trunk/Source/WebCore/page/AlternativeTextClient.h

    r161106 r164358  
    3232#include <wtf/text/WTFString.h>
    3333
    34 #if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
     34#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    3535// Some platforms provide UI for suggesting alternative dictation text.
    3636#define WTF_USE_DICTATION_ALTERNATIVES 1
    37 #endif // !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
     37#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    3838
    3939namespace WebCore {

  • trunk/Source/WebCore/page/EventHandler.cpp

    r164184 r164358  
    24482448#endif
    24492449
    2450 #if !PLATFORM(MAC) || PLATFORM(IOS)
     2450#if !PLATFORM(MAC)
    24512451void EventHandler::platformPrepareForWheelEvents(const PlatformWheelEvent&, const HitTestResult&, Element*&, ContainerNode*&, ScrollableArea*&, bool&)
    24522452{
    … …  
    27852785}
    27862786
    2787 #if !PLATFORM(MAC) || PLATFORM(IOS)
     2787#if !PLATFORM(MAC)
    27882788bool EventHandler::needsKeyboardEventDisambiguationQuirks() const
    27892789{

  • trunk/Source/WebCore/page/PageGroup.cpp

    r163073 r164358  
    4444
    4545#if ENABLE(VIDEO_TRACK)
    46 #if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
     46#if PLATFORM(MAC) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
    4747#include "CaptionUserPreferencesMediaAF.h"
    4848#else
    … …  
    322322{
    323323    if (!m_captionPreferences) {
    324 #if (PLATFORM(MAC) && !PLATFORM(IOS)) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
     324#if PLATFORM(MAC) || HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
    325325        m_captionPreferences = std::make_unique<CaptionUserPreferencesMediaAF>(*this);
    326326#else

  • trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp

    r164110 r164358  
    4242ScrollingStateScrollingNode::ScrollingStateScrollingNode(ScrollingStateTree& stateTree, ScrollingNodeID nodeID)
    4343    : ScrollingStateNode(ScrollingNode, stateTree, nodeID)
    44 #if PLATFORM(MAC) && !PLATFORM(IOS)
     44#if PLATFORM(MAC)
    4545    , m_verticalScrollbarPainter(0)
    4646    , m_horizontalScrollbarPainter(0)
    … …  
    5858ScrollingStateScrollingNode::ScrollingStateScrollingNode(const ScrollingStateScrollingNode& stateNode, ScrollingStateTree& adoptiveTree)
    5959    : ScrollingStateNode(stateNode, adoptiveTree)
    60 #if PLATFORM(MAC) && !PLATFORM(IOS)
     60#if PLATFORM(MAC)
    6161    , m_verticalScrollbarPainter(stateNode.verticalScrollbarPainter())
    6262    , m_horizontalScrollbarPainter(stateNode.horizontalScrollbarPainter())
    … …  
    252252}
    253253
    254 #if !(PLATFORM(MAC) && !PLATFORM(IOS))
     254#if !PLATFORM(MAC)
    255255void ScrollingStateScrollingNode::setScrollbarPaintersFromScrollbars(Scrollbar*, Scrollbar*)
    256256{

  • trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h

    r164110 r164358  
    127127    void setFooterLayer(const LayerRepresentation&);
    128128
    129 #if PLATFORM(MAC) && !PLATFORM(IOS)
     129#if PLATFORM(MAC)
    130130    ScrollbarPainter verticalScrollbarPainter() const { return m_verticalScrollbarPainter.get(); }
    131131    ScrollbarPainter horizontalScrollbarPainter() const { return m_horizontalScrollbarPainter.get(); }
    … …  
    144144    LayerRepresentation m_footerLayer;
    145145
    146 #if PLATFORM(MAC) && !PLATFORM(IOS)
     146#if PLATFORM(MAC)
    147147    RetainPtr<ScrollbarPainter> m_verticalScrollbarPainter;
    148148    RetainPtr<ScrollbarPainter> m_horizontalScrollbarPainter;

  • trunk/Source/WebCore/page/scrolling/ScrollingTree.h

    r163516 r164358  
    7979    bool isPointInNonFastScrollableRegion(IntPoint);
    8080   
    81 #if PLATFORM(MAC) && !PLATFORM(IOS)
     81#if PLATFORM(MAC)
    8282    virtual void handleWheelEventPhase(PlatformWheelEventPhase) = 0;
    8383#endif

  • trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp

    r163231 r164358  
    112112}
    113113
    114 #if PLATFORM(MAC) && !PLATFORM(IOS)
     114#if PLATFORM(MAC)
    115115void ThreadedScrollingTree::handleWheelEventPhase(PlatformWheelEventPhase phase)
    116116{

  • trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h

    r163231 r164358  
    6666
    6767    virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;
    68 #if PLATFORM(MAC) && !PLATFORM(IOS)
     68#if PLATFORM(MAC)
    6969    virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;
    7070#endif

  • trunk/Source/WebCore/platform/DragData.h

    r162774 r164358  
    3535#include <wtf/Vector.h>
    3636
    37 #if PLATFORM(MAC) && !PLATFORM(IOS)
     37#if PLATFORM(MAC)
    3838#include <wtf/RetainPtr.h>
    3939#include <wtf/text/WTFString.h>
    … …  
    109109    unsigned numberOfFiles() const;
    110110    int modifierKeyState() const;
    111 #if PLATFORM(MAC) && !PLATFORM(IOS)
     111#if PLATFORM(MAC)
    112112    const String& pasteboardName() const { return m_pasteboardName; }
    113113#endif
    … …  
    135135    DragOperation m_draggingSourceOperationMask;
    136136    DragApplicationFlags m_applicationFlags;
    137 #if PLATFORM(MAC) && !PLATFORM(IOS)
     137#if PLATFORM(MAC)
    138138    String m_pasteboardName;
    139139#endif

  • trunk/Source/WebCore/platform/FileSystem.cpp

    r161589 r164358  
    9696}
    9797
    98 #if !PLATFORM(MAC) || PLATFORM(IOS)
     98#if !PLATFORM(MAC)
    9999
    100100void setMetadataURL(String&, const String&, const String&)

  • trunk/Source/WebCore/platform/MemoryPressureHandler.cpp

    r161589 r164358  
    5252}
    5353
    54 #if !PLATFORM(MAC) || PLATFORM(IOS)
     54#if !PLATFORM(MAC)
    5555
    5656void MemoryPressureHandler::install() { }

  • trunk/Source/WebCore/platform/Pasteboard.h

    r157375 r164358  
    8484    URL url;
    8585    String title;
    86 #if PLATFORM(MAC) && !PLATFORM(IOS)
     86#if PLATFORM(MAC)
    8787    String userVisibleForm;
    8888#endif
    … …  
    120120struct PasteboardPlainText {
    121121    String text;
    122 #if PLATFORM(MAC) && !PLATFORM(IOS)
     122#if PLATFORM(MAC)
    123123    bool isURL;
    124124#endif
    … …  
    181181#endif
    182182
    183 #if PLATFORM(MAC) && !PLATFORM(IOS)
     183#if PLATFORM(MAC)
    184184    explicit Pasteboard(const String& pasteboardName);
    185185    static PassOwnPtr<Pasteboard> create(const String& pasteboardName);
    … …  
    224224#endif
    225225
    226 #if PLATFORM(MAC) && !PLATFORM(IOS)
     226#if PLATFORM(MAC)
    227227    String m_pasteboardName;
    228228    long m_changeCount;
    … …  
    241241#endif
    242242
    243 #if PLATFORM(MAC) && !PLATFORM(IOS)
     243#if PLATFORM(MAC)
    244244extern const char* const WebArchivePboardType;
    245245extern const char* const WebURLNamePboardType;

  • trunk/Source/WebCore/platform/PlatformMouseEvent.h

    r161680 r164358  
    5454            , m_clickCount(0)
    5555            , m_modifierFlags(0)
    56 #if PLATFORM(MAC) && !PLATFORM(IOS)
     56#if PLATFORM(MAC)
    5757            , m_eventNumber(0)
    5858#elif PLATFORM(WIN)
    … …  
    7070            , m_clickCount(clickCount)
    7171            , m_modifierFlags(0)
    72 #if PLATFORM(MAC) && !PLATFORM(IOS)
     72#if PLATFORM(MAC)
    7373            , m_eventNumber(0)
    7474#elif PLATFORM(WIN)
    … …  
    102102#endif
    103103
    104 #if PLATFORM(MAC) && !PLATFORM(IOS)
     104#if PLATFORM(MAC)
    105105        int eventNumber() const { return m_eventNumber; }
    106106#endif
    … …  
    122122        unsigned m_modifierFlags;
    123123
    124 #if PLATFORM(MAC) && !PLATFORM(IOS)
     124#if PLATFORM(MAC)
    125125        int m_eventNumber;
    126126#elif PLATFORM(WIN)

  • trunk/Source/WebCore/platform/PlatformPasteboard.h

    r156588 r164358  
    3232#include <wtf/Vector.h>
    3333
    34 #if PLATFORM(MAC) && !PLATFORM(IOS)
     34#if PLATFORM(MAC)
    3535OBJC_CLASS NSPasteboard;
    3636#endif
    … …  
    8383
    8484private:
    85 #if PLATFORM(MAC) && !PLATFORM(IOS)
     85#if PLATFORM(MAC)
    8686    RetainPtr<NSPasteboard> m_pasteboard;
    8787#endif

  • trunk/Source/WebCore/platform/PlatformScreen.h

    r161589 r164358  
    2929#include <wtf/Vector.h>
    3030
    31 #if PLATFORM(MAC) && !PLATFORM(IOS)
     31#if PLATFORM(MAC)
    3232OBJC_CLASS NSScreen;
    3333OBJC_CLASS NSWindow;
    … …  
    5858    void screenColorProfile(ColorProfile&);
    5959
    60 #if PLATFORM(MAC) && !PLATFORM(IOS)
     60#if PLATFORM(MAC)
    6161    NSScreen *screenForWindow(NSWindow *);
    6262

  • trunk/Source/WebCore/platform/Scrollbar.cpp

    r161768 r164358  
    550550    // It's unfortunate that this needs to be done with an ifdef. Ideally there would be a way to feature-detect
    551551    // the necessary support within AppKit.
    552 #if ENABLE(ASYNC_SCROLLING) && !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     552#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
    553553    return m_scrollableArea ? !m_scrollableArea->updatesScrollLayerPositionOnMainThread() : false;
    554554#else

  • trunk/Source/WebCore/platform/SuddenTermination.h

    r161995 r164358  
    3737    void enableSuddenTermination();
    3838
    39 #if PLATFORM(IOS) || !PLATFORM(MAC)
     39#if !PLATFORM(MAC)
    4040    inline void disableSuddenTermination() { }
    4141    inline void enableSuddenTermination() { }

  • trunk/Source/WebCore/platform/ThreadGlobalData.cpp

    r164144 r164358  
    3939#include <wtf/text/StringImpl.h>
    4040
    41 #if PLATFORM(MAC) && !PLATFORM(IOS)
     41#if PLATFORM(MAC)
    4242#include "TextCodeCMac.h"
    4343#endif
    … …  
    6565#endif
    6666    , m_cachedConverterICU(adoptPtr(new ICUConverterWrapper))
    67 #if PLATFORM(MAC) && !PLATFORM(IOS)
     67#if PLATFORM(MAC)
    6868    , m_cachedConverterTEC(adoptPtr(new TECConverterWrapper))
    6969#endif
    … …  
    8686void ThreadGlobalData::destroy()
    8787{
    88 #if PLATFORM(MAC) && !PLATFORM(IOS)
     88#if PLATFORM(MAC)
    8989    m_cachedConverterTEC.clear();
    9090#endif

  • trunk/Source/WebCore/platform/ThreadGlobalData.h

    r164144 r164358  
    6565        ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
    6666
    67 #if PLATFORM(MAC) && !PLATFORM(IOS)
     67#if PLATFORM(MAC)
    6868        TECConverterWrapper& cachedConverterTEC() { return *m_cachedConverterTEC; }
    6969#endif
    … …  
    9292        OwnPtr<ICUConverterWrapper> m_cachedConverterICU;
    9393
    94 #if PLATFORM(MAC) && !PLATFORM(IOS)
     94#if PLATFORM(MAC)
    9595        OwnPtr<TECConverterWrapper> m_cachedConverterTEC;
    9696#endif

  • trunk/Source/WebCore/platform/audio/mac/AudioDestinationMac.cpp

    r162944 r164358  
    3131#if ENABLE(WEB_AUDIO)
    3232
    33 #if PLATFORM(MAC) && !PLATFORM(IOS)
     33#if PLATFORM(MAC)
    3434
    3535#include "AudioDestinationMac.h"
    … …  
    184184} // namespace WebCore
    185185
    186 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     186#endif // PLATFORM(MAC)
    187187
    188188#endif // ENABLE(WEB_AUDIO)

  • trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp

    r162944 r164358  
    3131#if ENABLE(WEB_AUDIO)
    3232
    33 #if PLATFORM(MAC) && !PLATFORM(IOS)
     33#if PLATFORM(MAC)
    3434
    3535#include "AudioFileReaderMac.h"
    … …  
    250250} // namespace WebCore
    251251
    252 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     252#endif // PLATFORM(MAC)
    253253
    254254#endif // ENABLE(WEB_AUDIO)

  • trunk/Source/WebCore/platform/audio/mac/AudioSessionMac.cpp

    r163657 r164358  
    2727#include "AudioSession.h"
    2828
    29 #if USE(AUDIO_SESSION) && PLATFORM(MAC) && !PLATFORM(IOS)
     29#if USE(AUDIO_SESSION) && PLATFORM(MAC)
    3030
    3131#include "FloatConversion.h"
    … …  
    165165}
    166166
    167 #endif // USE(AUDIO_SESSION) && PLATFORM(MAC) && !PLATFORM(IOS)
     167#endif // USE(AUDIO_SESSION) && PLATFORM(MAC)

  • trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h

    r163657 r164358  
    120120    HashSet<DisplayRefreshMonitorClient*>* m_clientsToBeNotified;
    121121
    122 #if PLATFORM(MAC) && !PLATFORM(IOS)
     122#if PLATFORM(MAC)
    123123public:
    124124    void displayLinkFired(double nowSeconds, double outputTimeSeconds);

  • trunk/Source/WebCore/platform/graphics/FloatPoint.h

    r163657 r164358  
    3636#endif
    3737
    38 #if PLATFORM(MAC) && !PLATFORM(IOS)
     38#if PLATFORM(MAC)
    3939#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    4040typedef struct CGPoint NSPoint;
    … …  
    4242typedef struct _NSPoint NSPoint;
    4343#endif
    44 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     44#endif // PLATFORM(MAC)
    4545
    4646namespace WebCore {
    … …  
    137137#endif
    138138
    139 #if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     139#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    140140    FloatPoint(const NSPoint&);
    141141    operator NSPoint() const;

  • trunk/Source/WebCore/platform/graphics/FloatRect.h

    r163657 r164358  
    3939#endif
    4040
    41 #if PLATFORM(MAC) && !PLATFORM(IOS)
     41#if PLATFORM(MAC)
    4242#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    4343typedef struct CGRect NSRect;
    … …  
    4545typedef struct _NSRect NSRect;
    4646#endif
    47 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     47#endif // PLATFORM(MAC)
    4848
    4949#if USE(CAIRO)
    … …  
    172172#endif
    173173
    174 #if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     174#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    175175    FloatRect(const NSRect&);
    176176    operator NSRect() const;

  • trunk/Source/WebCore/platform/graphics/FloatSize.h

    r163657 r164358  
    4040#endif
    4141
    42 #if PLATFORM(MAC) && !PLATFORM(IOS)
     42#if PLATFORM(MAC)
    4343#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    4444typedef struct CGSize NSSize;
    … …  
    4646typedef struct _NSSize NSSize;
    4747#endif
    48 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     48#endif // PLATFORM(MAC)
    4949
    5050namespace WebCore {
    … …  
    114114#endif
    115115
    116 #if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     116#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    117117    explicit FloatSize(const NSSize &); // don't do this implicitly since it's lossy
    118118    operator NSSize() const;

  • trunk/Source/WebCore/platform/graphics/IntRect.h

    r163657 r164358  
    3535#endif
    3636
    37 #if PLATFORM(MAC) && !PLATFORM(IOS)
     37#if PLATFORM(MAC)
    3838#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    3939typedef struct CGRect NSRect;
    … …  
    194194#endif
    195195
    196 #if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     196#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    197197    operator NSRect() const;
    198198#endif
    … …  
    249249#endif
    250250
    251 #if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     251#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    252252IntRect enclosingIntRect(const NSRect&);
    253253#endif

  • trunk/Source/WebCore/platform/graphics/IntSize.h

    r163657 r164358  
    3434#endif
    3535
    36 #if PLATFORM(MAC) && !PLATFORM(IOS)
     36#if PLATFORM(MAC)
    3737#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    3838typedef struct CGSize NSSize;
    … …  
    130130#endif
    131131
    132 #if PLATFORM(MAC) && !PLATFORM(IOS) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     132#if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    133133    explicit IntSize(const NSSize &); // don't do this implicitly since it's lossy
    134134    operator NSSize() const;

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r163907 r164358  
    225225#endif
    226226
    227 #if PLATFORM(MAC) && !PLATFORM(IOS)
     227#if PLATFORM(MAC)
    228228    if (Settings::isQTKitEnabled())
    229229        MediaPlayerPrivateQTKit::registerMediaEngine(addMediaEngine);

  • trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

    r163657 r164358  
    406406static RetainPtr<CFStringRef> utiFromMIMEType(const String& mimeType)
    407407{
    408 #if PLATFORM(MAC) && !PLATFORM(IOS)
     408#if PLATFORM(MAC)
    409409    return adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, mimeType.createCFString().get(), 0));
    410410#else

  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h

    r162158 r164358  
    3434#if USE(CG)
    3535
    36 #if PLATFORM(MAC) && !PLATFORM(IOS)
     36#if PLATFORM(MAC)
    3737#define WTF_USE_PDFKIT_FOR_PDFDOCUMENTIMAGE 1
    3838#endif

  • trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

    r164075 r164358  
    4040enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidth, TextSpacingHalfWidth, TextSpacingThirdWidth, TextSpacingQuarterWidth };
    4141
    42 #if PLATFORM(MAC) && !PLATFORM(IOS)
     42#if PLATFORM(MAC)
    4343void FontPlatformData::loadFont(NSFont* nsFont, float, NSFont*& outNSFont, CGFontRef& cgFont)
    4444{
    … …  
    4646    cgFont = CTFontCopyGraphicsFont(toCTFontRef(nsFont), 0);
    4747}
    48 #endif  // PLATFORM(MAC) && !PLATFORM(IOS)
     48#endif  // PLATFORM(MAC)
    4949
    5050#if !PLATFORM(IOS)

  • trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm

    r161589 r164358  
    187187#endif
    188188        }
    189 #if !PLATFORM(IOS) && PLATFORM(MAC)
     189#if PLATFORM(MAC)
    190190        // To support correction panel.
    191191        case DocumentMarkerAutocorrectionReplacementLineStyle:

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp

    r164293 r164358  
    210210
    211211    if (name == "GL_EXT_draw_buffers") {
    212 #if PLATFORM(MAC) && !PLATFORM(IOS)
     212#if PLATFORM(MAC)
    213213        return m_availableExtensions.contains("GL_ARB_draw_buffers");
    214214#else
    … …  
    229229{
    230230    //  FIXME: implement support for other platforms.
    231 #if PLATFORM(MAC) && !PLATFORM(IOS)
     231#if PLATFORM(MAC)
    232232    ::glDrawBuffersARB(n, bufs);
    233233#else

  • trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp

    r162451 r164358  
    7272        m_isIntel = true;
    7373
    74 #if PLATFORM(MAC) && !PLATFORM(IOS)
     74#if PLATFORM(MAC)
    7575    if (m_isAMD || m_isIntel)
    7676        m_requiresBuiltInFunctionEmulation = true;

  • trunk/Source/WebCore/platform/mac/KeyEventMac.mm

    r163657 r164358  
    2727#import "PlatformKeyboardEvent.h"
    2828
    29 #if PLATFORM(MAC) && !PLATFORM(IOS)
     29#if PLATFORM(MAC)
    3030
    3131#import "KeyEventCocoa.h"
    … …  
    7979} // namespace WebCore
    8080
    81 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     81#endif // PLATFORM(MAC)

  • trunk/Source/WebCore/platform/network/NetworkStateNotifier.h

    r163657 r164358  
    3232#include <wtf/Vector.h>
    3333
    34 #if PLATFORM(MAC) && !PLATFORM(IOS)
     34#if PLATFORM(MAC)
    3535
    3636#include <wtf/RetainPtr.h>
    … …  
    7575    void updateState();
    7676
    77 #if PLATFORM(MAC) && !PLATFORM(IOS)
     77#if PLATFORM(MAC)
    7878    void networkStateChangeTimerFired(Timer<NetworkStateNotifier>&);
    7979

  • trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp

    r164272 r164358  
    4242#endif
    4343
    44 #if PLATFORM(WIN) || (!PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
     44#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
    4545enum {
    4646    CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3

  • trunk/Source/WebCore/platform/network/cf/ResourceRequest.h

    r163725 r164358  
    105105        void updateFromDelegatePreservingOldHTTPBody(const ResourceRequest&);
    106106
    107 #if PLATFORM(MAC) && !PLATFORM(IOS)
     107#if PLATFORM(MAC)
    108108        void applyWebArchiveHackForMail();
    109109#endif

  • trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

    r163725 r164358  
    338338}
    339339
    340 #if PLATFORM(MAC) && !PLATFORM(IOS)
     340#if PLATFORM(MAC)
    341341void ResourceRequest::applyWebArchiveHackForMail()
    342342{

  • trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp

    r162235 r164358  
    579579    String description;
    580580
    581 #if PLATFORM(MAC) && !PLATFORM(IOS)
     581#if PLATFORM(MAC)
    582582
    583583#if COMPILER(CLANG)

  • trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp

    r162784 r164358  
    4343#include <wtf/StringExtras.h>
    4444
    45 #if PLATFORM(MAC) && !PLATFORM(IOS)
     45#if PLATFORM(MAC)
    4646#include "TextCodecMac.h"
    4747#endif
    … …  
    280280    TextCodecICU::registerCodecs(addToTextCodecMap);
    281281
    282 #if PLATFORM(MAC) && !PLATFORM(IOS)
     282#if PLATFORM(MAC)
    283283    TextCodecMac::registerEncodingNames(addToTextEncodingNameMap);
    284284    TextCodecMac::registerCodecs(addToTextCodecMap);

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r164192 r164358  
    19131913bool RenderLayerCompositor::allowsIndependentlyCompositedFrames(const FrameView* view)
    19141914{
    1915 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1915#if PLATFORM(MAC)
    19161916    // frames are only independently composited in Mac pre-WebKit2.
    19171917    return view->platformWidget();
    … …  
    23842384            && (inCompositingMode() || (m_compositingTriggers & ChromeClient::AnimatedOpacityTrigger)))
    23852385#if ENABLE(CSS_FILTERS)
    2386 #if PLATFORM(IOS) || !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    2387             // <rdar://problem/10907251> - WebKit2 doesn't support CA animations of CI filters on Lion and below
    23882386            || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitFilter)
    2389 #endif // PLATFORM(IOS) || !PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    23902387#endif // CSS_FILTERS
    23912388            || animController.isRunningAnimationOnRenderer(&renderer, CSSPropertyWebkitTransform);

  • trunk/Source/WebKit2/ChangeLog

    r164357 r164358  
     12014-02-19  Dan Bernstein  <mitz@apple.com>
     2
     3        Simplify PLATFORM(MAC) && !PLATFORM(IOS) and similar expressions
     4        https://bugs.webkit.org/show_bug.cgi?id=129029
     5
     6        Reviewed by Mark Rowe.
     7
     8        * PluginProcess/PluginProcess.cpp:
     9        (WebKit::PluginProcess::netscapePluginModule):
     10        * Shared/API/c/WKDeprecatedFunctions.cpp:
     11        * Shared/WebPreferencesStore.h:
     12        * UIProcess/API/Cocoa/WKWebView.mm:
     13        (-[WKWebView initWithFrame:configuration:]):
     14        * UIProcess/PageClient.h:
     15        * UIProcess/Scrolling/RemoteScrollingTree.cpp:
     16        * UIProcess/Scrolling/RemoteScrollingTree.h:
     17        * UIProcess/WebContext.h:
     18        * UIProcess/WebInspectorProxy.h:
     19        * UIProcess/WebPageProxy.cpp:
     20        (WebKit::WebPageProxy::didChangeBackForwardList):
     21        (WebKit::WebPageProxy::pageDidScroll):
     22        (WebKit::WebPageProxy::resetStateAfterProcessExited):
     23        (WebKit::WebPageProxy::creationParameters):
     24        * UIProcess/WebPageProxy.h:
     25        * UIProcess/WebPageProxy.messages.in:
     26        * UIProcess/mac/WebContextMac.mm:
     27        (WebKit::WebContext::platformInitializeWebProcess):
     28        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
     29        (WKBundlePageSetTopOverhangImage):
     30        (WKBundlePageSetBottomOverhangImage):
     31        * WebProcess/WebPage/PageBanner.h:
     32        * WebProcess/WebPage/WebPage.cpp:
     33        (WebKit::WebPage::setDeviceScaleFactor):
     34        (WebKit::WebPage::mainFrameDidLayout):
     35        (WebKit::WebPage::beginPrinting):
     36        (WebKit::WebPage::drawRectToImage):
     37        (WebKit::WebPage::drawPagesToPDF):
     38        * WebProcess/WebPage/WebPage.messages.in:
     39        * config.h:
     40
    1412014-02-18  Dan Bernstein  <mitz@apple.com>
    242

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

    r164112 r164358  
    4141#include <wtf/RunLoop.h>
    4242
    43 #if PLATFORM(MAC) && !PLATFORM(IOS)
     43#if PLATFORM(MAC)
    4444#include <crt_externs.h>
    4545#endif
    … …  
    107107        m_pluginModule = NetscapePluginModule::getOrCreate(m_pluginPath);
    108108
    109 #if PLATFORM(MAC) && !PLATFORM(IOS)
     109#if PLATFORM(MAC)
    110110        if (m_pluginModule) {
    111111            if (m_pluginModule->pluginQuirks().contains(PluginQuirks::PrognameShouldBeWebKitPluginHost))

  • trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp

    r163886 r164358  
    3131#include "WKSharedAPICast.h"
    3232
    33 #if PLATFORM(MAC) && !PLATFORM(IOS)
     33#if PLATFORM(MAC)
    3434#include "WKContextPrivateMac.h"
    3535#endif
    … …  
    4848WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
    4949
    50 #if PLATFORM(MAC) && !PLATFORM(IOS)
     50#if PLATFORM(MAC)
    5151WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
    5252#endif
    … …  
    7777}
    7878
    79 #if PLATFORM(MAC) && !PLATFORM(IOS)
     79#if PLATFORM(MAC)
    8080CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
    8181{

  • trunk/Source/WebKit2/Shared/WebPreferencesStore.h

    r164304 r164358  
    4949#endif
    5050
    51 #if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     51#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    5252#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
    5353#else

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r164335 r164358  
    6262#endif
    6363
    64 #if PLATFORM(MAC) && !PLATFORM(IOS)
     64#if PLATFORM(MAC)
    6565#import "WKViewInternal.h"
    6666#endif
    … …  
    8585    CGFloat _lastAdjustmentForScroller;
    8686#endif
    87 #if PLATFORM(MAC) && !PLATFORM(IOS)
     87#if PLATFORM(MAC)
    8888    RetainPtr<WKView> _wkView;
    8989#endif
    … …  
    149149#endif
    150150
    151 #if PLATFORM(MAC) && !PLATFORM(IOS)
     151#if PLATFORM(MAC)
    152152    _wkView = [[WKView alloc] initWithFrame:bounds context:context configuration:std::move(webPageConfiguration)];
    153153    [self addSubview:_wkView.get()];
    … …  
    432432#pragma mark OS X-specific methods
    433433
    434 #if PLATFORM(MAC) && !PLATFORM(IOS)
     434#if PLATFORM(MAC)
    435435
    436436- (void)resizeSubviewsWithOldSize:(NSSize)oldSize

  • trunk/Source/WebKit2/UIProcess/PageClient.h

    r164172 r164358  
    214214    virtual void updateAcceleratedCompositingMode(const LayerTreeContext&) = 0;
    215215
    216 #if !PLATFORM(IOS) && PLATFORM(MAC)
     216#if PLATFORM(MAC)
    217217    virtual void pluginFocusOrWindowFocusChanged(uint64_t pluginComplexTextInputIdentifier, bool pluginHasFocusAndWindowHasFocus) = 0;
    218218    virtual void setPluginComplexTextInputState(uint64_t pluginComplexTextInputIdentifier, PluginComplexTextInputState) = 0;
    … …  
    237237#endif // USE(DICTATION_ALTERNATIVES)
    238238#endif // USE(APPKIT)
    239 #endif // !PLATFORM(IOS) && PLATFORM(MAC)
     239#endif // PLATFORM(MAC)
    240240
    241241#if PLATFORM(IOS)

  • trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp

    r163231 r164358  
    7070}
    7171
    72 #if PLATFORM(MAC) && !PLATFORM(IOS)
     72#if PLATFORM(MAC)
    7373void RemoteScrollingTree::handleWheelEventPhase(PlatformWheelEventPhase phase)
    7474{

  • trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h

    r163231 r164358  
    5050    explicit RemoteScrollingTree(RemoteScrollingCoordinatorProxy&);
    5151
    52 #if PLATFORM(MAC) && !PLATFORM(IOS)
     52#if PLATFORM(MAC)
    5353    virtual void handleWheelEventPhase(WebCore::PlatformWheelEventPhase) override;
    5454#endif

  • trunk/Source/WebKit2/UIProcess/WebContext.h

    r164230 r164358  
    489489#endif
    490490
    491 #if PLATFORM(MAC) && !PLATFORM(IOS)
     491#if PLATFORM(MAC)
    492492    RetainPtr<NSObject> m_enhancedAccessibilityObserver;
    493493    RetainPtr<NSObject> m_automaticTextReplacementNotificationObserver;

  • trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h

    r164172 r164358  
    3737#include <wtf/text/WTFString.h>
    3838
    39 #if PLATFORM(MAC) && !PLATFORM(IOS)
     39#if PLATFORM(MAC)
    4040#include "WKGeometry.h"
    4141#include <wtf/HashMap.h>
    … …  
    9494    void close();
    9595   
    96 #if PLATFORM(MAC) && !PLATFORM(IOS)
     96#if PLATFORM(MAC)
    9797    void createInspectorWindow();
    9898    void updateInspectorWindowTitle() const;
    … …  
    225225    AttachmentSide m_attachmentSide;
    226226
    227 #if PLATFORM(MAC) && !PLATFORM(IOS)
     227#if PLATFORM(MAC)
    228228    RetainPtr<WKWebInspectorWKView> m_inspectorView;
    229229    RetainPtr<NSWindow> m_inspectorWindow;

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r164337 r164358  
    858858    m_loaderClient->didChangeBackForwardList(this, added, std::move(removed));
    859859
    860 #if PLATFORM(MAC) && !PLATFORM(IOS)
     860#if PLATFORM(MAC)
    861861    m_pageClient.clearCustomSwipeViews();
    862862#endif
    … …  
    28372837{
    28382838    m_uiClient->pageDidScroll(this);
    2839 #if !PLATFORM(IOS) && PLATFORM(MAC)
     2839#if PLATFORM(MAC)
    28402840    dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
    28412841#endif
    … …  
    39263926    m_temporarilyClosedComposition = false;
    39273927
    3928 #if !PLATFORM(IOS) && PLATFORM(MAC)
     3928#if PLATFORM(MAC)
    39293929    dismissCorrectionPanel(ReasonForDismissingAlternativeTextIgnored);
    39303930    m_pageClient.dismissDictionaryLookupPanel();
    … …  
    39663966    parameters.layerHostingMode = m_layerHostingMode;
    39673967
    3968 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3968#if PLATFORM(MAC)
    39693969    parameters.colorSpace = m_pageClient.colorSpace();
    39703970#endif
    … …  
    43594359}
    43604360
    4361 #if !PLATFORM(IOS) && PLATFORM(MAC)
     4361#if PLATFORM(MAC)
    43624362
    43634363void WebPageProxy::substitutionsPanelIsShowing(bool& isShowing)
    … …  
    44094409#endif
    44104410
    4411 #endif // !PLATFORM(IOS) && PLATFORM(MAC)
     4411#endif // PLATFORM(MAC)
    44124412
    44134413#if PLATFORM(COCOA)

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r164337 r164358  
    11401140    bool maybeInitializeSandboxExtensionHandle(const WebCore::URL&, SandboxExtension::Handle&);
    11411141
    1142 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1142#if PLATFORM(MAC)
    11431143    void substitutionsPanelIsShowing(bool&);
    11441144    void showCorrectionPanel(int32_t panelType, const WebCore::FloatRect& boundingBoxOfReplacedString, const String& replacedString, const String& replacementString, const Vector<String>& alternativeReplacementStrings);
    … …  
    11521152    void dictationAlternatives(uint64_t dictationContext, Vector<String>& result);
    11531153#endif
    1154 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     1154#endif // PLATFORM(MAC)
    11551155
    11561156#if PLATFORM(IOS)

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

    r164172 r164358  
    282282    SubstitutionsPanelIsShowing() -> (bool isShowing)
    283283#endif
    284 #if !PLATFORM(IOS) && PLATFORM(MAC)
     284#if PLATFORM(MAC)
    285285    # Autocorrection messages
    286286    ShowCorrectionPanel(int32_t panelType, WebCore::FloatRect boundingBoxOfReplacedString, String replacedString, String replacementString, Vector<String> alternativeReplacementStrings)

  • trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

    r163950 r164358  
    145145    parameters.presenterApplicationPid = getpid();
    146146
    147 #if PLATFORM(MAC) && !PLATFORM(IOS)
     147#if PLATFORM(MAC)
    148148    parameters.accessibilityEnhancedUserInterfaceEnabled = [[NSApp accessibilityAttributeValue:@"AXEnhancedUserInterface"] boolValue];
    149149#else

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r163800 r164358  
    357357void WKBundlePageSetTopOverhangImage(WKBundlePageRef pageRef, WKImageRef imageRef)
    358358{
    359 #if PLATFORM(MAC) && !PLATFORM(IOS)
     359#if PLATFORM(MAC)
    360360    toImpl(pageRef)->setTopOverhangImage(toImpl(imageRef));
    361361#else
    … …  
    367367void WKBundlePageSetBottomOverhangImage(WKBundlePageRef pageRef, WKImageRef imageRef)
    368368{
    369 #if PLATFORM(MAC) && !PLATFORM(IOS)
     369#if PLATFORM(MAC)
    370370    toImpl(pageRef)->setBottomOverhangImage(toImpl(imageRef));
    371371#else

  • trunk/Source/WebKit2/WebProcess/WebPage/PageBanner.h

    r164225 r164358  
    3131#include <wtf/PassRefPtr.h>
    3232
    33 #if PLATFORM(MAC) && !PLATFORM(IOS)
     33#if PLATFORM(MAC)
    3434OBJC_CLASS CALayer;
    3535#include <wtf/RetainPtr.h>
    … …  
    6161    };
    6262
    63 #if PLATFORM(MAC) && !PLATFORM(IOS)
     63#if PLATFORM(MAC)
    6464    static PassRefPtr<PageBanner> create(CALayer *, int height, Client*);
    6565    CALayer *layer();
    … …  
    8080
    8181private:
    82 #if PLATFORM(MAC) && !PLATFORM(IOS)
     82#if PLATFORM(MAC)
    8383    explicit PageBanner(CALayer *, int height, Client*);
    8484#endif
    … …  
    9191    bool m_isHidden;
    9292
    93 #if PLATFORM(MAC) && !PLATFORM(IOS)
     93#if PLATFORM(MAC)
    9494    RetainPtr<CALayer> m_layer;
    9595    int m_height;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r164337 r164358  
    12801280
    12811281    // Tell all our plug-in views that the device scale factor changed.
    1282 #if PLATFORM(MAC) && !PLATFORM(IOS)
     1282#if PLATFORM(MAC)
    12831283    for (auto* pluginView : m_pluginViews)
    12841284        pluginView->setDeviceScaleFactor(scaleFactor);
    … …  
    20292029}
    20302030
    2031 #if !PLATFORM(MAC) || PLATFORM(IOS)
     2031#if !PLATFORM(MAC)
    20322032void WebPage::didUpdateViewStateTimerFired()
    20332033{
    … …  
    30753075#endif
    30763076
    3077 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3077#if PLATFORM(MAC)
    30783078    m_viewGestureGeometryCollector.mainFrameDidLayout();
    30793079#endif
    … …  
    33613361#endif
    33623362
    3363 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3363#if PLATFORM(MAC)
    33643364RetainPtr<PDFDocument> WebPage::pdfDocumentForPrintingFrame(Frame* coreFrame)
    33653365{
    … …  
    33773377    return pluginView->pdfDocumentForPrinting();
    33783378}
    3379 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     3379#endif // PLATFORM(MAC)
    33803380
    33813381void WebPage::beginPrinting(uint64_t frameID, const PrintInfo& printInfo)
    … …  
    33893389        return;
    33903390
    3391 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3391#if PLATFORM(MAC)
    33923392    if (pdfDocumentForPrintingFrame(coreFrame))
    33933393        return;
    3394 #endif // PLATFORM(MAC) && !PLATFORM(IOS)
     3394#endif // PLATFORM(MAC)
    33953395
    33963396    if (!m_printContext)
    … …  
    34513451#if USE(CG)
    34523452    if (coreFrame) {
    3453 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3453#if PLATFORM(MAC)
    34543454        ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame));
    34553455#else
    … …  
    34633463        graphicsContext->scale(FloatSize(printingScale, printingScale));
    34643464
    3465 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3465#if PLATFORM(MAC)
    34663466        if (RetainPtr<PDFDocument> pdfDocument = pdfDocumentForPrintingFrame(coreFrame)) {
    34673467            ASSERT(!m_printContext);
    … …  
    34973497    if (coreFrame) {
    34983498
    3499 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3499#if PLATFORM(MAC)
    35003500        ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame));
    35013501#else
    … …  
    35093509        RetainPtr<CGContextRef> context = adoptCF(CGPDFContextCreate(pdfDataConsumer.get(), &mediaBox, 0));
    35103510
    3511 #if PLATFORM(MAC) && !PLATFORM(IOS)
     3511#if PLATFORM(MAC)
    35123512        if (RetainPtr<PDFDocument> pdfDocument = pdfDocumentForPrintingFrame(coreFrame)) {
    35133513            ASSERT(!m_printContext);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r164337 r164358  
    292292    InsertDictatedText(String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd, Vector<WebCore::DictationAlternative> dictationAlternatives) -> (bool handled, WebKit::EditorState newState)
    293293#endif
    294 #if PLATFORM(MAC) && !PLATFORM(IOS)
     294#if PLATFORM(MAC)
    295295    InsertText(String text, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (bool handled, WebKit::EditorState newState)
    296296    SetComposition(String text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd) -> (WebKit::EditorState newState)

  • trunk/Source/WebKit2/config.h

    r161246 r164358  
    7777
    7878#ifndef ENABLE_SEC_ITEM_SHIM
    79 #if PLATFORM(MAC) && !PLATFORM(IOS)
     79#if PLATFORM(MAC)
    8080#define ENABLE_SEC_ITEM_SHIM 1
    8181#endif
    … …  
    8383
    8484#ifndef HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS
    85 #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
     85#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    8686#define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS 1
    8787#endif
Note: See TracChangeset for help on using the changeset viewer.