Title: [184628] branches/safari-601.1.32.2-branch/Source/WebKit2
- Revision
- 184628
- Author
- [email protected]
- Date
- 2015-05-20 02:06:46 -0700 (Wed, 20 May 2015)
Log Message
Merged r184583. rdar://problem/20964171
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184627 => 184628)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-20 09:05:38 UTC (rev 184627)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-20 09:06:46 UTC (rev 184628)
@@ -1,5 +1,19 @@
2015-05-20 Babak Shafiei <[email protected]>
+ Merge r184583.
+
+ 2015-05-19 Jeremy Jones <[email protected]>
+
+ WebVideoFullscreenManagerProxy has incorrect OS_VERSION_MIN_REQUIRED conditionals.
+ https://bugs.webkit.org/show_bug.cgi?id=145158
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::setVideoLayerFrame):
+
+2015-05-20 Babak Shafiei <[email protected]>
+
Merge r184404.
2015-05-15 Jeremy Jones <[email protected]>
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (184627 => 184628)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-05-20 09:05:38 UTC (rev 184627)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-05-20 09:06:46 UTC (rev 184628)
@@ -38,7 +38,7 @@
#import <WebCore/TimeRanges.h>
#import <WebKitSystemInterface.h>
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 90000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
#import "BackBoardServicesSPI.h"
#endif
@@ -46,7 +46,7 @@
namespace WebKit {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 || !HAVE(AVKIT)
PassRefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy&)
{
@@ -516,7 +516,7 @@
void WebVideoFullscreenManagerProxy::setVideoLayerFrame(uint64_t contextId, WebCore::FloatRect frame)
{
@autoreleasepool {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 90000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
BKSAnimationFenceHandle* synchronizationFence = [UIWindow _synchronizedDrawingFence];
mach_port_name_t fencePort = [synchronizationFence CAPort];
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
