Skip to content

W
webkit
Commit 3bc89111 authored by timothy@apple.com's avatar timothy@apple.com
Browse files
Options

Link to WebInspectorUI.framework at build time instead of soft linking. 

https://bugs.webkit.org/show_bug.cgi?id=118261

Reviewed by Joseph Pecoraro.

.:

* Source/Makefile: Build WebInspectorUI before WebKit and WebKit2.

Source/WebKit:

* WebKit.xcodeproj/project.pbxproj:

Source/WebKit/mac:

* Configurations/WebKit.xcconfig:
* WebCoreSupport/WebInspectorClient.mm:
(useWebKitWebInspector):

Source/WebKit2:

* Configurations/WebKit2.xcconfig:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::inspectorReallyUsesWebKitUserInterface):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/mac/WebInspectorMac.mm:
(WebKit::inspectorReallyUsesWebKitUserInterface):

Tools:

* Scripts/build-webkit: Build WebInspectorUI before WebKit and WebKit2.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152267 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9aa2b1b7
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 23 deletions
ChangeLog
View file @ 3bc89111
2013-07-01 Timothy Hatcher <timothy@apple.com>
Link to WebInspectorUI.framework at build time instead of soft linking.
https://bugs.webkit.org/show_bug.cgi?id=118261
Reviewed by Joseph Pecoraro.
* Source/Makefile: Build WebInspectorUI before WebKit and WebKit2.
2013-06-28 Sean Bright <sean@malleable.com>
[Autotools] Properly quote harfbuzz-icu pkg-config check
......
Source/Makefile
View file @ 3bc89111
MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit WebKit2 WebInspectorUI
MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebInspectorUI WebKit WebKit2
ifneq (,$(findstring iphoneos,$(SDKROOT)))
MODULES = WTF JavaScriptCore ThirdParty/ANGLE WebCore WebKit
......
Source/WebKit/ChangeLog
View file @ 3bc89111
2013-07-01 Timothy Hatcher <timothy@apple.com>
Link to WebInspectorUI.framework at build time instead of soft linking.
https://bugs.webkit.org/show_bug.cgi?id=118261
Reviewed by Joseph Pecoraro.
* WebKit.xcodeproj/project.pbxproj:
2013-07-01 Brent Fulgham <bfulgham@apple.com>
[Windows] Unreviewed build correction.
......
Source/WebKit/WebKit.xcodeproj/project.pbxproj
View file @ 3bc89111
......@@ -448,6 +448,7 @@
1C904FD40BA9DD0F0081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
1C904FD50BA9DD0F0081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
1C9F5EFB1651CDF700C480F8 /* Dock.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Dock.pdf; sourceTree = "<group>"; };
1CC915AB1782151B002CC4B1 /* WebInspectorUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebInspectorUI.framework; path = "/Users/Timothy/Work/Safari-TOT.git/OpenSource/WebKitBuild/Release/WebInspectorUI.framework"; sourceTree = "<absolute>"; };
1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OldWebAssertions.c; sourceTree = "<group>"; };
224100F2091818D900D2D266 /* WebPluginsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginsPrivate.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
224100F80918190100D2D266 /* WebPluginsPrivate.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginsPrivate.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
......@@ -831,6 +832,7 @@
1A20D08A0ED384F20043FA9F /* QuartzCore.framework */,
830E81E005853AC000AD0891 /* Security.framework */,
F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */,
1CC915AB1782151B002CC4B1 /* WebInspectorUI.framework */,
);
name = "Frameworks and Libraries";
sourceTree = "<group>";
......
Source/WebKit/mac/ChangeLog
View file @ 3bc89111
2013-07-01 Timothy Hatcher <timothy@apple.com>
Link to WebInspectorUI.framework at build time instead of soft linking.
https://bugs.webkit.org/show_bug.cgi?id=118261
Reviewed by Joseph Pecoraro.
* Configurations/WebKit.xcconfig:
* WebCoreSupport/WebInspectorClient.mm:
(useWebKitWebInspector):
2013-07-01 Jochen Eisinger <jochen@chromium.org>
Remove support for consumable user gestures
......
Source/WebKit/mac/Configurations/WebKit.xcconfig
View file @ 3bc89111
......@@ -70,7 +70,7 @@ OTHER_LDFLAGS_BASE = -licucore -framework JavaScriptCore -framework QuartzCore -
OTHER_LDFLAGS = $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO;
OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL -framework Security;
OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL -framework Security -framework WebInspectorUI;
NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
......
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
View file @ 3bc89111
......@@ -49,13 +49,10 @@
#import <WebCore/Page.h>
#import <WebCore/ScriptController.h>
#import <WebCore/ScriptValue.h>
#import <WebCore/SoftLinking.h>
#import <WebKit/DOMExtensions.h>
#import <WebKitSystemInterface.h>
#import <wtf/PassOwnPtr.h>
SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
// The margin from the top and right of the dock button (same as the full screen button).
static const CGFloat dockButtonMargin = 3;
......@@ -220,9 +217,6 @@ void WebInspectorFrontendClient::frontendLoaded()
static bool useWebKitWebInspector()
{
// Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
WebInspectorUILibrary();
if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])
return true;
......
Source/WebKit2/ChangeLog
View file @ 3bc89111
2013-07-01 Timothy Hatcher <timothy@apple.com>
Link to WebInspectorUI.framework at build time instead of soft linking.
https://bugs.webkit.org/show_bug.cgi?id=118261
Reviewed by Joseph Pecoraro.
* Configurations/WebKit2.xcconfig:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::inspectorReallyUsesWebKitUserInterface):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/mac/WebInspectorMac.mm:
(WebKit::inspectorReallyUsesWebKitUserInterface):
2013-07-01 Tim Horton <timothy_horton@apple.com>
[wk2] TiledCoreAnimationDrawingArea should support scrolling its exposed rect
......
Source/WebKit2/Configurations/WebKit2.xcconfig
View file @ 3bc89111
......@@ -32,7 +32,7 @@ DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
FRAMEWORK_AND_LIBRARY_LDFLAGS = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework JavaScriptCore -licucore -framework QuartzCore -framework Security -framework WebCore -framework CoreAudio;
OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS);
OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebInspectorUI;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf;
......
Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
View file @ 3bc89111
......@@ -47,11 +47,8 @@
#import <WebKitSystemInterface.h>
#import <WebCore/InspectorFrontendClientLocal.h>
#import <WebCore/LocalizedStrings.h>
#import <WebCore/SoftLinking.h>
#import <wtf/text/WTFString.h>
SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
using namespace WebCore;
using namespace WebKit;
......@@ -194,9 +191,6 @@ static bool inspectorReallyUsesWebKitUserInterface(WebPreferences* preferences)
{
// This matches a similar check in WebInspectorMac.mm. Keep them in sync.
// Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
WebInspectorUILibrary();
if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])
return true;
......
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
View file @ 3bc89111
......@@ -1754,6 +1754,7 @@
1CB75C931701E880009F809F /* DockRight.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = DockRight.pdf; path = Resources/DockRight.pdf; sourceTree = "<group>"; };
1CBC945D16515ED200D68AAE /* DockBottom.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = DockBottom.pdf; path = Resources/DockBottom.pdf; sourceTree = "<group>"; };
1CC417C912C00CCA002BE67B /* TextCheckerCompletion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckerCompletion.h; sourceTree = "<group>"; };
1CC915A91782106D002CC4B1 /* WebInspectorUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebInspectorUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
290F4271172A0C7400939FF0 /* ChildProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildProcessSupplement.h; sourceTree = "<group>"; };
293EBEA91627D9C9005F89F1 /* WKDOMText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMText.h; sourceTree = "<group>"; };
293EBEAA1627D9C9005F89F1 /* WKDOMText.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKDOMText.mm; sourceTree = "<group>"; };
......@@ -3005,6 +3006,7 @@
1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */,
BCF5068412431861005955AE /* Security.framework */,
1AA1C79A100E7FC50078DEBC /* WebCore.framework */,
1CC915A91782106D002CC4B1 /* WebInspectorUI.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
......
Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm
View file @ 3bc89111
......@@ -26,19 +26,12 @@
#import "config.h"
#import "WebInspector.h"
#import <WebCore/SoftLinking.h>
SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(WebInspectorUI, PrivateFrameworks, A)
namespace WebKit {
static bool inspectorReallyUsesWebKitUserInterface(bool preference)
{
// This matches a similar check in WebInspectorProxyMac.mm. Keep them in sync.
// Call the soft link framework function to dlopen it, then [NSBundle bundleWithIdentifier:] will work.
WebInspectorUILibrary();
if (![[NSBundle bundleWithIdentifier:@"com.apple.WebInspectorUI"] pathForResource:@"Main" ofType:@"html"])
return true;
......
Tools/ChangeLog
View file @ 3bc89111
2013-07-01 Timothy Hatcher <timothy@apple.com>
Link to WebInspectorUI.framework at build time instead of soft linking.
https://bugs.webkit.org/show_bug.cgi?id=118261
Reviewed by Joseph Pecoraro.
* Scripts/build-webkit: Build WebInspectorUI before WebKit and WebKit2.
2013-07-01 Tim Horton <timothy_horton@apple.com>
Maximum scroll position can be negative in some cases
......
Tools/Scripts/build-webkit
View file @ 3bc89111
......@@ -227,7 +227,8 @@ if (isAppleMacWebKit()) {
# WebKit2 is only supported in SnowLeopard and later at present.
push @projects, ("Source/WebKit2", "Tools/MiniBrowser") if osXVersion()->{"minor"} >= 6 and !$noWebKit2;
push @projects, ("Source/WebInspectorUI");
# WebInspectorUI must come before WebKit and WebKit2
unshift @projects, ("Source/WebInspectorUI");
# Build Tools needed for Apple ports
push @projects, ("Tools/DumpRenderTree", "Tools/WebKitTestRunner", "Source/ThirdParty/gtest", "Tools/TestWebKitAPI");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment