Diff
Modified: trunk/Source/WebCore/ChangeLog (152570 => 152571)
--- trunk/Source/WebCore/ChangeLog 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebCore/ChangeLog 2013-07-11 15:43:53 UTC (rev 152571)
@@ -1,3 +1,15 @@
+2013-07-11 Timothy Hatcher <[email protected]>
+
+ Revert r152267 and soft link WebInspectorUI.framework again.
+
+ https://bugs.webkit.org/show_bug.cgi?id=118544
+
+ Reviewed by David Kilzer.
+
+ * platform/mac/SoftLinking.h: Rename SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL
+ to SOFT_LINK_STAGED_FRAMEWORK and ASSERT since we don't want to silently
+ fail anymore when using this macro.
+
2013-07-11 Jae Hyun Park <[email protected]>
[Coordinated Graphics] Parameter of commitSceneState should be const
Modified: trunk/Source/WebCore/platform/mac/SoftLinking.h (152570 => 152571)
--- trunk/Source/WebCore/platform/mac/SoftLinking.h 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebCore/platform/mac/SoftLinking.h 2013-07-11 15:43:53 UTC (rev 152571)
@@ -52,7 +52,7 @@
return frameworkLibrary; \
}
-#define SOFT_LINK_STAGED_FRAMEWORK_OPTIONAL(framework, unstagedLocation, version) \
+#define SOFT_LINK_STAGED_FRAMEWORK(framework, unstagedLocation, version) \
static void* framework##Library() \
{ \
static void* frameworkLibrary = ^{ \
@@ -61,6 +61,7 @@
result = dlopen("/System/Library/StagedFrameworks/Safari/" #framework ".framework/Versions/" #version "/" #framework, RTLD_LAZY); \
return result; \
}(); \
+ ASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
return frameworkLibrary; \
}
Modified: trunk/Source/WebKit/ChangeLog (152570 => 152571)
--- trunk/Source/WebKit/ChangeLog 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit/ChangeLog 2013-07-11 15:43:53 UTC (rev 152571)
@@ -1,3 +1,13 @@
+2013-07-11 Timothy Hatcher <[email protected]>
+
+ Revert r152267 and soft link WebInspectorUI.framework again.
+
+ https://bugs.webkit.org/show_bug.cgi?id=118544
+
+ Reviewed by David Kilzer.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2013-07-01 Timothy Hatcher <[email protected]>
Link to WebInspectorUI.framework at build time instead of soft linking.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (152570 => 152571)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2013-07-11 15:43:53 UTC (rev 152571)
@@ -448,7 +448,6 @@
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; };
@@ -832,7 +831,6 @@
1A20D08A0ED384F20043FA9F /* QuartzCore.framework */,
830E81E005853AC000AD0891 /* Security.framework */,
F738C9EA03FAD3DF0321FBE0 /* WebCore.framework */,
- 1CC915AB1782151B002CC4B1 /* WebInspectorUI.framework */,
);
name = "Frameworks and Libraries";
sourceTree = "<group>";
Modified: trunk/Source/WebKit/mac/ChangeLog (152570 => 152571)
--- trunk/Source/WebKit/mac/ChangeLog 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-07-11 15:43:53 UTC (rev 152571)
@@ -1,3 +1,15 @@
+2013-07-11 Timothy Hatcher <[email protected]>
+
+ Revert r152267 and soft link WebInspectorUI.framework again.
+
+ https://bugs.webkit.org/show_bug.cgi?id=118544
+
+ Reviewed by David Kilzer.
+
+ * Configurations/WebKit.xcconfig:
+ * WebCoreSupport/WebInspectorClient.mm:
+ (useWebKitWebInspector):
+
2013-07-10 Jessie Berlin <[email protected]>
Remove some dead code from WebNSURLExtras _web_hostString
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (152570 => 152571)
--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2013-07-11 15:43:53 UTC (rev 152571)
@@ -70,7 +70,7 @@
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 -framework WebInspectorUI;
+OTHER_LDFLAGS_macosx = -sub_umbrella WebCore -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL -framework Security;
NORMAL_WEBKIT_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
NORMAL_WEBKIT_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (152570 => 152571)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2013-07-11 15:43:53 UTC (rev 152571)
@@ -49,10 +49,13 @@
#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(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;
@@ -217,6 +220,9 @@
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;
Modified: trunk/Source/WebKit2/ChangeLog (152570 => 152571)
--- trunk/Source/WebKit2/ChangeLog 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-11 15:43:53 UTC (rev 152571)
@@ -1,3 +1,18 @@
+2013-07-11 Timothy Hatcher <[email protected]>
+
+ Revert r152267 and soft link WebInspectorUI.framework again.
+
+ https://bugs.webkit.org/show_bug.cgi?id=118544
+
+ Reviewed by David Kilzer.
+
+ * Configurations/WebKit2.xcconfig:
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::inspectorReallyUsesWebKitUserInterface):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/mac/WebInspectorMac.mm:
+ (WebKit::inspectorReallyUsesWebKitUserInterface):
+
2013-07-11 Jae Hyun Park <[email protected]>
[Coordinated Graphics] Parameter of commitSceneState should be const
Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (152570 => 152571)
--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2013-07-11 15:43:53 UTC (rev 152571)
@@ -32,7 +32,7 @@
FRAMEWORK_AND_LIBRARY_LDFLAGS = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework _javascript_Core -licucore -framework QuartzCore -framework Security -framework WebCore -framework CoreAudio;
OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS);
-OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebInspectorUI;
+OTHER_LDFLAGS_macosx = $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf;
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (152570 => 152571)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2013-07-11 15:43:53 UTC (rev 152571)
@@ -47,8 +47,11 @@
#import <WebKitSystemInterface.h>
#import <WebCore/InspectorFrontendClientLocal.h>
#import <WebCore/LocalizedStrings.h>
+#import <WebCore/SoftLinking.h>
#import <wtf/text/WTFString.h>
+SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
+
using namespace WebCore;
using namespace WebKit;
@@ -191,6 +194,9 @@
{
// 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;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (152570 => 152571)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-07-11 15:43:53 UTC (rev 152571)
@@ -1754,7 +1754,6 @@
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>"; };
@@ -3006,7 +3005,6 @@
1AA1CC5C100FA1A10078DEBC /* QuartzCore.framework */,
BCF5068412431861005955AE /* Security.framework */,
1AA1C79A100E7FC50078DEBC /* WebCore.framework */,
- 1CC915A91782106D002CC4B1 /* WebInspectorUI.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm (152570 => 152571)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2013-07-11 15:17:13 UTC (rev 152570)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2013-07-11 15:43:53 UTC (rev 152571)
@@ -26,12 +26,19 @@
#import "config.h"
#import "WebInspector.h"
+#import <WebCore/SoftLinking.h>
+
+SOFT_LINK_STAGED_FRAMEWORK(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;
