⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 235521 in webkit


Ignore:
Timestamp:
Aug 30, 2018, 1:31:32 PM (8 years ago)
Author:
timothy_horton@apple.com
Message:

Bundle unified sources more tightly in projects with deep directory structures
​https://bugs.webkit.org/show_bug.cgi?id=189009

Reviewed by Simon Fraser.

  • Scripts/generate-unified-source-bundles.rb:

It turns out our plan to switch unified source bundle every time the directory
changes is not a good fit for projects like WebKit2 with many small directories.
It leaves many unified source bundles with only a single source file,
achieving only ~40% density.

Instead, switch unified source bundles every time the top-level directory changes.
This still achieves the goal of *usually* only rebuilding the one top-level
directory you touched, and increases source bundle density wildly, to ~95%.

Fix a variety of unification errors due to reshuffling the bundles.

  • Modules/mediastream/RTCController.cpp:
  • SourcesCocoa.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • crypto/algorithms/CryptoAlgorithmECDSA.cpp:

(WebCore::CryptoAlgorithmECDSA::importKey):

  • dom/Document.h:
  • html/parser/HTMLTreeBuilder.cpp:
  • loader/appcache/ApplicationCacheResourceLoader.h:
  • page/AlternativeTextClient.h:
  • platform/Pasteboard.h:
  • platform/graphics/DisplayRefreshMonitor.cpp:
  • platform/graphics/FontFamilySpecificationNull.cpp:
  • platform/graphics/cocoa/WebGLLayer.mm:

(-[WebGLLayer initWithGraphicsContext3D:]):
(-[WebGLLayer copyImageSnapshotWithColorSpace:]):
(-[WebGLLayer display]):
(-[WebGLLayer allocateIOSurfaceBackingStoreWithSize:usingAlpha:]):

  • platform/graphics/cocoa/WebGPULayer.mm:

(-[WebGPULayer initWithGPUDevice:]):

  • platform/graphics/metal/GPUCommandQueueMetal.mm:
  • platform/mac/PasteboardMac.mm:
  • platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp:
  • platform/network/ResourceRequestBase.cpp:
  • rendering/updating/RenderTreeBuilderBlockFlow.cpp:
  • rendering/updating/RenderTreeBuilderInline.cpp:
  • Shared/APIWebArchive.mm:
  • Shared/APIWebArchiveResource.mm:
  • Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
  • Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
  • SourcesCocoa.txt:
  • SourcesGTK.txt:
  • UIProcess/API/APIAutomationSessionClient.h:

(API::AutomationSessionClient::sessionIdentifier const):
(API::AutomationSessionClient::messageOfCurrentJavaScriptDialogOnPage):
(API::AutomationSessionClient::setUserInputForCurrentJavaScriptPromptOnPage):

  • UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm:

(-[WKCustomProtocolLoader initWithLegacyCustomProtocolManagerProxy:customProtocolID:request:]):
(-[WKCustomProtocolLoader connection:didFailWithError:]):
(-[WKCustomProtocolLoader connection:didReceiveResponse:]):

  • UIProcess/Plugins/PluginProcessProxy.cpp:

(WebKit::generatePluginProcessCallbackID):
(WebKit::PluginProcessProxy::fetchWebsiteData):
(WebKit::PluginProcessProxy::deleteWebsiteData):
(WebKit::PluginProcessProxy::deleteWebsiteDataForHostNames):
(WebKit::generateCallbackID): Deleted.

  • UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:

(-[WKScrollingNodeScrollViewDelegate scrollViewWillEndDragging:withVelocity:targetContentOffset:]):

  • UIProcess/Storage/StorageProcessProxy.cpp:

(WebKit::generateStorageProcessCallbackID):
(WebKit::StorageProcessProxy::fetchWebsiteData):
(WebKit::StorageProcessProxy::deleteWebsiteData):
(WebKit::StorageProcessProxy::deleteWebsiteDataForOrigins):
(WebKit::generateCallbackID): Deleted.

  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/Plugins/PDF/PDFPlugin.mm:

(-[WKPDFPluginAccessibilityObject accessibilityPerformAction:]):
(-[WKPDFPluginAccessibilityObject accessibilityFocusedUIElement]):
(-[WKPDFPluginAccessibilityObject accessibilityAssociatedControlForAnnotation:]):
(-[WKPDFPluginAccessibilityObject accessibilityHitTest:]):
(-[WKPDFLayerControllerDelegate updateScrollPosition:]):
(WebKit::PDFPlugin::updateCursor):
(WebKit::coreCursor):
(appendValuesInPDFNameSubtreeToVector): Deleted.
(getAllValuesInPDFNameTree): Deleted.
(getAllScriptsInPDFDocument): Deleted.

