Diff
Modified: trunk/Source/WTF/ChangeLog (121571 => 121572)
--- trunk/Source/WTF/ChangeLog 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WTF/ChangeLog 2012-06-29 17:36:26 UTC (rev 121572)
@@ -1,3 +1,13 @@
+2012-06-29 Eric Seidel <e...@webkit.org>
+
+ Remove BUILDING_ON_LEOPARD now that no ports build on Leopard
+ https://bugs.webkit.org/show_bug.cgi?id=90249
+
+ Reviewed by Ryosuke Niwa.
+
+ * wtf/ThreadingPthreads.cpp:
+ (WTF::initializeCurrentThreadInternal):
+
2012-06-29 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r121529.
Modified: trunk/Source/WTF/wtf/ThreadingPthreads.cpp (121571 => 121572)
--- trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WTF/wtf/ThreadingPthreads.cpp 2012-06-29 17:36:26 UTC (rev 121572)
@@ -55,7 +55,7 @@
#include <sys/time.h>
#endif
-#if OS(MAC_OS_X) && !defined(BUILDING_ON_LEOPARD)
+#if OS(MAC_OS_X)
#include <objc/objc-auto.h>
#endif
@@ -228,7 +228,7 @@
UNUSED_PARAM(threadName);
#endif
-#if OS(MAC_OS_X) && !defined(BUILDING_ON_LEOPARD)
+#if OS(MAC_OS_X)
// All threads that potentially use APIs above the BSD layer must be registered with the Objective-C
// garbage collector in case API implementations use garbage-collected memory.
objc_registerThreadWithCollector();
Modified: trunk/Source/WebCore/ChangeLog (121571 => 121572)
--- trunk/Source/WebCore/ChangeLog 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/ChangeLog 2012-06-29 17:36:26 UTC (rev 121572)
@@ -1,3 +1,32 @@
+2012-06-29 Eric Seidel <e...@webkit.org>
+
+ Remove BUILDING_ON_LEOPARD now that no ports build on Leopard
+ https://bugs.webkit.org/show_bug.cgi?id=90249
+
+ Reviewed by Ryosuke Niwa.
+
+ I don't think I quite got it all yet, but this is another step towards
+ removing Leopard support in WebCore.
+
+ * WebCore.exp.in:
+ * page/AlternativeTextClient.h:
+ * page/ContextMenuController.cpp:
+ (WebCore::ContextMenuController::populate):
+ * platform/graphics/cg/ImageBufferDataCG.h:
+ * platform/graphics/mac/GraphicsContextMac.mm:
+ (WebCore::GraphicsContext::drawLineForDocumentMarker):
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::setClosedCaptionsVisible):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/network/Credential.h:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore):
+ (WebCore::initializeMaximumHTTPConnectionCountPerHost):
+ * platform/text/TextChecking.h:
+ (WebCore):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::containsPaintedContent):
+
2012-06-29 Andreas Kling <kl...@webkit.org>
Unreviewed, rolling out r121562.
Modified: trunk/Source/WebCore/WebCore.exp.in (121571 => 121572)
--- trunk/Source/WebCore/WebCore.exp.in 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-06-29 17:36:26 UTC (rev 121572)
@@ -2535,7 +2535,7 @@
__ZNK7WebCore4KURL22protocolIsInHTTPFamilyEv
#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
__ZN7WebCore27AlternativeTextUIController15addAlternativesERKN3WTF9RetainPtrI18NSTextAlternativesEE
__ZN7WebCore27AlternativeTextUIController22alternativesForContextEy
__ZN7WebCore27AlternativeTextUIController5clearEv
Modified: trunk/Source/WebCore/page/AlternativeTextClient.h (121571 => 121572)
--- trunk/Source/WebCore/page/AlternativeTextClient.h 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/page/AlternativeTextClient.h 2012-06-29 17:36:26 UTC (rev 121572)
@@ -31,10 +31,10 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
// Some platforms provide UI for suggesting alternative dictation text.
#define WTF_USE_DICTATION_ALTERNATIVES 1
-#endif // PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
+#endif // PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION)
namespace WebCore {
Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (121571 => 121572)
--- trunk/Source/WebCore/page/ContextMenuController.cpp 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2012-06-29 17:36:26 UTC (rev 121572)
@@ -934,7 +934,7 @@
appendItem(IgnoreGrammarItem, m_contextMenu.get());
appendItem(*separatorItem(), m_contextMenu.get());
haveContextMenuItemsForMisspellingOrGrammer = true;
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC)
} else {
// If the string was autocorrected, generate a contextual menu item allowing it to be changed back.
String replacedString = m_hitTestResult.replacedString();
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (121571 => 121572)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2012-06-29 17:36:26 UTC (rev 121572)
@@ -30,7 +30,7 @@
#include <wtf/RetainPtr.h>
#include <wtf/Uint8ClampedArray.h>
-#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
+#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_SNOW_LEOPARD))
#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
#endif
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (121571 => 121572)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2012-06-29 17:36:26 UTC (rev 121572)
@@ -129,7 +129,7 @@
patternColor = grammarPatternColor.get();
break;
}
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
// To support correction panel.
case DocumentMarkerAutocorrectionReplacementLineStyle:
case DocumentMarkerDictationAlternativesLineStyle:
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (121571 => 121572)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2012-06-29 17:36:26 UTC (rev 121572)
@@ -903,7 +903,7 @@
if (metaDataAvailable()) {
wkQTMovieSetShowClosedCaptions(m_qtMovie.get(), closedCaptionsVisible);
-#if USE(ACCELERATED_COMPOSITING) && !defined(BUILDING_ON_LEOPARD)
+#if USE(ACCELERATED_COMPOSITING)
if (closedCaptionsVisible && m_qtVideoLayer) {
// Captions will be rendered upside down unless we flag the movie as flipped (again). See <rdar://7408440>.
[m_qtVideoLayer.get() setGeometryFlipped:YES];
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (121571 => 121572)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2012-06-29 17:36:26 UTC (rev 121572)
@@ -58,7 +58,7 @@
typedef FMFont ATSUFontID;
typedef UInt16 ATSGlyphRef;
-#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_SNOW_LEOPARD)
typedef struct __IOSurface *IOSurfaceRef;
#endif
Modified: trunk/Source/WebCore/platform/network/Credential.h (121571 => 121572)
--- trunk/Source/WebCore/platform/network/Credential.h 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/platform/network/Credential.h 2012-06-29 17:36:26 UTC (rev 121572)
@@ -27,7 +27,7 @@
#include "PlatformString.h"
-#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS)) && !defined(BUILDING_ON_LEOPARD))
+#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS)))
#if CERTIFICATE_CREDENTIALS_SUPPORTED
#include <Security/SecBase.h>
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (121571 => 121572)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2012-06-29 17:36:26 UTC (rev 121572)
@@ -265,7 +265,7 @@
s_httpPipeliningEnabled = flag;
}
-#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
static inline bool readBooleanPreference(CFStringRef key)
{
Boolean keyExistsAndHasValidFormat;
@@ -281,7 +281,7 @@
// Always set the connection count per host, even when pipelining.
unsigned maximumHTTPConnectionCountPerHost = wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
-#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
static const unsigned unlimitedConnectionCount = 10000;
if (!ResourceRequest::httpPipeliningEnabled() && readBooleanPreference(CFSTR("WebKitEnableHTTPPipelining")))
Modified: trunk/Source/WebCore/platform/text/TextChecking.h (121571 => 121572)
--- trunk/Source/WebCore/platform/text/TextChecking.h 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/platform/text/TextChecking.h 2012-06-29 17:36:26 UTC (rev 121572)
@@ -39,18 +39,18 @@
#define WTF_USE_GRAMMAR_CHECKING 1
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC)
#define WTF_USE_UNIFIED_TEXT_CHECKING 1
#define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
#endif
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
// Some platforms provide UI for suggesting autocorrection.
#define WTF_USE_AUTOCORRECTION_PANEL 1
// Some platforms use spelling and autocorrection markers to provide visual cue.
// On such platform, if word with marker is edited, we need to remove the marker.
#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
-#endif // #if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#endif // #if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
enum TextCheckingType {
TextCheckingTypeSpelling = 1 << 1,
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (121571 => 121572)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-06-29 17:36:26 UTC (rev 121572)
@@ -991,7 +991,7 @@
if (renderer()->isVideo() && toRenderVideo(renderer())->shouldDisplayVideo())
return hasBoxDecorationsOrBackground(renderer());
#endif
-#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_SNOW_LEOPARD)
#elif ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS)
if (isAcceleratedCanvas(renderer()))
return hasBoxDecorationsOrBackground(renderer());
Modified: trunk/Source/WebKit2/ChangeLog (121571 => 121572)
--- trunk/Source/WebKit2/ChangeLog 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-29 17:36:26 UTC (rev 121572)
@@ -1,3 +1,16 @@
+2012-06-29 Eric Seidel <e...@webkit.org>
+
+ Remove BUILDING_ON_LEOPARD now that no ports build on Leopard
+ https://bugs.webkit.org/show_bug.cgi?id=90249
+
+ Reviewed by Ryosuke Niwa.
+
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_GetValue):
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection):
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+
2012-06-29 Konrad Piascik <kpias...@rim.com>
Don't hardcode target dpi of 160 (it should be 96 on desktop)
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (121571 => 121572)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2012-06-29 17:36:26 UTC (rev 121572)
@@ -38,7 +38,7 @@
#include <WebCore/SharedBuffer.h>
#include <utility>
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
#include "NetscapeSandboxFunctions.h"
#endif
@@ -507,7 +507,7 @@
*(NPBool*)value = true;
break;
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && ENABLE(PLUGIN_PROCESS)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) && ENABLE(PLUGIN_PROCESS)
case WKNVSandboxFunctions:
{
*(WKNSandboxFunctions **)value = netscapeSandboxFunctions();
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (121571 => 121572)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2012-06-29 17:36:26 UTC (rev 121572)
@@ -375,7 +375,7 @@
bool WebEditorClient::shouldEraseMarkersAfterChangeSelection(WebCore::TextCheckingType type) const
{
// This prevents erasing spelling markers on OS X Lion or later to match AppKit on these Mac OS X versions.
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
return type != TextCheckingTypeSpelling;
#else
return true;
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (121571 => 121572)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2012-06-29 17:29:42 UTC (rev 121571)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2012-06-29 17:36:26 UTC (rev 121572)
@@ -135,7 +135,7 @@
virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength) OVERRIDE;
virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord) OVERRIDE;
virtual void checkGrammarOfString(const UChar*, int length, Vector<WebCore::GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE;
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)
+#if PLATFORM(MAC)
virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector<WebCore::TextCheckingResult>& results) OVERRIDE;
#endif
virtual void updateSpellingUIWithGrammarString(const String&, const WebCore::GrammarDetail&) OVERRIDE;
