[cmake] Fix the style issues in cmake project files
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Jun 2015 09:46:19 +0000 (09:46 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Jun 2015 09:46:19 +0000 (09:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=145755

Reviewed by Darin Adler.

Source/JavaScriptCore:

* CMakeLists.txt:

Source/WebCore:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWin.cmake:
* PlatformWinCairo.cmake:

Source/WebKit:

* PlatformMac.cmake:

Source/WebKit2:

* CMakeLists.txt:
* PlatformGTK.cmake:
* PlatformMac.cmake:

Source/WTF:

* wtf/CMakeLists.txt:

Tools:

* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformEfl.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185358 268f45cc-cd09-0410-ab3c-d52691b4dbfc

20 files changed:
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/PlatformWin.cmake
Source/WebCore/PlatformWinCairo.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/PlatformMac.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformEfl.cmake

index 7637f3c..b9f4513 100644 (file)
@@ -127,9 +127,9 @@ set(JavaScriptCore_SOURCES
 
     dfg/DFGAbstractHeap.cpp
     dfg/DFGAbstractValue.cpp
-    dfg/DFGArithMode.cpp
     dfg/DFGArgumentsEliminationPhase.cpp
     dfg/DFGArgumentsUtilities.cpp
+    dfg/DFGArithMode.cpp
     dfg/DFGArrayMode.cpp
     dfg/DFGAtTailAbstractState.cpp
     dfg/DFGAvailability.cpp
@@ -255,14 +255,16 @@ set(JavaScriptCore_SOURCES
     dfg/DFGWatchpointCollectionPhase.cpp
     dfg/DFGWorklist.cpp
 
-    disassembler/ARM64/A64DOpcode.cpp
-    disassembler/ARMv7/ARMv7DOpcode.cpp
     disassembler/ARM64Disassembler.cpp
     disassembler/ARMv7Disassembler.cpp
     disassembler/Disassembler.cpp
     disassembler/LLVMDisassembler.cpp
     disassembler/X86Disassembler.cpp
 
+    disassembler/ARM64/A64DOpcode.cpp
+
+    disassembler/ARMv7/ARMv7DOpcode.cpp
+
     heap/CodeBlockSet.cpp
     heap/ConservativeRoots.cpp
     heap/CopiedSpace.cpp
@@ -307,11 +309,11 @@ set(JavaScriptCore_SOURCES
     inspector/InspectorAgentRegistry.cpp
     inspector/InspectorBackendDispatcher.cpp
     inspector/InspectorValues.cpp
-    inspector/JSInjectedScriptHost.cpp
-    inspector/JSInjectedScriptHostPrototype.cpp
     inspector/JSGlobalObjectConsoleClient.cpp
     inspector/JSGlobalObjectInspectorController.cpp
     inspector/JSGlobalObjectScriptDebugServer.cpp
+    inspector/JSInjectedScriptHost.cpp
+    inspector/JSInjectedScriptHostPrototype.cpp
     inspector/JSJavaScriptCallFrame.cpp
     inspector/JSJavaScriptCallFramePrototype.cpp
     inspector/JavaScriptCallFrame.cpp
@@ -337,8 +339,8 @@ set(JavaScriptCore_SOURCES
     interpreter/StackVisitor.cpp
 
     jit/AccessorCallJITStubRoutine.cpp
-    jit/AssemblyHelpers.cpp
     jit/ArityCheckFailReturnThunks.cpp
+    jit/AssemblyHelpers.cpp
     jit/BinarySwitch.cpp
     jit/ExecutableAllocationFuzz.cpp
     jit/ExecutableAllocator.cpp
@@ -363,13 +365,13 @@ set(JavaScriptCore_SOURCES
     jit/JITStubs.cpp
     jit/JITThunks.cpp
     jit/JITToDFGDeferredCompilationCallback.cpp
-    jit/SetupVarargsFrame.cpp
     jit/PolymorphicCallStubRoutine.cpp
     jit/Reg.cpp
     jit/RegisterPreservationWrapperGenerator.cpp
     jit/RegisterSet.cpp
     jit/Repatch.cpp
     jit/ScratchRegisterAllocator.cpp
+    jit/SetupVarargsFrame.cpp
     jit/TempRegisterSet.cpp
     jit/ThunkGenerators.cpp
 
@@ -473,7 +475,6 @@ set(JavaScriptCore_RUNTIME_SOURCES
     runtime/InternalFunction.cpp
     runtime/IteratorOperations.cpp
     runtime/JSAPIValueWrapper.cpp
-    runtime/JSLexicalEnvironment.cpp
     runtime/JSArray.cpp
     runtime/JSArrayBuffer.cpp
     runtime/JSArrayBufferConstructor.cpp
@@ -481,7 +482,6 @@ set(JavaScriptCore_RUNTIME_SOURCES
     runtime/JSArrayBufferView.cpp
     runtime/JSArrayIterator.cpp
     runtime/JSBoundFunction.cpp
-    runtime/JSGlobalObjectDebuggable.cpp
     runtime/JSCJSValue.cpp
     runtime/JSCallee.cpp
     runtime/JSCatchScope.cpp
@@ -494,7 +494,9 @@ set(JavaScriptCore_RUNTIME_SOURCES
     runtime/JSFunction.cpp
     runtime/JSFunctionNameScope.cpp
     runtime/JSGlobalObject.cpp
+    runtime/JSGlobalObjectDebuggable.cpp
     runtime/JSGlobalObjectFunctions.cpp
+    runtime/JSLexicalEnvironment.cpp
     runtime/JSLock.cpp
     runtime/JSMap.cpp
     runtime/JSMapIterator.cpp
@@ -506,10 +508,10 @@ set(JavaScriptCore_RUNTIME_SOURCES
     runtime/JSPromiseConstructor.cpp
     runtime/JSPromiseDeferred.cpp
     runtime/JSPromiseFunctions.cpp
-    runtime/JSPromiseReaction.cpp
     runtime/JSPromisePrototype.cpp
-    runtime/JSProxy.cpp
+    runtime/JSPromiseReaction.cpp
     runtime/JSPropertyNameEnumerator.cpp
+    runtime/JSProxy.cpp
     runtime/JSScope.cpp
     runtime/JSSegmentedVariableObject.cpp
     runtime/JSSet.cpp
@@ -659,6 +661,8 @@ if (USE_UDIS86)
         ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
     )
     list(APPEND JavaScriptCore_SOURCES
+        disassembler/UDis86Disassembler.cpp
+
         disassembler/udis86/udis86.c
         disassembler/udis86/udis86_decode.c
         disassembler/udis86/udis86_input.c
@@ -666,7 +670,6 @@ if (USE_UDIS86)
         disassembler/udis86/udis86_syn-att.c
         disassembler/udis86/udis86_syn-intel.c
         disassembler/udis86/udis86_syn.c
-        disassembler/UDis86Disassembler.cpp
     )
 endif ()
 
@@ -881,8 +884,8 @@ if (ENABLE_FTL_JIT)
         ftl/FTLLocation.cpp
         ftl/FTLLowerDFGToLLVM.cpp
         ftl/FTLOSREntry.cpp
-        ftl/FTLOSRExitCompiler.cpp
         ftl/FTLOSRExit.cpp
+        ftl/FTLOSRExitCompiler.cpp
         ftl/FTLOperations.cpp
         ftl/FTLOutput.cpp
         ftl/FTLRecoveryOpcode.cpp
@@ -927,9 +930,6 @@ set(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
     debugger
     heap
     inspector
-    inspector/agents
-    inspector/augmentable
-    inspector/remote
     interpreter
     jit
     llint
@@ -939,6 +939,11 @@ set(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
     yarr
 
     collector/handles
+
+    inspector/agents
+    inspector/augmentable
+    inspector/remote
+
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
 )
 
@@ -989,7 +994,6 @@ set(JavaScriptCore_FORWARDING_HEADERS_FILES
     assembler/LinkBuffer.h
     assembler/MacroAssembler.h
     assembler/MacroAssemblerCodeRef.h
-    assembler/MacroAssemblerCodeRef.h
 
     inspector/augmentable/AugmentableInspectorController.h
 
index d31a28a..983dcf6 100644 (file)
@@ -1,3 +1,12 @@
+2015-06-09  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Fix the style issues in cmake project files
+        https://bugs.webkit.org/show_bug.cgi?id=145755
+
+        Reviewed by Darin Adler.
+
+        * CMakeLists.txt:
+
 2015-06-08  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 
         Purge PassRefPtr in JavaScriptCore
index 9f4376c..b0c7f97 100644 (file)
@@ -1,3 +1,12 @@
+2015-06-09  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Fix the style issues in cmake project files
+        https://bugs.webkit.org/show_bug.cgi?id=145755
+
+        Reviewed by Darin Adler.
+
+        * wtf/CMakeLists.txt:
+
 2015-06-08  Alexey Proskuryakov  <ap@apple.com>
 
         Build fix.
index b15bdf7..01d8bf1 100644 (file)
@@ -100,8 +100,8 @@ set(WTF_HEADERS
     Vector.h
     VectorTraits.h
     WTFThreadData.h
-    WorkQueue.h
     WeakPtr.h
+    WorkQueue.h
     dtoa.h
 
     dtoa/bignum-dtoa.h
@@ -172,8 +172,8 @@ set(WTF_SOURCES
     RunLoop.cpp
     SHA1.cpp
     SixCharacterHash.cpp
-    StackStats.cpp
     StackBounds.cpp
+    StackStats.cpp
     StringPrintStream.cpp
     Threading.cpp
     WTFThreadData.cpp
index a458537..f87805c 100644 (file)
@@ -137,11 +137,22 @@ set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
 )
 
 set(WebCore_IDL_INCLUDES
+    css
+    dom
+    fileapi
+    html
+    inspector
+    page
+    plugins
+    storage
+    svg
+    workers
+    xml
+
     Modules/airplay
     Modules/battery
     Modules/encryptedmedia
     Modules/gamepad
-    Modules/gamepad/deprecated
     Modules/geolocation
     Modules/indexeddb
     Modules/indieui
@@ -156,23 +167,17 @@ set(WebCore_IDL_INCLUDES
     Modules/webaudio
     Modules/webdatabase
     Modules/websockets
+
+    Modules/gamepad/deprecated
+
     bindings/generic
     bindings/js
-    css
-    dom
-    fileapi
-    html
+
     html/canvas
     html/shadow
     html/track
-    inspector
+
     loader/appcache
-    page
-    plugins
-    storage
-    svg
-    workers
-    xml
 )
 
 set(WebCore_NON_SVG_IDL_FILES
@@ -255,11 +260,11 @@ set(WebCore_NON_SVG_IDL_FILES
     Modules/mediastream/RTCDTMFToneChangeEvent.idl
     Modules/mediastream/RTCDataChannel.idl
     Modules/mediastream/RTCDataChannelEvent.idl
-    Modules/mediastream/RTCPeerConnectionErrorCallback.idl
     Modules/mediastream/RTCIceCandidate.idl
     Modules/mediastream/RTCIceCandidateEvent.idl
     Modules/mediastream/RTCIceServer.idl
     Modules/mediastream/RTCPeerConnection.idl
+    Modules/mediastream/RTCPeerConnectionErrorCallback.idl
     Modules/mediastream/RTCSessionDescription.idl
     Modules/mediastream/RTCSessionDescriptionCallback.idl
     Modules/mediastream/RTCStatsCallback.idl
@@ -341,6 +346,8 @@ set(WebCore_NON_SVG_IDL_FILES
     css/CSSFontFaceLoadEvent.idl
     css/CSSFontFaceRule.idl
     css/CSSImportRule.idl
+    css/CSSKeyframeRule.idl
+    css/CSSKeyframesRule.idl
     css/CSSMediaRule.idl
     css/CSSPageRule.idl
     css/CSSPrimitiveValue.idl
@@ -365,8 +372,6 @@ set(WebCore_NON_SVG_IDL_FILES
     css/StyleSheet.idl
     css/StyleSheetList.idl
     css/WebKitCSSFilterValue.idl
-    css/CSSKeyframeRule.idl
-    css/CSSKeyframesRule.idl
     css/WebKitCSSMatrix.idl
     css/WebKitCSSRegionRule.idl
     css/WebKitCSSTransformValue.idl
@@ -421,8 +426,8 @@ set(WebCore_NON_SVG_IDL_FILES
     dom/NodeFilter.idl
     dom/NodeIterator.idl
     dom/NodeList.idl
-    dom/NonElementParentNode.idl
     dom/NonDocumentTypeChildNode.idl
+    dom/NonElementParentNode.idl
     dom/OverflowEvent.idl
     dom/PageTransitionEvent.idl
     dom/ParentNode.idl
@@ -563,6 +568,7 @@ set(WebCore_NON_SVG_IDL_FILES
     html/canvas/OESTextureHalfFloat.idl
     html/canvas/OESTextureHalfFloatLinear.idl
     html/canvas/OESVertexArrayObject.idl
+    html/canvas/WebGL2RenderingContext.idl
     html/canvas/WebGLActiveInfo.idl
     html/canvas/WebGLBuffer.idl
     html/canvas/WebGLCompressedTextureATC.idl
@@ -579,9 +585,8 @@ set(WebCore_NON_SVG_IDL_FILES
     html/canvas/WebGLProgram.idl
     html/canvas/WebGLQuery.idl
     html/canvas/WebGLRenderbuffer.idl
-    html/canvas/WebGLRenderingContextBase.idl
     html/canvas/WebGLRenderingContext.idl
-    html/canvas/WebGL2RenderingContext.idl
+    html/canvas/WebGLRenderingContextBase.idl
     html/canvas/WebGLSampler.idl
     html/canvas/WebGLShader.idl
     html/canvas/WebGLShaderPrecisionFormat.idl
@@ -623,19 +628,19 @@ set(WebCore_NON_SVG_IDL_FILES
     page/History.idl
     page/Location.idl
     page/Navigator.idl
+    page/Performance.idl
     page/PerformanceEntry.idl
     page/PerformanceEntryList.idl
-    page/Performance.idl
     page/PerformanceMark.idl
     page/PerformanceMeasure.idl
     page/PerformanceNavigation.idl
     page/PerformanceResourceTiming.idl
     page/PerformanceTiming.idl
     page/Screen.idl
-    page/WebKitPoint.idl
-    page/WebKitNamespace.idl
-    page/UserMessageHandlersNamespace.idl
     page/UserMessageHandler.idl
+    page/UserMessageHandlersNamespace.idl
+    page/WebKitNamespace.idl
+    page/WebKitPoint.idl
     page/WindowBase64.idl
     page/WindowEventHandlers.idl
     page/WindowTimers.idl
@@ -1082,8 +1087,6 @@ set(WebCore_SOURCES
     bindings/js/JSCallbackData.cpp
     bindings/js/JSCanvasRenderingContext2DCustom.cpp
     bindings/js/JSCanvasRenderingContextCustom.cpp
-    bindings/js/JSDataCueCustom.cpp
-    bindings/js/JSDataTransferCustom.cpp
     bindings/js/JSCommandLineAPIHostCustom.cpp
     bindings/js/JSCryptoAlgorithmBuilder.cpp
     bindings/js/JSCryptoAlgorithmDictionary.cpp
@@ -1108,6 +1111,8 @@ set(WebCore_SOURCES
     bindings/js/JSDOMWindowCustom.cpp
     bindings/js/JSDOMWindowShell.cpp
     bindings/js/JSDOMWrapper.cpp
+    bindings/js/JSDataCueCustom.cpp
+    bindings/js/JSDataTransferCustom.cpp
     bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
     bindings/js/JSDeviceMotionEventCustom.cpp
     bindings/js/JSDeviceOrientationEventCustom.cpp
@@ -1173,10 +1178,9 @@ set(WebCore_SOURCES
     bindings/js/JSRTCPeerConnectionCustom.cpp
     bindings/js/JSRTCSessionDescriptionCustom.cpp
     bindings/js/JSRTCStatsResponseCustom.cpp
-    bindings/js/JSReadableStreamCustom.cpp
     bindings/js/JSReadableStreamControllerCustom.cpp
+    bindings/js/JSReadableStreamCustom.cpp
     bindings/js/JSReadableStreamReaderCustom.cpp
-    bindings/js/ReadableJSStream.cpp
     bindings/js/JSRequestAnimationFrameCallbackCustom.cpp
     bindings/js/JSSQLResultSetRowListCustom.cpp
     bindings/js/JSSQLTransactionCustom.cpp
@@ -1186,8 +1190,6 @@ set(WebCore_SOURCES
     bindings/js/JSStyleSheetCustom.cpp
     bindings/js/JSStyleSheetListCustom.cpp
     bindings/js/JSSubtleCryptoCustom.cpp
-    bindings/js/JSSVGLengthCustom.cpp
-    bindings/js/JSSVGPathSegCustom.cpp
     bindings/js/JSTextCustom.cpp
     bindings/js/JSTextTrackCueCustom.cpp
     bindings/js/JSTextTrackCustom.cpp
@@ -1199,9 +1201,9 @@ set(WebCore_SOURCES
     bindings/js/JSTreeWalkerCustom.cpp
     bindings/js/JSVideoTrackCustom.cpp
     bindings/js/JSVideoTrackListCustom.cpp
+    bindings/js/JSWebGL2RenderingContextCustom.cpp
     bindings/js/JSWebGLRenderingContextBaseCustom.cpp
     bindings/js/JSWebGLRenderingContextCustom.cpp
-    bindings/js/JSWebGL2RenderingContextCustom.cpp
     bindings/js/JSWebKitPointCustom.cpp
     bindings/js/JSWorkerCustom.cpp
     bindings/js/JSWorkerGlobalScopeBase.cpp
@@ -1209,6 +1211,7 @@ set(WebCore_SOURCES
     bindings/js/JSXMLHttpRequestCustom.cpp
     bindings/js/JSXPathResultCustom.cpp
     bindings/js/JSXSLTProcessorCustom.cpp
+    bindings/js/ReadableJSStream.cpp
     bindings/js/ScheduledAction.cpp
     bindings/js/ScriptCachedFrameData.cpp
     bindings/js/ScriptController.cpp
@@ -1283,6 +1286,8 @@ set(WebCore_SOURCES
     css/CSSImportRule.cpp
     css/CSSInheritedValue.cpp
     css/CSSInitialValue.cpp
+    css/CSSKeyframeRule.cpp
+    css/CSSKeyframesRule.cpp
     css/CSSLineBoxContainValue.cpp
     css/CSSMediaRule.cpp
     css/CSSOMUtils.cpp
@@ -1345,11 +1350,9 @@ set(WebCore_SOURCES
     css/TransformFunctions.cpp
     css/ViewportStyleResolver.cpp
     css/WebKitCSSFilterValue.cpp
-    css/WebKitCSSResourceValue.cpp
-    css/CSSKeyframeRule.cpp
-    css/CSSKeyframesRule.cpp
     css/WebKitCSSMatrix.cpp
     css/WebKitCSSRegionRule.cpp
+    css/WebKitCSSResourceValue.cpp
     css/WebKitCSSTransformValue.cpp
     css/WebKitCSSViewportRule.cpp
 
@@ -1746,6 +1749,7 @@ set(WebCore_SOURCES
     html/canvas/OESTextureHalfFloat.cpp
     html/canvas/OESTextureHalfFloatLinear.cpp
     html/canvas/OESVertexArrayObject.cpp
+    html/canvas/WebGL2RenderingContext.cpp
     html/canvas/WebGLBuffer.cpp
     html/canvas/WebGLCompressedTextureATC.cpp
     html/canvas/WebGLCompressedTexturePVRTC.cpp
@@ -1766,9 +1770,8 @@ set(WebCore_SOURCES
     html/canvas/WebGLProgram.cpp
     html/canvas/WebGLQuery.cpp
     html/canvas/WebGLRenderbuffer.cpp
-    html/canvas/WebGLRenderingContextBase.cpp
     html/canvas/WebGLRenderingContext.cpp
-    html/canvas/WebGL2RenderingContext.cpp
+    html/canvas/WebGLRenderingContextBase.cpp
     html/canvas/WebGLSampler.cpp
     html/canvas/WebGLShader.cpp
     html/canvas/WebGLShaderPrecisionFormat.cpp
@@ -1792,7 +1795,6 @@ set(WebCore_SOURCES
     html/parser/HTMLFormattingElementList.cpp
     html/parser/HTMLMetaCharsetParser.cpp
     html/parser/HTMLParserIdioms.cpp
-    html/parser/HTMLSrcsetParser.cpp
     html/parser/HTMLParserOptions.cpp
     html/parser/HTMLParserScheduler.cpp
     html/parser/HTMLPreloadScanner.cpp
@@ -1862,8 +1864,8 @@ set(WebCore_SOURCES
     inspector/WorkerInspectorController.cpp
     inspector/WorkerRuntimeAgent.cpp
 
-    loader/CookieJar.cpp
     loader/ContentFilter.cpp
+    loader/CookieJar.cpp
     loader/CrossOriginAccessControl.cpp
     loader/CrossOriginPreflightResultCache.cpp
     loader/DocumentLoadTiming.cpp
@@ -1918,7 +1920,6 @@ set(WebCore_SOURCES
     loader/archive/mhtml/MHTMLParser.cpp
 
     loader/cache/CachedCSSStyleSheet.cpp
-    loader/cache/CachedSVGFont.cpp
     loader/cache/CachedFont.cpp
     loader/cache/CachedImage.cpp
     loader/cache/CachedRawResource.cpp
@@ -1929,6 +1930,7 @@ set(WebCore_SOURCES
     loader/cache/CachedResourceRequestInitiators.cpp
     loader/cache/CachedSVGDocument.cpp
     loader/cache/CachedSVGDocumentReference.cpp
+    loader/cache/CachedSVGFont.cpp
     loader/cache/CachedScript.cpp
     loader/cache/CachedXSLStyleSheet.cpp
     loader/cache/MemoryCache.cpp
@@ -2026,9 +2028,8 @@ set(WebCore_SOURCES
     page/scrolling/ScrollingConstraints.cpp
     page/scrolling/ScrollingCoordinator.cpp
     page/scrolling/ScrollingStateFixedNode.cpp
-    page/scrolling/ScrollingStateNode.cpp
-    page/scrolling/ScrollingStateScrollingNode.cpp
     page/scrolling/ScrollingStateFrameScrollingNode.cpp
+    page/scrolling/ScrollingStateNode.cpp
     page/scrolling/ScrollingStateOverflowScrollingNode.cpp
     page/scrolling/ScrollingStateScrollingNode.cpp
     page/scrolling/ScrollingStateStickyNode.cpp
@@ -2050,7 +2051,6 @@ set(WebCore_SOURCES
     platform/FileChooser.cpp
     platform/FileStream.cpp
     platform/FileSystem.cpp
-    platform/URL.cpp
     platform/KillRingNone.cpp
     platform/Language.cpp
     platform/Length.cpp
@@ -2065,7 +2065,6 @@ set(WebCore_SOURCES
     platform/PlatformSpeechSynthesizer.cpp
     platform/PlatformStrategies.cpp
     platform/RemoteCommandListener.cpp
-    platform/SystemSleepListener.cpp
     platform/RuntimeApplicationChecks.cpp
     platform/SchemeRegistry.cpp
     platform/ScrollAnimator.cpp
@@ -2076,12 +2075,14 @@ set(WebCore_SOURCES
     platform/ScrollbarThemeComposite.cpp
     platform/SharedBuffer.cpp
     platform/SharedBufferChunkReader.cpp
+    platform/SystemSleepListener.cpp
     platform/Theme.cpp
     platform/ThreadGlobalData.cpp
     platform/ThreadTimers.cpp
     platform/Timer.cpp
-    platform/UserActivity.cpp
+    platform/URL.cpp
     platform/UUID.cpp
+    platform/UserActivity.cpp
     platform/Widget.cpp
 
     platform/animation/Animation.cpp
@@ -2153,13 +2154,13 @@ set(WebCore_SOURCES
     platform/graphics/GraphicsLayerTransform.cpp
     platform/graphics/GraphicsLayerUpdater.cpp
     platform/graphics/GraphicsTypes.cpp
+    platform/graphics/ISOVTTCue.cpp
     platform/graphics/Image.cpp
     platform/graphics/ImageBuffer.cpp
     platform/graphics/ImageOrientation.cpp
     platform/graphics/IntPoint.cpp
     platform/graphics/IntRect.cpp
     platform/graphics/IntSize.cpp
-    platform/graphics/ISOVTTCue.cpp
     platform/graphics/LayoutRect.cpp
     platform/graphics/MaskImageOperation.cpp
     platform/graphics/MediaPlayer.cpp
@@ -2229,20 +2230,20 @@ set(WebCore_SOURCES
 
     platform/mediastream/MediaStreamPrivate.cpp
     platform/mediastream/MediaStreamTrackPrivate.cpp
-    platform/mediastream/RealtimeMediaSource.cpp
-    platform/mediastream/RealtimeMediaSourceCenter.cpp
-    platform/mediastream/RealtimeMediaSourceStates.cpp
     platform/mediastream/RTCIceCandidateDescriptor.cpp
     platform/mediastream/RTCPeerConnectionHandler.cpp
     platform/mediastream/RTCSessionDescriptionDescriptor.cpp
+    platform/mediastream/RealtimeMediaSource.cpp
+    platform/mediastream/RealtimeMediaSourceCenter.cpp
+    platform/mediastream/RealtimeMediaSourceStates.cpp
 
     platform/mock/DeviceMotionClientMock.cpp
     platform/mock/DeviceOrientationClientMock.cpp
     platform/mock/GeolocationClientMock.cpp
     platform/mock/MediaConstraintsMock.cpp
     platform/mock/MockRealtimeMediaSourceCenter.cpp
-    platform/mock/RTCDataChannelHandlerMock.cpp
     platform/mock/RTCDTMFSenderHandlerMock.cpp
+    platform/mock/RTCDataChannelHandlerMock.cpp
     platform/mock/RTCNotifiersMock.cpp
     platform/mock/RTCPeerConnectionHandlerMock.cpp
     platform/mock/ScrollbarThemeMock.cpp
@@ -2421,18 +2422,18 @@ set(WebCore_SOURCES
     rendering/RenderTextLineBoxes.cpp
     rendering/RenderTheme.cpp
     rendering/RenderTreeAsText.cpp
+    rendering/RenderVTTCue.cpp
     rendering/RenderVideo.cpp
     rendering/RenderView.cpp
-    rendering/RenderVTTCue.cpp
     rendering/RenderWidget.cpp
     rendering/RootInlineBox.cpp
-    rendering/SelectionSubtreeRoot.cpp
     rendering/ScrollBehavior.cpp
+    rendering/SelectionSubtreeRoot.cpp
     rendering/SimpleLineLayout.cpp
     rendering/SimpleLineLayoutFlowContents.cpp
-    rendering/SimpleLineLayoutTextFragmentIterator.cpp
     rendering/SimpleLineLayoutFunctions.cpp
     rendering/SimpleLineLayoutResolver.cpp
+    rendering/SimpleLineLayoutTextFragmentIterator.cpp
     rendering/TextAutosizer.cpp
     rendering/TextPaintStyle.cpp
     rendering/TextPainter.cpp
@@ -2571,8 +2572,8 @@ set(WebCore_SOURCES
     svg/SVGAltGlyphItemElement.cpp
     svg/SVGAngle.cpp
     svg/SVGAnimateColorElement.cpp
-    svg/SVGAnimateElementBase.cpp
     svg/SVGAnimateElement.cpp
+    svg/SVGAnimateElementBase.cpp
     svg/SVGAnimateMotionElement.cpp
     svg/SVGAnimateTransformElement.cpp
     svg/SVGAnimatedAngle.cpp
@@ -2813,14 +2814,16 @@ set(WebCore_LIBRARIES
 if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
     list(APPEND WebCore_SOURCES
         Modules/encryptedmedia/CDM.cpp
-        Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp
         Modules/encryptedmedia/CDMPrivateClearKey.cpp
+        Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp
         Modules/encryptedmedia/CDMSessionClearKey.cpp
         Modules/encryptedmedia/MediaKeyMessageEvent.cpp
         Modules/encryptedmedia/MediaKeyNeededEvent.cpp
-        Modules/encryptedmedia/MediaKeys.cpp
         Modules/encryptedmedia/MediaKeySession.cpp
+        Modules/encryptedmedia/MediaKeys.cpp
+
         html/MediaKeyEvent.cpp
+
         testing/MockCDM.cpp
     )
     list(APPEND WebCore_IDL_FILES
@@ -2828,8 +2831,9 @@ if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
         Modules/encryptedmedia/MediaKeyNeededEvent.idl
         Modules/encryptedmedia/MediaKeySession.idl
         Modules/encryptedmedia/MediaKeys.idl
-        html/MediaKeyEvent.idl
+
         html/MediaKeyError.idl
+        html/MediaKeyEvent.idl
     )
 endif ()
 
@@ -2858,6 +2862,7 @@ if (ENABLE_WEBGL)
         html/canvas/OESTextureHalfFloat.cpp
         html/canvas/OESTextureHalfFloatLinear.cpp
         html/canvas/OESVertexArrayObject.cpp
+        html/canvas/WebGL2RenderingContext.cpp
         html/canvas/WebGLBuffer.cpp
         html/canvas/WebGLCompressedTextureATC.cpp
         html/canvas/WebGLCompressedTexturePVRTC.cpp
@@ -2878,9 +2883,8 @@ if (ENABLE_WEBGL)
         html/canvas/WebGLProgram.cpp
         html/canvas/WebGLQuery.cpp
         html/canvas/WebGLRenderbuffer.cpp
-        html/canvas/WebGLRenderingContextBase.cpp
         html/canvas/WebGLRenderingContext.cpp
-        html/canvas/WebGL2RenderingContext.cpp
+        html/canvas/WebGLRenderingContextBase.cpp
         html/canvas/WebGLSampler.cpp
         html/canvas/WebGLShader.cpp
         html/canvas/WebGLShaderPrecisionFormat.cpp
@@ -2907,6 +2911,7 @@ if (ENABLE_WEBGL)
         html/canvas/OESTextureHalfFloat.idl
         html/canvas/OESTextureHalfFloatLinear.idl
         html/canvas/OESVertexArrayObject.idl
+        html/canvas/WebGL2RenderingContext.idl
         html/canvas/WebGLActiveInfo.idl
         html/canvas/WebGLBuffer.idl
         html/canvas/WebGLCompressedTextureATC.idl
@@ -2923,9 +2928,8 @@ if (ENABLE_WEBGL)
         html/canvas/WebGLProgram.idl
         html/canvas/WebGLQuery.idl
         html/canvas/WebGLRenderbuffer.idl
-        html/canvas/WebGLRenderingContextBase.idl
         html/canvas/WebGLRenderingContext.idl
-        html/canvas/WebGL2RenderingContext.idl
+        html/canvas/WebGLRenderingContextBase.idl
         html/canvas/WebGLSampler.idl
         html/canvas/WebGLShader.idl
         html/canvas/WebGLShaderPrecisionFormat.idl
@@ -2948,9 +2952,9 @@ if (ENABLE_VIDEO_TRACK)
         html/track/TextTrackCueList.idl
         html/track/TextTrackList.idl
         html/track/TrackEvent.idl
+        html/track/VTTCue.idl
         html/track/VideoTrack.idl
         html/track/VideoTrackList.idl
-        html/track/VTTCue.idl
     )
 
     list(APPEND WebCore_SOURCES
@@ -2971,12 +2975,12 @@ if (ENABLE_VIDEO_TRACK)
         html/track/TrackBase.cpp
         html/track/TrackEvent.cpp
         html/track/TrackListBase.cpp
-        html/track/VideoTrack.cpp
-        html/track/VideoTrackList.cpp
         html/track/VTTCue.cpp
         html/track/VTTRegion.cpp
         html/track/VTTRegionList.cpp
         html/track/VTTScanner.cpp
+        html/track/VideoTrack.cpp
+        html/track/VideoTrackList.cpp
         html/track/WebVTTElement.cpp
         html/track/WebVTTParser.cpp
         html/track/WebVTTTokenizer.cpp
@@ -3055,7 +3059,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
         ${THIRDPARTY_DIR}/ANGLE/src/common/RefCountObject.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/common/shadervars.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/common/utilities.cpp
-    
+
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/BuiltInFunctionEmulator.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/CodeGen.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Compiler.cpp
@@ -3073,7 +3077,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Intermediate.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/IntermTraverse.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Intermediate.cpp
-        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/LoopInfo.cpp        
+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/LoopInfo.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputESSL.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputGLSL.cpp
         ${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/OutputGLSLBase.cpp
@@ -3138,8 +3142,8 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
 
     list(APPEND WebCore_SOURCES
         platform/graphics/ANGLEWebKitBridge.cpp
-        platform/graphics/GraphicsContext3D.cpp
         platform/graphics/FormatConverter.cpp
+        platform/graphics/GraphicsContext3D.cpp
     )
 endif ()
 
@@ -3159,16 +3163,17 @@ if (ENABLE_WEB_REPLAY)
 
     list(APPEND WebCore_SOURCES
         inspector/InspectorReplayAgent.cpp
+
         replay/CapturingInputCursor.cpp
         replay/EventLoopInput.cpp
         replay/EventLoopInputDispatcher.cpp
         replay/MemoizedDOMResult.cpp
         replay/ReplayController.cpp
-        replay/ReplayingInputCursor.cpp
         replay/ReplayInputCreationMethods.cpp
         replay/ReplayInputDispatchMethods.cpp
         replay/ReplaySession.cpp
         replay/ReplaySessionSegment.cpp
+        replay/ReplayingInputCursor.cpp
         replay/SegmentedInputStorage.cpp
         replay/SerializationMethods.cpp
         replay/UserInputBridge.cpp
@@ -3185,6 +3190,7 @@ if (ENABLE_USER_MESSAGE_HANDLERS)
     )
     list(APPEND WebCore_SOURCES
         bindings/js/JSUserMessageHandlersNamespaceCustom.cpp
+
         page/UserMessageHandler.cpp
         page/UserMessageHandlerDescriptor.cpp
         page/UserMessageHandlersNamespace.cpp
@@ -3222,7 +3228,6 @@ set(WebCoreTestSupport_SOURCES
 
     testing/InternalSettings.cpp
     testing/Internals.cpp
-
     testing/MicroTaskTest.cpp
     testing/MockPageOverlayClient.cpp
 
index ec4d28d..5daa4d4 100644 (file)
@@ -1,3 +1,17 @@
+2015-06-09  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Fix the style issues in cmake project files
+        https://bugs.webkit.org/show_bug.cgi?id=145755
+
+        Reviewed by Darin Adler.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * PlatformWin.cmake:
+        * PlatformWinCairo.cmake:
+
 2015-06-09  Xabier Rodriguez Calvar  <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
 
         [Streams API] ReadableJSStream should handle JS source getters that throw
index 1830192..18e2a9e 100644 (file)
@@ -480,8 +480,8 @@ if (ENABLE_SPEECH_SYNTHESIS)
         ${ESPEAK_LIBRARIES}
     )
     list(APPEND WebCore_SOURCES
-        platform/efl/PlatformSpeechSynthesizerEfl.cpp
         platform/efl/PlatformSpeechSynthesisProviderEfl.cpp
+        platform/efl/PlatformSpeechSynthesizerEfl.cpp
     )
 endif ()
 
@@ -493,25 +493,26 @@ if (ENABLE_SUBTLE_CRYPTO)
         crypto/CryptoKey.cpp
         crypto/CryptoKeyPair.cpp
         crypto/SubtleCrypto.cpp
+
         crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
         crypto/algorithms/CryptoAlgorithmAES_KW.cpp
         crypto/algorithms/CryptoAlgorithmHMAC.cpp
         crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
-        crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
         crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+        crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
         crypto/algorithms/CryptoAlgorithmSHA1.cpp
         crypto/algorithms/CryptoAlgorithmSHA224.cpp
         crypto/algorithms/CryptoAlgorithmSHA256.cpp
         crypto/algorithms/CryptoAlgorithmSHA384.cpp
         crypto/algorithms/CryptoAlgorithmSHA512.cpp
 
-        crypto/gnutls/CryptoAlgorithmRegistryGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmAES_KWGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmRSAES_PKCS1_v1_5GnuTLS.cpp
-        crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
+        crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
+        crypto/gnutls/CryptoAlgorithmRegistryGnuTLS.cpp
         crypto/gnutls/CryptoDigestGnuTLS.cpp
         crypto/gnutls/CryptoKeyRSAGnuTLS.cpp
         crypto/gnutls/SerializedCryptoKeyWrapGnuTLS.cpp
index 70d849a..a2fa058 100644 (file)
@@ -45,22 +45,23 @@ list(APPEND WebCore_SOURCES
     accessibility/atk/WebKitAccessibleUtil.cpp
     accessibility/atk/WebKitAccessibleWrapperAtk.cpp
 
-    editing/atk/FrameSelectionAtk.cpp
     editing/SmartReplace.cpp
 
+    editing/atk/FrameSelectionAtk.cpp
+
     loader/soup/CachedRawResourceSoup.cpp
     loader/soup/SubresourceLoaderSoup.cpp
 
     platform/PlatformStrategies.cpp
 
-    platform/audio/gtk/AudioBusGtk.cpp
-
     platform/audio/gstreamer/AudioDestinationGStreamer.cpp
     platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
     platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
     platform/audio/gstreamer/FFTFrameGStreamer.cpp
     platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
 
+    platform/audio/gtk/AudioBusGtk.cpp
+
     platform/geoclue/GeolocationProviderGeoclue1.cpp
     platform/geoclue/GeolocationProviderGeoclue2.cpp
 
@@ -142,6 +143,9 @@ list(APPEND WebCore_SOURCES
 
     platform/image-decoders/ImageDecoder.cpp
 
+    platform/image-decoders/bmp/BMPImageDecoder.cpp
+    platform/image-decoders/bmp/BMPImageReader.cpp
+
     platform/image-decoders/cairo/ImageDecoderCairo.cpp
 
     platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -151,9 +155,6 @@ list(APPEND WebCore_SOURCES
 
     platform/image-decoders/jpeg/JPEGImageDecoder.cpp
 
-    platform/image-decoders/bmp/BMPImageDecoder.cpp
-    platform/image-decoders/bmp/BMPImageReader.cpp
-
     platform/image-decoders/png/PNGImageDecoder.cpp
 
     platform/image-decoders/webp/WEBPImageDecoder.cpp
@@ -164,6 +165,8 @@ list(APPEND WebCore_SOURCES
     platform/mediastream/openwebrtc/OpenWebRTCUtilities.cpp
     platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp
 
+    platform/network/gtk/CredentialBackingStore.cpp
+
     platform/network/soup/AuthenticationChallengeSoup.cpp
     platform/network/soup/CertificateInfo.cpp
     platform/network/soup/CookieJarSoup.cpp
@@ -190,8 +193,6 @@ list(APPEND WebCore_SOURCES
 
     platform/text/gtk/HyphenationLibHyphen.cpp
     platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
-
-    platform/network/gtk/CredentialBackingStore.cpp
 )
 
 list(APPEND WebCorePlatformGTK_SOURCES
@@ -401,13 +402,15 @@ if (ENABLE_THREADED_COMPOSITOR)
         "${WEBCORE_DIR}/platform/graphics/texmap/threadedcompositor"
     )
     list(APPEND WebCore_SOURCES
-        page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
-        page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
-        page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp
         page/scrolling/ScrollingStateStickyNode.cpp
         page/scrolling/ScrollingThread.cpp
         page/scrolling/ScrollingTreeNode.cpp
         page/scrolling/ScrollingTreeScrollingNode.cpp
+
+        page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
+        page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
+        page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp
+
         platform/graphics/texmap/coordinated/AreaAllocator.cpp
         platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
         platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
@@ -699,8 +702,8 @@ list(APPEND GObjectDOMBindingsUnstable_IDL_FILES
     page/Screen.idl
     page/UserMessageHandler.idl
     page/UserMessageHandlersNamespace.idl
-    page/WebKitPoint.idl
     page/WebKitNamespace.idl
+    page/WebKitPoint.idl
 
     plugins/DOMMimeType.idl
     plugins/DOMMimeTypeArray.idl
@@ -889,25 +892,26 @@ if (ENABLE_SUBTLE_CRYPTO)
         crypto/CryptoKey.cpp
         crypto/CryptoKeyPair.cpp
         crypto/SubtleCrypto.cpp
+
         crypto/algorithms/CryptoAlgorithmAES_CBC.cpp
         crypto/algorithms/CryptoAlgorithmAES_KW.cpp
         crypto/algorithms/CryptoAlgorithmHMAC.cpp
         crypto/algorithms/CryptoAlgorithmRSAES_PKCS1_v1_5.cpp
-        crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
         crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
+        crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
         crypto/algorithms/CryptoAlgorithmSHA1.cpp
         crypto/algorithms/CryptoAlgorithmSHA224.cpp
         crypto/algorithms/CryptoAlgorithmSHA256.cpp
         crypto/algorithms/CryptoAlgorithmSHA384.cpp
         crypto/algorithms/CryptoAlgorithmSHA512.cpp
 
-        crypto/gnutls/CryptoAlgorithmRegistryGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmAES_CBCGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmAES_KWGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmHMACGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmRSAES_PKCS1_v1_5GnuTLS.cpp
-        crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
         crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
+        crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
+        crypto/gnutls/CryptoAlgorithmRegistryGnuTLS.cpp
         crypto/gnutls/CryptoDigestGnuTLS.cpp
         crypto/gnutls/CryptoKeyRSAGnuTLS.cpp
         crypto/gnutls/SerializedCryptoKeyWrapGnuTLS.cpp
index 6d9e6fa..982c486 100644 (file)
@@ -155,8 +155,8 @@ list(APPEND WebCore_SOURCES
     platform/cocoa/SystemVersion.mm
     platform/cocoa/TelephoneNumberDetectorCocoa.cpp
 
-    platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
     platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
+    platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
     platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
     platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
     platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
@@ -194,14 +194,6 @@ list(APPEND WebCore_SOURCES
     platform/graphics/ca/mac/PlatformCALayerMac.mm
     platform/graphics/ca/mac/WebTiledBackingLayer.mm
 
-    platform/graphics/cocoa/FontCascadeCocoa.mm
-    platform/graphics/cocoa/FontCocoa.mm
-    platform/graphics/cocoa/FontPlatformDataCocoa.mm
-    platform/graphics/cocoa/IOSurface.mm
-    platform/graphics/cocoa/IOSurfacePoolCocoa.mm
-    platform/graphics/cocoa/WebActionDisablingCALayerDelegate.mm
-    platform/graphics/cocoa/WebCoreCALayerExtras.mm
-
     platform/graphics/cg/BitmapImageCG.cpp
     platform/graphics/cg/ColorCG.cpp
     platform/graphics/cg/FloatPointCG.cpp
@@ -226,6 +218,14 @@ list(APPEND WebCore_SOURCES
     platform/graphics/cg/SubimageCacheWithTimer.cpp
     platform/graphics/cg/TransformationMatrixCG.cpp
 
+    platform/graphics/cocoa/FontCascadeCocoa.mm
+    platform/graphics/cocoa/FontCocoa.mm
+    platform/graphics/cocoa/FontPlatformDataCocoa.mm
+    platform/graphics/cocoa/IOSurface.mm
+    platform/graphics/cocoa/IOSurfacePoolCocoa.mm
+    platform/graphics/cocoa/WebActionDisablingCALayerDelegate.mm
+    platform/graphics/cocoa/WebCoreCALayerExtras.mm
+
     platform/graphics/mac/ColorMac.mm
     platform/graphics/mac/ComplexTextController.cpp
     platform/graphics/mac/ComplexTextControllerCoreText.mm
@@ -309,10 +309,6 @@ list(APPEND WebCore_SOURCES
     platform/mac/WebWindowAnimation.mm
     platform/mac/WidgetMac.mm
 
-    platform/network/cocoa/CredentialCocoa.mm
-    platform/network/cocoa/ProtectionSpaceCocoa.mm
-    platform/network/cocoa/ResourceRequestCocoa.mm
-
     platform/network/cf/AuthenticationCF.cpp
     platform/network/cf/CookieJarCFNet.cpp
     platform/network/cf/CookieStorageCFNet.cpp
@@ -332,6 +328,10 @@ list(APPEND WebCore_SOURCES
     platform/network/cf/SynchronousLoaderClientCFNet.cpp
     platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
 
+    platform/network/cocoa/CredentialCocoa.mm
+    platform/network/cocoa/ProtectionSpaceCocoa.mm
+    platform/network/cocoa/ResourceRequestCocoa.mm
+
     platform/network/mac/AuthenticationMac.mm
     platform/network/mac/BlobDataFileReferenceMac.mm
     platform/network/mac/CertificateInfoMac.mm
@@ -365,35 +365,17 @@ list(APPEND WebCore_SOURCES
 # Move some to WebCore_FORWARDING_HEADERS_FILES once people start actually maintaining this.
 set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     accessibility
-    bindings/js
-    bindings/objc
-    bindings/generic
     bridge
     contentextensions
     crypto
     css
     dom
     editing
-    editing/cocoa
-    editing/mac
     fileapi
     history
     html
-    html/forms
-    html/parser
-    html/shadow
     inspector
     loader
-
-    bridge/jsc
-    loader/appcache
-    loader/archive
-    loader/archive/cf
-    loader/cache
-    Modules/indexeddb
-    Modules/geolocation
-    Modules/notifications
-    Modules/webdatabase
     page
     platform
     plugins
@@ -403,12 +385,35 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     style
     svg
 
+    Modules/geolocation
+    Modules/indexeddb
+    Modules/notifications
+    Modules/webdatabase
+
+    bindings/generic
+    bindings/js
+    bindings/objc
+
+    bridge/jsc
+
+    editing/cocoa
+    editing/mac
+
+    html/forms
+    html/parser
+    html/shadow
+
+    loader/appcache
+    loader/archive
+    loader/cache
+
+    loader/archive/cf
+
     page/animation
+    page/cocoa
     page/mac
     page/scrolling
 
-    page/cocoa
-
     platform/animation
     platform/audio
     platform/graphics
@@ -441,6 +446,8 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
 )
 
 set(WebCore_FORWARDING_HEADERS_FILES
+    Modules/webdatabase/DatabaseDetails.h
+
     bridge/IdentifierRep.h
     bridge/npruntime_impl.h
     bridge/npruntime_internal.h
@@ -470,8 +477,6 @@ set(WebCore_FORWARDING_HEADERS_FILES
 
     loader/mac/LoaderNSURLExtras.h
 
-    Modules/webdatabase/DatabaseDetails.h
-
     platform/DisplaySleepDisabler.h
     platform/PlatformExportMacros.h
 
@@ -488,11 +493,11 @@ set(WebCore_FORWARDING_HEADERS_FILES
     platform/mac/SoftLinking.h
     platform/mac/WebCoreSystemInterface.h
 
-    platform/network/mac/AuthenticationMac.h
-
     platform/network/cf/CertificateInfo.h
     platform/network/cf/ResourceResponse.h
 
+    platform/network/mac/AuthenticationMac.h
+
     platform/sql/SQLiteDatabase.h
 
     rendering/style/RenderStyleConstants.h
index f4f0a38..3cfbaea 100644 (file)
@@ -75,9 +75,9 @@ if (${WTF_PLATFORM_WIN_CAIRO})
 endif ()
 
 set(WebCore_FORWARDING_HEADERS_DIRECTORIES
-    bridge/c
-
     Modules/indexeddb
+
+    bridge/c
 )
 
 WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
index fedb35d..6b59aac 100644 (file)
@@ -122,8 +122,8 @@ list(APPEND WebCore_SOURCES
     platform/network/curl/ProxyServerCurl.cpp
     platform/network/curl/ResourceHandleCurl.cpp
     platform/network/curl/ResourceHandleManager.cpp
-    platform/network/curl/SocketStreamHandleCurl.cpp
     platform/network/curl/SSLHandle.cpp
+    platform/network/curl/SocketStreamHandleCurl.cpp
 
     platform/network/win/DownloadBundleWin.cpp
 
index 5ff9d2d..7fddf1e 100644 (file)
@@ -1,3 +1,12 @@
+2015-06-09  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Fix the style issues in cmake project files
+        https://bugs.webkit.org/show_bug.cgi?id=145755
+
+        Reviewed by Darin Adler.
+
+        * PlatformMac.cmake:
+
 2015-06-07  Anders Carlsson  <andersca@apple.com>
 
         Remove WebNSArrayExtras
index 7f0a183..45c3bb9 100644 (file)
@@ -103,6 +103,15 @@ list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
 )
 
 list(APPEND WebKit_SOURCES
+    Storage/StorageAreaImpl.cpp
+    Storage/StorageAreaSync.cpp
+    Storage/StorageNamespaceImpl.cpp
+    Storage/StorageSyncManager.cpp
+    Storage/StorageThread.cpp
+    Storage/StorageTracker.cpp
+    Storage/WebDatabaseProvider.cpp
+    Storage/WebStorageNamespaceProvider.cpp
+
     mac/Carbon/CarbonUtils.m
     mac/Carbon/CarbonWindowAdapter.mm
     mac/Carbon/CarbonWindowContentView.m
@@ -258,15 +267,6 @@ list(APPEND WebKit_SOURCES
     mac/WebView/WebTextIterator.mm
     mac/WebView/WebView.mm
     mac/WebView/WebViewData.mm
-
-    Storage/StorageAreaImpl.cpp
-    Storage/StorageAreaSync.cpp
-    Storage/StorageNamespaceImpl.cpp
-    Storage/StorageSyncManager.cpp
-    Storage/StorageThread.cpp
-    Storage/StorageTracker.cpp
-    Storage/WebDatabaseProvider.cpp
-    Storage/WebStorageNamespaceProvider.cpp
 )
 
 set(WebKit_LIBRARY_TYPE SHARED)
index 547aa67..5e42363 100644 (file)
@@ -177,12 +177,14 @@ set(NetworkProcess_COMMON_SOURCES
 )
 
 set(WebKit2_SOURCES
-    DatabaseProcess/DatabaseToWebProcessConnection.cpp
     DatabaseProcess/DatabaseProcess.cpp
+    DatabaseProcess/DatabaseToWebProcessConnection.cpp
+
     DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.cpp
     DatabaseProcess/IndexedDB/IDBSerialization.cpp
     DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp
     DatabaseProcess/IndexedDB/UniqueIDBDatabaseIdentifier.cpp
+
     DatabaseProcess/IndexedDB/sqlite/SQLiteIDBCursor.cpp
     DatabaseProcess/IndexedDB/sqlite/SQLiteIDBTransaction.cpp
     DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
@@ -207,18 +209,6 @@ set(WebKit2_SOURCES
     PluginProcess/PluginProcess.cpp
     PluginProcess/WebProcessConnection.cpp
 
-    Shared/API/APIArray.cpp
-    Shared/API/APIData.cpp
-    Shared/API/APIDictionary.cpp
-    Shared/API/APIError.cpp
-    Shared/API/APIFrameHandle.cpp
-    Shared/API/APIGeometry.cpp
-    Shared/API/APIPageGroupHandle.cpp
-    Shared/API/APIPageHandle.cpp
-    Shared/API/APIObject.cpp
-    Shared/API/APIURLRequest.cpp
-    Shared/API/APIURLResponse.cpp
-
     Shared/ActivityAssertion.cpp
     Shared/AsyncRequest.cpp
     Shared/BlobDataFileReferenceWithSandboxExtension.cpp
@@ -276,6 +266,18 @@ set(WebKit2_SOURCES
     Shared/WebTouchEvent.cpp
     Shared/WebWheelEvent.cpp
 
+    Shared/API/APIArray.cpp
+    Shared/API/APIData.cpp
+    Shared/API/APIDictionary.cpp
+    Shared/API/APIError.cpp
+    Shared/API/APIFrameHandle.cpp
+    Shared/API/APIGeometry.cpp
+    Shared/API/APIObject.cpp
+    Shared/API/APIPageGroupHandle.cpp
+    Shared/API/APIPageHandle.cpp
+    Shared/API/APIURLRequest.cpp
+    Shared/API/APIURLResponse.cpp
+
     Shared/API/c/WKArray.cpp
     Shared/API/c/WKCertificateInfo.cpp
     Shared/API/c/WKConnectionRef.cpp
@@ -304,6 +306,7 @@ set(WebKit2_SOURCES
     Shared/Authentication/AuthenticationManager.cpp
 
     Shared/Databases/DatabaseProcessCreationParameters.cpp
+
     Shared/Databases/IndexedDB/IDBUtilities.cpp
 
     Shared/Downloads/Download.cpp
@@ -346,9 +349,6 @@ set(WebKit2_SOURCES
     UIProcess/WebBatteryProvider.cpp
     UIProcess/WebColorPicker.cpp
     UIProcess/WebConnectionToWebProcess.cpp
-    UIProcess/WebProcessLifetimeObserver.cpp
-    UIProcess/WebProcessLifetimeTracker.cpp
-    UIProcess/WebProcessPool.cpp
     UIProcess/WebContextClient.cpp
     UIProcess/WebContextConnectionClient.cpp
     UIProcess/WebContextInjectedBundleClient.cpp
@@ -372,8 +372,8 @@ set(WebKit2_SOURCES
     UIProcess/WebIconDatabaseClient.cpp
     UIProcess/WebInspectorProxy.cpp
     UIProcess/WebKeyValueStorageManager.cpp
-    UIProcess/WebNavigationState.cpp
     UIProcess/WebMediaCacheManagerProxy.cpp
+    UIProcess/WebNavigationState.cpp
     UIProcess/WebOpenPanelResultListenerProxy.cpp
     UIProcess/WebOriginDataManagerProxy.cpp
     UIProcess/WebPageDiagnosticLoggingClient.cpp
@@ -382,6 +382,9 @@ set(WebKit2_SOURCES
     UIProcess/WebPageProxy.cpp
     UIProcess/WebPasteboardProxy.cpp
     UIProcess/WebPreferences.cpp
+    UIProcess/WebProcessLifetimeObserver.cpp
+    UIProcess/WebProcessLifetimeTracker.cpp
+    UIProcess/WebProcessPool.cpp
     UIProcess/WebProcessProxy.cpp
     UIProcess/WebResourceCacheManagerProxy.cpp
     UIProcess/WebTextChecker.cpp
@@ -389,7 +392,6 @@ set(WebKit2_SOURCES
     UIProcess/WebVibrationProvider.cpp
     UIProcess/WebVibrationProxy.cpp
     UIProcess/WebViewportAttributes.cpp
-    UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
 
     UIProcess/API/APIFrameInfo.cpp
     UIProcess/API/APINavigation.cpp
@@ -397,15 +399,15 @@ set(WebKit2_SOURCES
     UIProcess/API/APIProcessPoolConfiguration.cpp
     UIProcess/API/APISession.cpp
     UIProcess/API/APISessionState.cpp
-    UIProcess/API/APIWebsiteDataStore.cpp
     UIProcess/API/APIUserContentExtension.cpp
     UIProcess/API/APIUserContentExtensionStore.cpp
+    UIProcess/API/APIWebsiteDataStore.cpp
 
     UIProcess/API/C/WKApplicationCacheManager.cpp
     UIProcess/API/C/WKAuthenticationChallenge.cpp
     UIProcess/API/C/WKAuthenticationDecisionListener.cpp
-    UIProcess/API/C/WKBackForwardListRef.cpp
     UIProcess/API/C/WKBackForwardListItemRef.cpp
+    UIProcess/API/C/WKBackForwardListRef.cpp
     UIProcess/API/C/WKBatteryManager.cpp
     UIProcess/API/C/WKBatteryStatus.cpp
     UIProcess/API/C/WKContext.cpp
@@ -489,6 +491,8 @@ set(WebKit2_SOURCES
     UIProcess/WebsiteData/WebsiteDataRecord.cpp
     UIProcess/WebsiteData/WebsiteDataStore.cpp
 
+    UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
+
     WebProcess/WebConnectionToUIProcess.cpp
     WebProcess/WebProcess.cpp
 
@@ -499,9 +503,10 @@ set(WebKit2_SOURCES
     WebProcess/Cookies/WebCookieManager.cpp
 
     WebProcess/Databases/WebDatabaseProvider.cpp
+    WebProcess/Databases/WebToDatabaseProcessConnection.cpp
+
     WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp
     WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp
-    WebProcess/Databases/WebToDatabaseProcessConnection.cpp
 
     WebProcess/FileAPI/BlobRegistryProxy.cpp
 
@@ -615,6 +620,7 @@ set(WebKit2_SOURCES
     WebProcess/WebPage/FindController.cpp
     WebProcess/WebPage/LayerTreeHost.cpp
     WebProcess/WebPage/PageBanner.cpp
+    WebProcess/WebPage/VisitedLinkTableController.cpp
     WebProcess/WebPage/WebBackForwardListProxy.cpp
     WebProcess/WebPage/WebContextMenu.cpp
     WebProcess/WebPage/WebDocumentLoader.cpp
@@ -625,15 +631,17 @@ set(WebKit2_SOURCES
     WebProcess/WebPage/WebPage.cpp
     WebProcess/WebPage/WebPageGroupProxy.cpp
     WebProcess/WebPage/WebPageOverlay.cpp
-    WebProcess/WebPage/VisitedLinkTableController.cpp
     WebProcess/WebPage/WebUndoStep.cpp
 
+
+
     ${NetworkProcess_COMMON_SOURCES}
 )
 
 set(WebKit2_MESSAGES_IN_FILES
-    DatabaseProcess/DatabaseToWebProcessConnection.messages.in
     DatabaseProcess/DatabaseProcess.messages.in
+    DatabaseProcess/DatabaseToWebProcessConnection.messages.in
+
     DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in
 
     NetworkProcess/NetworkConnectionToWebProcess.messages.in
@@ -649,15 +657,14 @@ set(WebKit2_MESSAGES_IN_FILES
 
     Shared/Authentication/AuthenticationManager.messages.in
 
-    Shared/Plugins/NPObjectMessageReceiver.messages.in
-
     Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
 
+    Shared/Plugins/NPObjectMessageReceiver.messages.in
+
     UIProcess/DrawingAreaProxy.messages.in
     UIProcess/VisitedLinkProvider.messages.in
     UIProcess/WebApplicationCacheManagerProxy.messages.in
     UIProcess/WebBatteryManagerProxy.messages.in
-    UIProcess/WebProcessPool.messages.in
     UIProcess/WebCookieManagerProxy.messages.in
     UIProcess/WebDatabaseManagerProxy.messages.in
     UIProcess/WebFullScreenManagerProxy.messages.in
@@ -668,6 +675,7 @@ set(WebKit2_MESSAGES_IN_FILES
     UIProcess/WebOriginDataManagerProxy.messages.in
     UIProcess/WebPageProxy.messages.in
     UIProcess/WebPasteboardProxy.messages.in
+    UIProcess/WebProcessPool.messages.in
     UIProcess/WebProcessProxy.messages.in
     UIProcess/WebResourceCacheManagerProxy.messages.in
     UIProcess/WebVibrationProxy.messages.in
index 285d4fe..5339109 100644 (file)
@@ -1,3 +1,14 @@
+2015-06-09  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Fix the style issues in cmake project files
+        https://bugs.webkit.org/show_bug.cgi?id=145755
+
+        Reviewed by Darin Adler.
+
+        * CMakeLists.txt:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+
 2015-06-02  Jon Honeycutt  <jhoneycutt@apple.com>
 
         [iOS] UI process memory spike, hang when uploading a very large JPEG
index 89c23a1..1145887 100644 (file)
@@ -58,8 +58,8 @@ list(APPEND WebKit2_SOURCES
     Shared/cairo/ShareableBitmapCairo.cpp
 
     Shared/gtk/ArgumentCodersGtk.cpp
-    Shared/gtk/KeyedEncoder.cpp
     Shared/gtk/KeyedDecoder.cpp
+    Shared/gtk/KeyedEncoder.cpp
     Shared/gtk/NativeContextMenuItemGtk.cpp
     Shared/gtk/NativeWebKeyboardEventGtk.cpp
     Shared/gtk/NativeWebMouseEventGtk.cpp
@@ -84,9 +84,6 @@ list(APPEND WebKit2_SOURCES
     Shared/unix/ChildProcessMain.cpp
 
     UIProcess/BackingStore.cpp
-
-    UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp
-
     UIProcess/DefaultUndoController.cpp
     UIProcess/DrawingAreaProxyImpl.cpp
 
@@ -177,14 +174,14 @@ list(APPEND WebKit2_SOURCES
     UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp
     UIProcess/API/gtk/WebKitNavigationPolicyDecision.h
     UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h
+    UIProcess/API/gtk/WebKitNotification.cpp
+    UIProcess/API/gtk/WebKitNotification.h
     UIProcess/API/gtk/WebKitNotificationPermissionRequest.cpp
     UIProcess/API/gtk/WebKitNotificationPermissionRequest.h
     UIProcess/API/gtk/WebKitNotificationPermissionRequestPrivate.h
+    UIProcess/API/gtk/WebKitNotificationPrivate.h
     UIProcess/API/gtk/WebKitNotificationProvider.cpp
     UIProcess/API/gtk/WebKitNotificationProvider.h
-    UIProcess/API/gtk/WebKitNotification.cpp
-    UIProcess/API/gtk/WebKitNotification.h
-    UIProcess/API/gtk/WebKitNotificationPrivate.h
     UIProcess/API/gtk/WebKitPermissionRequest.cpp
     UIProcess/API/gtk/WebKitPermissionRequest.h
     UIProcess/API/gtk/WebKitPlugin.cpp
@@ -225,12 +222,12 @@ list(APPEND WebKit2_SOURCES
     UIProcess/API/gtk/WebKitURISchemeRequest.cpp
     UIProcess/API/gtk/WebKitURISchemeRequest.h
     UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h
-    UIProcess/API/gtk/WebKitUserContent.h
     UIProcess/API/gtk/WebKitUserContent.cpp
-    UIProcess/API/gtk/WebKitUserContentPrivate.h
+    UIProcess/API/gtk/WebKitUserContent.h
+    UIProcess/API/gtk/WebKitUserContentManager.cpp
     UIProcess/API/gtk/WebKitUserContentManager.h
     UIProcess/API/gtk/WebKitUserContentManagerPrivate.h
-    UIProcess/API/gtk/WebKitUserContentManager.cpp
+    UIProcess/API/gtk/WebKitUserContentPrivate.h
     UIProcess/API/gtk/WebKitUserMediaPermissionRequest.cpp
     UIProcess/API/gtk/WebKitUserMediaPermissionRequest.h
     UIProcess/API/gtk/WebKitUserMediaPermissionRequestPrivate.h
@@ -258,6 +255,8 @@ list(APPEND WebKit2_SOURCES
     UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h
     UIProcess/API/gtk/webkit2.h
 
+    UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp
+
     UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp
 
     UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
@@ -265,8 +264,10 @@ list(APPEND WebKit2_SOURCES
     UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
 
     UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
-    UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp
     UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp
+    UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp
+
+    UIProcess/Network/soup/NetworkProcessProxySoup.cpp
 
     UIProcess/Plugins/gtk/PluginInfoCache.cpp
 
@@ -294,7 +295,6 @@ list(APPEND WebKit2_SOURCES
     UIProcess/gtk/WebProcessPoolGtk.cpp
     UIProcess/gtk/WebProcessProxyGtk.cpp
 
-    UIProcess/Network/soup/NetworkProcessProxySoup.cpp
     UIProcess/soup/WebCookieManagerProxySoup.cpp
     UIProcess/soup/WebProcessPoolSoup.cpp
 
@@ -666,13 +666,13 @@ if (ENABLE_PLUGIN_PROCESS_GTK2)
 
         Platform/unix/SharedMemoryUnix.cpp
 
-        PluginProcess/EntryPoint/unix/PluginProcessMain.cpp
-
         PluginProcess/PluginControllerProxy.cpp
         PluginProcess/PluginCreationParameters.cpp
         PluginProcess/PluginProcess.cpp
         PluginProcess/WebProcessConnection.cpp
 
+        PluginProcess/EntryPoint/unix/PluginProcessMain.cpp
+
         PluginProcess/unix/PluginControllerProxyUnix.cpp
         PluginProcess/unix/PluginProcessMainUnix.cpp
         PluginProcess/unix/PluginProcessUnix.cpp
@@ -781,8 +781,10 @@ if (ENABLE_THREADED_COMPOSITOR)
         Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp
         Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
         Shared/CoordinatedGraphics/SimpleViewportController.cpp
-        Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
+
         Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp
+        Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
+
         WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
     )
     list(APPEND WebKit2_INCLUDE_DIRECTORIES
@@ -997,6 +999,6 @@ add_custom_target(WebKit2-fake-api-headers
 )
 
 set(WEBKIT2_EXTRA_DEPENDENCIES
-     WebKit2-forwarding-headers
      WebKit2-fake-api-headers
+     WebKit2-forwarding-headers
 )
index c5e1f1a..0a9a850 100644 (file)
@@ -48,11 +48,16 @@ set(WebKit2_FORWARDING_HEADERS_FILES
 
 set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
     Shared/API/c
+
     Shared/API/c/mac
-    UIProcess/API/C
+
     UIProcess/Cocoa
-    WebProcess/InjectedBundle/API/c
+
+    UIProcess/API/C
+
     WebProcess/WebPage
+
+    WebProcess/InjectedBundle/API/c
 )
 
 WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
index 23ac173..3fd9fee 100644 (file)
@@ -1,3 +1,13 @@
+2015-06-09  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Fix the style issues in cmake project files
+        https://bugs.webkit.org/show_bug.cgi?id=145755
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/PlatformEfl.cmake:
+
 2015-06-08  Ryosuke Niwa  <rniwa@webkit.org>
 
         Fix a typo in r185345.
index c5dfa2f..53529da 100644 (file)
@@ -39,15 +39,15 @@ set(test_wtf_LIBRARIES
 )
 
 set(test_webcore_LIBRARIES
-    gtest
     WTF
     WebCore
+    gtest
 )
 
 set(test_webkit2_api_LIBRARIES
+    JavaScriptCore
     TestWebKitAPIBase
     WTF
-    JavaScriptCore
     WebKit2
     gtest
 )
@@ -58,8 +58,8 @@ set(TestWebKitAPI_LIBRARIES
 )
 
 set(TestJavaScriptCore_LIBRARIES
-    gtest
     JavaScriptCore
+    gtest
 )
 
 set(TestWTF_SOURCES
index 39df1b4..cbfb7eb 100644 (file)
@@ -65,8 +65,8 @@ set(test_webkit2_api_BINARIES
     AboutBlankLoad
     CloseThenTerminate
     CookieManager
-    DidAssociateFormControls
     DOMWindowExtensionNoCache
+    DidAssociateFormControls
     DocumentStartUserScriptAlertCrash
     EvaluateJavaScript
     FailedLoad
@@ -98,8 +98,10 @@ set(test_webkit2_api_BINARIES
     WKStringJSString
     WKURL
     WillSendSubmitEvent
+
     CoordinatedGraphics/WKViewRestoreZoomAndScrollBackForward
     CoordinatedGraphics/WKViewUserViewportToContents
+
     efl/WKViewClientWebProcessCallbacks
     efl/WKViewScrollTo
 )