Location:
trunk/Source
Files:
56 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r235473 r235521  
     12018-08-30  Tim Horton  <timothy_horton@apple.com>
     2
     3        Bundle unified sources more tightly in projects with deep directory structures
     4        https://bugs.webkit.org/show_bug.cgi?id=189009
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Scripts/generate-unified-source-bundles.rb:
     9        It turns out our plan to switch unified source bundle every time the directory
     10        changes is not a good fit for projects like WebKit2 with many small directories.
     11        It leaves many unified source bundles with only a single source file,
     12        achieving only ~40% density.
     13
     14        Instead, switch unified source bundles every time the top-level directory changes.
     15        This still achieves the goal of *usually* only rebuilding the one top-level
     16        directory you touched, and increases source bundle density wildly, to ~95%.
     17
     18        * wtf/Platform.h:
     19
    1202018-08-29  David Kilzer  <ddkilzer@apple.com>
    221

  • trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb

    r235336 r235521  
    211211end
    212212
     213def TopLevelDirectoryForPath(path)
     214    if !path
     215        return nil
     216    end
     217    while path.dirname != path.dirname.dirname
     218        path = path.dirname
     219    end
     220    return path
     221end
     222
    213223def ProcessFileForUnifiedSourceGeneration(sourceFile)
    214224    path = sourceFile.path
    215     if ($currentDirectory != path.dirname)
    216         log("Flushing because new dirname; old: #{$currentDirectory}, new: #{path.dirname}")
     225    if (TopLevelDirectoryForPath($currentDirectory) != TopLevelDirectoryForPath(path.dirname))
     226        log("Flushing because new top level directory; old: #{$currentDirectory}, new: #{path.dirname}")
    217227        $bundleManagers.each_value { |x| x.flush }
    218228        $currentDirectory = path.dirname

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

    r234677 r235521  
    13151315#define HAVE_TOUCH_BAR 1
    13161316#define HAVE_ADVANCED_SPELL_CHECKING 1
     1317#define USE_DICTATION_ALTERNATIVES 1
    13171318
    13181319#if defined(__LP64__)

  • trunk/Source/WTF/wtf/text/StringBuffer.h

    r231337 r235521  
    3030#define StringBuffer_h
    3131
    32 #include <wtf/Assertions.h>
    3332#include <limits>
    3433#include <unicode/utypes.h>
     34#include <wtf/Assertions.h>
     35#include <wtf/MallocPtr.h>
    3536
    3637namespace WTF {

  • trunk/Source/WebCore/ChangeLog

    r235518 r235521  
     12018-08-30  Tim Horton  <timothy_horton@apple.com>
     2
     3        Bundle unified sources more tightly in projects with deep directory structures
     4        https://bugs.webkit.org/show_bug.cgi?id=189009
     5
     6        Reviewed by Simon Fraser.
     7
     8        Fix a variety of unification errors due to reshuffling the bundles.
     9
     10        * Modules/mediastream/RTCController.cpp:
     11        * SourcesCocoa.txt:
     12        * WebCore.xcodeproj/project.pbxproj:
     13        * crypto/algorithms/CryptoAlgorithmECDSA.cpp:
     14        (WebCore::CryptoAlgorithmECDSA::importKey):
     15        * dom/Document.h:
     16        * html/parser/HTMLTreeBuilder.cpp:
     17        * loader/appcache/ApplicationCacheResourceLoader.h:
     18        * page/AlternativeTextClient.h:
     19        * platform/Pasteboard.h:
     20        * platform/graphics/DisplayRefreshMonitor.cpp:
     21        * platform/graphics/FontFamilySpecificationNull.cpp:
     22        * platform/graphics/cocoa/WebGLLayer.mm:
     23        (-[WebGLLayer initWithGraphicsContext3D:]):
     24        (-[WebGLLayer copyImageSnapshotWithColorSpace:]):
     25        (-[WebGLLayer display]):
     26        (-[WebGLLayer allocateIOSurfaceBackingStoreWithSize:usingAlpha:]):
     27        * platform/graphics/cocoa/WebGPULayer.mm:
     28        (-[WebGPULayer initWithGPUDevice:]):
     29        * platform/graphics/metal/GPUCommandQueueMetal.mm:
     30        * platform/mac/PasteboardMac.mm:
     31        * platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp:
     32        * platform/network/ResourceRequestBase.cpp:
     33        * rendering/updating/RenderTreeBuilderBlockFlow.cpp:
     34        * rendering/updating/RenderTreeBuilderInline.cpp:
     35
    1362018-08-30  Andy Estes  <aestes@apple.com>
    237

  • trunk/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp

    r228924 r235521  
    3030#include "CacheQueryOptions.h"
    3131#include "CacheStorageProvider.h"
     32#include "ClientOrigin.h"
    3233#include "Document.h"
    3334#include "Page.h"
    … …  
    3637#include "WorkerRunLoop.h"
    3738#include "WorkerThread.h"
    38 
    3939
    4040namespace WebCore {

  • trunk/Source/WebCore/Modules/mediastream/RTCController.cpp

    r226804 r235521  
    2828#if ENABLE(WEB_RTC)
    2929
     30#include "Document.h"
    3031#include "LibWebRTCProvider.h"
    3132#include "RTCPeerConnection.h"

  • trunk/Source/WebCore/Modules/paymentrequest/PaymentRequestUpdateEvent.cpp

    r235518 r235521  
    2929#if ENABLE(PAYMENT_REQUEST)
    3030
     31#include "EventNames.h"
    3132#include "PaymentRequest.h"
    3233

  • trunk/Source/WebCore/Modules/webvr/VRDisplay.cpp

    r233846 r235521  
    3030#include "Chrome.h"
    3131#include "DOMException.h"
     32#include "DOMWindow.h"
    3233#include "EventNames.h"
    3334#include "Page.h"

  • trunk/Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h

    r222497 r235521  
    2929#include <gcrypt.h>
    3030#include <wtf/Assertions.h>
     31#include <wtf/Optional.h>
    3132
    3233namespace PAL {

  • trunk/Source/WebCore/SourcesCocoa.txt

    r235120 r235521  
    390390platform/ios/PlaybackSessionInterfaceAVKit.mm @no-unify
    391391platform/ios/QuickLook.mm
    392 platform/ios/QuickLookSoftLink.mm
     392platform/ios/QuickLookSoftLink.mm @no-unify
    393393platform/ios/RemoteCommandListenerIOS.mm
    394394platform/ios/ScrollAnimatorIOS.mm
    … …  
    400400platform/ios/ThemeIOS.mm @no-unify
    401401platform/ios/TileControllerMemoryHandlerIOS.cpp
    402 platform/ios/UserAgentIOS.mm
     402platform/ios/UserAgentIOS.mm @no-unify
    403403platform/ios/ValidationBubbleIOS.mm @no-unify
    404404platform/ios/VideoFullscreenInterfaceAVKit.mm @no-unify

  • trunk/Source/WebCore/SourcesGTK.txt

    r232796 r235521  
    6262platform/geoclue/GeolocationProviderGeoclue.cpp
    6363
    64 platform/graphics/GLContext.cpp
     64platform/graphics/GLContext.cpp @no-unify
    6565platform/graphics/GraphicsContext3DPrivate.cpp
    6666
    67 platform/graphics/cairo/BackingStoreBackendCairoX11.cpp
     67platform/graphics/cairo/BackingStoreBackendCairoX11.cpp @no-unify
    6868
    6969platform/graphics/egl/GLContextEGL.cpp
    7070platform/graphics/egl/GLContextEGLWayland.cpp @no-unify
    71 platform/graphics/egl/GLContextEGLX11.cpp
     71platform/graphics/egl/GLContextEGLX11.cpp @no-unify
    7272
    7373platform/graphics/glx/GLContextGLX.cpp
    … …  
    8383platform/graphics/wayland/PlatformDisplayWayland.cpp
    8484
    85 platform/graphics/x11/PlatformDisplayX11.cpp
    86 platform/graphics/x11/XErrorTrapper.cpp
    87 platform/graphics/x11/XUniqueResource.cpp
     85platform/graphics/x11/PlatformDisplayX11.cpp @no-unify
     86platform/graphics/x11/XErrorTrapper.cpp @no-unify
     87platform/graphics/x11/XUniqueResource.cpp @no-unify
    8888
    8989platform/gtk/DragDataGtk.cpp

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r235518 r235521  
    805805                2D8FEBDD143E3EF70072502B /* CSSCrossfadeValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */; };
    806806                2D9066070BE141D400956998 /* LayoutState.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D9066050BE141D400956998 /* LayoutState.h */; settings = {ATTRIBUTES = (Private, ); }; };
     807                2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */ = {isa = PBXBuildFile; fileRef = 443917FD1A91B2F8006E04F2 /* QuickLookSoftLink.mm */; };
     808                2D92A79D2134AF9500F493FD /* UserAgentIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = A3AF9D8320325691006CAD06 /* UserAgentIOS.mm */; };
    807809                2D93AEE319DF5641002A86C3 /* ServicesOverlayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D93AEE119DF5641002A86C3 /* ServicesOverlayController.h */; };
    808810                2D97F04719DD413C001EE9C3 /* MockPageOverlayClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DAAE32C19DCAF6000E002D2 /* MockPageOverlayClient.cpp */; };
    … …  
    3146031462                                CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
    3146131463                                CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,
     31464                                2D92A79A2134AD7900F493FD /* QuickLookSoftLink.mm in Sources */,
    3146231465                                419242492127B93E00634FCF /* RealtimeOutgoingVideoSourceCocoa.mm in Sources */,
    3146331466                                316DCB8A1E7A6996001B5F87 /* RTCIceTransport.cpp in Sources */,
    … …  
    3207432077                                2D8B92FE203D13E1009C868F /* UnifiedSource529.cpp in Sources */,
    3207532078                                2D8B92FF203D13E1009C868F /* UnifiedSource530.cpp in Sources */,
     32079                                2D92A79D2134AF9500F493FD /* UserAgentIOS.mm in Sources */,
    3207632080                                532042021F9A9F1000B81B2A /* UserAgentScriptsData.cpp in Sources */,
    3207732081                                7C3B79711908757B00B47A2D /* UserMessageHandler.cpp in Sources */,

  • trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmECDSA.cpp

    r233898 r235521  
    3737namespace WebCore {
    3838
     39namespace CryptoAlgorithmECDSAInternal {
    3940static const char* const ALG256 = "ES256";
    4041static const char* const ALG384 = "ES384";
    … …  
    4344static const char* const P384 = "P-384";
    4445static const char* const P521 = "P-521";
     46}
    4547
    4648Ref<CryptoAlgorithm> CryptoAlgorithmECDSA::create()
    … …  
    103105void CryptoAlgorithmECDSA::importKey(CryptoKeyFormat format, KeyData&& data, const CryptoAlgorithmParameters& parameters, bool extractable, CryptoKeyUsageBitmap usages, KeyCallback&& callback, ExceptionCallback&& exceptionCallback)
    104106{
     107    using namespace CryptoAlgorithmECDSAInternal;
    105108    const auto& ecParameters = downcast<CryptoAlgorithmEcKeyParams>(parameters);
    106109

  • trunk/Source/WebCore/crypto/gcrypt/GCryptUtilities.h

    r233247 r235521  
    3535#include <pal/crypto/gcrypt/Handle.h>
    3636#include <pal/crypto/gcrypt/Utilities.h>
     37#include <wtf/Optional.h>
    3738
    3839namespace WebCore {

  • trunk/Source/WebCore/dom/Document.h

    r235424 r235521  
    642642    WEBCORE_EXPORT DocumentLoader* loader() const;
    643643
    644     WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstWindow, const String& url, const AtomicString& name, const String& features);
     644    WEBCORE_EXPORT ExceptionOr<RefPtr<WindowProxy>> openForBindings(DOMWindow& activeWindow, DOMWindow& firstDOMWindow, const String& url, const AtomicString& name, const String& features);
    645645    WEBCORE_EXPORT ExceptionOr<Document&> openForBindings(Document* responsibleDocument, const String& type, const String& replace);
    646646

  • trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

    r233572 r235521  
    3333#include "HTMLFormControlElement.h"
    3434#include "HTMLFormElement.h"
     35#include "HTMLInputElement.h"
    3536#include "HTMLOptGroupElement.h"
    3637#include "HTMLOptionElement.h"

  • trunk/Source/WebCore/loader/appcache/ApplicationCacheResourceLoader.h

    r229675 r235521  
    2626#pragma once
    2727
     28#include "ApplicationCacheResource.h"
    2829#include "CachedRawResource.h"
    2930#include "CachedRawResourceClient.h"

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

    r223728 r235521  
    2929#include <wtf/Vector.h>
    3030#include <wtf/text/WTFString.h>
    31 
    32 #if PLATFORM(MAC)
    33 // Some platforms provide UI for suggesting alternative dictation text.
    34 #define USE_DICTATION_ALTERNATIVES 1
    35 #endif
    3631
    3732namespace WebCore {

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

    r235011 r235521  
    339339extern const char* const WebArchivePboardType;
    340340extern const char* const WebURLNamePboardType;
     341extern const char* const WebURLsWithTitlesPboardType;
    341342#endif
    342343

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

    r234743 r235521  
    3434#include <CoreAudio/AudioHardware.h>
    3535#include <wtf/MainThread.h>
     36#include <wtf/text/WTFString.h>
    3637
    3738namespace WebCore {

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

    r233512 r235521  
    3131#include "DisplayRefreshMonitorClient.h"
    3232#include "DisplayRefreshMonitorManager.h"
     33#include "Logging.h"
    3334
    3435#if PLATFORM(IOS)

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

    r218421 r235521  
    2828
    2929#include "FontSelector.h"
     30#include <wtf/text/AtomicStringHash.h>
    3031
    3132namespace WebCore {

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

    r167811 r235521  
    3030#include <wtf/HashMap.h>
    3131#include <wtf/text/AtomicString.h>
     32#include <wtf/text/AtomicStringHash.h>
    3233
    3334namespace WebCore {

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

    r220503 r235521  
    2828#include "FontTaggedSettings.h"
    2929
     30#include <wtf/text/AtomicStringHash.h>
    3031#include <wtf/text/TextStream.h>
    31 
    32 #include <wtf/text/AtomicStringHash.h>
    3332
    3433namespace WebCore {

  • trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp

    r228821 r235521  
    3535
    3636#include "AffineTransform.h"
     37#include "CairoOperations.h"
    3738#include "CairoUtilities.h"
    3839#include "Font.h"

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

    r232501 r235521  
    4343#endif
    4444
    45 using namespace WebCore;
    46 
    4745@implementation WebGLLayer
    4846
    4947@synthesize context=_context;
    5048
    51 -(id)initWithGraphicsContext3D:(GraphicsContext3D*)context
     49-(id)initWithGraphicsContext3D:(WebCore::GraphicsContext3D*)context
    5250{
    5351    _context = context;
    … …  
    8785#endif
    8886
    89 -(CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
     87- (CGImageRef)copyImageSnapshotWithColorSpace:(CGColorSpaceRef)colorSpace
    9088{
    9189    if (!_context)
    … …  
    9795    RetainPtr<CGColorSpaceRef> imageColorSpace = colorSpace;
    9896    if (!imageColorSpace)
    99         imageColorSpace = sRGBColorSpaceRef();
     97        imageColorSpace = WebCore::sRGBColorSpaceRef();
    10098
    10199    CGRect layerBounds = CGRectIntegral([self bounds]);
    … …  
    142140
    143141    _context->markLayerComposited();
    144     PlatformCALayer* layer = PlatformCALayer::platformCALayer((__bridge void*)self);
     142    WebCore::PlatformCALayer* layer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
    145143    if (layer && layer->owner())
    146144        layer->owner()->platformCALayerLayerDidDisplay(layer);
    … …  
    148146
    149147#if USE(OPENGL)
    150 - (void)allocateIOSurfaceBackingStoreWithSize:(IntSize)size usingAlpha:(BOOL)usingAlpha
     148- (void)allocateIOSurfaceBackingStoreWithSize:(WebCore::IntSize)size usingAlpha:(BOOL)usingAlpha
    151149{
    152150    _bufferSize = size;
    153151    _usingAlpha = usingAlpha;
    154     _contentsBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
    155     _drawingBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
    156     _spareBuffer = WebCore::IOSurface::create(size, sRGBColorSpaceRef());
     152    _contentsBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
     153    _drawingBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
     154    _spareBuffer = WebCore::IOSurface::create(size, WebCore::sRGBColorSpaceRef());
    157155
    158156    ASSERT(_contentsBuffer);

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

    r219050 r235521  
    3535#import <wtf/RetainPtr.h>
    3636
    37 using namespace WebCore;
    38 
    3937@implementation WebGPULayer
    4038
    4139@synthesize context=_context;
    4240
    43 - (id)initWithGPUDevice:(GPUDevice*)context
     41- (id)initWithGPUDevice:(WebCore::GPUDevice*)context
    4442{
    4543    self = [super init];
    … …  
    5149#if PLATFORM(MAC)
    5250    self.contentsScale = _devicePixelRatio;
    53     self.colorspace = sRGBColorSpaceRef();
     51    self.colorspace = WebCore::sRGBColorSpaceRef();
    5452#endif
    5553    return self;

  • trunk/Source/WebCore/platform/graphics/metal/GPUCommandQueueMetal.mm

    r234258 r235521  
    3232#import "Logging.h"
    3333#import <Metal/Metal.h>
     34#import <wtf/text/WTFString.h>
    3435
    3536namespace WebCore {

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

    r234930 r235521  
    5353const char* const WebArchivePboardType = "Apple Web Archive pasteboard type";
    5454const char* const WebURLNamePboardType = "public.url-name";
     55const char* const WebURLsWithTitlesPboardType = "WebURLsWithTitlesPboardType";
    5556
    5657const char WebSmartPastePboardType[] = "NeXT smart paste pasteboard type";
    5758const char WebURLPboardType[] = "public.url";
    58 const char WebURLsWithTitlesPboardType[] = "WebURLsWithTitlesPboardType";
    5959
    6060static const Vector<String> writableTypesForURL()

  • trunk/Source/WebCore/platform/mediastream/mac/DisplayCaptureManagerCocoa.cpp

    r234146 r235521  
    2929#if ENABLE(MEDIA_STREAM)
    3030
     31#include "CoreVideoSoftLink.h"
    3132#include "Logging.h"
    3233#include <wtf/Algorithms.h>

  • trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

    r233668 r235521  
    3030#include "PublicSuffix.h"
    3131#include "ResourceRequest.h"
     32#include "ResourceResponse.h"
    3233#include "SecurityPolicy.h"
    3334#include <wtf/PointerComparison.h>

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

    r235363 r235521  
    4343#include <wtf/Threading.h>
    4444
    45 #if PLATFORM(IOS) && !PLATFORM(IOSMAC)
    46 static const SInt32 fnfErr = -43;
    47 #elif PLATFORM(MAC)
    48 #include <CoreServices/CoreServices.h>
    49 #endif
     45static const SInt32 fileNotFoundError = -43;
    5046
    5147#if PLATFORM(COCOA)
    … …  
    242238        ENOENT;
    243239#else
    244         fnfErr;
     240        fileNotFoundError;
    245241#endif
    246242    return opened;

  • trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h

    r231876 r235521  
    2727#define SoupNetworkSession_h
    2828
     29#include <gio/gio.h>
    2930#include <glib-object.h>
    3031#include <pal/SessionID.h>

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

    r225618 r235521  
    3030#include <wtf/text/CString.h>
    3131#include <wtf/text/StringBuffer.h>
     32#include <wtf/text/WTFString.h>
    3233#include <wtf/unicode/CharacterNames.h>
    3334

  • trunk/Source/WebCore/platform/text/TextCodecUTF8.h

    r225618 r235521  
    2727
    2828#include "TextCodec.h"
     29#include <unicode/utf8.h>
    2930#include <wtf/text/LChar.h>
    3031

  • trunk/Source/WebCore/rendering/updating/RenderTreeBuilderBlockFlow.cpp

    r228938 r235521  
    2828
    2929#include "RenderMultiColumnFlow.h"
     30#include "RenderTreeBuilderBlock.h"
     31#include "RenderTreeBuilderMultiColumn.h"
    3032
    3133namespace WebCore {

  • trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp

    r228938 r235521  
    2929#include "RenderButton.h"
    3030#include "RenderMenuList.h"
     31#include "RenderTreeBuilderBlock.h"
    3132
    3233namespace WebCore {

  • trunk/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp

    r232178 r235521  
    3131#include "RenderInline.h"
    3232#include "RenderTable.h"
     33#include "RenderTreeBuilderMultiColumn.h"
     34#include "RenderTreeBuilderTable.h"
    3335
    3436namespace WebCore {

  • trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp

    r232178 r235521  
    2727#include "RenderTreeBuilderRuby.h"
    2828
     29#include "RenderAncestorIterator.h"
    2930#include "RenderRuby.h"
    3031#include "RenderRubyBase.h"

  • trunk/Source/WebCore/rendering/updating/RenderTreeUpdater.cpp

    r234109 r235521  
    4242#include "RenderFullScreen.h"
    4343#include "RenderInline.h"
     44#include "RenderMultiColumnFlow.h"
     45#include "RenderMultiColumnSet.h"
    4446#include "RenderTreeUpdaterGeneratedContent.h"
    4547#include "RuntimeEnabledFeatures.h"

  • trunk/Source/WebKit/ChangeLog

    r235520 r235521  
     12018-08-30  Tim Horton  <timothy_horton@apple.com>
     2
     3        Bundle unified sources more tightly in projects with deep directory structures
     4        https://bugs.webkit.org/show_bug.cgi?id=189009
     5
     6        Reviewed by Simon Fraser.
     7
     8        Fix a variety of unification errors due to reshuffling the bundles.
     9
     10        * Shared/APIWebArchive.mm:
     11        * Shared/APIWebArchiveResource.mm:
     12        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
     13        * Shared/Plugins/Netscape/mac/PluginInformationMac.mm:
     14        * SourcesCocoa.txt:
     15        * SourcesGTK.txt:
     16        * UIProcess/API/APIAutomationSessionClient.h:
     17        (API::AutomationSessionClient::sessionIdentifier const):
     18        (API::AutomationSessionClient::messageOfCurrentJavaScriptDialogOnPage):
     19        (API::AutomationSessionClient::setUserInputForCurrentJavaScriptPromptOnPage):
     20        * UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm:
     21        (-[WKCustomProtocolLoader initWithLegacyCustomProtocolManagerProxy:customProtocolID:request:]):
     22        (-[WKCustomProtocolLoader connection:didFailWithError:]):
     23        (-[WKCustomProtocolLoader connection:didReceiveResponse:]):
     24        * UIProcess/Plugins/PluginProcessProxy.cpp:
     25        (WebKit::generatePluginProcessCallbackID):
     26        (WebKit::PluginProcessProxy::fetchWebsiteData):
     27        (WebKit::PluginProcessProxy::deleteWebsiteData):
     28        (WebKit::PluginProcessProxy::deleteWebsiteDataForHostNames):
     29        (WebKit::generateCallbackID): Deleted.
     30        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
     31        (-[WKScrollingNodeScrollViewDelegate scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
     32        * UIProcess/Storage/StorageProcessProxy.cpp:
     33        (WebKit::generateStorageProcessCallbackID):
     34        (WebKit::StorageProcessProxy::fetchWebsiteData):
     35        (WebKit::StorageProcessProxy::deleteWebsiteData):
     36        (WebKit::StorageProcessProxy::deleteWebsiteDataForOrigins):
     37        (WebKit::generateCallbackID): Deleted.
     38        * WebKit.xcodeproj/project.pbxproj:
     39        * WebProcess/Plugins/PDF/PDFPlugin.mm:
     40        (-[WKPDFPluginAccessibilityObject accessibilityPerformAction:]):
     41        (-[WKPDFPluginAccessibilityObject accessibilityFocusedUIElement]):
     42        (-[WKPDFPluginAccessibilityObject accessibilityAssociatedControlForAnnotation:]):
     43        (-[WKPDFPluginAccessibilityObject accessibilityHitTest:]):
     44        (-[WKPDFLayerControllerDelegate updateScrollPosition:]):
     45        (WebKit::PDFPlugin::updateCursor):
     46        (WebKit::coreCursor):
     47        (appendValuesInPDFNameSubtreeToVector): Deleted.
     48        (getAllValuesInPDFNameTree): Deleted.
     49        (getAllScriptsInPDFDocument): Deleted.
     50
    1512018-08-30  Tim Horton  <timothy_horton@apple.com>
    252

  • trunk/Source/WebKit/Shared/APIWebArchive.mm

    r235006 r235521  
    3535#include <wtf/RetainPtr.h>
    3636
     37namespace API {
    3738using namespace WebCore;
    38 
    39 namespace API {
    4039
    4140Ref<WebArchive> WebArchive::create(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives)

  • trunk/Source/WebKit/Shared/APIWebArchiveResource.mm

    r235006 r235521  
    3434#include <wtf/RetainPtr.h>
    3535
     36namespace API {
    3637using namespace WebCore;
    37 
    38 namespace API {
    3938
    4039Ref<WebArchiveResource> WebArchiveResource::create(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)

  • trunk/Source/WebKit/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

    r234278 r235521  
    3535#import <wtf/spi/cf/CFBundleSPI.h>
    3636
     37namespace WebKit {
    3738using namespace WebCore;
    38 
    39 namespace WebKit {
    4039
    4140static bool getPluginArchitecture(CFBundleRef bundle, PluginModuleInfo& plugin)

  • trunk/Source/WebKit/Shared/Plugins/Netscape/mac/PluginInformationMac.mm

    r204462 r235521  
    3535#import <WebCore/PluginBlacklist.h>
    3636
     37namespace WebKit {
    3738using namespace WebCore;
    38 
    39 namespace WebKit {
    4039
    4140void getPlatformPluginModuleInformation(const PluginModuleInfo& plugin, API::Dictionary::MapType& map)

  • trunk/Source/WebKit/SourcesCocoa.txt

    r235265 r235521  
    299299UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm
    300300
    301 UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm
    302 
    303 UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm
     301UIProcess/ApplePay/ios/WebPaymentCoordinatorProxyIOS.mm @no-unify
     302
     303UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm @no-unify
    304304
    305305UIProcess/Authentication/cocoa/AuthenticationChallengeProxyCocoa.mm

  • trunk/Source/WebKit/SourcesGTK.txt

    r235098 r235521  
    208208UIProcess/linux/MemoryPressureMonitor.cpp
    209209
    210 UIProcess/Plugins/gtk/PluginInfoCache.cpp
    211 
    212 UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
     210UIProcess/Plugins/gtk/PluginInfoCache.cpp @no-unify
     211
     212UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp @no-unify
    213213UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp @no-unify
    214214
    … …  
    217217UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
    218218
    219 UIProcess/cairo/BackingStoreCairo.cpp
     219UIProcess/cairo/BackingStoreCairo.cpp @no-unify
    220220
    221221UIProcess/glib/RemoteInspectorClient.cpp
    … …  
    230230UIProcess/gtk/GestureController.cpp
    231231UIProcess/gtk/HardwareAccelerationManager.cpp
    232 UIProcess/gtk/InputMethodFilter.cpp
     232UIProcess/gtk/InputMethodFilter.cpp @no-unify
    233233UIProcess/gtk/KeyBindingTranslator.cpp
    234234UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp @no-unify
    235235UIProcess/gtk/TextCheckerGtk.cpp @no-unify
    236236UIProcess/gtk/WaylandCompositor.cpp @no-unify
    237 UIProcess/gtk/WebColorPickerGtk.cpp
     237UIProcess/gtk/WebColorPickerGtk.cpp @no-unify
    238238UIProcess/gtk/WebContextMenuProxyGtk.cpp
    239239UIProcess/gtk/WebInspectorProxyGtk.cpp
    240240UIProcess/gtk/WebKitInspectorWindow.cpp
    241 UIProcess/gtk/WebPageProxyGtk.cpp
     241UIProcess/gtk/WebPageProxyGtk.cpp @no-unify
    242242UIProcess/gtk/WebPasteboardProxyGtk.cpp
    243243UIProcess/gtk/WebPopupMenuProxyGtk.cpp

  • trunk/Source/WebKit/UIProcess/API/APIAutomationSessionClient.h

    r232150 r235521  
    5252    virtual ~AutomationSessionClient() { }
    5353
    54     virtual String sessionIdentifier() const { return String(); }
     54    virtual WTF::String sessionIdentifier() const { return WTF::String(); }
    5555    virtual void didDisconnectFromRemote(WebKit::WebAutomationSession&) { }
    5656    virtual void requestNewPageWithOptions(WebKit::WebAutomationSession&, AutomationSessionBrowsingContextOptions, CompletionHandler<void(WebKit::WebPageProxy*)>&& completionHandler) { completionHandler(nullptr); }
    … …  
    6262    virtual void dismissCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { }
    6363    virtual void acceptCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { }
    64     virtual String messageOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return String(); }
    65     virtual void setUserInputForCurrentJavaScriptPromptOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, const String&) { }
     64    virtual WTF::String messageOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return WTF::String(); }
     65    virtual void setUserInputForCurrentJavaScriptPromptOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&, const WTF::String&) { }
    6666    virtual std::optional<JavaScriptDialogType> typeOfCurrentJavaScriptDialogOnPage(WebKit::WebAutomationSession&, WebKit::WebPageProxy&) { return std::nullopt; }
    6767};

  • trunk/Source/WebKit/UIProcess/Cocoa/LegacyCustomProtocolManagerClient.mm

    r233668 r235521  
    3333#import <WebCore/ResourceResponse.h>
    3434
    35 using namespace WebCore;
    36 using namespace WebKit;
    37 
    3835@interface WKCustomProtocolLoader : NSObject <NSURLConnectionDelegate> {
    3936@private
    40     LegacyCustomProtocolManagerProxy* _customProtocolManagerProxy;
     37    WebKit::LegacyCustomProtocolManagerProxy* _customProtocolManagerProxy;
    4138    uint64_t _customProtocolID;
    4239    NSURLCacheStoragePolicy _storagePolicy;
    4340    NSURLConnection *_urlConnection;
    4441}
    45 - (id)initWithLegacyCustomProtocolManagerProxy:(LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request;
     42- (id)initWithLegacyCustomProtocolManagerProxy:(WebKit::LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request;
    4643- (void)customProtocolManagerProxyDestroyed;
    4744@end
    … …  
    4946@implementation WKCustomProtocolLoader
    5047
    51 - (id)initWithLegacyCustomProtocolManagerProxy:(LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request
     48- (id)initWithLegacyCustomProtocolManagerProxy:(WebKit::LegacyCustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request
    5249{
    5350    self = [super init];
    … …  
    8683- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
    8784{
    88     ResourceError coreError(error);
     85    WebCore::ResourceError coreError(error);
    8986    _customProtocolManagerProxy->didFailWithError(_customProtocolID, coreError);
    9087    _customProtocolManagerProxy->stopLoading(_customProtocolID);
    … …  
    10097- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
    10198{
    102     ResourceResponse coreResponse(response);
     99    WebCore::ResourceResponse coreResponse(response);
    103100    _customProtocolManagerProxy->didReceiveResponse(_customProtocolID, coreResponse, _storagePolicy);
    104101}
    … …  
    128125
    129126namespace WebKit {
     127using namespace WebCore;
    130128
    131129void LegacyCustomProtocolManagerClient::startLoading(LegacyCustomProtocolManagerProxy& manager, uint64_t customProtocolID, const ResourceRequest& coreRequest)

  • trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.cpp

    r235265 r235521  
    4949static const Seconds snapshottingShutdownTimeout { 15_s };
    5050
    51 static uint64_t generateCallbackID()
     51static uint64_t generatePluginProcessCallbackID()
    5252{
    5353    static uint64_t callbackID;
    … …  
    115115void PluginProcessProxy::fetchWebsiteData(CompletionHandler<void (Vector<String>)>&& completionHandler)
    116116{
    117     uint64_t callbackID = generateCallbackID();
     117    uint64_t callbackID = generatePluginProcessCallbackID();
    118118    m_pendingFetchWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
    119119
    … …  
    128128void PluginProcessProxy::deleteWebsiteData(WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
    129129{
    130     uint64_t callbackID = generateCallbackID();
     130    uint64_t callbackID = generatePluginProcessCallbackID();
    131131    m_pendingDeleteWebsiteDataCallbacks.set(callbackID, WTFMove(completionHandler));
    132132
    … …  
    141141void PluginProcessProxy::deleteWebsiteDataForHostNames(const Vector<String>& hostNames, CompletionHandler<void ()>&& completionHandler)
    142142{
    143     uint64_t callbackID = generateCallbackID();
     143    uint64_t callbackID = generatePluginProcessCallbackID();
    144144    m_pendingDeleteWebsiteDataForHostNamesCallbacks.set(callbackID, WTFMove(completionHandler));
    145145

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm

    r228264 r235521  
    4444#endif
    4545
    46 using namespace WebCore;
    47 
    4846@implementation WKScrollingNodeScrollViewDelegate
    4947
    … …  
    8179    if (!_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets().isEmpty()) {
    8280        unsigned index;
    83         float potentialSnapPosition = closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsetRanges(), horizontalTarget, velocity.x, index);
     81        float potentialSnapPosition = WebCore::closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().horizontalSnapOffsetRanges(), horizontalTarget, velocity.x, index);
    8482        _scrollingTreeNodeDelegate->scrollingNode().setCurrentHorizontalSnapPointIndex(index);
    8583        if (horizontalTarget >= 0 && horizontalTarget <= scrollView.contentSize.width)
    … …  
    8987    if (!_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets().isEmpty()) {
    9088        unsigned index;
    91         float potentialSnapPosition = closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsetRanges(), verticalTarget, velocity.y, index);
     89        float potentialSnapPosition = WebCore::closestSnapOffset(_scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsets(), _scrollingTreeNodeDelegate->scrollingNode().verticalSnapOffsetRanges(), verticalTarget, velocity.y, index);
    9290        _scrollingTreeNodeDelegate->scrollingNode().setCurrentVerticalSnapPointIndex(index);
    9391        if (verticalTarget >= 0 && verticalTarget <= scrollView.contentSize.height)
    … …  
    123121
    124122namespace WebKit {
     123using namespace WebCore;
    125124
    126125ScrollingTreeScrollingNodeDelegateIOS::ScrollingTreeScrollingNodeDelegateIOS(ScrollingTreeScrollingNode& scrollingNode)

  • trunk/Source/WebKit/UIProcess/Storage/StorageProcessProxy.cpp

    r235265 r235521  
    3838using namespace WebCore;
    3939
    40 static uint64_t generateCallbackID()
     40static uint64_t generateStorageProcessCallbackID()
    4141{
    4242    static uint64_t callbackID;
    … …  
    106106    ASSERT(canSendMessage());
    107107
    108     uint64_t callbackID = generateCallbackID();
     108    uint64_t callbackID = generateStorageProcessCallbackID();
    109109    m_pendingFetchWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
    110110
    … …  
    114114void StorageProcessProxy::deleteWebsiteData(PAL::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, WallTime modifiedSince, CompletionHandler<void ()>&& completionHandler)
    115115{
    116     auto callbackID = generateCallbackID();
     116    auto callbackID = generateStorageProcessCallbackID();
    117117
    118118    m_pendingDeleteWebsiteDataCallbacks.add(callbackID, WTFMove(completionHandler));
    … …  
    124124    ASSERT(canSendMessage());
    125125
    126     uint64_t callbackID = generateCallbackID();
     126    uint64_t callbackID = generateStorageProcessCallbackID();
    127127    m_pendingDeleteWebsiteDataForOriginsCallbacks.add(callbackID, WTFMove(completionHandler));
    128128

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

    r235489 r235521  
    6363#include "WebPaymentCoordinatorProxy.h"
    6464#include "WebPreferences.h"
    65 #include <WebCore/AlternativeTextClient.h> // FIXME: Needed by WebPageProxyMessages.h for DICTATION_ALTERNATIVES.
    6665#include "WebPageProxyMessages.h"
    6766#include "WebPopupMenuProxy.h"

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r235489 r235521  
    760760                2D92A796212B6ADA00F493FD /* NetscapePluginModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A9C5312B816CF008FE984 /* NetscapePluginModule.cpp */; };
    761761                2D92A797212B6ADA00F493FD /* PluginInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3F8C8E173AF52D007B7F39 /* PluginInformation.cpp */; };
     762                2D92A79821348D8500F493FD /* WebPaymentCoordinatorProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F77D1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyMac.mm */; };
     763                2D92A79F2134B07E00F493FD /* WebPaymentCoordinatorProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F77B1D1B30A9007C9BD1 /* WebPaymentCoordinatorProxyIOS.mm */; };
    762764                2D931169212F61B200044BFE /* WKContentView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E3D18BBE044000FCFC9 /* WKContentView.mm */; };
    763765                2D93116A212F61B500044BFE /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
    … …  
    1124911251                                7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */,
    1125011252                                1AB1F7961D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp in Sources */,
     11253                                2D92A79F2134B07E00F493FD /* WebPaymentCoordinatorProxyIOS.mm in Sources */,
     11254                                2D92A79821348D8500F493FD /* WebPaymentCoordinatorProxyMac.mm in Sources */,
    1125111255                                1AB1F7981D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp in Sources */,
    1125211256                                2D92A78D212B6AB100F493FD /* WebPlatformTouchPoint.cpp in Sources */,

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm

    r235365 r235521  
    8989#import <wtf/UUID.h>
    9090
    91 using namespace WebCore;
    92 
    9391// Set overflow: hidden on the annotation container so <input> elements scrolled out of view don't show
    9492// scrollbars on the body. We can't add annotations directly to the body, because overflow: hidden on the body
    … …  
    291289{
    292290    if ([action isEqualToString:NSAccessibilityShowMenuAction])
    293         _pdfPlugin->showContextMenuAtPoint(IntRect(IntPoint(), _pdfPlugin->size()).center());
     291        _pdfPlugin->showContextMenuAtPoint(WebCore::IntRect(WebCore::IntPoint(), _pdfPlugin->size()).center());
    294292}
    295293
    … …  
    317315#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    318316    if (WebKit::PDFPluginAnnotation* activeAnnotation = _pdfPlugin->activeAnnotation()) {
    319         if (AXObjectCache* existingCache = _pdfPlugin->axObjectCache()) {
    320             if (AccessibilityObject* object = existingCache->getOrCreate(activeAnnotation->element()))
     317        if (WebCore::AXObjectCache* existingCache = _pdfPlugin->axObjectCache()) {
     318            if (WebCore::AccessibilityObject* object = existingCache->getOrCreate(activeAnnotation->element()))
    321319#pragma clang diagnostic push
    322320#pragma clang diagnostic ignored "-Wdeprecated-declarations"
    … …  
    339337        return nil;
    340338   
    341     AXObjectCache* cache = _pdfPlugin->axObjectCache();
     339    WebCore::AXObjectCache* cache = _pdfPlugin->axObjectCache();
    342340    if (!cache)
    343341        return nil;
    344342   
    345     AccessibilityObject* object = cache->getOrCreate(activeAnnotation->element());
     343    WebCore::AccessibilityObject* object = cache->getOrCreate(activeAnnotation->element());
    346344    if (!object)
    347345        return nil;
    … …  
    354352{
    355353#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
    356     point = _pdfPlugin->convertFromRootViewToPDFView(IntPoint(point));
     354    point = _pdfPlugin->convertFromRootViewToPDFView(WebCore::IntPoint(point));
    357355    return [_pdfLayerController accessibilityHitTest:point];
    358356#else
    … …  
    422420- (void)updateScrollPosition:(CGPoint)newPosition
    423421{
    424     _pdfPlugin->notifyScrollPositionChanged(IntPoint(newPosition));
     422    _pdfPlugin->notifyScrollPositionChanged(WebCore::IntPoint(newPosition));
    425423}
    426424
    … …  
    500498- (PDFPage *)pageNearestPoint:(NSPoint)point currentPage:(PDFPage *)currentPage;
    501499@end
     500
     501namespace WebKit {
     502using namespace WebCore;
     503using namespace HTMLNames;
    502504
    503505static const char* postScriptMIMEType = "application/postscript";
    … …  
    596598    }
    597599}
    598 
    599 namespace WebKit {
    600 using namespace HTMLNames;
    601600
    602601Ref<PDFPlugin> PDFPlugin::create(WebFrame& frame)
    … …  
    14511450        return;
    14521451
    1453     webFrame()->page()->send(Messages::WebPageProxy::SetCursor(hitTestResult == Text ? iBeamCursor() : pointerCursor()));
     1452    webFrame()->page()->send(Messages::WebPageProxy::SetCursor(hitTestResult == Text ? WebCore::iBeamCursor() : WebCore::pointerCursor()));
    14541453    m_lastHitTestResult = hitTestResult;
    14551454}
    … …  
    19821981}
    19831982
    1984 static const Cursor& coreCursor(PDFLayerControllerCursorType type)
     1983static const WebCore::Cursor& coreCursor(PDFLayerControllerCursorType type)
    19851984{
    19861985    switch (type) {
    19871986    case kPDFLayerControllerCursorTypeHand:
    1988         return handCursor();
     1987        return WebCore::handCursor();
    19891988    case kPDFLayerControllerCursorTypeIBeam:
    1990         return iBeamCursor();
     1989        return WebCore::iBeamCursor();
    19911990    case kPDFLayerControllerCursorTypePointer:
    19921991    default:
    1993         return pointerCursor();
     1992        return WebCore::pointerCursor();
    19941993    }
    19951994}
Note: See TracChangeset for help on using the changeset viewer.