Changeset 168047 in webkit
- Timestamp:
- Apr 30, 2014 3:02:19 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 132 edited
- 2 copied
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r168043 r168047 1 2014-04-30 Anders Carlsson <andersca@apple.com> 2 3 Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework 4 https://bugs.webkit.org/show_bug.cgi?id=132399 5 <rdar://problem/15920046> 6 7 Reviewed by Dan Bernstein. 8 9 Allow WebKitLegacy to link against WebCore. 10 11 * Configurations/WebCore.xcconfig: 12 1 13 2014-04-30 David Hyatt <hyatt@apple.com> 2 14 -
trunk/Source/WebCore/Configurations/WebCore.xcconfig
r166965 r168047 74 74 OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface; 75 75 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt; 76 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 - framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;76 OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL; 77 77 78 78 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME)); -
trunk/Source/WebKit/ChangeLog
r167971 r168047 1 2014-04-30 Anders Carlsson <andersca@apple.com> 2 3 Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework 4 https://bugs.webkit.org/show_bug.cgi?id=132399 5 <rdar://problem/15920046> 6 7 Reviewed by Dan Bernstein. 8 9 * WebKit.xcodeproj/project.pbxproj: 10 Add a new build target that builds the legacy WebKit API in WebKitLegacy.framework. This framework 11 is then re-exported by WebKit.framework, and its headers are copied to WebKit.framework. All the WebKitLegacy 12 headers are made private, and the MigrateHeadersFromWebKitLegacy.make Makefile will copy all the headers specified 13 in WEBKIT_PUBLIC_HEADERS to WebKit/Headers. 14 1 15 2014-04-29 Alex Christensen <achristensen@webkit.org> 2 16 -
trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj
r166691 r168047 34 34 1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */; }; 35 35 1A6A208E1886154600E50F5F /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */; }; 36 1A739036190AE622002E3105 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739034190AE5D4002E3105 /* WebKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 37 1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A739037190AE674002E3105 /* WebKitPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 36 38 1A74A28E0F4F75400082E228 /* WebTextInputWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */; }; 37 39 1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; }; … … 61 63 1AB1DAC118BC0232004B6A9F /* WebViewGroup.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */; }; 62 64 1AB1DAC218BC0232004B6A9F /* WebViewGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */; }; 63 1AD7453C18D0D324006F3A1E /* WebKit Legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp*/; };65 1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AD7451218D0D24C006F3A1E /* WebKit.m */; }; 64 66 1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */; }; 65 67 1AEA66D50DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */; }; … … 164 166 9391F275121B38BD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F273121B38BD00EBF7E8 /* WebFrameNetworkingContext.h */; }; 165 167 9391F276121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */; }; 166 939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (P ublic, ); }; };167 939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (P ublic, ); }; };168 939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (P ublic, ); }; };168 939810110824BF01008DF038 /* WebBackForwardList.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607D020F50ED0ECA1767 /* WebBackForwardList.h */; settings = {ATTRIBUTES = (Private, ); }; }; 169 939810120824BF01008DF038 /* WebHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = F520FB190221DEFD01C1A525 /* WebHistory.h */; settings = {ATTRIBUTES = (Private, ); }; }; 170 939810130824BF01008DF038 /* WebHistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944607F020F50ED0ECA1767 /* WebHistoryItem.h */; settings = {ATTRIBUTES = (Private, ); }; }; 169 171 939810140824BF01008DF038 /* WebHistoryPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F5B92B820223191D01C1A525 /* WebHistoryPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 170 172 939810150824BF01008DF038 /* WebURLsWithTitles.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E0A76E02B8FEE401C1A525 /* WebURLsWithTitles.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 172 174 939810180824BF01008DF038 /* WebIconDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3E9031E91AD01CA2ACA /* WebIconDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; }; 173 175 939810190824BF01008DF038 /* WebIconDatabasePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = F528E3EB031E91AD01CA2ACA /* WebIconDatabasePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 174 9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (P ublic, ); }; };175 9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (P ublic, ); }; };176 9398101B0824BF01008DF038 /* WebKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 2568C72C0174912D0ECA149E /* WebKit.h */; settings = {ATTRIBUTES = (Private, ); }; }; 177 9398101C0824BF01008DF038 /* WebKitErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = F5927D4E02D26C5E01CA2DBB /* WebKitErrors.h */; settings = {ATTRIBUTES = (Private, ); }; }; 176 178 9398101D0824BF01008DF038 /* WebKitLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 93AEB17D032C1735008635CE /* WebKitLogging.h */; settings = {ATTRIBUTES = (); }; }; 177 179 9398101E0824BF01008DF038 /* WebKitNSStringExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7082F56F038EADAA00A80180 /* WebKitNSStringExtras.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 189 191 9398102E0824BF01008DF038 /* WebBasePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF46036652150000E506 /* WebBasePluginPackage.h */; }; 190 192 939810310824BF01008DF038 /* WebNetscapePluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F7171E0288493C018635CA /* WebNetscapePluginPackage.h */; }; 191 939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (P ublic, ); }; };192 939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (P ublic, ); }; };193 939810350824BF01008DF038 /* WebPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF840365FE6A00CA2ACA /* WebPlugin.h */; settings = {ATTRIBUTES = (Private, ); }; }; 194 939810360824BF01008DF038 /* WebPluginContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF850365FE6A00CA2ACA /* WebPluginContainer.h */; settings = {ATTRIBUTES = (Private, ); }; }; 193 195 939810370824BF01008DF038 /* WebPluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8467275C0367158500CA2ACA /* WebPluginController.h */; }; 194 196 939810380824BF01008DF038 /* WebPluginDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F717200288493C018635CA /* WebPluginDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; }; 195 197 939810390824BF01008DF038 /* WebPluginPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E4AF4B036659440000E506 /* WebPluginPackage.h */; }; 196 9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (P ublic, ); }; };198 9398103A0824BF01008DF038 /* WebPluginViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 848DFF860365FE6A00CA2ACA /* WebPluginViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; }; 197 199 939810420824BF01008DF038 /* WebJavaScriptTextInputPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */; settings = {ATTRIBUTES = (Private, ); }; }; 198 200 939810470824BF01008DF038 /* WebKitPrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C283730284676D018635CA /* WebKitPrefix.h */; }; 199 201 939810490824BF01008DF038 /* WebClipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 933D659903413FF2008635CE /* WebClipView.h */; }; 200 9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (P ublic, ); }; };202 9398104B0824BF01008DF038 /* WebDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446070020F50ED0ECA1767 /* WebDataSource.h */; settings = {ATTRIBUTES = (Private, ); }; }; 201 203 9398104C0824BF01008DF038 /* WebDataSourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446072020F50ED0ECA1767 /* WebDataSourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 202 204 9398104E0824BF01008DF038 /* WebDefaultContextMenuDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADD033FC50400CA2ACD /* WebDefaultContextMenuDelegate.h */; settings = {ATTRIBUTES = (); }; }; 203 205 9398104F0824BF01008DF038 /* WebDefaultPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FADF033FC50400CA2ACD /* WebDefaultPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 204 939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (P ublic, ); }; };206 939810500824BF01008DF038 /* WebDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */; settings = {ATTRIBUTES = (Private, ); }; }; 205 207 939810510824BF01008DF038 /* WebDynamicScrollBarsView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606B020F50ED0ECA1767 /* WebDynamicScrollBarsView.h */; settings = {ATTRIBUTES = (Private, ); }; }; 206 208 939810520824BF01008DF038 /* WebFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D81DAB203EB0B2D00A80166 /* WebFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 207 939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (P ublic, ); }; };209 939810530824BF01008DF038 /* WebFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 39446074020F50ED0ECA1767 /* WebFrame.h */; settings = {ATTRIBUTES = (Private, ); }; }; 208 210 939810540824BF01008DF038 /* WebFramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CF0E249021361B00ECA16EA /* WebFramePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 209 211 939810550824BF01008DF038 /* WebHTMLRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9202B6D4D80ACA2ACA /* WebHTMLRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 211 213 939810570824BF01008DF038 /* WebHTMLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9402B6D4D80ACA2ACA /* WebHTMLView.h */; settings = {ATTRIBUTES = (Private, ); }; }; 212 214 939810580824BF01008DF038 /* WebHTMLViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 35081D9602B6D4D80ACA2ACA /* WebHTMLViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 213 9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (P ublic, ); }; };214 9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (P ublic, ); }; };215 9398105B0824BF01008DF038 /* WebFrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5152FAE5033FC52200CA2ACD /* WebFrameLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 216 9398105D0824BF01008DF038 /* WebPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 3944606E020F50ED0ECA1767 /* WebPreferences.h */; settings = {ATTRIBUTES = (Private, ); }; }; 215 217 9398105E0824BF01008DF038 /* WebPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CAE9D070252A4130ECA16EA /* WebPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 216 218 9398105F0824BF01008DF038 /* WebRenderNode.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F81C3902B67C26018635CA /* WebRenderNode.h */; settings = {ATTRIBUTES = (Private, ); }; }; 217 939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (P ublic, ); }; };219 939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513D422E034CF55A00CA2ACD /* WebResourceLoadDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 218 220 939810630824BF01008DF038 /* WebHistoryItemInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 516F296F03A6C45A00CA2D3A /* WebHistoryItemInternal.h */; }; 219 221 939810640824BF01008DF038 /* WebFormDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D36FD5E03F78F9E00A80166 /* WebFormDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 222 224 939810670824BF01008DF038 /* CarbonWindowFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9403F9DBA103CA0DE6 /* CarbonWindowFrame.h */; }; 223 225 939810680824BF01008DF038 /* HIViewAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEE9A03F9DBA103CA0DE6 /* HIViewAdapter.h */; }; 224 939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (P ublic, ); }; };225 9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (P ublic, ); }; };226 939810690824BF01008DF038 /* HIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = F7EBEEAA03F9DBA103CA0DE6 /* HIWebView.h */; settings = {ATTRIBUTES = (Private, ); }; }; 227 9398106A0824BF01008DF038 /* CarbonUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F79B974804019934036909D2 /* CarbonUtils.h */; settings = {ATTRIBUTES = (Private, ); }; }; 226 228 9398106D0824BF01008DF038 /* WebKitErrorsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84CA5F7E042685E800CA2ACA /* WebKitErrorsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 227 9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (P ublic, ); }; };229 9398106E0824BF01008DF038 /* WebFrameView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B52E04282B5900CA2D3A /* WebFrameView.h */; settings = {ATTRIBUTES = (Private, ); }; }; 228 230 9398106F0824BF01008DF038 /* WebFrameViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B53204282BD200CA2D3A /* WebFrameViewInternal.h */; }; 229 939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (P ublic, ); }; };231 939810700824BF01008DF038 /* WebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B579042834F700CA2D3A /* WebView.h */; settings = {ATTRIBUTES = (Private, ); }; }; 230 232 939810710824BF01008DF038 /* WebViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A8B57D0428353A00CA2D3A /* WebViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 231 939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (P ublic, ); }; };233 939810720824BF01008DF038 /* WebPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9A0429392B00CA2D3A /* WebPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 232 234 939810730824BF01008DF038 /* WebPolicyDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 51443F9C0429392B00CA2D3A /* WebPolicyDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 233 939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (P ublic, ); }; };235 939810750824BF01008DF038 /* WebUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CC0458C86500CA2D3A /* WebUIDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 234 236 939810760824BF01008DF038 /* WebDefaultUIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E27CF0458CA4B00CA2D3A /* WebDefaultUIDelegate.h */; }; 235 939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (P ublic, ); }; };237 939810770824BF01008DF038 /* WebDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6578F5DE045F817400000128 /* WebDownload.h */; settings = {ATTRIBUTES = (Private, ); }; }; 236 238 939810790824BF01008DF038 /* WebLocalizableStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE18F990472B73200CA289C /* WebLocalizableStrings.h */; settings = {ATTRIBUTES = (Private, ); }; }; 237 239 9398107A0824BF01008DF038 /* WebKitSystemBits.h in Headers */ = {isa = PBXBuildFile; fileRef = BEE52D4A0473032500CA289C /* WebKitSystemBits.h */; }; … … 244 246 939810850824BF01008DF038 /* WebKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84723BE3056D719E0044BFEA /* WebKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; }; 245 247 939810870824BF01008DF038 /* WebNSPrintOperationExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = EDD1A5C605C83987008E3150 /* WebNSPrintOperationExtras.h */; }; 246 939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (P ublic, ); }; };248 939810880824BF01008DF038 /* WebResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311A1205EAAAF00088EDA4 /* WebResource.h */; settings = {ATTRIBUTES = (Private, ); }; }; 247 249 939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84311AF105EAB12B0088EDA4 /* WebResourcePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 248 250 9398108D0824BF01008DF038 /* WebDefaultEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE95BEE605FD0805006E1513 /* WebDefaultEditingDelegate.h */; }; 249 939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (P ublic, ); }; };250 9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (P ublic, ); }; };251 939810990824BF01008DF038 /* WebDOMOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 846171F90624AE5B0071A4A3 /* WebDOMOperations.h */; settings = {ATTRIBUTES = (Private, ); }; }; 252 9398109A0824BF01008DF038 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = 8373435A0624EE0D00F3B289 /* WebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; }; 251 253 9398109B0824BF01008DF038 /* WebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BB06275F640076701E /* WebViewInternal.h */; }; 252 254 9398109C0824BF01008DF038 /* WebFrameInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 930D02BD06275F710076701E /* WebFrameInternal.h */; }; 253 255 9398109D0824BF01008DF038 /* WebDOMOperationsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 84AE905F062DE6A80075BBF9 /* WebDOMOperationsPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 254 9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (P ublic, ); }; };256 9398109E0824BF01008DF038 /* WebEditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4FBECB0653DF47005EDE15 /* WebEditingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 255 257 939810A10824BF01008DF038 /* WebHTMLViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93185DB506679F42005D5E7E /* WebHTMLViewInternal.h */; }; 256 258 939810A20824BF01008DF038 /* WebNSObjectExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D1FE13067EB10B009CE68A /* WebNSObjectExtras.h */; }; … … 477 479 14D8252D0AF955090004F057 /* WebChromeClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebChromeClient.h; sourceTree = "<group>"; }; 478 480 14D8252E0AF955090004F057 /* WebChromeClient.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebChromeClient.mm; sourceTree = "<group>"; }; 481 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MigrateHeadersFromWebKitLegacy.make; sourceTree = "<group>"; }; 479 482 1A2DBE9D0F251E3A0036F8A6 /* ProxyInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProxyInstance.h; sourceTree = "<group>"; }; 480 483 1A2DBE9E0F251E3A0036F8A6 /* ProxyInstance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ProxyInstance.mm; sourceTree = "<group>"; }; … … 489 492 1A6A208B1886154600E50F5F /* WebProgressTrackerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProgressTrackerClient.mm; sourceTree = "<group>"; }; 490 493 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProgressTrackerClient.h; sourceTree = "<group>"; }; 494 1A739034190AE5D4002E3105 /* WebKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit.h; sourceTree = "<group>"; }; 495 1A739037190AE674002E3105 /* WebKitPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPrivate.h; sourceTree = "<group>"; }; 491 496 1A74A28C0F4F75400082E228 /* WebTextInputWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebTextInputWindowController.h; sourceTree = "<group>"; }; 492 497 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; }; … … 513 518 1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; }; 514 519 1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; }; 515 1AD7451218D0D24C006F3A1E /* WebKit Legacy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitLegacy.cpp; sourceTree = "<group>"; };516 1AD7451918D0D26C006F3A1E /* WebKit Legacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; };517 1AD7453B18D0D2A6006F3A1E /* WebKit Legacy.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; sourceTree = "<group>"; };520 1AD7451218D0D24C006F3A1E /* WebKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebKit.m; sourceTree = "<group>"; }; 521 1AD7451918D0D26C006F3A1E /* WebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 522 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; }; 518 523 1AD7453D18D0D383006F3A1E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 519 524 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; }; … … 532 537 1C7B0C650EB2464D00A28502 /* WebInspectorClientCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebInspectorClientCF.cpp; path = cf/WebCoreSupport/WebInspectorClientCF.cpp; sourceTree = SOURCE_ROOT; }; 533 538 1C8CB0790AE9830C00B1F6E9 /* WebEditingDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebEditingDelegatePrivate.h; sourceTree = "<group>"; }; 534 1C904FD20BA9DD0F0081E9D0 /* WebKit .xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };539 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitLegacy.xcconfig; sourceTree = "<group>"; }; 535 540 1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; }; 536 541 1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; }; … … 715 720 9391F274121B38BD00EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; }; 716 721 939811320824BF01008DF038 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = mac/Info.plist; sourceTree = SOURCE_ROOT; tabWidth = 8; usesTabs = 1; }; 717 939811330824BF01008DF038 /* WebKit .framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };722 939811330824BF01008DF038 /* WebKitLegacy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebKitLegacy.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 718 723 93AEB17D032C1735008635CE /* WebKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebKitLogging.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 719 724 93AEB17E032C1735008635CE /* WebKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebKitLogging.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; … … 945 950 isa = PBXGroup; 946 951 children = ( 947 939811330824BF01008DF038 /* WebKit .framework */,948 1AD7451918D0D26C006F3A1E /* WebKit Legacy.framework */,952 939811330824BF01008DF038 /* WebKitLegacy.framework */, 953 1AD7451918D0D26C006F3A1E /* WebKit.framework */, 949 954 ); 950 955 name = Products; … … 969 974 511F3FC30CECC7E200852565 /* Storage */, 970 975 F5B36B400281DE87018635CB /* WebCoreSupport */, 971 1AD7451118D0D23D006F3A1E /* WebKit Legacy*/,976 1AD7451118D0D23D006F3A1E /* WebKit Framework */, 972 977 9C7CABBB0190A37C0ECA16EA /* WebView */, 973 978 1C68F63F095B5F9C00C2984E /* WebInspector */, … … 1051 1056 sourceTree = "<group>"; 1052 1057 }; 1053 1AD7451118D0D23D006F3A1E /* WebKitLegacy */ = { 1054 isa = PBXGroup; 1055 children = ( 1058 1AD7451118D0D23D006F3A1E /* WebKit Framework */ = { 1059 isa = PBXGroup; 1060 children = ( 1061 1A06CDB21909A4F000FCB52C /* MigrateHeadersFromWebKitLegacy.make */, 1056 1062 1AD7453D18D0D383006F3A1E /* Info.plist */, 1057 1AD7451218D0D24C006F3A1E /* WebKitLegacy.cpp */, 1058 ); 1059 name = WebKitLegacy; 1063 1AD7451218D0D24C006F3A1E /* WebKit.m */, 1064 1A739034190AE5D4002E3105 /* WebKit.h */, 1065 1A739037190AE674002E3105 /* WebKitPrivate.h */, 1066 ); 1067 name = "WebKit Framework"; 1060 1068 path = mac/WebKitLegacy; 1061 1069 sourceTree = "<group>"; … … 1090 1098 FEE7D6910D99B06A005351F6 /* iOS.xcconfig */, 1091 1099 1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */, 1092 1C904FD20BA9DD0F0081E9D0 /* WebKit .xcconfig */,1093 1AD7453B18D0D2A6006F3A1E /* WebKit Legacy.xcconfig */,1100 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */, 1101 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */, 1094 1102 ); 1095 1103 name = Configurations; … … 1696 1704 1697 1705 /* Begin PBXHeadersBuildPhase section */ 1706 1A739035190AE603002E3105 /* Headers */ = { 1707 isa = PBXHeadersBuildPhase; 1708 buildActionMask = 2147483647; 1709 files = ( 1710 1A739038190AE674002E3105 /* WebKitPrivate.h in Headers */, 1711 1A739036190AE622002E3105 /* WebKit.h in Headers */, 1712 ); 1713 runOnlyForDeploymentPostprocessing = 0; 1714 }; 1698 1715 9398100D0824BF01008DF038 /* Headers */ = { 1699 1716 isa = PBXHeadersBuildPhase; … … 1959 1976 1960 1977 /* Begin PBXNativeTarget section */ 1961 1AD7451818D0D26C006F3A1E /* WebKit Legacy*/ = {1978 1AD7451818D0D26C006F3A1E /* WebKit */ = { 1962 1979 isa = PBXNativeTarget; 1963 buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit Legacy" */;1980 buildConfigurationList = 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */; 1964 1981 buildPhases = ( 1982 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */, 1965 1983 1A5B250818D0D90C00913729 /* Migrate Headers */, 1984 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */, 1985 1A739035190AE603002E3105 /* Headers */, 1966 1986 1AD7451418D0D26C006F3A1E /* Sources */, 1967 1987 1AD7451518D0D26C006F3A1E /* Frameworks */, 1988 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */, 1989 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */, 1968 1990 ); 1969 1991 buildRules = ( … … 1972 1994 1A5B250A18D0DBD300913729 /* PBXTargetDependency */, 1973 1995 ); 1974 name = WebKit Legacy;1975 productName = WebKit Legacy;1976 productReference = 1AD7451918D0D26C006F3A1E /* WebKit Legacy.framework */;1996 name = WebKit; 1997 productName = WebKit; 1998 productReference = 1AD7451918D0D26C006F3A1E /* WebKit.framework */; 1977 1999 productType = "com.apple.product-type.framework"; 1978 2000 }; 1979 9398100A0824BF01008DF038 /* WebKit */ = {2001 9398100A0824BF01008DF038 /* WebKitLegacy */ = { 1980 2002 isa = PBXNativeTarget; 1981 buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit " */;2003 buildConfigurationList = 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */; 1982 2004 buildPhases = ( 1983 2005 5D2F7DB70C687A5A00B5B72B /* Update Info.plist with version information */, … … 1992 2014 5D0D54210E98631D0029E223 /* Check For Weak VTables and Externals */, 1993 2015 3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */, 1994 5D88EE6C11407DE800BC3ABC /* Check For Framework Include Consistency */,1995 A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */,1996 2016 5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */, 1997 2017 ); … … 2000 2020 dependencies = ( 2001 2021 ); 2002 name = WebKit ;2022 name = WebKitLegacy; 2003 2023 productInstallPath = /System/Library/Frameworks; 2004 productName = WebKit ;2005 productReference = 939811330824BF01008DF038 /* WebKit .framework */;2024 productName = WebKitLegacy; 2025 productReference = 939811330824BF01008DF038 /* WebKitLegacy.framework */; 2006 2026 productType = "com.apple.product-type.framework"; 2007 2027 }; … … 2032 2052 projectRoot = ""; 2033 2053 targets = ( 2034 1AD7451818D0D26C006F3A1E /* WebKit Legacy*/,2035 9398100A0824BF01008DF038 /* WebKit */,2054 1AD7451818D0D26C006F3A1E /* WebKit */, 2055 9398100A0824BF01008DF038 /* WebKitLegacy */, 2036 2056 ); 2037 2057 }; … … 2054 2074 2055 2075 /* Begin PBXShellScriptBuildPhase section */ 2076 1A27F2A2190F1B8500D2B661 /* Check For Inappropriate Macros in External Headers */ = { 2077 isa = PBXShellScriptBuildPhase; 2078 buildActionMask = 2147483647; 2079 files = ( 2080 ); 2081 inputPaths = ( 2082 "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", 2083 ); 2084 name = "Check For Inappropriate Macros in External Headers"; 2085 outputPaths = ( 2086 ); 2087 runOnlyForDeploymentPostprocessing = 0; 2088 shellPath = /bin/sh; 2089 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi"; 2090 }; 2091 1A27F2A3190F1BB700D2B661 /* Check For Framework Include Consistency */ = { 2092 isa = PBXShellScriptBuildPhase; 2093 buildActionMask = 2147483647; 2094 files = ( 2095 ); 2096 inputPaths = ( 2097 "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", 2098 ); 2099 name = "Check For Framework Include Consistency"; 2100 outputPaths = ( 2101 ); 2102 runOnlyForDeploymentPostprocessing = 0; 2103 shellPath = /bin/sh; 2104 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\nexit 0;\nfi\n\n# FIXME: Once WebKit is provided by WebKit2.xcodeproj, this should be re-enabled.\nif [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nif [ -f ../../Tools/Scripts/check-for-webkit-framework-include-consistency ]; then\n../../Tools/Scripts/check-for-webkit-framework-include-consistency || exit $?\nfi\n"; 2105 }; 2056 2106 1A5B250818D0D90C00913729 /* Migrate Headers */ = { 2057 2107 isa = PBXShellScriptBuildPhase; … … 2066 2116 runOnlyForDeploymentPostprocessing = 0; 2067 2117 shellPath = /bin/sh; 2068 shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n make -C mac/WebKitLegacy -f \"MigrateHeadersToLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n"; 2118 shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n if [[ ${PLATFORM_NAME} == \"macosx\" ]]; then\n mkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\n fi\n mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\n make -C mac/WebKitLegacy -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n"; 2119 }; 2120 1ABDE1BB1909AC18005E2FA9 /* Update Info.plist with version information */ = { 2121 isa = PBXShellScriptBuildPhase; 2122 buildActionMask = 2147483647; 2123 files = ( 2124 ); 2125 inputPaths = ( 2126 "$(PROJECT_DIR)/mac/Configurations/Version.xcconfig", 2127 ); 2128 name = "Update Info.plist with version information"; 2129 outputPaths = ( 2130 "$(PROJECT_DIR)/mac/WebKitLegacy/Info.plist", 2131 ); 2132 runOnlyForDeploymentPostprocessing = 0; 2133 shellPath = /bin/sh; 2134 shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\ntouch \"${PROJECT_DIR}/mac/WebKitLegacy/Info.plist\";\nfi;\n"; 2135 }; 2136 1AE4A9121909E0C7007035C8 /* Make Frameworks Symbolic Link */ = { 2137 isa = PBXShellScriptBuildPhase; 2138 buildActionMask = 8; 2139 files = ( 2140 ); 2141 inputPaths = ( 2142 WebKit.xcodeproj, 2143 ); 2144 name = "Make Frameworks Symbolic Link"; 2145 outputPaths = ( 2146 "$(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)/frameworks-symlink-stamp", 2147 ); 2148 runOnlyForDeploymentPostprocessing = 1; 2149 shellPath = /bin/sh; 2150 shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n"; 2069 2151 }; 2070 2152 1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = { … … 2080 2162 name = "Generate Export Files"; 2081 2163 outputPaths = ( 2082 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit /WebKit.LP64.exp",2083 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit /WebKit.generated.exp",2164 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp", 2165 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp", 2084 2166 ); 2085 2167 runOnlyForDeploymentPostprocessing = 0; 2086 2168 shellPath = /bin/sh; 2087 shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit \"\n\nif [[ \"${PLATFORM_NAME}\" == \"iphoneos\" || \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]]; then\n cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/ios/WebKit.iOS.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nelse\n cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/mac/WebKit.mac.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nfi;\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";2169 shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy\"\n\nif [[ \"${PLATFORM_NAME}\" == \"iphoneos\" || \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]]; then\n cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/ios/WebKit.iOS.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp\"\nelse\n cat \"${PROJECT_DIR}/mac/WebKit.exp\" \"${PROJECT_DIR}/mac/WebKit.mac.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp\"\nfi;\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp\"\n"; 2088 2170 }; 2089 2171 1C6CB0510AA63EB000D23BFD /* Migrate Headers */ = { … … 2148 2230 shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\n touch \"${PROJECT_DIR}/mac/Info.plist\";\nfi;\n"; 2149 2231 }; 2150 5D88EE6C11407DE800BC3ABC /* Check For Framework Include Consistency */ = {2151 isa = PBXShellScriptBuildPhase;2152 buildActionMask = 2147483647;2153 files = (2154 );2155 inputPaths = (2156 "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",2157 );2158 name = "Check For Framework Include Consistency";2159 outputPaths = (2160 );2161 runOnlyForDeploymentPostprocessing = 0;2162 shellPath = /bin/sh;2163 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-webkit-framework-include-consistency ]; then\n ../../Tools/Scripts/check-for-webkit-framework-include-consistency || exit $?\nfi\n";2164 };2165 2232 5DE6D18C0FCF231B002DE28C /* Symlink WebKitPluginHost in to place */ = { 2166 2233 isa = PBXShellScriptBuildPhase; … … 2172 2239 name = "Symlink WebKitPluginHost in to place"; 2173 2240 outputPaths = ( 2174 "$(CONFIGURATION_BUILD_DIR)/WebKit .framework/WebKitPluginHost.app",2241 "$(CONFIGURATION_BUILD_DIR)/WebKitLegacy.framework/WebKitPluginHost.app", 2175 2242 ); 2176 2243 runOnlyForDeploymentPostprocessing = 0; 2177 2244 shellPath = /bin/sh; 2178 shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit .framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\n fi\nfi\n";2245 shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" ]]; then\n if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n else\n ln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\n fi\n fi\nfi\n"; 2179 2246 }; 2180 2247 939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = { … … 2192 2259 runOnlyForDeploymentPostprocessing = 1; 2193 2260 shellPath = /bin/sh; 2194 shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit .framework/Frameworks\"\n";2261 shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKitLegacy.framework/Frameworks\"\n"; 2195 2262 }; 2196 2263 A13EE61D185AE82700556064 /* Postprocess Headers */ = { … … 2207 2274 shellPath = /bin/sh; 2208 2275 shellScript = "exec \"${SRCROOT}/mac/postprocess-headers.sh\""; 2209 };2210 A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */ = {2211 isa = PBXShellScriptBuildPhase;2212 buildActionMask = 2147483647;2213 files = (2214 );2215 inputPaths = (2216 "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",2217 );2218 name = "Check For Inappropriate Macros in External Headers";2219 outputPaths = (2220 );2221 runOnlyForDeploymentPostprocessing = 0;2222 shellPath = /bin/sh;2223 shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ]; then\n exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers ]; then\n ../../Tools/Scripts/check-for-inappropriate-macros-in-external-headers Headers PrivateHeaders || exit $?\nfi";2224 2276 }; 2225 2277 /* End PBXShellScriptBuildPhase section */ … … 2230 2282 buildActionMask = 2147483647; 2231 2283 files = ( 2232 1AD7453C18D0D324006F3A1E /* WebKit Legacy.cppin Sources */,2284 1AD7453C18D0D324006F3A1E /* WebKit.m in Sources */, 2233 2285 ); 2234 2286 runOnlyForDeploymentPostprocessing = 0; … … 2424 2476 1A5B250A18D0DBD300913729 /* PBXTargetDependency */ = { 2425 2477 isa = PBXTargetDependency; 2426 target = 9398100A0824BF01008DF038 /* WebKit */;2478 target = 9398100A0824BF01008DF038 /* WebKitLegacy */; 2427 2479 targetProxy = 1A5B250918D0DBD300913729 /* PBXContainerItemProxy */; 2428 2480 }; … … 2453 2505 149C282E08902B0F008A9EFC /* Debug */ = { 2454 2506 isa = XCBuildConfiguration; 2455 baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit .xcconfig */;2507 baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */; 2456 2508 buildSettings = { 2457 2509 DEBUG_DEFINES = "$(DEBUG_DEFINES_debug) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH"; … … 2466 2518 149C282F08902B0F008A9EFC /* Release */ = { 2467 2519 isa = XCBuildConfiguration; 2468 baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit .xcconfig */;2520 baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */; 2469 2521 buildSettings = { 2470 2522 DEBUG_DEFINES = "$(DEBUG_DEFINES_$(CURRENT_VARIANT)) ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH"; … … 2479 2531 149C283108902B0F008A9EFC /* Production */ = { 2480 2532 isa = XCBuildConfiguration; 2481 baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKit .xcconfig */;2533 baseConfigurationReference = 1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */; 2482 2534 buildSettings = { 2483 2535 BUILD_VARIANTS = normal; … … 2516 2568 1AD7453418D0D26C006F3A1E /* Debug */ = { 2517 2569 isa = XCBuildConfiguration; 2518 baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit Legacy.xcconfig */;2570 baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */; 2519 2571 buildSettings = { 2520 2572 }; … … 2523 2575 1AD7453518D0D26C006F3A1E /* Release */ = { 2524 2576 isa = XCBuildConfiguration; 2525 baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit Legacy.xcconfig */;2577 baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */; 2526 2578 buildSettings = { 2527 2579 }; … … 2530 2582 1AD7453618D0D26C006F3A1E /* Production */ = { 2531 2583 isa = XCBuildConfiguration; 2532 baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit Legacy.xcconfig */;2584 baseConfigurationReference = 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */; 2533 2585 buildSettings = { 2534 2586 }; … … 2538 2590 2539 2591 /* Begin XCConfigurationList section */ 2540 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKit " */ = {2592 149C282D08902B0F008A9EFC /* Build configuration list for PBXNativeTarget "WebKitLegacy" */ = { 2541 2593 isa = XCConfigurationList; 2542 2594 buildConfigurations = ( … … 2558 2610 defaultConfigurationName = Production; 2559 2611 }; 2560 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit Legacy" */ = {2612 1AD7453318D0D26C006F3A1E /* Build configuration list for PBXNativeTarget "WebKit" */ = { 2561 2613 isa = XCConfigurationList; 2562 2614 buildConfigurations = ( -
trunk/Source/WebKit/ios/ChangeLog
r167768 r168047 1 2014-04-30 Anders Carlsson <andersca@apple.com> 2 3 Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework 4 https://bugs.webkit.org/show_bug.cgi?id=132399 5 <rdar://problem/15920046> 6 7 Reviewed by Dan Bernstein. 8 9 Import WebKitLegacy headers instead of WebKit headers. 10 11 * DefaultDelegates/WebDefaultFormDelegate.h: 12 * DefaultDelegates/WebDefaultFrameLoadDelegate.m: 13 * DefaultDelegates/WebDefaultResourceLoadDelegate.m: 14 * DefaultDelegates/WebDefaultUIKitDelegate.h: 15 * Misc/WebGeolocationProviderIOS.h: 16 * Misc/WebNSStringExtrasIPhone.h: 17 * WebCoreSupport/WebFrameIOS.h: 18 * WebCoreSupport/WebFrameIOS.mm: 19 * WebCoreSupport/WebFrameIPhone.h: 20 * WebCoreSupport/WebSelectionRect.h: 21 * WebCoreSupport/WebVisiblePosition.h: 22 * WebView/WebPDFViewIOS.h: 23 * WebView/WebPDFViewIOS.mm: 24 * WebView/WebPDFViewIPhone.h: 25 * WebView/WebPDFViewPlaceholder.h: 26 * WebView/WebPDFViewPlaceholder.mm: 27 * WebView/WebPlainWhiteView.h: 28 * WebView/WebUIKitDelegate.h: 29 1 30 2014-04-24 Myles C. Maxfield <mmaxfield@apple.com> 2 31 -
trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultFormDelegate.h
r158327 r168047 24 24 */ 25 25 26 #import <WebKit /WebFormDelegate.h>26 #import <WebKitLegacy/WebFormDelegate.h> 27 27 28 28 @interface WebDefaultFormDelegate : NSObject <WebFormDelegate> { -
trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultFrameLoadDelegate.m
r158327 r168047 28 28 #import "WebDefaultFrameLoadDelegate.h" 29 29 30 #import <WebKit /WebFrameLoadDelegatePrivate.h>30 #import <WebKitLegacy/WebFrameLoadDelegatePrivate.h> 31 31 #import "WebViewPrivate.h" 32 32 -
trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m
r158327 r168047 28 28 #import "WebDefaultResourceLoadDelegate.h" 29 29 30 #import <WebKit /WebResourceLoadDelegate.h>30 #import <WebKitLegacy/WebResourceLoadDelegate.h> 31 31 32 32 @implementation WebDefaultResourceLoadDelegate -
trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultUIKitDelegate.h
r158327 r168047 24 24 */ 25 25 26 #import <WebKit /WebUIKitDelegate.h>26 #import <WebKitLegacy/WebUIKitDelegate.h> 27 27 28 28 @interface WebDefaultUIKitDelegate : NSObject { -
trunk/Source/WebKit/ios/Misc/WebGeolocationProviderIOS.h
r158327 r168047 25 25 26 26 #import <Foundation/NSObject.h> 27 #import <WebKit /WebViewPrivate.h>27 #import <WebKitLegacy/WebViewPrivate.h> 28 28 29 29 @interface WebGeolocationProviderIOS : NSObject<WebGeolocationProvider> -
trunk/Source/WebKit/ios/Misc/WebNSStringExtrasIPhone.h
r158327 r168047 24 24 */ 25 25 26 #import <WebKit /WebNSStringExtrasIOS.h>26 #import <WebKitLegacy/WebNSStringExtrasIOS.h> -
trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.h
r166409 r168047 27 27 28 28 #import <CoreGraphics/CoreGraphics.h> 29 #import <WebKit /WebFrame.h>30 #import <WebKit /WebVisiblePosition.h>29 #import <WebKitLegacy/WebFrame.h> 30 #import <WebKitLegacy/WebVisiblePosition.h> 31 31 32 32 @class DOMRange; -
trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIOS.mm
r166409 r168047 48 48 #import <WebCore/VisiblePosition.h> 49 49 #import <WebCore/VisibleUnits.h> 50 #import <WebKit /DOM.h>51 #import <WebKit /DOMRange.h>52 #import <WebKit /DOMUIKitExtensions.h>53 #import <WebKit /WebSelectionRect.h>54 #import <WebKit /WebVisiblePosition.h>50 #import <WebKitLegacy/DOM.h> 51 #import <WebKitLegacy/DOMRange.h> 52 #import <WebKitLegacy/DOMUIKitExtensions.h> 53 #import <WebKitLegacy/WebSelectionRect.h> 54 #import <WebKitLegacy/WebVisiblePosition.h> 55 55 #import <unicode/uchar.h> 56 56 -
trunk/Source/WebKit/ios/WebCoreSupport/WebFrameIPhone.h
r158327 r168047 24 24 */ 25 25 26 #import <WebKit /WebFrameIOS.h>26 #import <WebKitLegacy/WebFrameIOS.h> -
trunk/Source/WebKit/ios/WebCoreSupport/WebSelectionRect.h
r162024 r168047 28 28 #import <CoreGraphics/CoreGraphics.h> 29 29 #import <Foundation/Foundation.h> 30 #import <WebKit /WebFrameIOS.h>30 #import <WebKitLegacy/WebFrameIOS.h> 31 31 32 32 @interface WebSelectionRect : NSObject <NSCopying> { -
trunk/Source/WebKit/ios/WebCoreSupport/WebVisiblePosition.h
r158327 r168047 25 25 26 26 #import <Foundation/Foundation.h> 27 #import <WebKit /DOMUIKitExtensions.h>27 #import <WebKitLegacy/DOMUIKitExtensions.h> 28 28 29 #import <WebKit /WAKAppKitStubs.h>29 #import <WebKitLegacy/WAKAppKitStubs.h> 30 30 31 31 typedef struct WebObjectInternal WebObjectInternal; -
trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.h
r158327 r168047 24 24 */ 25 25 26 #import <WebKit /WebDocumentPrivate.h>26 #import <WebKitLegacy/WebDocumentPrivate.h> 27 27 28 28 @interface WebPDFView : WAKView <WebPDFDocumentView, WebPDFDocumentRepresentation> { -
trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm
r161106 r168047 44 44 #import <WebCore/StringWithDirection.h> 45 45 #import <WebCore/WKGraphics.h> 46 #import <WebKit /WebFrame.h>47 #import <WebKit /WebFrameLoadDelegate.h>48 #import <WebKit /WebFramePrivate.h>49 #import <WebKit /WebFrameView.h>50 #import <WebKit /WebNSViewExtras.h>51 #import <WebKit /WebViewPrivate.h>46 #import <WebKitLegacy/WebFrame.h> 47 #import <WebKitLegacy/WebFrameLoadDelegate.h> 48 #import <WebKitLegacy/WebFramePrivate.h> 49 #import <WebKitLegacy/WebFrameView.h> 50 #import <WebKitLegacy/WebNSViewExtras.h> 51 #import <WebKitLegacy/WebViewPrivate.h> 52 52 #import <wtf/Assertions.h> 53 53 #import <wtf/RetainPtr.h> -
trunk/Source/WebKit/ios/WebView/WebPDFViewIPhone.h
r158327 r168047 24 24 */ 25 25 26 #import <WebKit /WebPDFViewIOS.h>26 #import <WebKitLegacy/WebPDFViewIOS.h> -
trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.h
r165896 r168047 24 24 */ 25 25 26 #import <WebKit /WebDocumentPrivate.h>26 #import <WebKitLegacy/WebDocumentPrivate.h> 27 27 28 28 #if TARGET_OS_IPHONE -
trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm
r166965 r168047 44 44 #import <WebCore/MouseEvent.h> 45 45 #import <WebCore/SoftLinking.h> 46 #import <WebKit /WebDataSourcePrivate.h>47 #import <WebKit /WebFramePrivate.h>48 #import <WebKit /WebJSPDFDoc.h>49 #import <WebKit /WebNSURLExtras.h>50 #import <WebKit /WebNSViewExtras.h>51 #import <WebKit /WebPDFDocumentExtras.h>52 #import <WebKit /WebViewPrivate.h>46 #import <WebKitLegacy/WebDataSourcePrivate.h> 47 #import <WebKitLegacy/WebFramePrivate.h> 48 #import <WebKitLegacy/WebJSPDFDoc.h> 49 #import <WebKitLegacy/WebNSURLExtras.h> 50 #import <WebKitLegacy/WebNSViewExtras.h> 51 #import <WebKitLegacy/WebPDFDocumentExtras.h> 52 #import <WebKitLegacy/WebViewPrivate.h> 53 53 #import <wtf/CurrentTime.h> 54 54 #import <wtf/Vector.h> -
trunk/Source/WebKit/ios/WebView/WebPlainWhiteView.h
r165676 r168047 28 28 29 29 #if PLATFORM(IOS) 30 #import <WebKit /WebDocumentInternal.h>30 #import <WebKitLegacy/WebDocumentInternal.h> 31 31 32 32 @class WebDataSource; -
trunk/Source/WebKit/ios/WebView/WebUIKitDelegate.h
r166409 r168047 27 27 #define WebUIKitDelegate_h 28 28 29 #import <WebKit /WAKAppKitStubs.h>30 #import <WebKit /WKContentObservation.h>29 #import <WebKitLegacy/WAKAppKitStubs.h> 30 #import <WebKitLegacy/WKContentObservation.h> 31 31 32 32 @class DOMNode; -
trunk/Source/WebKit/mac/Carbon/CarbonUtils.h
r165676 r168047 34 34 // These functions are only available for 32-bit. 35 35 36 #include <WebKit /WebKitAvailability.h>36 #include <WebKitLegacy/WebKitAvailability.h> 37 37 38 38 #ifdef __OBJC__ -
trunk/Source/WebKit/mac/Carbon/HIViewAdapter.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebKit.h>29 #import <WebKitLegacy/WebKit.h> 30 30 #include <HIToolbox/HIView.h> 31 31 -
trunk/Source/WebKit/mac/Carbon/HIWebView.h
r165676 r168047 34 34 #include <Carbon/Carbon.h> 35 35 36 #include <WebKit /WebKitAvailability.h>36 #include <WebKitLegacy/WebKitAvailability.h> 37 37 38 38 #if PRAGMA_ONCE -
trunk/Source/WebKit/mac/ChangeLog
r168046 r168047 1 2014-04-30 Anders Carlsson <andersca@apple.com> 2 3 Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework 4 https://bugs.webkit.org/show_bug.cgi?id=132399 5 <rdar://problem/15920046> 6 7 Reviewed by Dan Bernstein. 8 9 * Carbon/CarbonUtils.h: 10 * Carbon/HIViewAdapter.h: 11 * Carbon/HIWebView.h: 12 Import WebKitLegacy headers instead of WebKit headers. 13 14 * Configurations/WebKit.xcconfig: 15 Move the definitions needed for building WebKitLegacy.framework to WebKitLegacy.xcconfig and 16 add the relevant definitions needed for re-exporting WebKitLegacy.framework. 17 18 * Configurations/WebKitLegacy.xcconfig: 19 Add definitions needed for building the "old" WebKit API as WebKitLegacy.framework. 20 21 * DOM/WebDOMOperations.h: 22 * DOM/WebDOMOperations.mm: 23 * DOM/WebDOMOperationsInternal.h: 24 * DOM/WebDOMOperationsPrivate.h: 25 * DefaultDelegates/WebDefaultContextMenuDelegate.h: 26 * DefaultDelegates/WebDefaultContextMenuDelegate.mm: 27 * DefaultDelegates/WebDefaultEditingDelegate.m: 28 * History/WebBackForwardListInternal.h: 29 * History/WebBackForwardListPrivate.h: 30 * History/WebHistoryItemPrivate.h: 31 * History/WebHistoryPrivate.h: 32 * History/WebURLsWithTitles.m: 33 Import WebKitLegacy headers instead of WebKit headers. 34 35 * MigrateHeaders.make: 36 Update header paths now that all WebKitLegacy headers are private. 37 Remove migration of WebKit2 headers, that is done by MigrateHeadersFromWebKitLegacy.make now. 38 39 * Misc/WebCoreStatistics.h: 40 * Misc/WebDownload.h: 41 * Misc/WebDownload.mm: 42 * Misc/WebDownloadInternal.h: 43 * Misc/WebElementDictionary.mm: 44 * Misc/WebIconDatabasePrivate.h: 45 * Misc/WebKit.h: 46 * Misc/WebKitErrors.m: 47 * Misc/WebKitErrorsPrivate.h: 48 * Misc/WebKitNSStringExtras.mm: 49 * Misc/WebLocalizableStrings.mm: 50 * Misc/WebNSDataExtras.m: 51 * Misc/WebNSDictionaryExtras.m: 52 * Misc/WebNSEventExtras.m: 53 * Misc/WebNSFileManagerExtras.mm: 54 * Misc/WebNSImageExtras.m: 55 * Misc/WebNSPasteboardExtras.mm: 56 * Misc/WebNSViewExtras.h: 57 * Misc/WebNSViewExtras.m: 58 * Panels/WebAuthenticationPanel.m: 59 * Panels/WebPanelAuthenticationHandler.m: 60 * Plugins/Hosted/HostedNetscapePluginStream.h: 61 * Plugins/Hosted/NetscapePluginInstanceProxy.h: 62 * Plugins/Hosted/WebKitPluginAgent.defs: 63 * Plugins/Hosted/WebKitPluginAgentReply.defs: 64 * Plugins/Hosted/WebKitPluginClient.defs: 65 * Plugins/Hosted/WebKitPluginHost.defs: 66 * Plugins/Hosted/WebKitPluginHostTypes.defs: 67 * Plugins/WebBaseNetscapePluginView.mm: 68 * Plugins/WebBasePluginPackage.h: 69 * Plugins/WebBasePluginPackage.mm: 70 * Plugins/WebNetscapeContainerCheckPrivate.h: 71 * Plugins/WebNetscapePluginEventHandlerCocoa.h: 72 * Plugins/WebNetscapePluginStream.h: 73 * Plugins/WebNetscapePluginView.h: 74 * Plugins/WebNetscapePluginView.mm: 75 * Plugins/WebPlugin.h: 76 * Plugins/WebPluginController.h: 77 * Plugins/WebPluginDatabase.h: 78 * Plugins/WebPluginPackage.h: 79 * Plugins/WebPluginPackage.mm: 80 * Plugins/WebPluginViewFactory.h: 81 * Plugins/WebPluginViewFactoryPrivate.h: 82 * Plugins/npapi.mm: 83 * Storage/WebDatabaseManagerPrivate.h: 84 * WebCoreSupport/WebContextMenuClient.mm: 85 * WebCoreSupport/WebFrameLoaderClient.mm: 86 * WebCoreSupport/WebFrameNetworkingContext.mm: 87 * WebCoreSupport/WebGeolocationClient.mm: 88 * WebCoreSupport/WebInspectorClient.mm: 89 * WebCoreSupport/WebJavaScriptTextInputPanel.m: 90 * WebCoreSupport/WebKeyGenerator.mm: 91 * WebInspector/WebInspectorPrivate.h: 92 * WebInspector/WebNodeHighlight.h: 93 * WebInspector/WebNodeHighlightView.h: 94 Import WebKitLegacy headers instead of WebKit headers. 95 96 * WebKitLegacy/MigrateHeadersFromWebKitLegacy.make: Added. 97 New makefile that handles copying WebKitLegacy headers to the WebKit framework, rewriting WebKitLegacy 98 imports to WebKit imports. (On iOS the WebKit headers just forward to the relevant WebKitLegacy headers). 99 On OS X, this also handles copying WebKit2 headers to the WebKit framework, rewriting WebKit2 imports to WebKit imports 100 and getting rid of C SPI imports. 101 102 * WebKitLegacy/MigrateHeadersToLegacy.make: Removed. 103 This is no longer needed. 104 105 * WebKitLegacy/WebKit.h: Added. 106 New umbrella header that imports the modern API if available, as well as the legacy API (using WebKit/WebKitLegacy.h). 107 108 * WebKitLegacy/WebKit.m: 109 This is an empty file so we'll have something to link. 110 111 * WebKitLegacy/WebKitPrivate.h: 112 New SPI header that imports the private headers of the modern API. 113 114 * WebView/WebDataSource.h: 115 * WebView/WebDataSource.mm: 116 * WebView/WebDataSourcePrivate.h: 117 * WebView/WebDelegateImplementationCaching.h: 118 * WebView/WebDocument.h: 119 * WebView/WebDocumentInternal.h: 120 * WebView/WebDocumentPrivate.h: 121 * WebView/WebEditingDelegate.h: 122 * WebView/WebEditingDelegatePrivate.h: 123 * WebView/WebFrameLoadDelegate.h: 124 * WebView/WebFrameLoadDelegatePrivate.h: 125 * WebView/WebFramePrivate.h: 126 * WebView/WebFrameView.h: 127 * WebView/WebFrameViewInternal.h: 128 * WebView/WebFrameViewPrivate.h: 129 * WebView/WebHTMLRepresentation.h: 130 * WebView/WebHTMLRepresentation.mm: 131 * WebView/WebHTMLRepresentationPrivate.h: 132 * WebView/WebHTMLView.h: 133 * WebView/WebHTMLView.mm: 134 * WebView/WebHTMLViewPrivate.h: 135 * WebView/WebPDFView.h: 136 * WebView/WebPolicyDelegatePrivate.h: 137 * WebView/WebPreferencesPrivate.h: 138 * WebView/WebResourcePrivate.h: 139 * WebView/WebUIDelegate.h: 140 * WebView/WebUIDelegatePrivate.h: 141 * WebView/WebView.h: 142 * WebView/WebView.mm: 143 * WebView/WebViewPrivate.h: 144 Import WebKitLegacy headers instead of WebKit headers. 145 146 * migrate-headers.sh: 147 Derived sources are put in DerivedSources/WebKitLegacy now. 148 1 149 2014-04-30 David Hyatt <hyatt@apple.com> 2 150 -
trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig
r166691 r168047 25 25 #include "Version.xcconfig" 26 26 27 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));28 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*;29 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);30 EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;31 32 EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));33 EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;34 EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;35 EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;36 EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;37 EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;38 EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));39 EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;40 EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;41 EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));42 EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp;43 EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp;44 45 27 FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME)); 46 28 FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION)); … … 50 32 FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION)); 51 33 FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(WEBKIT2_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS); 34 UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks; 52 35 53 36 STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH)); 54 37 STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; 55 38 56 OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME)); 57 OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 58 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); 59 60 GCC_PREFIX_HEADER = mac/WebKitPrefix.h; 61 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS); 62 HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS); 63 INFOPLIST_FILE = mac/Info.plist; 39 INFOPLIST_FILE = mac/WebKitLegacy/Info.plist; 64 40 INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME)); 65 INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/ PrivateFrameworks;41 INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks; 66 42 INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL); 67 43 INSTALL_PATH_macosx = $(WEBKIT_FRAMEWORKS_DIR); 68 44 INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME)); 69 45 INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos); 46 70 47 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME)); 48 DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/Frameworks; 49 DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos); 71 50 DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_FRAMEWORKS_DIR); 72 DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;73 DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);74 INSTALLHDRS_COPY_PHASE = YES;75 INSTALLHDRS_SCRIPT_PHASE = YES;76 PRODUCT_NAME = WebKit;77 UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;78 79 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));80 OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt;81 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);82 OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework WebKit2 -sub_umbrella WebKit2 -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;83 84 NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));85 NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);86 NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);87 NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks;88 89 WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION));90 WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering);91 WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering);92 WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));93 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO);94 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks;95 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR);96 WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR)97 51 98 52 WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME)); … … 103 57 WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR); 104 58 WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; 59 60 NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME)); 61 NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR); 62 NORMAL_WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR); 63 NORMAL_WEBKIT_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks; 105 64 106 65 NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)); … … 117 76 PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; 118 77 78 WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(CONFIGURATION)); 79 WEBKIT2_FRAMEWORKS_DIR_Release = $(WEBKIT2_FRAMEWORKS_DIR_engineering); 80 WEBKIT2_FRAMEWORKS_DIR_Debug = $(WEBKIT2_FRAMEWORKS_DIR_engineering); 81 WEBKIT2_FRAMEWORKS_DIR_Production = $(SDKROOT)$(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)); 82 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO); 83 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_NO = /System/Library/PrivateFrameworks; 84 WEBKIT2_FRAMEWORKS_DIR_Production_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR); 85 WEBKIT2_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR) 86 87 INSTALLHDRS_COPY_PHASE = YES; 88 INSTALLHDRS_SCRIPT_PHASE = YES; 89 PRODUCT_NAME = WebKit; 90 91 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME)); 92 OTHER_LDFLAGS_iphoneos = -framework WebKitLegacy -sub_umbrella WebKitLegacy 93 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos); 94 OTHER_LDFLAGS_macosx = -framework WebCore -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy -framework WebKit2 -sub_umbrella WebKit2 119 95 120 96 PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME)); … … 122 98 PRODUCTION_ROOT_iphonesimulator = $(SDKROOT); 123 99 PRODUCTION_ROOT_macosx = $(NEXT_ROOT); 124 125 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));126 WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);127 WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);128 WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));129 WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;130 WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);131 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));132 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);133 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;134 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;135 WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;136 137 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));138 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);139 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);140 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;141 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));142 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;143 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;144 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;145 -
trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig
r165503 r168047 25 25 #include "Version.xcconfig" 26 26 27 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME)); 28 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebRenderNode.mm WebStringTruncator.* WebTextCompletionController.*; 29 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos); 30 EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h; 31 32 EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH)); 33 EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 34 EXPORTED_SYMBOLS_FILE_armv7 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 35 EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 36 EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 37 EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 38 EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME)); 39 EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 40 EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 41 EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME)); 42 EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp; 43 EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp; 44 27 45 FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME)); 28 46 FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION)); … … 31 49 FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR); 32 50 FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION)); 51 FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS); 33 52 34 INFOPLIST_FILE = mac/WebKitLegacy/Info.plist; 53 STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH)); 54 STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; 55 56 OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME)); 57 OTHER_CFLAGS_macosx = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 58 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); 59 60 GCC_PREFIX_HEADER = mac/WebKitPrefix.h; 61 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS); 62 HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS); 63 INFOPLIST_FILE = mac/Info.plist; 35 64 INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME)); 36 65 INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 37 66 INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL); 67 INSTALL_PATH_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR); 38 68 INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME)); 39 69 INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos); 40 41 70 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME)); 71 DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR); 42 72 DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 43 73 DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos); 44 45 74 INSTALLHDRS_COPY_PHASE = YES; 46 75 INSTALLHDRS_SCRIPT_PHASE = YES; 47 76 PRODUCT_NAME = WebKitLegacy; 48 49 SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME)); 50 SKIP_INSTALL_macosx = YES; 51 SKIP_INSTALL_iphoneos = $(SKIP_INSTALL); 52 SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos); 77 UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks; 53 78 54 79 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME)); 55 OTHER_LDFLAGS_iphoneos = - framework WebKit -sub_umbrella WebKit80 OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework MobileAsset -lMobileGestalt; 56 81 OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos); 82 OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL; 83 84 NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME)); 85 NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR); 86 NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR); 87 NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; 88 89 WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME)); 90 WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos); 91 WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos); 92 WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)); 93 WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO); 94 WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR); 95 WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; 96 97 NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)); 98 NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 99 NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos); 100 NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks; 101 102 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)); 103 PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos); 104 PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos); 105 PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)); 106 PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO); 107 PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx); 108 PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari; 57 109 58 110 PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME)); … … 60 112 PRODUCTION_ROOT_iphonesimulator = $(SDKROOT); 61 113 PRODUCTION_ROOT_macosx = $(NEXT_ROOT); 114 115 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION)); 116 WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering); 117 WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering); 118 WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME)); 119 WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders; 120 WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos); 121 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH)); 122 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO); 123 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders; 124 WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders; 125 WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders; 126 127 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION)); 128 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering); 129 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering); 130 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include; 131 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME)); 132 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include; 133 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include; 134 WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include; 135 -
trunk/Source/WebKit/mac/DOM/WebDOMOperations.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /DOMCore.h>30 #import <WebKit /DOMHTML.h>31 #import <WebKit /DOMRange.h>29 #import <WebKitLegacy/DOMCore.h> 30 #import <WebKitLegacy/DOMHTML.h> 31 #import <WebKitLegacy/DOMRange.h> 32 32 33 33 @class WebArchive; -
trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm
r165676 r168047 54 54 #import <WebCore/WheelEvent.h> 55 55 #import <WebCore/markup.h> 56 #import <WebKit /DOMExtensions.h>57 #import <WebKit /DOMHTML.h>56 #import <WebKitLegacy/DOMExtensions.h> 57 #import <WebKitLegacy/DOMHTML.h> 58 58 #import <runtime/JSCJSValue.h> 59 59 #import <runtime/JSLock.h> -
trunk/Source/WebKit/mac/DOM/WebDOMOperationsInternal.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDOMOperations.h>29 #import <WebKitLegacy/WebDOMOperations.h> 30 30 31 31 @interface DOMDocument (WebDOMDocumentOperationsInternal) -
trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDOMOperations.h>29 #import <WebKitLegacy/WebDOMOperations.h> 30 30 #import <JavaScriptCore/JSBase.h> 31 31 … … 34 34 #else 35 35 #import <AppKit/NSEvent.h> 36 #import <WebKit /DOMWheelEvent.h>36 #import <WebKitLegacy/DOMWheelEvent.h> 37 37 #endif 38 38 -
trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.h
r165676 r168047 29 29 #import <Foundation/Foundation.h> 30 30 31 #import <WebKit /WebDefaultUIDelegate.h>31 #import <WebKitLegacy/WebDefaultUIDelegate.h> 32 32 33 33 @interface WebDefaultUIDelegate (WebContextMenu) -
trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultContextMenuDelegate.mm
r165676 r168047 49 49 #import <WebCore/Frame.h> 50 50 #import <WebCore/FrameLoader.h> 51 #import <WebKit /DOM.h>52 #import <WebKit /DOMPrivate.h>51 #import <WebKitLegacy/DOM.h> 52 #import <WebKitLegacy/DOMPrivate.h> 53 53 #import <WebKitSystemInterface.h> 54 54 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDefaultEditingDelegate.h>29 #import <WebKitLegacy/WebDefaultEditingDelegate.h> 30 30 31 #import <WebKit /DOM.h>32 #import <WebKit /WebEditingDelegate.h>33 #import <WebKit /WebEditingDelegatePrivate.h>34 #import <WebKit /WebView.h>31 #import <WebKitLegacy/DOM.h> 32 #import <WebKitLegacy/WebEditingDelegate.h> 33 #import <WebKitLegacy/WebEditingDelegatePrivate.h> 34 #import <WebKitLegacy/WebView.h> 35 35 36 36 @implementation WebDefaultEditingDelegate -
trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h
r168041 r168047 27 27 */ 28 28 29 #import <WebKit /WebBackForwardList.h>29 #import <WebKitLegacy/WebBackForwardList.h> 30 30 31 31 namespace WebCore { 32 32 class BackForwardList; 33 33 } 34 34 -
trunk/Source/WebKit/mac/History/WebBackForwardListPrivate.h
r165676 r168047 28 28 29 29 #import <Foundation/Foundation.h> 30 #import <WebKit /WebBackForwardList.h>30 #import <WebKitLegacy/WebBackForwardList.h> 31 31 32 32 @interface WebBackForwardList (WebBackForwardListPrivate) -
trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebHistoryItem.h>29 #import <WebKitLegacy/WebHistoryItem.h> 30 30 31 31 #if TARGET_OS_IPHONE -
trunk/Source/WebKit/mac/History/WebHistoryPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebHistory.h>29 #import <WebKitLegacy/WebHistory.h> 30 30 31 31 /* -
trunk/Source/WebKit/mac/History/WebURLsWithTitles.m
r165676 r168047 31 31 #import "WebURLsWithTitles.h" 32 32 33 #import <WebKit /WebNSURLExtras.h>34 #import <WebKit /WebKitNSStringExtras.h>33 #import <WebKitLegacy/WebNSURLExtras.h> 34 #import <WebKitLegacy/WebKitNSStringExtras.h> 35 35 36 36 @implementation WebURLsWithTitles -
trunk/Source/WebKit/mac/MigrateHeaders.make
r167730 r168047 28 28 VPATH = $(WEBCORE_PRIVATE_HEADERS_DIR) 29 29 30 INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit 30 INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy 31 31 PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH) 32 32 PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH) … … 34 34 .PHONY : all 35 35 all : \ 36 $(P UBLIC_HEADERS_DIR)/DOM.h \37 $(P UBLIC_HEADERS_DIR)/DOMAbstractView.h \38 $(P UBLIC_HEADERS_DIR)/DOMAttr.h \39 $(P UBLIC_HEADERS_DIR)/DOMBlob.h \36 $(PRIVATE_HEADERS_DIR)/DOM.h \ 37 $(PRIVATE_HEADERS_DIR)/DOMAbstractView.h \ 38 $(PRIVATE_HEADERS_DIR)/DOMAttr.h \ 39 $(PRIVATE_HEADERS_DIR)/DOMBlob.h \ 40 40 $(INTERNAL_HEADERS_DIR)/DOMBlobInternal.h \ 41 $(P UBLIC_HEADERS_DIR)/DOMCDATASection.h \42 $(P UBLIC_HEADERS_DIR)/DOMCSS.h \43 $(P UBLIC_HEADERS_DIR)/DOMCSSCharsetRule.h \44 $(P UBLIC_HEADERS_DIR)/DOMCSSFontFaceRule.h \45 $(P UBLIC_HEADERS_DIR)/DOMCSSImportRule.h \46 $(P UBLIC_HEADERS_DIR)/DOMCSSMediaRule.h \47 $(P UBLIC_HEADERS_DIR)/DOMCSSPageRule.h \48 $(P UBLIC_HEADERS_DIR)/DOMCSSPrimitiveValue.h \49 $(P UBLIC_HEADERS_DIR)/DOMCSSRule.h \50 $(P UBLIC_HEADERS_DIR)/DOMCSSRuleList.h \51 $(P UBLIC_HEADERS_DIR)/DOMCSSStyleDeclaration.h \41 $(PRIVATE_HEADERS_DIR)/DOMCDATASection.h \ 42 $(PRIVATE_HEADERS_DIR)/DOMCSS.h \ 43 $(PRIVATE_HEADERS_DIR)/DOMCSSCharsetRule.h \ 44 $(PRIVATE_HEADERS_DIR)/DOMCSSFontFaceRule.h \ 45 $(PRIVATE_HEADERS_DIR)/DOMCSSImportRule.h \ 46 $(PRIVATE_HEADERS_DIR)/DOMCSSMediaRule.h \ 47 $(PRIVATE_HEADERS_DIR)/DOMCSSPageRule.h \ 48 $(PRIVATE_HEADERS_DIR)/DOMCSSPrimitiveValue.h \ 49 $(PRIVATE_HEADERS_DIR)/DOMCSSRule.h \ 50 $(PRIVATE_HEADERS_DIR)/DOMCSSRuleList.h \ 51 $(PRIVATE_HEADERS_DIR)/DOMCSSStyleDeclaration.h \ 52 52 $(INTERNAL_HEADERS_DIR)/DOMCSSStyleDeclarationInternal.h \ 53 $(P UBLIC_HEADERS_DIR)/DOMCSSStyleRule.h \54 $(P UBLIC_HEADERS_DIR)/DOMCSSStyleSheet.h \55 $(P UBLIC_HEADERS_DIR)/DOMCSSUnknownRule.h \56 $(P UBLIC_HEADERS_DIR)/DOMCSSValue.h \57 $(P UBLIC_HEADERS_DIR)/DOMCSSValueList.h \58 $(P UBLIC_HEADERS_DIR)/DOMCharacterData.h \59 $(P UBLIC_HEADERS_DIR)/DOMComment.h \60 $(P UBLIC_HEADERS_DIR)/DOMCore.h \61 $(P UBLIC_HEADERS_DIR)/DOMCounter.h \62 $(P UBLIC_HEADERS_DIR)/DOMDocument.h \63 $(P UBLIC_HEADERS_DIR)/DOMDocumentFragment.h \53 $(PRIVATE_HEADERS_DIR)/DOMCSSStyleRule.h \ 54 $(PRIVATE_HEADERS_DIR)/DOMCSSStyleSheet.h \ 55 $(PRIVATE_HEADERS_DIR)/DOMCSSUnknownRule.h \ 56 $(PRIVATE_HEADERS_DIR)/DOMCSSValue.h \ 57 $(PRIVATE_HEADERS_DIR)/DOMCSSValueList.h \ 58 $(PRIVATE_HEADERS_DIR)/DOMCharacterData.h \ 59 $(PRIVATE_HEADERS_DIR)/DOMComment.h \ 60 $(PRIVATE_HEADERS_DIR)/DOMCore.h \ 61 $(PRIVATE_HEADERS_DIR)/DOMCounter.h \ 62 $(PRIVATE_HEADERS_DIR)/DOMDocument.h \ 63 $(PRIVATE_HEADERS_DIR)/DOMDocumentFragment.h \ 64 64 $(INTERNAL_HEADERS_DIR)/DOMDocumentFragmentInternal.h \ 65 65 $(PRIVATE_HEADERS_DIR)/DOMDocumentFragmentPrivate.h \ 66 66 $(INTERNAL_HEADERS_DIR)/DOMDocumentInternal.h \ 67 67 $(PRIVATE_HEADERS_DIR)/DOMDocumentPrivate.h \ 68 $(P UBLIC_HEADERS_DIR)/DOMDocumentType.h \69 $(P UBLIC_HEADERS_DIR)/DOMElement.h \68 $(PRIVATE_HEADERS_DIR)/DOMDocumentType.h \ 69 $(PRIVATE_HEADERS_DIR)/DOMElement.h \ 70 70 $(INTERNAL_HEADERS_DIR)/DOMElementInternal.h \ 71 $(P UBLIC_HEADERS_DIR)/DOMEntity.h \72 $(P UBLIC_HEADERS_DIR)/DOMEntityReference.h \73 $(P UBLIC_HEADERS_DIR)/DOMEvent.h \74 $(P UBLIC_HEADERS_DIR)/DOMEventException.h \75 $(P UBLIC_HEADERS_DIR)/DOMEventListener.h \76 $(P UBLIC_HEADERS_DIR)/DOMEventTarget.h \77 $(P UBLIC_HEADERS_DIR)/DOMEvents.h \78 $(P UBLIC_HEADERS_DIR)/DOMException.h \79 $(P UBLIC_HEADERS_DIR)/DOMExtensions.h \80 $(P UBLIC_HEADERS_DIR)/DOMFile.h \81 $(P UBLIC_HEADERS_DIR)/DOMFileList.h \82 $(P UBLIC_HEADERS_DIR)/DOMHTML.h \83 $(P UBLIC_HEADERS_DIR)/DOMHTMLAnchorElement.h \84 $(P UBLIC_HEADERS_DIR)/DOMHTMLAppletElement.h \85 $(P UBLIC_HEADERS_DIR)/DOMHTMLAreaElement.h \86 $(P UBLIC_HEADERS_DIR)/DOMHTMLBRElement.h \87 $(P UBLIC_HEADERS_DIR)/DOMHTMLBaseElement.h \88 $(P UBLIC_HEADERS_DIR)/DOMHTMLBaseFontElement.h \89 $(P UBLIC_HEADERS_DIR)/DOMHTMLBodyElement.h \90 $(P UBLIC_HEADERS_DIR)/DOMHTMLButtonElement.h \91 $(P UBLIC_HEADERS_DIR)/DOMHTMLCollection.h \92 $(P UBLIC_HEADERS_DIR)/DOMHTMLDListElement.h \93 $(P UBLIC_HEADERS_DIR)/DOMHTMLDirectoryElement.h \94 $(P UBLIC_HEADERS_DIR)/DOMHTMLDivElement.h \95 $(P UBLIC_HEADERS_DIR)/DOMHTMLDocument.h \96 $(P UBLIC_HEADERS_DIR)/DOMHTMLElement.h \71 $(PRIVATE_HEADERS_DIR)/DOMEntity.h \ 72 $(PRIVATE_HEADERS_DIR)/DOMEntityReference.h \ 73 $(PRIVATE_HEADERS_DIR)/DOMEvent.h \ 74 $(PRIVATE_HEADERS_DIR)/DOMEventException.h \ 75 $(PRIVATE_HEADERS_DIR)/DOMEventListener.h \ 76 $(PRIVATE_HEADERS_DIR)/DOMEventTarget.h \ 77 $(PRIVATE_HEADERS_DIR)/DOMEvents.h \ 78 $(PRIVATE_HEADERS_DIR)/DOMException.h \ 79 $(PRIVATE_HEADERS_DIR)/DOMExtensions.h \ 80 $(PRIVATE_HEADERS_DIR)/DOMFile.h \ 81 $(PRIVATE_HEADERS_DIR)/DOMFileList.h \ 82 $(PRIVATE_HEADERS_DIR)/DOMHTML.h \ 83 $(PRIVATE_HEADERS_DIR)/DOMHTMLAnchorElement.h \ 84 $(PRIVATE_HEADERS_DIR)/DOMHTMLAppletElement.h \ 85 $(PRIVATE_HEADERS_DIR)/DOMHTMLAreaElement.h \ 86 $(PRIVATE_HEADERS_DIR)/DOMHTMLBRElement.h \ 87 $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseElement.h \ 88 $(PRIVATE_HEADERS_DIR)/DOMHTMLBaseFontElement.h \ 89 $(PRIVATE_HEADERS_DIR)/DOMHTMLBodyElement.h \ 90 $(PRIVATE_HEADERS_DIR)/DOMHTMLButtonElement.h \ 91 $(PRIVATE_HEADERS_DIR)/DOMHTMLCollection.h \ 92 $(PRIVATE_HEADERS_DIR)/DOMHTMLDListElement.h \ 93 $(PRIVATE_HEADERS_DIR)/DOMHTMLDirectoryElement.h \ 94 $(PRIVATE_HEADERS_DIR)/DOMHTMLDivElement.h \ 95 $(PRIVATE_HEADERS_DIR)/DOMHTMLDocument.h \ 96 $(PRIVATE_HEADERS_DIR)/DOMHTMLElement.h \ 97 97 $(INTERNAL_HEADERS_DIR)/DOMHTMLElementInternal.h \ 98 $(P UBLIC_HEADERS_DIR)/DOMHTMLEmbedElement.h \98 $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElement.h \ 99 99 $(PRIVATE_HEADERS_DIR)/DOMHTMLEmbedElementPrivate.h \ 100 $(P UBLIC_HEADERS_DIR)/DOMHTMLFieldSetElement.h \101 $(P UBLIC_HEADERS_DIR)/DOMHTMLFontElement.h \102 $(P UBLIC_HEADERS_DIR)/DOMHTMLFormElement.h \100 $(PRIVATE_HEADERS_DIR)/DOMHTMLFieldSetElement.h \ 101 $(PRIVATE_HEADERS_DIR)/DOMHTMLFontElement.h \ 102 $(PRIVATE_HEADERS_DIR)/DOMHTMLFormElement.h \ 103 103 $(INTERNAL_HEADERS_DIR)/DOMHTMLFormElementInternal.h \ 104 $(P UBLIC_HEADERS_DIR)/DOMHTMLFrameElement.h \105 $(P UBLIC_HEADERS_DIR)/DOMHTMLFrameSetElement.h \106 $(P UBLIC_HEADERS_DIR)/DOMHTMLHRElement.h \107 $(P UBLIC_HEADERS_DIR)/DOMHTMLHeadElement.h \108 $(P UBLIC_HEADERS_DIR)/DOMHTMLHeadingElement.h \109 $(P UBLIC_HEADERS_DIR)/DOMHTMLHtmlElement.h \110 $(P UBLIC_HEADERS_DIR)/DOMHTMLIFrameElement.h \111 $(P UBLIC_HEADERS_DIR)/DOMHTMLImageElement.h \112 $(P UBLIC_HEADERS_DIR)/DOMHTMLInputElement.h \104 $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameElement.h \ 105 $(PRIVATE_HEADERS_DIR)/DOMHTMLFrameSetElement.h \ 106 $(PRIVATE_HEADERS_DIR)/DOMHTMLHRElement.h \ 107 $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadElement.h \ 108 $(PRIVATE_HEADERS_DIR)/DOMHTMLHeadingElement.h \ 109 $(PRIVATE_HEADERS_DIR)/DOMHTMLHtmlElement.h \ 110 $(PRIVATE_HEADERS_DIR)/DOMHTMLIFrameElement.h \ 111 $(PRIVATE_HEADERS_DIR)/DOMHTMLImageElement.h \ 112 $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElement.h \ 113 113 $(PRIVATE_HEADERS_DIR)/DOMHTMLInputElementPrivate.h \ 114 114 $(INTERNAL_HEADERS_DIR)/DOMHTMLInputElementInternal.h \ 115 $(P UBLIC_HEADERS_DIR)/DOMHTMLLIElement.h \116 $(P UBLIC_HEADERS_DIR)/DOMHTMLLabelElement.h \117 $(P UBLIC_HEADERS_DIR)/DOMHTMLLegendElement.h \118 $(P UBLIC_HEADERS_DIR)/DOMHTMLLinkElement.h \119 $(P UBLIC_HEADERS_DIR)/DOMHTMLMapElement.h \120 $(P UBLIC_HEADERS_DIR)/DOMHTMLMarqueeElement.h \121 $(P UBLIC_HEADERS_DIR)/DOMHTMLMenuElement.h \122 $(P UBLIC_HEADERS_DIR)/DOMHTMLMetaElement.h \123 $(P UBLIC_HEADERS_DIR)/DOMHTMLModElement.h \124 $(P UBLIC_HEADERS_DIR)/DOMHTMLOListElement.h \125 $(P UBLIC_HEADERS_DIR)/DOMHTMLObjectElement.h \115 $(PRIVATE_HEADERS_DIR)/DOMHTMLLIElement.h \ 116 $(PRIVATE_HEADERS_DIR)/DOMHTMLLabelElement.h \ 117 $(PRIVATE_HEADERS_DIR)/DOMHTMLLegendElement.h \ 118 $(PRIVATE_HEADERS_DIR)/DOMHTMLLinkElement.h \ 119 $(PRIVATE_HEADERS_DIR)/DOMHTMLMapElement.h \ 120 $(PRIVATE_HEADERS_DIR)/DOMHTMLMarqueeElement.h \ 121 $(PRIVATE_HEADERS_DIR)/DOMHTMLMenuElement.h \ 122 $(PRIVATE_HEADERS_DIR)/DOMHTMLMetaElement.h \ 123 $(PRIVATE_HEADERS_DIR)/DOMHTMLModElement.h \ 124 $(PRIVATE_HEADERS_DIR)/DOMHTMLOListElement.h \ 125 $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElement.h \ 126 126 $(PRIVATE_HEADERS_DIR)/DOMHTMLObjectElementPrivate.h \ 127 $(P UBLIC_HEADERS_DIR)/DOMHTMLOptGroupElement.h \128 $(P UBLIC_HEADERS_DIR)/DOMHTMLOptionElement.h \129 $(P UBLIC_HEADERS_DIR)/DOMHTMLOptionsCollection.h \130 $(P UBLIC_HEADERS_DIR)/DOMHTMLParagraphElement.h \131 $(P UBLIC_HEADERS_DIR)/DOMHTMLParamElement.h \132 $(P UBLIC_HEADERS_DIR)/DOMHTMLPreElement.h \133 $(P UBLIC_HEADERS_DIR)/DOMHTMLQuoteElement.h \134 $(P UBLIC_HEADERS_DIR)/DOMHTMLScriptElement.h \135 $(P UBLIC_HEADERS_DIR)/DOMHTMLSelectElement.h \136 $(P UBLIC_HEADERS_DIR)/DOMHTMLStyleElement.h \137 $(P UBLIC_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \138 $(P UBLIC_HEADERS_DIR)/DOMHTMLTableCellElement.h \139 $(P UBLIC_HEADERS_DIR)/DOMHTMLTableColElement.h \140 $(P UBLIC_HEADERS_DIR)/DOMHTMLTableElement.h \141 $(P UBLIC_HEADERS_DIR)/DOMHTMLTableRowElement.h \142 $(P UBLIC_HEADERS_DIR)/DOMHTMLTableSectionElement.h \143 $(P UBLIC_HEADERS_DIR)/DOMHTMLTextAreaElement.h \127 $(PRIVATE_HEADERS_DIR)/DOMHTMLOptGroupElement.h \ 128 $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionElement.h \ 129 $(PRIVATE_HEADERS_DIR)/DOMHTMLOptionsCollection.h \ 130 $(PRIVATE_HEADERS_DIR)/DOMHTMLParagraphElement.h \ 131 $(PRIVATE_HEADERS_DIR)/DOMHTMLParamElement.h \ 132 $(PRIVATE_HEADERS_DIR)/DOMHTMLPreElement.h \ 133 $(PRIVATE_HEADERS_DIR)/DOMHTMLQuoteElement.h \ 134 $(PRIVATE_HEADERS_DIR)/DOMHTMLScriptElement.h \ 135 $(PRIVATE_HEADERS_DIR)/DOMHTMLSelectElement.h \ 136 $(PRIVATE_HEADERS_DIR)/DOMHTMLStyleElement.h \ 137 $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCaptionElement.h \ 138 $(PRIVATE_HEADERS_DIR)/DOMHTMLTableCellElement.h \ 139 $(PRIVATE_HEADERS_DIR)/DOMHTMLTableColElement.h \ 140 $(PRIVATE_HEADERS_DIR)/DOMHTMLTableElement.h \ 141 $(PRIVATE_HEADERS_DIR)/DOMHTMLTableRowElement.h \ 142 $(PRIVATE_HEADERS_DIR)/DOMHTMLTableSectionElement.h \ 143 $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElement.h \ 144 144 $(INTERNAL_HEADERS_DIR)/DOMHTMLTextAreaElementInternal.h \ 145 $(P UBLIC_HEADERS_DIR)/DOMHTMLTitleElement.h \146 $(P UBLIC_HEADERS_DIR)/DOMHTMLUListElement.h \147 $(P UBLIC_HEADERS_DIR)/DOMImplementation.h \148 $(P UBLIC_HEADERS_DIR)/DOMKeyboardEvent.h \149 $(P UBLIC_HEADERS_DIR)/DOMMediaList.h \150 $(P UBLIC_HEADERS_DIR)/DOMMouseEvent.h \151 $(P UBLIC_HEADERS_DIR)/DOMMutationEvent.h \152 $(P UBLIC_HEADERS_DIR)/DOMNamedNodeMap.h \153 $(P UBLIC_HEADERS_DIR)/DOMNode.h \145 $(PRIVATE_HEADERS_DIR)/DOMHTMLTitleElement.h \ 146 $(PRIVATE_HEADERS_DIR)/DOMHTMLUListElement.h \ 147 $(PRIVATE_HEADERS_DIR)/DOMImplementation.h \ 148 $(PRIVATE_HEADERS_DIR)/DOMKeyboardEvent.h \ 149 $(PRIVATE_HEADERS_DIR)/DOMMediaList.h \ 150 $(PRIVATE_HEADERS_DIR)/DOMMouseEvent.h \ 151 $(PRIVATE_HEADERS_DIR)/DOMMutationEvent.h \ 152 $(PRIVATE_HEADERS_DIR)/DOMNamedNodeMap.h \ 153 $(PRIVATE_HEADERS_DIR)/DOMNode.h \ 154 154 $(INTERNAL_HEADERS_DIR)/DOMNodeInternal.h \ 155 155 $(PRIVATE_HEADERS_DIR)/DOMNodePrivate.h \ 156 $(P UBLIC_HEADERS_DIR)/DOMNodeFilter.h \157 $(P UBLIC_HEADERS_DIR)/DOMNodeIterator.h \158 $(P UBLIC_HEADERS_DIR)/DOMNodeList.h \159 $(P UBLIC_HEADERS_DIR)/DOMNotation.h \160 $(P UBLIC_HEADERS_DIR)/DOMObject.h \161 $(P UBLIC_HEADERS_DIR)/DOMOverflowEvent.h \156 $(PRIVATE_HEADERS_DIR)/DOMNodeFilter.h \ 157 $(PRIVATE_HEADERS_DIR)/DOMNodeIterator.h \ 158 $(PRIVATE_HEADERS_DIR)/DOMNodeList.h \ 159 $(PRIVATE_HEADERS_DIR)/DOMNotation.h \ 160 $(PRIVATE_HEADERS_DIR)/DOMObject.h \ 161 $(PRIVATE_HEADERS_DIR)/DOMOverflowEvent.h \ 162 162 $(PRIVATE_HEADERS_DIR)/DOMPrivate.h \ 163 $(P UBLIC_HEADERS_DIR)/DOMProcessingInstruction.h \164 $(P UBLIC_HEADERS_DIR)/DOMProgressEvent.h \165 $(P UBLIC_HEADERS_DIR)/DOMRGBColor.h \166 $(P UBLIC_HEADERS_DIR)/DOMRange.h \163 $(PRIVATE_HEADERS_DIR)/DOMProcessingInstruction.h \ 164 $(PRIVATE_HEADERS_DIR)/DOMProgressEvent.h \ 165 $(PRIVATE_HEADERS_DIR)/DOMRGBColor.h \ 166 $(PRIVATE_HEADERS_DIR)/DOMRange.h \ 167 167 $(INTERNAL_HEADERS_DIR)/DOMRangeInternal.h \ 168 $(P UBLIC_HEADERS_DIR)/DOMRangeException.h \169 $(P UBLIC_HEADERS_DIR)/DOMRanges.h \170 $(P UBLIC_HEADERS_DIR)/DOMRect.h \171 $(P UBLIC_HEADERS_DIR)/DOMStyleSheet.h \172 $(P UBLIC_HEADERS_DIR)/DOMStyleSheetList.h \173 $(P UBLIC_HEADERS_DIR)/DOMStylesheets.h \174 $(P UBLIC_HEADERS_DIR)/DOMText.h \175 $(P UBLIC_HEADERS_DIR)/DOMTraversal.h \176 $(P UBLIC_HEADERS_DIR)/DOMTreeWalker.h \177 $(P UBLIC_HEADERS_DIR)/DOMUIEvent.h \178 $(P UBLIC_HEADERS_DIR)/DOMViews.h \179 $(P UBLIC_HEADERS_DIR)/DOMWheelEvent.h \168 $(PRIVATE_HEADERS_DIR)/DOMRangeException.h \ 169 $(PRIVATE_HEADERS_DIR)/DOMRanges.h \ 170 $(PRIVATE_HEADERS_DIR)/DOMRect.h \ 171 $(PRIVATE_HEADERS_DIR)/DOMStyleSheet.h \ 172 $(PRIVATE_HEADERS_DIR)/DOMStyleSheetList.h \ 173 $(PRIVATE_HEADERS_DIR)/DOMStylesheets.h \ 174 $(PRIVATE_HEADERS_DIR)/DOMText.h \ 175 $(PRIVATE_HEADERS_DIR)/DOMTraversal.h \ 176 $(PRIVATE_HEADERS_DIR)/DOMTreeWalker.h \ 177 $(PRIVATE_HEADERS_DIR)/DOMUIEvent.h \ 178 $(PRIVATE_HEADERS_DIR)/DOMViews.h \ 179 $(PRIVATE_HEADERS_DIR)/DOMWheelEvent.h \ 180 180 $(INTERNAL_HEADERS_DIR)/DOMWheelEventInternal.h \ 181 $(P UBLIC_HEADERS_DIR)/DOMXPath.h \182 $(P UBLIC_HEADERS_DIR)/DOMXPathException.h \183 $(P UBLIC_HEADERS_DIR)/DOMXPathExpression.h \184 $(P UBLIC_HEADERS_DIR)/DOMXPathNSResolver.h \185 $(P UBLIC_HEADERS_DIR)/DOMXPathResult.h \186 $(P UBLIC_HEADERS_DIR)/WebKitAvailability.h \187 $(P UBLIC_HEADERS_DIR)/WebScriptObject.h \188 $(P UBLIC_HEADERS_DIR)/npapi.h \189 $(P UBLIC_HEADERS_DIR)/npfunctions.h \190 $(P UBLIC_HEADERS_DIR)/npruntime.h \191 $(P UBLIC_HEADERS_DIR)/nptypes.h \181 $(PRIVATE_HEADERS_DIR)/DOMXPath.h \ 182 $(PRIVATE_HEADERS_DIR)/DOMXPathException.h \ 183 $(PRIVATE_HEADERS_DIR)/DOMXPathExpression.h \ 184 $(PRIVATE_HEADERS_DIR)/DOMXPathNSResolver.h \ 185 $(PRIVATE_HEADERS_DIR)/DOMXPathResult.h \ 186 $(PRIVATE_HEADERS_DIR)/WebKitAvailability.h \ 187 $(PRIVATE_HEADERS_DIR)/WebScriptObject.h \ 188 $(PRIVATE_HEADERS_DIR)/npapi.h \ 189 $(PRIVATE_HEADERS_DIR)/npfunctions.h \ 190 $(PRIVATE_HEADERS_DIR)/npruntime.h \ 191 $(PRIVATE_HEADERS_DIR)/nptypes.h \ 192 192 # 193 193 194 194 ifneq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), ) 195 195 all : \ 196 $(P UBLIC_HEADERS_DIR)/DOMGestureEvent.h \196 $(PRIVATE_HEADERS_DIR)/DOMGestureEvent.h \ 197 197 $(PRIVATE_HEADERS_DIR)/DOMHTMLTextAreaElementPrivate.h \ 198 $(P UBLIC_HEADERS_DIR)/DOMTouch.h \199 $(P UBLIC_HEADERS_DIR)/DOMTouchEvent.h \200 $(P UBLIC_HEADERS_DIR)/DOMTouchList.h \198 $(PRIVATE_HEADERS_DIR)/DOMTouch.h \ 199 $(PRIVATE_HEADERS_DIR)/DOMTouchEvent.h \ 200 $(PRIVATE_HEADERS_DIR)/DOMTouchList.h \ 201 201 $(PRIVATE_HEADERS_DIR)/DOMUIKitExtensions.h \ 202 202 $(PRIVATE_HEADERS_DIR)/KeyEventCodesIOS.h \ … … 231 231 endif 232 232 233 WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKit / -e s/DOMDOMImplementation/DOMImplementation/233 WEBCORE_HEADER_REPLACE_RULES = -e s/\<WebCore/\<WebKitLegacy/ -e s/DOMDOMImplementation/DOMImplementation/ 234 234 WEBCORE_HEADER_MIGRATE_CMD = sed $(WEBCORE_HEADER_REPLACE_RULES) $< > $@ 235 236 ifeq ($(filter iphoneos iphonesimulator, $(PLATFORM_NAME)), )237 PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi238 else239 PUBLIC_HEADER_CHECK_CMD =240 endif241 242 $(PUBLIC_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make243 $(PUBLIC_HEADER_CHECK_CMD)244 $(WEBCORE_HEADER_MIGRATE_CMD)245 235 246 236 $(PRIVATE_HEADERS_DIR)/DOM% : DOMDOM% MigrateHeaders.make 247 237 $(WEBCORE_HEADER_MIGRATE_CMD) 248 238 249 $(PUBLIC_HEADERS_DIR)/% : % MigrateHeaders.make250 $(PUBLIC_HEADER_CHECK_CMD)251 $(WEBCORE_HEADER_MIGRATE_CMD)252 253 239 $(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make 254 240 $(WEBCORE_HEADER_MIGRATE_CMD) … … 256 242 $(INTERNAL_HEADERS_DIR)/% : % MigrateHeaders.make 257 243 $(WEBCORE_HEADER_MIGRATE_CMD) 258 259 # Migration of WebKit2 headers to WebKit260 261 WEBKIT2_HEADERS = \262 WKBackForwardList.h \263 WKBackForwardListItem.h \264 WKBackForwardListItemPrivate.h \265 WKBackForwardListPrivate.h \266 WKFoundation.h \267 WKFrameInfo.h \268 WKHistoryDelegatePrivate.h \269 WKNavigation.h \270 WKNavigationAction.h \271 WKNavigationDelegate.h \272 WKNavigationResponse.h \273 WKPreferences.h \274 WKProcessPool.h \275 WKProcessPoolPrivate.h \276 WKScriptMessage.h \277 WKScriptMessageHandler.h \278 WKScriptMessagePrivate.h \279 WKUIDelegate.h \280 WKUIDelegatePrivate.h \281 WKUserContentController.h \282 WKUserContentControllerPrivate.h \283 WKWebView.h \284 WKWebViewConfiguration.h \285 WKWebViewConfigurationPrivate.h \286 WKWebViewPrivate.h \287 _WKActivatedElementInfo.h \288 _WKElementAction.h \289 _WKFormDelegate.h \290 _WKFormInputSession.h \291 _WKProcessPoolConfiguration.h \292 _WKScriptWorld.h \293 _WKThumbnailView.h \294 _WKVisitedLinkProvider.h \295 _WKVisitedLinkProviderPrivate.h \296 #297 298 WEBKIT2_PUBLIC_HEADERS = $(addprefix $(PUBLIC_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/*))))299 WEBKIT2_PRIVATE_HEADERS = $(addprefix $(PRIVATE_HEADERS_DIR)/, $(filter $(WEBKIT2_HEADERS),$(notdir $(wildcard $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/*))))300 301 ifeq ($(PLATFORM_NAME), macosx)302 all : $(WEBKIT2_PUBLIC_HEADERS) $(WEBKIT2_PRIVATE_HEADERS)303 endif304 305 WEBKIT2_HEADER_REPLACE_RULES = -e s/\<WebKit2/\<WebKit/ -e /$\#.*\<WebKit\\/WK.*Ref\\.h\>/d306 WEBKIT2_HEADER_MIGRATE_CMD = sed $(WEBKIT2_HEADER_REPLACE_RULES) $< > $@307 308 $(PUBLIC_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/Headers/% MigrateHeaders.make309 $(WEBKIT2_HEADER_MIGRATE_CMD)310 311 $(PRIVATE_HEADERS_DIR)/% : $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/PrivateHeaders/% MigrateHeaders.make312 $(WEBKIT2_HEADER_MIGRATE_CMD) -
trunk/Source/WebKit/mac/Misc/WebCoreStatistics.h
r165676 r168047 29 29 #import <CoreGraphics/CGContext.h> 30 30 #import <Foundation/Foundation.h> 31 #import <WebKit /WebFrame.h>31 #import <WebKitLegacy/WebFrame.h> 32 32 33 33 @class DOMElement; -
trunk/Source/WebKit/mac/Misc/WebDownload.h
r165676 r168047 30 30 31 31 #if TARGET_OS_IPHONE 32 #import <WebKit /WAKAppKitStubs.h>32 #import <WebKitLegacy/WAKAppKitStubs.h> 33 33 #endif 34 34 -
trunk/Source/WebKit/mac/Misc/WebDownload.mm
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDownload.h>29 #import <WebKitLegacy/WebDownload.h> 30 30 31 31 #import <Foundation/NSURLAuthenticationChallenge.h> … … 36 36 #import <WebCore/CredentialStorage.h> 37 37 #import <WebCore/ProtectionSpace.h> 38 #import <WebKit /WebPanelAuthenticationHandler.h>38 #import <WebKitLegacy/WebPanelAuthenticationHandler.h> 39 39 #import <wtf/Assertions.h> 40 40 -
trunk/Source/WebKit/mac/Misc/WebDownloadInternal.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDownload.h>29 #import <WebKitLegacy/WebDownload.h> 30 30 31 31 #if USE(CFNETWORK) -
trunk/Source/WebKit/mac/Misc/WebElementDictionary.mm
r166378 r168047 41 41 #import <WebCore/Image.h> 42 42 #import <WebCore/WebCoreObjCExtras.h> 43 #import <WebKit /DOMCore.h>44 #import <WebKit /DOMExtensions.h>43 #import <WebKitLegacy/DOMCore.h> 44 #import <WebKitLegacy/DOMExtensions.h> 45 45 #import <runtime/InitializeThreading.h> 46 46 #import <wtf/MainThread.h> -
trunk/Source/WebKit/mac/Misc/WebIconDatabasePrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebIconDatabase.h>29 #import <WebKitLegacy/WebIconDatabase.h> 30 30 31 31 // FIXME: Some of the following is not API and should be moved -
trunk/Source/WebKit/mac/Misc/WebKit.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /DOM.h>30 #import <WebKit /WebArchive.h>31 #import <WebKit /WebBackForwardList.h>32 #import <WebKit /WebDataSource.h>33 #import <WebKit /WebDocument.h>34 #import <WebKit /WebDOMOperations.h>35 #import <WebKit /WebDownload.h>36 #import <WebKit /WebEditingDelegate.h>37 #import <WebKit /WebFrame.h>38 #import <WebKit /WebFrameLoadDelegate.h>39 #import <WebKit /WebFrameView.h>40 #import <WebKit /WebHistory.h>41 #import <WebKit /WebHistoryItem.h>42 #import <WebKit /WebKitErrors.h>43 #import <WebKit /WebPlugin.h>44 #import <WebKit /WebPluginContainer.h>45 #import <WebKit /WebPluginViewFactory.h>46 #import <WebKit /WebPolicyDelegate.h>47 #import <WebKit /WebPreferences.h>48 #import <WebKit /WebResource.h>49 #import <WebKit /WebResourceLoadDelegate.h>50 #import <WebKit /WebScriptObject.h>51 #import <WebKit /WebUIDelegate.h>52 #import <WebKit /WebView.h>29 #import <WebKitLegacy/DOM.h> 30 #import <WebKitLegacy/WebArchive.h> 31 #import <WebKitLegacy/WebBackForwardList.h> 32 #import <WebKitLegacy/WebDataSource.h> 33 #import <WebKitLegacy/WebDocument.h> 34 #import <WebKitLegacy/WebDOMOperations.h> 35 #import <WebKitLegacy/WebDownload.h> 36 #import <WebKitLegacy/WebEditingDelegate.h> 37 #import <WebKitLegacy/WebFrame.h> 38 #import <WebKitLegacy/WebFrameLoadDelegate.h> 39 #import <WebKitLegacy/WebFrameView.h> 40 #import <WebKitLegacy/WebHistory.h> 41 #import <WebKitLegacy/WebHistoryItem.h> 42 #import <WebKitLegacy/WebKitErrors.h> 43 #import <WebKitLegacy/WebPlugin.h> 44 #import <WebKitLegacy/WebPluginContainer.h> 45 #import <WebKitLegacy/WebPluginViewFactory.h> 46 #import <WebKitLegacy/WebPolicyDelegate.h> 47 #import <WebKitLegacy/WebPreferences.h> 48 #import <WebKitLegacy/WebResource.h> 49 #import <WebKitLegacy/WebResourceLoadDelegate.h> 50 #import <WebKitLegacy/WebScriptObject.h> 51 #import <WebKitLegacy/WebUIDelegate.h> 52 #import <WebKitLegacy/WebView.h> -
trunk/Source/WebKit/mac/Misc/WebKitErrors.m
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebKitErrors.h>29 #import <WebKitLegacy/WebKitErrors.h> 30 30 31 31 #import "WebLocalizableStringsInternal.h" 32 #import <WebKit /WebKitErrorsPrivate.h>33 #import <WebKit /WebNSURLExtras.h>32 #import <WebKitLegacy/WebKitErrorsPrivate.h> 33 #import <WebKitLegacy/WebNSURLExtras.h> 34 34 35 35 #import <pthread.h> -
trunk/Source/WebKit/mac/Misc/WebKitErrorsPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebKitErrors.h>29 #import <WebKitLegacy/WebKitErrors.h> 30 30 31 31 #define WebKitErrorPlugInCancelledConnection 203 -
trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm
r165676 r168047 34 34 #import <WebCore/TextRun.h> 35 35 #import <WebCore/WebCoreNSStringExtras.h> 36 #import <WebKit /WebNSFileManagerExtras.h>37 #import <WebKit /WebNSObjectExtras.h>36 #import <WebKitLegacy/WebNSFileManagerExtras.h> 37 #import <WebKitLegacy/WebNSObjectExtras.h> 38 38 #import <unicode/uchar.h> 39 39 #import <sys/param.h> … … 41 41 #if PLATFORM(IOS) 42 42 #import <WebCore/WAKViewPrivate.h> 43 #import <WebKit /DOM.h>44 #import <WebKit /WebFrame.h>45 #import <WebKit /WebFrameView.h>46 #import <WebKit /WebViewPrivate.h>43 #import <WebKitLegacy/DOM.h> 44 #import <WebKitLegacy/WebFrame.h> 45 #import <WebKitLegacy/WebFrameView.h> 46 #import <WebKitLegacy/WebViewPrivate.h> 47 47 #endif 48 48 -
trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebLocalizableStrings.h>29 #import <WebKitLegacy/WebLocalizableStrings.h> 30 30 31 31 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/Misc/WebNSDataExtras.m
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebNSDataExtras.h>30 #import <WebKit /WebNSDataExtrasPrivate.h>29 #import <WebKitLegacy/WebNSDataExtras.h> 30 #import <WebKitLegacy/WebNSDataExtrasPrivate.h> 31 31 32 32 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/Misc/WebNSDictionaryExtras.m
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebNSDataExtras.h>29 #import <WebKitLegacy/WebNSDataExtras.h> 30 30 31 31 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/Misc/WebNSEventExtras.m
r165676 r168047 29 29 #if !PLATFORM(IOS) 30 30 31 #import <WebKit /WebNSEventExtras.h>31 #import <WebKitLegacy/WebNSEventExtras.h> 32 32 33 33 @implementation NSEvent (WebExtras) -
trunk/Source/WebKit/mac/Misc/WebNSFileManagerExtras.mm
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebNSFileManagerExtras.h>29 #import <WebKitLegacy/WebNSFileManagerExtras.h> 30 30 31 31 #import "WebKitNSStringExtras.h" -
trunk/Source/WebKit/mac/Misc/WebNSImageExtras.m
r165676 r168047 29 29 #if !PLATFORM(IOS) 30 30 31 #import <WebKit /WebNSImageExtras.h>31 #import <WebKitLegacy/WebNSImageExtras.h> 32 32 33 #import <WebKit /WebKitLogging.h>33 #import <WebKitLegacy/WebKitLogging.h> 34 34 35 35 @implementation NSImage (WebExtras) -
trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
r165676 r168047 44 44 #import <WebCore/MIMETypeRegistry.h> 45 45 #import <WebCore/RenderImage.h> 46 #import <WebKit /DOMExtensions.h>47 #import <WebKit /DOMPrivate.h>46 #import <WebKitLegacy/DOMExtensions.h> 47 #import <WebKitLegacy/DOMPrivate.h> 48 48 #import <WebKitSystemInterface.h> 49 49 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/Misc/WebNSViewExtras.h
r165676 r168047 32 32 #import <AppKit/AppKit.h> 33 33 #else 34 #import <WebKit /WAKAppKitStubs.h>35 #import <WebKit /WAKView.h>34 #import <WebKitLegacy/WAKAppKitStubs.h> 35 #import <WebKitLegacy/WAKView.h> 36 36 #endif 37 37 -
trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebNSViewExtras.h>30 31 #import <WebKit /DOMExtensions.h>32 #import <WebKit /WebDataSource.h>33 #import <WebKit /WebFramePrivate.h>34 #import <WebKit /WebFrameViewInternal.h>35 #import <WebKit /WebNSImageExtras.h>36 #import <WebKit /WebNSURLExtras.h>37 #import <WebKit /WebView.h>29 #import <WebKitLegacy/WebNSViewExtras.h> 30 31 #import <WebKitLegacy/DOMExtensions.h> 32 #import <WebKitLegacy/WebDataSource.h> 33 #import <WebKitLegacy/WebFramePrivate.h> 34 #import <WebKitLegacy/WebFrameViewInternal.h> 35 #import <WebKitLegacy/WebNSImageExtras.h> 36 #import <WebKitLegacy/WebNSURLExtras.h> 37 #import <WebKitLegacy/WebView.h> 38 38 39 39 #if !PLATFORM(IOS) 40 #import <WebKit /WebNSPasteboardExtras.h>40 #import <WebKitLegacy/WebNSPasteboardExtras.h> 41 41 #endif 42 42 -
trunk/Source/WebKit/mac/Panels/WebAuthenticationPanel.m
r165676 r168047 29 29 #if !PLATFORM(IOS) 30 30 31 #import <WebKit /WebAuthenticationPanel.h>31 #import <WebKitLegacy/WebAuthenticationPanel.h> 32 32 33 33 #import "WebLocalizableStringsInternal.h" … … 35 35 #import <Foundation/NSURLProtectionSpace.h> 36 36 #import <Foundation/NSURLCredential.h> 37 #import <WebKit /WebKitNSStringExtras.h>38 #import <WebKit /WebNSURLExtras.h>37 #import <WebKitLegacy/WebKitNSStringExtras.h> 38 #import <WebKitLegacy/WebNSURLExtras.h> 39 39 #import <wtf/Assertions.h> 40 40 41 #import <WebKit /WebNSControlExtras.h>41 #import <WebKitLegacy/WebNSControlExtras.h> 42 42 43 43 #define WebAuthenticationPanelNibName @"WebAuthenticationPanel" -
trunk/Source/WebKit/mac/Panels/WebPanelAuthenticationHandler.m
r165676 r168047 29 29 #if !PLATFORM(IOS) 30 30 31 #import <WebKit /WebPanelAuthenticationHandler.h>31 #import <WebKitLegacy/WebPanelAuthenticationHandler.h> 32 32 33 33 #import <Foundation/NSURLAuthenticationChallenge.h> 34 #import <WebKit /WebAuthenticationPanel.h>34 #import <WebKitLegacy/WebAuthenticationPanel.h> 35 35 #import <wtf/Assertions.h> 36 36 -
trunk/Source/WebKit/mac/Plugins/Hosted/HostedNetscapePluginStream.h
r128234 r168047 30 30 31 31 #include <WebCore/NetscapePlugInStreamLoader.h> 32 #include <WebKit /npapi.h>32 #include <WebKitLegacy/npapi.h> 33 33 #include <wtf/PassRefPtr.h> 34 34 #include <wtf/RefCounted.h> -
trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
r161309 r168047 33 33 #include <JavaScriptCore/Strong.h> 34 34 #include <WebCore/Timer.h> 35 #include <WebKit /npapi.h>35 #include <WebKitLegacy/npapi.h> 36 36 #include <wtf/Deque.h> 37 37 #include <wtf/Forward.h> -
trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgent.defs
r45678 r168047 24 24 */ 25 25 26 #include <WebKit /WebKitPluginHostTypes.defs>26 #include <WebKitLegacy/WebKitPluginHostTypes.defs> 27 27 28 28 subsystem WebKitPluginAgent 100; -
trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginAgentReply.defs
r45678 r168047 24 24 */ 25 25 26 #include <WebKit /WebKitPluginHostTypes.defs>26 #include <WebKitLegacy/WebKitPluginHostTypes.defs> 27 27 28 28 subsystem WebKitPluginAgentReply 200; -
trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs
r154078 r168047 24 24 */ 25 25 26 #include <WebKit /WebKitPluginHostTypes.defs>26 #include <WebKitLegacy/WebKitPluginHostTypes.defs> 27 27 28 28 // FIXME: Come up with a better name. -
trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHost.defs
r154078 r168047 24 24 */ 25 25 26 #include <WebKit /WebKitPluginHostTypes.defs>26 #include <WebKitLegacy/WebKitPluginHostTypes.defs> 27 27 28 28 subsystem WebKitPluginHost 300; -
trunk/Source/WebKit/mac/Plugins/Hosted/WebKitPluginHostTypes.defs
r45678 r168047 27 27 #include <mach/mach_types.defs> 28 28 29 import <WebKit /WebKitPluginHostTypes.h>;29 import <WebKitLegacy/WebKitPluginHostTypes.h>; 30 30 31 31 type plist_bytes_t = ^array [] of uint8_t; -
trunk/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
r166378 r168047 58 58 #import <WebCore/SecurityOrigin.h> 59 59 #import <WebCore/WebCoreObjCExtras.h> 60 #import <WebKit /DOMPrivate.h>60 #import <WebKitLegacy/DOMPrivate.h> 61 61 #import <runtime/InitializeThreading.h> 62 62 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.h
r165676 r168047 31 31 32 32 #if ENABLE(NETSCAPE_PLUGIN_API) 33 #import <WebKit /npfunctions.h>33 #import <WebKitLegacy/npfunctions.h> 34 34 #else 35 35 typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void); -
trunk/Source/WebKit/mac/Plugins/WebBasePluginPackage.mm
r166378 r168047 27 27 */ 28 28 29 #import <WebKit /WebBasePluginPackage.h>29 #import <WebKitLegacy/WebBasePluginPackage.h> 30 30 31 31 #import <algorithm> 32 32 #import <WebCore/WebCoreObjCExtras.h> 33 #import <WebKit /WebKitNSStringExtras.h>34 #import <WebKit /WebNetscapePluginPackage.h>35 #import <WebKit /WebPluginPackage.h>33 #import <WebKitLegacy/WebKitNSStringExtras.h> 34 #import <WebKitLegacy/WebNetscapePluginPackage.h> 35 #import <WebKitLegacy/WebPluginPackage.h> 36 36 #import <runtime/InitializeThreading.h> 37 37 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/Plugins/WebNetscapeContainerCheckPrivate.h
r165676 r168047 30 30 #define WebNetscapeContainerCheckPrivate_h 31 31 32 #include <WebKit /npapi.h>32 #include <WebKitLegacy/npapi.h> 33 33 34 34 #ifdef __cplusplus -
trunk/Source/WebKit/mac/Plugins/WebNetscapePluginEventHandlerCocoa.h
r95901 r168047 29 29 #define WebNetscapePluginEventHandlerCocoa_h 30 30 31 #include <WebKit /npapi.h>31 #include <WebKitLegacy/npapi.h> 32 32 #include "WebNetscapePluginEventHandler.h" 33 33 -
trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h
r165676 r168047 32 32 #import <WebCore/Timer.h> 33 33 #import <WebCore/NetscapePlugInStreamLoader.h> 34 #import <WebKit /npfunctions.h>34 #import <WebKitLegacy/npfunctions.h> 35 35 #import <wtf/PassRefPtr.h> 36 36 #import <wtf/RefCounted.h> -
trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.h
r165676 r168047 32 32 33 33 #import "WebNetscapeContainerCheckPrivate.h" 34 #import <WebKit /npfunctions.h>35 #import <WebKit /npapi.h>34 #import <WebKitLegacy/npfunctions.h> 35 #import <WebKitLegacy/npapi.h> 36 36 #import <wtf/HashMap.h> 37 37 #import <wtf/HashSet.h> -
trunk/Source/WebKit/mac/Plugins/WebNetscapePluginView.mm
r166378 r168047 75 75 #import <WebCore/WebCoreURLResponse.h> 76 76 #import <WebCore/npruntime_impl.h> 77 #import <WebKit /DOMPrivate.h>78 #import <WebKit /WebUIDelegate.h>77 #import <WebKitLegacy/DOMPrivate.h> 78 #import <WebKitLegacy/WebUIDelegate.h> 79 79 #import <objc/runtime.h> 80 80 #import <runtime/InitializeThreading.h> -
trunk/Source/WebKit/mac/Plugins/WebPlugin.h
r165676 r168047 28 28 29 29 #import <Foundation/Foundation.h> 30 #import <WebKit /WebKitAvailability.h>30 #import <WebKitLegacy/WebKitAvailability.h> 31 31 32 32 #if !TARGET_OS_IPHONE -
trunk/Source/WebKit/mac/Plugins/WebPluginController.h
r165979 r168047 27 27 */ 28 28 29 #import <WebKit /WebBasePluginPackage.h>30 #import <WebKit /WebPluginContainerCheck.h>29 #import <WebKitLegacy/WebBasePluginPackage.h> 30 #import <WebKitLegacy/WebPluginContainerCheck.h> 31 31 32 32 @class WebFrame; -
trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.h
r165676 r168047 30 30 31 31 #if TARGET_OS_IPHONE 32 #import <WebKit /WAKAppKitStubs.h>32 #import <WebKitLegacy/WAKAppKitStubs.h> 33 33 #endif 34 34 -
trunk/Source/WebKit/mac/Plugins/WebPluginPackage.h
r165676 r168047 29 29 #import <Foundation/Foundation.h> 30 30 31 #import <WebKit /WebBasePluginPackage.h>31 #import <WebKitLegacy/WebBasePluginPackage.h> 32 32 33 33 @protocol WebPluginViewFactory; -
trunk/Source/WebKit/mac/Plugins/WebPluginPackage.mm
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebPluginPackage.h>29 #import <WebKitLegacy/WebPluginPackage.h> 30 30 31 #import <WebKit /WebKitLogging.h>32 #import <WebKit /WebKitNSStringExtras.h>31 #import <WebKitLegacy/WebKitLogging.h> 32 #import <WebKitLegacy/WebKitNSStringExtras.h> 33 33 34 34 NSString *WebPlugInBaseURLKey = @"WebPlugInBaseURLKey"; -
trunk/Source/WebKit/mac/Plugins/WebPluginViewFactory.h
r165676 r168047 28 28 29 29 #import <Foundation/Foundation.h> 30 #import <WebKit /WebKitAvailability.h>30 #import <WebKitLegacy/WebKitAvailability.h> 31 31 32 32 #if !TARGET_OS_IPHONE -
trunk/Source/WebKit/mac/Plugins/WebPluginViewFactoryPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebPluginViewFactory.h>29 #import <WebKitLegacy/WebPluginViewFactory.h> 30 30 31 31 typedef enum { -
trunk/Source/WebKit/mac/Plugins/npapi.mm
r165676 r168047 28 28 29 29 #if ENABLE(NETSCAPE_PLUGIN_API) 30 #import <WebKit /npapi.h>30 #import <WebKitLegacy/npapi.h> 31 31 32 32 #import "WebNetscapePluginView.h" -
trunk/Source/WebKit/mac/Storage/WebDatabaseManagerPrivate.h
r165676 r168047 50 50 51 51 #if TARGET_OS_IPHONE 52 #import <WebKit /WebUIKitSupport.h>52 #import <WebKitLegacy/WebUIKitSupport.h> 53 53 54 54 // Posted when origins have changed. -
trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm
r167786 r168047 54 54 #import <WebCore/FrameView.h> 55 55 #import <WebCore/RuntimeApplicationChecks.h> 56 #import <WebKit /DOMPrivate.h>56 #import <WebKitLegacy/DOMPrivate.h> 57 57 58 58 using namespace WebCore; -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r168041 r168047 122 122 #import <WebCore/WebScriptObjectPrivate.h> 123 123 #import <WebCore/Widget.h> 124 #import <WebKit /DOMElement.h>125 #import <WebKit /DOMHTMLFormElement.h>124 #import <WebKitLegacy/DOMElement.h> 125 #import <WebKitLegacy/DOMHTMLFormElement.h> 126 126 #import <WebKitSystemInterface.h> 127 127 #import <runtime/InitializeThreading.h> -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm
r166928 r168047 38 38 #import <CFNetwork/CFHTTPCookiesPriv.h> 39 39 #import <WebCore/WebCoreThread.h> 40 #import <WebKit /WebFrameLoadDelegate.h>40 #import <WebKitLegacy/WebFrameLoadDelegate.h> 41 41 #endif 42 42 -
trunk/Source/WebKit/mac/WebCoreSupport/WebGeolocationClient.mm
r161185 r168047 41 41 #if PLATFORM(IOS) 42 42 #import <WebCore/WAKResponder.h> 43 #import <WebKit /WebCoreThreadRun.h>43 #import <WebKitLegacy/WebCoreThreadRun.h> 44 44 #endif 45 45 -
trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
r166257 r168047 52 52 #import <WebCore/ScriptController.h> 53 53 #import <WebCore/SoftLinking.h> 54 #import <WebKit /DOMExtensions.h>54 #import <WebKitLegacy/DOMExtensions.h> 55 55 #import <WebKitSystemInterface.h> 56 56 #import <wtf/text/Base64.h> -
trunk/Source/WebKit/mac/WebCoreSupport/WebJavaScriptTextInputPanel.m
r165676 r168047 33 33 #import <wtf/Assertions.h> 34 34 35 #import <WebKit /WebNSControlExtras.h>36 #import <WebKit /WebNSWindowExtras.h>35 #import <WebKitLegacy/WebNSControlExtras.h> 36 #import <WebKitLegacy/WebNSWindowExtras.h> 37 37 38 38 @implementation WebJavaScriptTextInputPanel -
trunk/Source/WebKit/mac/WebCoreSupport/WebKeyGenerator.mm
r161185 r168047 26 26 #if !PLATFORM(IOS) 27 27 28 #import <WebKit /WebKeyGenerator.h>28 #import <WebKitLegacy/WebKeyGenerator.h> 29 29 30 30 #import <WebKitSystemInterface.h> -
trunk/Source/WebKit/mac/WebInspector/WebInspectorPrivate.h
r165676 r168047 29 29 // This header contains the WebInspector SPI. 30 30 31 #import <WebKit /WebInspector.h>31 #import <WebKitLegacy/WebInspector.h> 32 32 33 33 @class WebInspectorFrontend; -
trunk/Source/WebKit/mac/WebInspector/WebNodeHighlight.h
r165676 r168047 29 29 #if PLATFORM(IOS) 30 30 #import <QuartzCore/CATiledLayer.h> 31 #import <WebKit /WAKAppKitStubs.h>32 #import <WebKit /WAKView.h>31 #import <WebKitLegacy/WAKAppKitStubs.h> 32 #import <WebKitLegacy/WAKView.h> 33 33 #endif 34 34 -
trunk/Source/WebKit/mac/WebInspector/WebNodeHighlightView.h
r165676 r168047 29 29 #if PLATFORM(IOS) 30 30 #import <QuartzCore/CAShapeLayer.h> 31 #import <WebKit /WAKAppKitStubs.h>32 #import <WebKit /WAKView.h>31 #import <WebKitLegacy/WAKAppKitStubs.h> 32 #import <WebKitLegacy/WAKView.h> 33 33 #endif 34 34 -
trunk/Source/WebKit/mac/WebKitLegacy/WebKit.h
r168046 r168047 24 24 */ 25 25 26 // This file is only here so that WebKitLegacy.framework has something to link. 26 // FIXME: Remove this __has_include check once the WebKit framework lives in the right place. 27 #if defined(__has_include) && __has_include(<WebKit/WKWebView.h>) 28 #import <WebKit/WKBackForwardList.h> 29 #import <WebKit/WKBackForwardListItem.h> 30 #import <WebKit/WKFoundation.h> 31 #import <WebKit/WKFrameInfo.h> 32 #import <WebKit/WKNavigation.h> 33 #import <WebKit/WKNavigationAction.h> 34 #import <WebKit/WKNavigationDelegate.h> 35 #import <WebKit/WKNavigationResponse.h> 36 #import <WebKit/WKPreferences.h> 37 #import <WebKit/WKProcessPool.h> 38 #import <WebKit/WKScriptMessage.h> 39 #import <WebKit/WKScriptMessageHandler.h> 40 #import <WebKit/WKUIDelegate.h> 41 #import <WebKit/WKUserContentController.h> 42 #import <WebKit/WKWebView.h> 43 #import <WebKit/WKWebViewConfiguration.h> 44 #endif 45 46 #if defined(__has_include) && __has_include(<WebKit/WebKitLegacy.h>) 47 #import <WebKit/WebKitLegacy.h> 48 #endif -
trunk/Source/WebKit/mac/WebKitLegacy/WebKit.m
r168046 r168047 24 24 */ 25 25 26 // This file is only here so that WebKitLegacy.framework has something to link. 26 // FIXME: This is only temporary; WebKit.framework is going to be provided by the WebKit2 project. 27 28 // This file is only here so that WebKit.framework has something to link. -
trunk/Source/WebKit/mac/WebKitLegacy/WebKitPrivate.h
r168046 r168047 24 24 */ 25 25 26 // This file is only here so that WebKitLegacy.framework has something to link. 26 #import <WebKit/WKBackForwardListPrivate.h> 27 #import <WebKit/WKHistoryDelegatePrivate.h> 28 #import <WebKit/WKProcessPoolPrivate.h> 29 #import <WebKit/WKScriptMessagePrivate.h> 30 #import <WebKit/WKUIDelegatePrivate.h> 31 #import <WebKit/WKUserContentControllerPrivate.h> 32 #import <WebKit/WKWebViewConfigurationPrivate.h> 33 #import <WebKit/WKWebViewPrivate.h> 34 #import <WebKit/_WKActivatedElementInfo.h> 35 #import <WebKit/_WKElementAction.h> 36 #import <WebKit/_WKFormDelegate.h> 37 #import <WebKit/_WKFormInputSession.h> 38 #import <WebKit/_WKProcessPoolConfiguration.h> 39 #import <WebKit/_WKScriptWorld.h> 40 #import <WebKit/_WKThumbnailView.h> 41 #import <WebKit/_WKVisitedLinkProvider.h> -
trunk/Source/WebKit/mac/WebView/WebDataSource.h
r165676 r168047 28 28 29 29 #import <Foundation/Foundation.h> 30 #import <WebKit /WebDocument.h>30 #import <WebKitLegacy/WebDocument.h> 31 31 32 32 @class NSMutableURLRequest; -
trunk/Source/WebKit/mac/WebView/WebDataSource.mm
r166378 r168047 59 59 #import <WebCore/WebCoreObjCExtras.h> 60 60 #import <WebCore/WebCoreURLResponse.h> 61 #import <WebKit /DOMHTML.h>62 #import <WebKit /DOMPrivate.h>61 #import <WebKitLegacy/DOMHTML.h> 62 #import <WebKitLegacy/DOMPrivate.h> 63 63 #import <runtime/InitializeThreading.h> 64 64 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/WebView/WebDataSourcePrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDataSource.h>29 #import <WebKitLegacy/WebDataSource.h> 30 30 31 31 @protocol WebDataSourcePrivateDelegate -
trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h
r165676 r168047 33 33 34 34 #if PLATFORM(IOS) 35 #import <WebKit /WAKAppKitStubs.h>35 #import <WebKitLegacy/WAKAppKitStubs.h> 36 36 #endif 37 37 -
trunk/Source/WebKit/mac/WebView/WebDocument.h
r165676 r168047 32 32 #import <AppKit/AppKit.h> 33 33 #else 34 #import <WebKit /WAKAppKitStubs.h>35 #import <WebKit /WAKView.h>34 #import <WebKitLegacy/WAKAppKitStubs.h> 35 #import <WebKitLegacy/WAKView.h> 36 36 #endif 37 37 -
trunk/Source/WebKit/mac/WebView/WebDocumentInternal.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDocumentPrivate.h>30 #import <WebKit /WebHTMLView.h>31 #import <WebKit /WebViewPrivate.h>29 #import <WebKitLegacy/WebDocumentPrivate.h> 30 #import <WebKitLegacy/WebHTMLView.h> 31 #import <WebKitLegacy/WebViewPrivate.h> 32 32 33 33 #if PLATFORM(IOS) -
trunk/Source/WebKit/mac/WebView/WebDocumentPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDocument.h>30 #import <WebKit /WebHTMLView.h>29 #import <WebKitLegacy/WebDocument.h> 30 #import <WebKitLegacy/WebHTMLView.h> 31 31 32 32 @class DOMDocument; -
trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h
r165676 r168047 32 32 #import <AppKit/AppKit.h> 33 33 #else 34 #import <WebKit /WAKAppKitStubs.h>34 #import <WebKitLegacy/WAKAppKitStubs.h> 35 35 #endif 36 36 -
trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebEditingDelegate.h>29 #import <WebKitLegacy/WebEditingDelegate.h> 30 30 31 31 @class DOMHTMLElement; -
trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h
r165676 r168047 29 29 #import <Foundation/Foundation.h> 30 30 #import <JavaScriptCore/JSBase.h> 31 #import <WebKit /WebKitAvailability.h>31 #import <WebKitLegacy/WebKitAvailability.h> 32 32 33 33 #if !TARGET_OS_IPHONE -
trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegatePrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebFrameLoadDelegate.h>29 #import <WebKitLegacy/WebFrameLoadDelegate.h> 30 30 31 31 @class WebScriptWorld; -
trunk/Source/WebKit/mac/WebView/WebFramePrivate.h
r165870 r168047 29 29 // This header contains the WebFrame SPI. 30 30 31 #import <WebKit /WebFrame.h>31 #import <WebKitLegacy/WebFrame.h> 32 32 #import <JavaScriptCore/JSBase.h> 33 33 … … 40 40 #if TARGET_OS_IPHONE 41 41 #include <CoreText/CoreText.h> 42 #include <WebKit /WAKAppKitStubs.h>42 #include <WebKitLegacy/WAKAppKitStubs.h> 43 43 #endif 44 44 -
trunk/Source/WebKit/mac/WebView/WebFrameView.h
r165676 r168047 32 32 #import <AppKit/AppKit.h> 33 33 #else 34 #import <WebKit /WAKAppKitStubs.h>35 #import <WebKit /WAKView.h>34 #import <WebKitLegacy/WAKAppKitStubs.h> 35 #import <WebKitLegacy/WAKView.h> 36 36 #endif 37 37 -
trunk/Source/WebKit/mac/WebView/WebFrameViewInternal.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebFrameView.h>29 #import <WebKitLegacy/WebFrameView.h> 30 30 31 31 @class WebDynamicScrollBarsView; -
trunk/Source/WebKit/mac/WebView/WebFrameViewPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebFrameView.h>29 #import <WebKitLegacy/WebFrameView.h> 30 30 31 31 @interface WebFrameView (WebPrivate) -
trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h
r165676 r168047 29 29 #import <Foundation/Foundation.h> 30 30 31 #import <WebKit /WebDocumentPrivate.h>31 #import <WebKitLegacy/WebDocumentPrivate.h> 32 32 33 33 @class WebHTMLRepresentationPrivate; -
trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm
r167594 r168047 60 60 #import <WebCore/RenderElement.h> 61 61 #import <WebCore/TextResourceDecoder.h> 62 #import <WebKit /DOMHTMLInputElement.h>62 #import <WebKitLegacy/DOMHTMLInputElement.h> 63 63 #import <yarr/RegularExpression.h> 64 64 #import <wtf/Assertions.h> -
trunk/Source/WebKit/mac/WebView/WebHTMLRepresentationPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebHTMLRepresentation.h>29 #import <WebKitLegacy/WebHTMLRepresentation.h> 30 30 31 31 @protocol WebPluginManualLoader; -
trunk/Source/WebKit/mac/WebView/WebHTMLView.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebDocument.h>29 #import <WebKitLegacy/WebDocument.h> 30 30 31 31 #if TARGET_OS_IPHONE 32 #import <WebKit /WAKAppKitStubs.h>33 #import <WebKit /WAKView.h>32 #import <WebKitLegacy/WAKAppKitStubs.h> 33 #import <WebKitLegacy/WAKView.h> 34 34 #endif 35 35 -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r168029 r168047 117 117 #import <WebCore/WebNSAttributedStringExtras.h> 118 118 #import <WebCore/markup.h> 119 #import <WebKit /DOM.h>120 #import <WebKit /DOMExtensions.h>121 #import <WebKit /DOMPrivate.h>119 #import <WebKitLegacy/DOM.h> 120 #import <WebKitLegacy/DOMExtensions.h> 121 #import <WebKitLegacy/DOMPrivate.h> 122 122 #import <WebKitSystemInterface.h> 123 123 #import <dlfcn.h> -
trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebHTMLView.h>29 #import <WebKitLegacy/WebHTMLView.h> 30 30 31 31 #if !TARGET_OS_IPHONE -
trunk/Source/WebKit/mac/WebView/WebPDFView.h
r165676 r168047 29 29 #if !PLATFORM(IOS) 30 30 31 #import <WebKit /WebDocumentInternal.h>31 #import <WebKitLegacy/WebDocumentInternal.h> 32 32 33 33 @class PDFDocument; -
trunk/Source/WebKit/mac/WebView/WebPolicyDelegatePrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebPolicyDelegate.h>29 #import <WebKitLegacy/WebPolicyDelegate.h> 30 30 31 31 @class WebHistoryItem; -
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h
r166665 r168047 27 27 */ 28 28 29 #import <WebKit /WebPreferences.h>29 #import <WebKitLegacy/WebPreferences.h> 30 30 31 31 #if !TARGET_OS_IPHONE -
trunk/Source/WebKit/mac/WebView/WebResourcePrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebResource.h>29 #import <WebKitLegacy/WebResource.h> 30 30 31 31 @interface WebResource (WebResourcePrivate) -
trunk/Source/WebKit/mac/WebView/WebUIDelegate.h
r165676 r168047 29 29 #import <Foundation/Foundation.h> 30 30 #import <Foundation/NSURLRequest.h> 31 #import <WebKit /WebKitAvailability.h>31 #import <WebKitLegacy/WebKitAvailability.h> 32 32 33 33 #if !TARGET_OS_IPHONE 34 34 #import <AppKit/AppKit.h> 35 35 #else 36 #import <WebKit /WAKAppKitStubs.h>37 #import <WebKit /WAKView.h>36 #import <WebKitLegacy/WAKAppKitStubs.h> 37 #import <WebKitLegacy/WAKView.h> 38 38 #endif 39 39 -
trunk/Source/WebKit/mac/WebView/WebUIDelegatePrivate.h
r165676 r168047 27 27 */ 28 28 29 #import <WebKit /WebAllowDenyPolicyListener.h>30 #import <WebKit /WebUIDelegate.h>29 #import <WebKitLegacy/WebAllowDenyPolicyListener.h> 30 #import <WebKitLegacy/WebUIDelegate.h> 31 31 32 32 #if !defined(ENABLE_DASHBOARD_SUPPORT) -
trunk/Source/WebKit/mac/WebView/WebView.h
r165676 r168047 32 32 #import <AppKit/AppKit.h> 33 33 #else 34 #import <WebKit /WAKAppKitStubs.h>35 #import <WebKit /WAKView.h>34 #import <WebKitLegacy/WAKAppKitStubs.h> 35 #import <WebKitLegacy/WAKView.h> 36 36 #if !defined(IBAction) 37 37 #define IBAction void -
trunk/Source/WebKit/mac/WebView/WebView.mm
r168041 r168047 176 176 #import <WebCore/WebCoreView.h> 177 177 #import <WebCore/Widget.h> 178 #import <WebKit /DOM.h>179 #import <WebKit /DOMExtensions.h>180 #import <WebKit /DOMPrivate.h>178 #import <WebKitLegacy/DOM.h> 179 #import <WebKitLegacy/DOMExtensions.h> 180 #import <WebKitLegacy/DOMPrivate.h> 181 181 #import <WebKitSystemInterface.h> 182 182 #import <bindings/ScriptValue.h> … … 251 251 252 252 #if ENABLE(DASHBOARD_SUPPORT) 253 #import <WebKit /WebDashboardRegion.h>253 #import <WebKitLegacy/WebDashboardRegion.h> 254 254 #endif 255 255 -
trunk/Source/WebKit/mac/WebView/WebViewPrivate.h
r166257 r168047 27 27 */ 28 28 29 #import <WebKit /WebView.h>30 #import <WebKit /WebFramePrivate.h>29 #import <WebKitLegacy/WebView.h> 30 #import <WebKitLegacy/WebFramePrivate.h> 31 31 #import <JavaScriptCore/JSBase.h> 32 32 -
trunk/Source/WebKit/mac/migrate-headers.sh
r165298 r168047 26 26 mkdir -p "${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}" 27 27 mkdir -p "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}" 28 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit "28 mkdir -p "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy" 29 29 30 30 # If we didn't build WebCore, use the production copy of the headers -
trunk/Tools/ChangeLog
r168045 r168047 1 2014-04-30 Anders Carlsson <andersca@apple.com> 2 3 Move the legacy WebKit API into WebKitLegacy.framework and move it inside WebKit.framework 4 https://bugs.webkit.org/show_bug.cgi?id=132399 5 <rdar://problem/15920046> 6 7 Reviewed by Dan Bernstein. 8 9 * Scripts/check-for-webkit-framework-include-consistency: 10 Allos WAK headers in WebKitLegacy as well as WebKit. 11 12 * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm: 13 * TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm: 14 Update header imports. 15 1 16 2014-04-30 Simon Fraser <simon.fraser@apple.com> 2 17 -
trunk/Tools/Scripts/check-for-webkit-framework-include-consistency
r161638 r168047 77 77 # iOS we want to keep the WAK headers private, even if a public header includes them, 78 78 # so we are going to not show warnings for WAK headers. 79 return if framework == "WebKit"and included_header_name =~ /^WAK/79 return if (framework == "WebKit" or framework == "WebKitLegacy") and included_header_name =~ /^WAK/ 80 80 81 81 header_type = $HEADER_NAMES_TO_TYPE[included_header_name] -
trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm
r167479 r168047 32 32 #import "Test.h" 33 33 #import <WebCore/FileSystem.h> 34 #import <WebKit 2/_WKDownload.h>35 #import <WebKit 2/_WKDownloadDelegate.h>36 #import <WebKit 2/WKNavigationDelegatePrivate.h>37 #import <WebKit 2/WKProcessPoolPrivate.h>38 #import <WebKit 2/WKWebView.h>39 #import <WebKit 2/WKWebViewConfiguration.h>34 #import <WebKit/_WKDownload.h> 35 #import <WebKit/_WKDownloadDelegate.h> 36 #import <WebKit/WKNavigationDelegatePrivate.h> 37 #import <WebKit/WKProcessPoolPrivate.h> 38 #import <WebKit/WKWebView.h> 39 #import <WebKit/WKWebViewConfiguration.h> 40 40 #import <wtf/RetainPtr.h> 41 41 #import <wtf/text/WTFString.h> -
trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm
r167627 r168047 26 26 #include "config.h" 27 27 28 #import <WebKit 2/WKNavigation.h>29 #import <WebKit 2/WKNavigationDelegate.h>30 #import <WebKit 2/WKWebView.h>28 #import <WebKit/WKNavigation.h> 29 #import <WebKit/WKNavigationDelegate.h> 30 #import <WebKit/WKWebView.h> 31 31 #import <wtf/RetainPtr.h> 32 32 #import "PlatformUtilities.h"
Note: See TracChangeset
for help on using the changeset viewer.