Diff
Modified: trunk/Source/WebCore/ChangeLog (187042 => 187043)
--- trunk/Source/WebCore/ChangeLog 2015-07-20 23:23:12 UTC (rev 187042)
+++ trunk/Source/WebCore/ChangeLog 2015-07-20 23:26:04 UTC (rev 187043)
@@ -1,3 +1,19 @@
+2015-07-20 Anders Carlsson <[email protected]>
+
+ Add PLATFORM #ifdefs for Mac SPI headers
+ https://bugs.webkit.org/show_bug.cgi?id=147129
+
+ Reviewed by Tim Horton.
+
+ * Configurations/WebCore.xcconfig:
+ Skip NPAPI headers on iOS.
+
+ * platform/mac/WebVideoFullscreenController.h:
+ * platform/spi/mac/DataDetectorsSPI.h:
+ * platform/spi/mac/NSEventSPI.h:
+ * platform/spi/mac/NSFontSPI.h:
+ * platform/spi/mac/NSMenuSPI.h:
+
2015-07-20 Tim Horton <[email protected]>
REGRESSION (r174287): Flash of black when opening a new web view or navigating to a new page
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (187042 => 187043)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-07-20 23:23:12 UTC (rev 187042)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2015-07-20 23:26:04 UTC (rev 187043)
@@ -94,5 +94,5 @@
EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_$(ENABLE_IOS_GESTURE_EVENTS));
EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_ = JSGesture* DOMGesture*;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp $(EXCLUDED
_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp npapi.h npf
unctions.h npruntime.h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h (187042 => 187043)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h 2015-07-20 23:23:12 UTC (rev 187042)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.h 2015-07-20 23:26:04 UTC (rev 187043)
@@ -23,8 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if ENABLE(VIDEO)
+#import <wtf/Platform.h>
+#if PLATFORM(MAC) && ENABLE(VIDEO)
+
#import <AppKit/NSWindowController.h>
#import <AppKit/NSScreen.h>
#import <wtf/RefPtr.h>
@@ -67,4 +69,4 @@
@end
-#endif // ENABLE(VIDEO)
+#endif
Modified: trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (187042 => 187043)
--- trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2015-07-20 23:23:12 UTC (rev 187042)
+++ trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2015-07-20 23:26:04 UTC (rev 187043)
@@ -23,6 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <wtf/Platform.h>
+
+#if PLATFORM(MAC)
+
#import <WebCore/DataDetectorsCoreSPI.h>
#import <WebCore/SoftLinking.h>
@@ -100,3 +104,5 @@
SOFT_LINK(DataDetectors, DDHighlightGetLayerWithContext, CGLayerRef, (DDHighlightRef highlight, CGContextRef context), (highlight, context))
SOFT_LINK(DataDetectors, DDHighlightGetBoundingRect, CGRect, (DDHighlightRef highlight), (highlight))
SOFT_LINK(DataDetectors, DDHighlightPointIsOnHighlight, Boolean, (DDHighlightRef highlight, CGPoint point, Boolean* onButton), (highlight, point, onButton))
+
+#endif
Modified: trunk/Source/WebCore/platform/spi/mac/NSEventSPI.h (187042 => 187043)
--- trunk/Source/WebCore/platform/spi/mac/NSEventSPI.h 2015-07-20 23:23:12 UTC (rev 187042)
+++ trunk/Source/WebCore/platform/spi/mac/NSEventSPI.h 2015-07-20 23:26:04 UTC (rev 187043)
@@ -20,9 +20,13 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <wtf/Platform.h>
+
+#if PLATFORM(MAC)
+
#if USE(APPLE_INTERNAL_SDK)
#import <AppKit/NSEvent_Private.h>
@@ -34,3 +38,5 @@
};
#endif
+
+#endif
Modified: trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h (187042 => 187043)
--- trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-07-20 23:23:12 UTC (rev 187042)
+++ trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-07-20 23:26:04 UTC (rev 187043)
@@ -23,6 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <wtf/Platform.h>
+
+#if PLATFORM(MAC)
+
#if USE(APPLE_INTERNAL_SDK)
#import <AppKit/NSFontDescriptor_Private.h>
@@ -50,3 +54,5 @@
#endif
#endif
+
+#endif
Modified: trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h (187042 => 187043)
--- trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-07-20 23:23:12 UTC (rev 187042)
+++ trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-07-20 23:26:04 UTC (rev 187043)
@@ -23,6 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <wtf/Platform.h>
+
+#if PLATFORM(MAC)
+
// FIXME: We should just include the appropriate internal headers.
typedef NS_ENUM(NSInteger, NSMenuType) {
@@ -40,3 +44,5 @@
+ (QLPreviewMenuItem *)standardQuickLookMenuItem;
+ (NSMenuItem *)standardShareMenuItemWithItems:(NSArray *)items;
@end
+
+#endif
