Title: [257003] trunk
- Revision
- 257003
- Author
- peng.l...@apple.com
- Date
- 2020-02-19 16:57:25 -0800 (Wed, 19 Feb 2020)
Log Message
Fix check-webkit-style errors related to AVFoundationSPI.h
https://bugs.webkit.org/show_bug.cgi?id=207834
Reviewed by Daniel Bates.
Source/WebCore:
No new tests, no functional change.
Revert the change in r256770 regarding the headers ordering.
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
Tools:
Revert the change in r256770 regarding the headers ordering.
Headers in the same category should be in sorted order (case sensitive, as done by the command-line sort tool or the Xcode sort selection command).
* Scripts/webkitpy/style/checkers/cpp.py:
(check_include_line):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (257002 => 257003)
--- trunk/Source/WebCore/ChangeLog 2020-02-20 00:55:02 UTC (rev 257002)
+++ trunk/Source/WebCore/ChangeLog 2020-02-20 00:57:25 UTC (rev 257003)
@@ -1,3 +1,17 @@
+2020-02-19 Peng Liu <peng.l...@apple.com>
+
+ Fix check-webkit-style errors related to AVFoundationSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=207834
+
+ Reviewed by Daniel Bates.
+
+ No new tests, no functional change.
+
+ Revert the change in r256770 regarding the headers ordering.
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+
2020-02-19 Zalan Bujtas <za...@apple.com>
[LFC][Integration] Do not try to lay out a formatting context unless there's some content in it
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (257002 => 257003)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2020-02-20 00:55:02 UTC (rev 257002)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2020-02-20 00:57:25 UTC (rev 257003)
@@ -29,11 +29,11 @@
#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
#import "Logging.h"
+#import <WebCore/FloatRect.h>
+#import <WebCore/MediaPlaybackTargetCocoa.h>
#import <objc/runtime.h>
#import <pal/spi/cocoa/AVFoundationSPI.h>
#import <pal/spi/cocoa/AVKitSPI.h>
-#import <WebCore/FloatRect.h>
-#import <WebCore/MediaPlaybackTargetCocoa.h>
#import <wtf/MainThread.h>
#import <pal/cf/CoreMediaSoftLink.h>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (257002 => 257003)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2020-02-20 00:55:02 UTC (rev 257002)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2020-02-20 00:57:25 UTC (rev 257003)
@@ -44,10 +44,10 @@
#import "WebCoreDecompressionSession.h"
#import <AVFoundation/AVAsset.h>
#import <AVFoundation/AVTime.h>
+#import <QuartzCore/CALayer.h>
#import <objc_runtime.h>
#import <pal/avfoundation/MediaTimeAVFoundation.h>
#import <pal/spi/cocoa/AVFoundationSPI.h>
-#import <QuartzCore/CALayer.h>
#import <wtf/Deque.h>
#import <wtf/FileSystem.h>
#import <wtf/MainThread.h>
Modified: trunk/Tools/ChangeLog (257002 => 257003)
--- trunk/Tools/ChangeLog 2020-02-20 00:55:02 UTC (rev 257002)
+++ trunk/Tools/ChangeLog 2020-02-20 00:57:25 UTC (rev 257003)
@@ -1,3 +1,16 @@
+2020-02-19 Peng Liu <peng.l...@apple.com>
+
+ Fix check-webkit-style errors related to AVFoundationSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=207834
+
+ Reviewed by Daniel Bates.
+
+ Revert the change in r256770 regarding the headers ordering.
+ Headers in the same category should be in sorted order (case sensitive, as done by the command-line sort tool or the Xcode sort selection command).
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_include_line):
+
2020-02-19 Jonathan Bedard <jbed...@apple.com>
results.webkit.org: Correctly report JSC tests for windows
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (257002 => 257003)
--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2020-02-20 00:55:02 UTC (rev 257002)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2020-02-20 00:57:25 UTC (rev 257003)
@@ -3270,7 +3270,7 @@
if previous_header_type == _OTHER_HEADER:
if '<' in previous_line and '"' in line:
error(line_number, 'build/include_order', 4, 'Bad include order. Mixing system and custom headers.')
- elif previous_line.strip().lower() > line.strip().lower():
+ elif previous_line.strip() > line.strip():
# This type of error is potentially a problem with this line or the previous one,
# so if the error is filtered for one line, report it for the next. This is so that
# we properly handle patches, for which only modified lines produce errors.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
