Changeset 160028 in webkit


Ignore:
Timestamp:
Dec 3, 2013 12:12:09 PM (10 years ago)
Author:
andersca@apple.com
Message:

Remove old WebKit::APIClient cruft
​https://bugs.webkit.org/show_bug.cgi?id=125173

Reviewed by Antti Koivisto.

  • Shared/APIClient.h:
  • Shared/APIClientTraits.cpp: Removed.
  • Shared/APIClientTraits.h: Removed.
  • WebKit2.xcodeproj/project.pbxproj:
  • WebProcess/Plugins/PDF/PDFPlugin.mm:
Location:
trunk/Source/WebKit2
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160026 r160028  
     12013-12-03  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove old WebKit::APIClient cruft
     4        https://bugs.webkit.org/show_bug.cgi?id=125173
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * Shared/APIClient.h:
     9        * Shared/APIClientTraits.cpp: Removed.
     10        * Shared/APIClientTraits.h: Removed.
     11        * WebKit2.xcodeproj/project.pbxproj:
     12        * WebProcess/Plugins/PDF/PDFPlugin.mm:
     13
    1142013-12-03  Enrica Casucci  <enrica@apple.com>
    215

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

    r160020 r160028  
    2727#define APIClient_h
    2828
    29 #include "APIClientTraits.h"
    3029#include <algorithm>
    3130#include <array>
    3231
    33 // FIXME: Transition all clients from WebKit::APIClient to API::Client.
    3432namespace API {
    3533
    … …  
    8583} // namespace API
    8684
    87 namespace WebKit {
    88 
    89 template<typename ClientInterface, int currentVersion> class APIClient {
    90 public:
    91     APIClient()
    92     {
    93         initialize(0);
    94     }
    95    
    96     void initialize(const ClientInterface* client)
    97     {
    98         COMPILE_ASSERT(sizeof(APIClientTraits<ClientInterface>::interfaceSizesByVersion) / sizeof(size_t) == currentVersion + 1, size_of_some_interfaces_are_unknown);
    99 
    100         if (client && client->version == currentVersion) {
    101             m_client = *client;
    102             return;
    103         }
    104 
    105         memset(&m_client, 0, sizeof(m_client));
    106 
    107         if (client && client->version < currentVersion)
    108             memcpy(&m_client, client, APIClientTraits<ClientInterface>::interfaceSizesByVersion[client->version]);
    109     }
    110 
    111     const ClientInterface& client() const { return m_client; }
    112 
    113 protected:
    114     ClientInterface m_client;
    115 };
    116 
    117 } // namespace WebKit
    118 
    11985#endif // APIClient_h

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

    r159992 r160028  
    675675                5272B28B1406985D0096A5D0 /* StatisticsData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5272B2891406985D0096A5D0 /* StatisticsData.h */; };
    676676                5D1A239115E75B220023E981 /* webkit2 in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 5D1A238E15E75AD50023E981 /* webkit2 */; };
    677                 5D51845513BCF9CC00C7FF4A /* APIClientTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D51845313BCF9CC00C7FF4A /* APIClientTraits.cpp */; };
    678                 5D51845613BCF9CC00C7FF4A /* APIClientTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D51845413BCF9CC00C7FF4A /* APIClientTraits.h */; };
    679677                5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */; };
    680678                5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */; };
    … …  
    22422240                5D1A238E15E75AD50023E981 /* webkit2 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = webkit2; sourceTree = "<group>"; };
    22432241                5D442A5516D5856700AC3331 /* PluginService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginService.entitlements; sourceTree = "<group>"; };
    2244                 5D51845313BCF9CC00C7FF4A /* APIClientTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIClientTraits.cpp; sourceTree = "<group>"; };
    2245                 5D51845413BCF9CC00C7FF4A /* APIClientTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIClientTraits.h; sourceTree = "<group>"; };
    22462242                5DA6ED081490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerEnvironmentExtractor.h; sourceTree = "<group>"; };
    22472243                5DA6ED091490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DynamicLinkerEnvironmentExtractor.mm; sourceTree = "<group>"; };
    … …  
    34063402                                BC64696E11DBE603006455B0 /* APIArray.h */,
    34073403                                1A3DD205125E5A2F004515E6 /* APIClient.h */,
    3408                                 5D51845313BCF9CC00C7FF4A /* APIClientTraits.cpp */,
    3409                                 5D51845413BCF9CC00C7FF4A /* APIClientTraits.h */,
    34103404                                B63403F814910D57001070B5 /* APIObject.cpp */,
    34113405                                BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
    … …  
    55845578                                1A3DD206125E5A2F004515E6 /* APIClient.h in Headers */,
    55855579                                1AC75380183BE50F0072CB15 /* DataReference.h in Headers */,
    5586                                 5D51845613BCF9CC00C7FF4A /* APIClientTraits.h in Headers */,
    55875580                                1AB474D8184D43FD0051B622 /* WKBundlePageLoaderClient.h in Headers */,
    55885581                                1AEFD27911D16C81008219D3 /* ArgumentCoder.h in Headers */,
    … …  
    69106903                                51E35200180F5D0F00E53BE9 /* DatabaseToWebProcessConnection.cpp in Sources */,
    69116904                                A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */,
    6912                                 5D51845513BCF9CC00C7FF4A /* APIClientTraits.cpp in Sources */,
    69136905                                B63403F914910D57001070B5 /* APIObject.cpp in Sources */,
    69146906                                1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */,

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

    r156688 r160028  
    3939#import "PDFPluginPasswordField.h"
    4040#import "PluginView.h"
     41#import "WKAccessibilityWebPageObject.h"
     42#import "WKPageFindMatchesClient.h"
    4143#import "WebContextMessages.h"
    4244#import "WebCoreArgumentCoders.h"
    … …  
    4648#import "WebPageProxyMessages.h"
    4749#import "WebProcess.h"
    48 #import "WKAccessibilityWebPageObject.h"
    4950#import <JavaScriptCore/JSContextRef.h>
    5051#import <JavaScriptCore/JSObjectRef.h>
Note: See TracChangeset for help on using the changeset viewer.