Title: [93600] trunk/Source
- Revision
- 93600
- Author
- [email protected]
- Date
- 2011-08-23 06:26:26 -0700 (Tue, 23 Aug 2011)
Log Message
[Qt] Fix build on Lion
https://bugs.webkit.org/show_bug.cgi?id=66770
Reviewed by Andreas Kling.
We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
the Qt one, and building on Lion revealed this when a typedef for
IOSurfaceRef was wrapped in PLATFORM(MAC).
For now we fix this by including WebCoreSystemInterface using
brackets, so that we'll pick up the right file based on the
include paths. This also means exposing a few missing enums
in our own version of the file, so those were added.
Lasty, we need to link against the right system interface library
on Lion.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (93599 => 93600)
--- trunk/Source/WebCore/ChangeLog 2011-08-23 13:19:40 UTC (rev 93599)
+++ trunk/Source/WebCore/ChangeLog 2011-08-23 13:26:26 UTC (rev 93600)
@@ -1,3 +1,26 @@
+2011-08-23 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Fix build on Lion
+
+ https://bugs.webkit.org/show_bug.cgi?id=66770
+
+ Reviewed by Andreas Kling.
+
+ We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
+ the Qt one, and building on Lion revealed this when a typedef for
+ IOSurfaceRef was wrapped in PLATFORM(MAC).
+
+ For now we fix this by including WebCoreSystemInterface using
+ brackets, so that we'll pick up the right file based on the
+ include paths. This also means exposing a few missing enums
+ in our own version of the file, so those were added.
+
+ Lasty, we need to link against the right system interface library
+ on Lion.
+
+ * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+ * platform/qt/WebCoreSystemInterface.h:
+
2011-08-23 Steve Block <[email protected]>
Remove last occurrences of PLATFORM(ANDROID)
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm (93599 => 93600)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2011-08-23 13:19:40 UTC (rev 93599)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm 2011-08-23 13:26:26 UTC (rev 93600)
@@ -29,7 +29,7 @@
#import "WebVideoFullscreenHUDWindowController.h"
#import "FloatConversion.h"
-#import "WebCoreSystemInterface.h"
+#import <WebCoreSystemInterface.h>
#import <WebCore/HTMLMediaElement.h>
#import <wtf/RetainPtr.h>
#import <wtf/UnusedParam.h>
Modified: trunk/Source/WebCore/platform/qt/WebCoreSystemInterface.h (93599 => 93600)
--- trunk/Source/WebCore/platform/qt/WebCoreSystemInterface.h 2011-08-23 13:19:40 UTC (rev 93599)
+++ trunk/Source/WebCore/platform/qt/WebCoreSystemInterface.h 2011-08-23 13:26:26 UTC (rev 93600)
@@ -79,6 +79,17 @@
extern void (*wkWindowSetAlpha)(NSWindow *, float);
extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
+typedef enum {
+ wkMediaUIControlTimeline,
+ wkMediaUIControlSlider,
+ wkMediaUIControlPlayPauseButton,
+ wkMediaUIControlExitFullscreenButton,
+ wkMediaUIControlRewindButton,
+ wkMediaUIControlFastForwardButton,
+ wkMediaUIControlVolumeUpButton,
+ wkMediaUIControlVolumeDownButton
+} wkMediaUIControlType;
+
}
#endif
Modified: trunk/Source/WebKit/qt/ChangeLog (93599 => 93600)
--- trunk/Source/WebKit/qt/ChangeLog 2011-08-23 13:19:40 UTC (rev 93599)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-08-23 13:26:26 UTC (rev 93600)
@@ -1,3 +1,25 @@
+2011-08-23 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Fix build on Lion
+
+ https://bugs.webkit.org/show_bug.cgi?id=66770
+
+ Reviewed by Andreas Kling.
+
+ We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
+ the Qt one, and building on Lion revealed this when a typedef for
+ IOSurfaceRef was wrapped in PLATFORM(MAC).
+
+ For now we fix this by including WebCoreSystemInterface using
+ brackets, so that we'll pick up the right file based on the
+ include paths. This also means exposing a few missing enums
+ in our own version of the file, so those were added.
+
+ Lasty, we need to link against the right system interface library
+ on Lion.
+
+ * QtWebKit.pro:
+
2011-08-21 Lindsay Mathieson <[email protected]>
[Qt] Fixes premature plugin unload bug
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (93599 => 93600)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-08-23 13:19:40 UTC (rev 93599)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-08-23 13:26:26 UTC (rev 93600)
@@ -256,12 +256,12 @@
# We can know the Mac OS version by using the Darwin major version
DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
- equals(DARWIN_MAJOR_VERSION, "10") {
- LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
- } else {
- equals(DARWIN_MAJOR_VERSION, "9") {
- LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
- }
+ equals(DARWIN_MAJOR_VERSION, "11") {
+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
+ } else:equals(DARWIN_MAJOR_VERSION, "10") {
+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+ } else:equals(DARWIN_MAJOR_VERSION, "9") {
+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
