From 49348268d6db96879f4d8c3f7bcede27f238b12a Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Fri, 29 Jun 2012 18:43:33 +0000 Subject: [PATCH] Unreviewed, rolling out r121572. http://trac.webkit.org/changeset/121572 https://bugs.webkit.org/show_bug.cgi?id=90249 Breaks Mac build since it depends on r121547, which was rolled out Source/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): Source/WebKit2: * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: (WebKit::NPN_GetValue): * WebProcess/WebCoreSupport/WebEditorClient.cpp: (WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection): * WebProcess/WebCoreSupport/WebEditorClient.h: Source/WTF: * wtf/ThreadingPthreads.cpp: (WTF::initializeCurrentThreadInternal): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121578 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WTF/ChangeLog | 12 ++++++++++ Source/WTF/wtf/ThreadingPthreads.cpp | 4 ++-- Source/WebCore/ChangeLog | 28 ++++++++++++++++++++++ Source/WebCore/WebCore.exp.in | 2 +- Source/WebCore/page/AlternativeTextClient.h | 4 ++-- Source/WebCore/page/ContextMenuController.cpp | 2 +- .../platform/graphics/cg/ImageBufferDataCG.h | 2 +- .../platform/graphics/mac/GraphicsContextMac.mm | 2 +- .../graphics/mac/MediaPlayerPrivateQTKit.mm | 2 +- .../WebCore/platform/mac/WebCoreSystemInterface.h | 2 +- Source/WebCore/platform/network/Credential.h | 2 +- .../platform/network/cf/ResourceRequestCFNet.cpp | 4 ++-- Source/WebCore/platform/text/TextChecking.h | 6 ++--- Source/WebCore/rendering/RenderLayerBacking.cpp | 2 +- Source/WebKit2/ChangeLog | 15 ++++++++++++ .../Plugins/Netscape/NetscapeBrowserFuncs.cpp | 4 ++-- .../WebProcess/WebCoreSupport/WebEditorClient.cpp | 2 +- .../WebProcess/WebCoreSupport/WebEditorClient.h | 2 +- 18 files changed, 76 insertions(+), 21 deletions(-) diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index 45435f5..09e5a77 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,15 @@ +2012-06-29 Tony Chang + + Unreviewed, rolling out r121572. + http://trac.webkit.org/changeset/121572 + https://bugs.webkit.org/show_bug.cgi?id=90249 + + Breaks Mac build since it depends on r121547, which was rolled + out + + * wtf/ThreadingPthreads.cpp: + (WTF::initializeCurrentThreadInternal): + 2012-06-29 Eric Seidel Remove BUILDING_ON_LEOPARD now that no ports build on Leopard diff --git a/Source/WTF/wtf/ThreadingPthreads.cpp b/Source/WTF/wtf/ThreadingPthreads.cpp index 9f11950..510173d 100644 --- a/Source/WTF/wtf/ThreadingPthreads.cpp +++ b/Source/WTF/wtf/ThreadingPthreads.cpp @@ -55,7 +55,7 @@ #include #endif -#if OS(MAC_OS_X) +#if OS(MAC_OS_X) && !defined(BUILDING_ON_LEOPARD) #include #endif @@ -228,7 +228,7 @@ void initializeCurrentThreadInternal(const char* threadName) UNUSED_PARAM(threadName); #endif -#if OS(MAC_OS_X) +#if OS(MAC_OS_X) && !defined(BUILDING_ON_LEOPARD) // 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(); diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 069f25a..d8c6a6a 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,5 +1,33 @@ 2012-06-29 Tony Chang + Unreviewed, rolling out r121572. + http://trac.webkit.org/changeset/121572 + https://bugs.webkit.org/show_bug.cgi?id=90249 + + Breaks Mac build since it depends on r121547, which was rolled + out + + * 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 Tony Chang + Unreviewed, rolling out r121547. http://trac.webkit.org/changeset/121547 https://bugs.webkit.org/show_bug.cgi?id=90256 diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in index fdc0021..0af4748 100644 --- a/Source/WebCore/WebCore.exp.in +++ b/Source/WebCore/WebCore.exp.in @@ -2535,7 +2535,7 @@ __ZNK7WebCore4KURL7isValidEv __ZNK7WebCore4KURL22protocolIsInHTTPFamilyEv #endif -#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) __ZN7WebCore27AlternativeTextUIController15addAlternativesERKN3WTF9RetainPtrI18NSTextAlternativesEE __ZN7WebCore27AlternativeTextUIController22alternativesForContextEy __ZN7WebCore27AlternativeTextUIController5clearEv diff --git a/Source/WebCore/page/AlternativeTextClient.h b/Source/WebCore/page/AlternativeTextClient.h index 976a2f5..67245e6 100644 --- a/Source/WebCore/page/AlternativeTextClient.h +++ b/Source/WebCore/page/AlternativeTextClient.h @@ -31,10 +31,10 @@ #include #include -#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !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_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) +#endif // PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && !defined(BUILDING_ON_LION) namespace WebCore { diff --git a/Source/WebCore/page/ContextMenuController.cpp b/Source/WebCore/page/ContextMenuController.cpp index 51bf116..6e188fd 100644 --- a/Source/WebCore/page/ContextMenuController.cpp +++ b/Source/WebCore/page/ContextMenuController.cpp @@ -934,7 +934,7 @@ void ContextMenuController::populate() appendItem(IgnoreGrammarItem, m_contextMenu.get()); appendItem(*separatorItem(), m_contextMenu.get()); haveContextMenuItemsForMisspellingOrGrammer = true; -#if PLATFORM(MAC) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) } else { // If the string was autocorrected, generate a contextual menu item allowing it to be changed back. String replacedString = m_hitTestResult.replacedString(); diff --git a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h index ff4dd82..6233c6c 100644 --- a/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h +++ b/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h @@ -30,7 +30,7 @@ #include #include -#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_SNOW_LEOPARD)) +#if (PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)) #define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1 #endif diff --git a/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm b/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm index e269440..e08591d 100644 --- a/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm +++ b/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm @@ -129,7 +129,7 @@ void GraphicsContext::drawLineForDocumentMarker(const FloatPoint& point, float w patternColor = grammarPatternColor.get(); break; } -#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) // To support correction panel. case DocumentMarkerAutocorrectionReplacementLineStyle: case DocumentMarkerDictationAlternativesLineStyle: diff --git a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm index ec4ade3..cd161a3 100644 --- a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm +++ b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm @@ -903,7 +903,7 @@ void MediaPlayerPrivateQTKit::setClosedCaptionsVisible(bool closedCaptionsVisibl if (metaDataAvailable()) { wkQTMovieSetShowClosedCaptions(m_qtMovie.get(), closedCaptionsVisible); -#if USE(ACCELERATED_COMPOSITING) +#if USE(ACCELERATED_COMPOSITING) && !defined(BUILDING_ON_LEOPARD) if (closedCaptionsVisible && m_qtVideoLayer) { // Captions will be rendered upside down unless we flag the movie as flipped (again). See . [m_qtVideoLayer.get() setGeometryFlipped:YES]; diff --git a/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/Source/WebCore/platform/mac/WebCoreSystemInterface.h index 7285917..908dd95 100644 --- a/Source/WebCore/platform/mac/WebCoreSystemInterface.h +++ b/Source/WebCore/platform/mac/WebCoreSystemInterface.h @@ -58,7 +58,7 @@ typedef UInt32 FMFont; typedef FMFont ATSUFontID; typedef UInt16 ATSGlyphRef; -#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_SNOW_LEOPARD) +#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) typedef struct __IOSurface *IOSurfaceRef; #endif diff --git a/Source/WebCore/platform/network/Credential.h b/Source/WebCore/platform/network/Credential.h index 93c886b..aae4d52 100644 --- a/Source/WebCore/platform/network/Credential.h +++ b/Source/WebCore/platform/network/Credential.h @@ -27,7 +27,7 @@ #include "PlatformString.h" -#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS))) +#define CERTIFICATE_CREDENTIALS_SUPPORTED ((PLATFORM(MAC) || PLATFORM(IOS)) && !defined(BUILDING_ON_LEOPARD)) #if CERTIFICATE_CREDENTIALS_SUPPORTED #include diff --git a/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp b/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp index 8311685..7ce9b60 100644 --- a/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp +++ b/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp @@ -265,7 +265,7 @@ void ResourceRequest::setHTTPPipeliningEnabled(bool flag) s_httpPipeliningEnabled = flag; } -#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) +#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) static inline bool readBooleanPreference(CFStringRef key) { Boolean keyExistsAndHasValidFormat; @@ -281,7 +281,7 @@ unsigned initializeMaximumHTTPConnectionCountPerHost() // Always set the connection count per host, even when pipelining. unsigned maximumHTTPConnectionCountPerHost = wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount); -#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) +#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) static const unsigned unlimitedConnectionCount = 10000; if (!ResourceRequest::httpPipeliningEnabled() && readBooleanPreference(CFSTR("WebKitEnableHTTPPipelining"))) diff --git a/Source/WebCore/platform/text/TextChecking.h b/Source/WebCore/platform/text/TextChecking.h index 6848fe1..0742cb3 100644 --- a/Source/WebCore/platform/text/TextChecking.h +++ b/Source/WebCore/platform/text/TextChecking.h @@ -39,18 +39,18 @@ namespace WebCore { #define WTF_USE_GRAMMAR_CHECKING 1 -#if PLATFORM(MAC) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) #define WTF_USE_UNIFIED_TEXT_CHECKING 1 #define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1 #endif -#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !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_SNOW_LEOPARD) +#endif // #if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) enum TextCheckingType { TextCheckingTypeSpelling = 1 << 1, diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index 3ccf215..7507323 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -991,7 +991,7 @@ bool RenderLayerBacking::containsPaintedContent() const if (renderer()->isVideo() && toRenderVideo(renderer())->shouldDisplayVideo()) return hasBoxDecorationsOrBackground(renderer()); #endif -#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_SNOW_LEOPARD) +#if PLATFORM(MAC) && USE(CA) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) #elif ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) if (isAcceleratedCanvas(renderer())) return hasBoxDecorationsOrBackground(renderer()); diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 57a0e28..e890479 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,18 @@ +2012-06-29 Tony Chang + + Unreviewed, rolling out r121572. + http://trac.webkit.org/changeset/121572 + https://bugs.webkit.org/show_bug.cgi?id=90249 + + Breaks Mac build since it depends on r121547, which was rolled + out + + * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp: + (WebKit::NPN_GetValue): + * WebProcess/WebCoreSupport/WebEditorClient.cpp: + (WebKit::WebEditorClient::shouldEraseMarkersAfterChangeSelection): + * WebProcess/WebCoreSupport/WebEditorClient.h: + 2012-06-29 Eric Seidel Remove BUILDING_ON_LEOPARD now that no ports build on Leopard diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp index eab0cf2..759765d 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp @@ -38,7 +38,7 @@ #include #include -#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) #include "NetscapeSandboxFunctions.h" #endif @@ -507,7 +507,7 @@ static NPError NPN_GetValue(NPP npp, NPNVariable variable, void *value) *(NPBool*)value = true; break; -#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD) && ENABLE(PLUGIN_PROCESS) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) && ENABLE(PLUGIN_PROCESS) case WKNVSandboxFunctions: { *(WKNSandboxFunctions **)value = netscapeSandboxFunctions(); diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp index 91222e3..03d599d 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp @@ -375,7 +375,7 @@ void WebEditorClient::textWillBeDeletedInTextField(Element* element) 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_SNOW_LEOPARD) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) return type != TextCheckingTypeSpelling; #else return true; diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h index 5f7fc50..d4ed311 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h @@ -135,7 +135,7 @@ private: 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&, int* badGrammarLocation, int* badGrammarLength) OVERRIDE; -#if PLATFORM(MAC) +#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) virtual void checkTextOfParagraph(const UChar* text, int length, WebCore::TextCheckingTypeMask checkingTypes, Vector& results) OVERRIDE; #endif virtual void updateSpellingUIWithGrammarString(const String&, const WebCore::GrammarDetail&) OVERRIDE; -- 2.7.4