Title: [129578] trunk/Tools
- Revision
- 129578
- Author
- [email protected]
- Date
- 2012-09-25 17:24:02 -0700 (Tue, 25 Sep 2012)
Log Message
Fix SnowLeopard build by adding #ifdefs.
Fix crashes on some tests where the CFURLRef appears to be null.
* WebKitTestRunner/InjectedBundle/mac/InjectedBundlePageMac.mm:
(WTR::testPathFromURL):
(WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129577 => 129578)
--- trunk/Tools/ChangeLog 2012-09-26 00:22:44 UTC (rev 129577)
+++ trunk/Tools/ChangeLog 2012-09-26 00:24:02 UTC (rev 129578)
@@ -1,5 +1,15 @@
2012-09-25 Simon Fraser <[email protected]>
+ Fix SnowLeopard build by adding #ifdefs.
+
+ Fix crashes on some tests where the CFURLRef appears to be null.
+
+ * WebKitTestRunner/InjectedBundle/mac/InjectedBundlePageMac.mm:
+ (WTR::testPathFromURL):
+ (WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame):
+
+2012-09-25 Simon Fraser <[email protected]>
+
Speculative build fix for Production builds.
* DumpRenderTree/mac/Configurations/Base.xcconfig:
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundlePageMac.mm (129577 => 129578)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundlePageMac.mm 2012-09-26 00:22:44 UTC (rev 129577)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundlePageMac.mm 2012-09-26 00:24:02 UTC (rev 129578)
@@ -38,10 +38,13 @@
using namespace WTF;
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
static String testPathFromURL(WKURLRef url)
{
RetainPtr<CFURLRef> cfURL(AdoptCF, WKURLCopyCFURL(kCFAllocatorDefault, url));
-
+ if (!cfURL)
+ return String();
+
RetainPtr<CFStringRef> schemeCFString(AdoptCF, CFURLCopyScheme(cfURL.get()));
RetainPtr<CFStringRef> pathCFString(AdoptCF, CFURLCopyPath(cfURL.get()));
@@ -67,9 +70,11 @@
return String();
}
+#endif
void InjectedBundlePage::platformDidStartProvisionalLoadForFrame(WKBundleFrameRef frame)
{
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
if (!WKBundleFrameIsMainFrame(frame))
return;
@@ -83,6 +88,7 @@
RetainPtr<CFStringRef> cfString(AdoptCF, builder.toString().createCFString());
WKSetCrashReportApplicationSpecificInformation(cfString.get());
}
+#endif
}
} // namespace WTR
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
