Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (185357 => 185358)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-06-09 09:46:19 UTC (rev 185358)
@@ -127,9 +127,9 @@
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 @@
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 @@
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/_javascript_CallFrame.cpp
@@ -337,8 +339,8 @@
interpreter/StackVisitor.cpp
jit/AccessorCallJITStubRoutine.cpp
+ jit/ArityCheckFailReturnThunks.cpp
jit/AssemblyHelpers.cpp
- jit/ArityCheckFailReturnThunks.cpp
jit/BinarySwitch.cpp
jit/ExecutableAllocationFuzz.cpp
jit/ExecutableAllocator.cpp
@@ -363,13 +365,13 @@
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 @@
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 @@
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 @@
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 @@
runtime/JSPromiseConstructor.cpp
runtime/JSPromiseDeferred.cpp
runtime/JSPromiseFunctions.cpp
+ runtime/JSPromisePrototype.cpp
runtime/JSPromiseReaction.cpp
- runtime/JSPromisePrototype.cpp
+ runtime/JSPropertyNameEnumerator.cpp
runtime/JSProxy.cpp
- runtime/JSPropertyNameEnumerator.cpp
runtime/JSScope.cpp
runtime/JSSegmentedVariableObject.cpp
runtime/JSSet.cpp
@@ -659,6 +661,8 @@
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h
)
list(APPEND _javascript_Core_SOURCES
+ disassembler/UDis86Disassembler.cpp
+
disassembler/udis86/udis86.c
disassembler/udis86/udis86_decode.c
disassembler/udis86/udis86_input.c
@@ -666,7 +670,6 @@
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 @@
ftl/FTLLocation.cpp
ftl/FTLLowerDFGToLLVM.cpp
ftl/FTLOSREntry.cpp
+ ftl/FTLOSRExit.cpp
ftl/FTLOSRExitCompiler.cpp
- ftl/FTLOSRExit.cpp
ftl/FTLOperations.cpp
ftl/FTLOutput.cpp
ftl/FTLRecoveryOpcode.cpp
@@ -927,9 +930,6 @@
debugger
heap
inspector
- inspector/agents
- inspector/augmentable
- inspector/remote
interpreter
jit
llint
@@ -939,6 +939,11 @@
yarr
collector/handles
+
+ inspector/agents
+ inspector/augmentable
+ inspector/remote
+
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
)
@@ -989,7 +994,6 @@
assembler/LinkBuffer.h
assembler/MacroAssembler.h
assembler/MacroAssemblerCodeRef.h
- assembler/MacroAssemblerCodeRef.h
inspector/augmentable/AugmentableInspectorController.h
Modified: trunk/Source/_javascript_Core/ChangeLog (185357 => 185358)
--- trunk/Source/_javascript_Core/ChangeLog 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-06-09 09:46:19 UTC (rev 185358)
@@ -1,3 +1,12 @@
+2015-06-09 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
Purge PassRefPtr in _javascript_Core
Modified: trunk/Source/WTF/ChangeLog (185357 => 185358)
--- trunk/Source/WTF/ChangeLog 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WTF/ChangeLog 2015-06-09 09:46:19 UTC (rev 185358)
@@ -1,3 +1,12 @@
+2015-06-09 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
Build fix.
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (185357 => 185358)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-06-09 09:46:19 UTC (rev 185358)
@@ -100,8 +100,8 @@
Vector.h
VectorTraits.h
WTFThreadData.h
+ WeakPtr.h
WorkQueue.h
- WeakPtr.h
dtoa.h
dtoa/bignum-dtoa.h
@@ -172,8 +172,8 @@
RunLoop.cpp
SHA1.cpp
SixCharacterHash.cpp
+ StackBounds.cpp
StackStats.cpp
- StackBounds.cpp
StringPrintStream.cpp
Threading.cpp
WTFThreadData.cpp
Modified: trunk/Source/WebCore/CMakeLists.txt (185357 => 185358)
--- trunk/Source/WebCore/CMakeLists.txt 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-06-09 09:46:19 UTC (rev 185358)
@@ -137,11 +137,22 @@
)
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 @@
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 @@
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 @@
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 @@
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 @@
dom/NodeFilter.idl
dom/NodeIterator.idl
dom/NodeList.idl
+ dom/NonDocumentTypeChildNode.idl
dom/NonElementParentNode.idl
- dom/NonDocumentTypeChildNode.idl
dom/OverflowEvent.idl
dom/PageTransitionEvent.idl
dom/ParentNode.idl
@@ -563,6 +568,7 @@
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 @@
html/canvas/WebGLProgram.idl
html/canvas/WebGLQuery.idl
html/canvas/WebGLRenderbuffer.idl
+ html/canvas/WebGLRenderingContext.idl
html/canvas/WebGLRenderingContextBase.idl
- html/canvas/WebGLRenderingContext.idl
- html/canvas/WebGL2RenderingContext.idl
html/canvas/WebGLSampler.idl
html/canvas/WebGLShader.idl
html/canvas/WebGLShaderPrecisionFormat.idl
@@ -623,19 +628,19 @@
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/UserMessageHandler.idl
+ page/UserMessageHandlersNamespace.idl
+ page/WebKitNamespace.idl
page/WebKitPoint.idl
- page/WebKitNamespace.idl
- page/UserMessageHandlersNamespace.idl
- page/UserMessageHandler.idl
page/WindowBase64.idl
page/WindowEventHandlers.idl
page/WindowTimers.idl
@@ -1082,8 +1087,6 @@
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 @@
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 @@
bindings/js/JSRTCPeerConnectionCustom.cpp
bindings/js/JSRTCSessionDescriptionCustom.cpp
bindings/js/JSRTCStatsResponseCustom.cpp
+ bindings/js/JSReadableStreamControllerCustom.cpp
bindings/js/JSReadableStreamCustom.cpp
- bindings/js/JSReadableStreamControllerCustom.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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
html/canvas/WebGLProgram.cpp
html/canvas/WebGLQuery.cpp
html/canvas/WebGLRenderbuffer.cpp
+ html/canvas/WebGLRenderingContext.cpp
html/canvas/WebGLRenderingContextBase.cpp
- html/canvas/WebGLRenderingContext.cpp
- html/canvas/WebGL2RenderingContext.cpp
html/canvas/WebGLSampler.cpp
html/canvas/WebGLShader.cpp
html/canvas/WebGLShaderPrecisionFormat.cpp
@@ -1792,7 +1795,6 @@
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 @@
inspector/WorkerInspectorController.cpp
inspector/WorkerRuntimeAgent.cpp
+ loader/ContentFilter.cpp
loader/CookieJar.cpp
- loader/ContentFilter.cpp
loader/CrossOriginAccessControl.cpp
loader/CrossOriginPreflightResultCache.cpp
loader/DocumentLoadTiming.cpp
@@ -1918,7 +1920,6 @@
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 @@
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 @@
page/scrolling/ScrollingConstraints.cpp
page/scrolling/ScrollingCoordinator.cpp
page/scrolling/ScrollingStateFixedNode.cpp
+ page/scrolling/ScrollingStateFrameScrollingNode.cpp
page/scrolling/ScrollingStateNode.cpp
- page/scrolling/ScrollingStateScrollingNode.cpp
- page/scrolling/ScrollingStateFrameScrollingNode.cpp
page/scrolling/ScrollingStateOverflowScrollingNode.cpp
page/scrolling/ScrollingStateScrollingNode.cpp
page/scrolling/ScrollingStateStickyNode.cpp
@@ -2050,7 +2051,6 @@
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 @@
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 @@
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/URL.cpp
+ platform/UUID.cpp
platform/UserActivity.cpp
- platform/UUID.cpp
platform/Widget.cpp
platform/animation/Animation.cpp
@@ -2153,13 +2154,13 @@
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 @@
platform/mediastream/MediaStreamPrivate.cpp
platform/mediastream/MediaStreamTrackPrivate.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/mediastream/RTCIceCandidateDescriptor.cpp
- platform/mediastream/RTCPeerConnectionHandler.cpp
- platform/mediastream/RTCSessionDescriptionDescriptor.cpp
platform/mock/DeviceMotionClientMock.cpp
platform/mock/DeviceOrientationClientMock.cpp
platform/mock/GeolocationClientMock.cpp
platform/mock/MediaConstraintsMock.cpp
platform/mock/MockRealtimeMediaSourceCenter.cpp
+ platform/mock/RTCDTMFSenderHandlerMock.cpp
platform/mock/RTCDataChannelHandlerMock.cpp
- platform/mock/RTCDTMFSenderHandlerMock.cpp
platform/mock/RTCNotifiersMock.cpp
platform/mock/RTCPeerConnectionHandlerMock.cpp
platform/mock/ScrollbarThemeMock.cpp
@@ -2421,18 +2422,18 @@
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/ScrollBehavior.cpp
rendering/SelectionSubtreeRoot.cpp
- rendering/ScrollBehavior.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 @@
svg/SVGAltGlyphItemElement.cpp
svg/SVGAngle.cpp
svg/SVGAnimateColorElement.cpp
+ svg/SVGAnimateElement.cpp
svg/SVGAnimateElementBase.cpp
- svg/SVGAnimateElement.cpp
svg/SVGAnimateMotionElement.cpp
svg/SVGAnimateTransformElement.cpp
svg/SVGAnimatedAngle.cpp
@@ -2813,14 +2814,16 @@
if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
list(APPEND WebCore_SOURCES
Modules/encryptedmedia/CDM.cpp
+ Modules/encryptedmedia/CDMPrivateClearKey.cpp
Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp
- Modules/encryptedmedia/CDMPrivateClearKey.cpp
Modules/encryptedmedia/CDMSessionClearKey.cpp
Modules/encryptedmedia/MediaKeyMessageEvent.cpp
Modules/encryptedmedia/MediaKeyNeededEvent.cpp
+ Modules/encryptedmedia/MediaKeySession.cpp
Modules/encryptedmedia/MediaKeys.cpp
- Modules/encryptedmedia/MediaKeySession.cpp
+
html/MediaKeyEvent.cpp
+
testing/MockCDM.cpp
)
list(APPEND WebCore_IDL_FILES
@@ -2828,8 +2831,9 @@
Modules/encryptedmedia/MediaKeyNeededEvent.idl
Modules/encryptedmedia/MediaKeySession.idl
Modules/encryptedmedia/MediaKeys.idl
+
+ html/MediaKeyError.idl
html/MediaKeyEvent.idl
- html/MediaKeyError.idl
)
endif ()
@@ -2858,6 +2862,7 @@
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 @@
html/canvas/WebGLProgram.cpp
html/canvas/WebGLQuery.cpp
html/canvas/WebGLRenderbuffer.cpp
+ html/canvas/WebGLRenderingContext.cpp
html/canvas/WebGLRenderingContextBase.cpp
- html/canvas/WebGLRenderingContext.cpp
- html/canvas/WebGL2RenderingContext.cpp
html/canvas/WebGLSampler.cpp
html/canvas/WebGLShader.cpp
html/canvas/WebGLShaderPrecisionFormat.cpp
@@ -2907,6 +2911,7 @@
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 @@
html/canvas/WebGLProgram.idl
html/canvas/WebGLQuery.idl
html/canvas/WebGLRenderbuffer.idl
+ html/canvas/WebGLRenderingContext.idl
html/canvas/WebGLRenderingContextBase.idl
- html/canvas/WebGLRenderingContext.idl
- html/canvas/WebGL2RenderingContext.idl
html/canvas/WebGLSampler.idl
html/canvas/WebGLShader.idl
html/canvas/WebGLShaderPrecisionFormat.idl
@@ -2948,9 +2952,9 @@
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 @@
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 @@
${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 @@
${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 @@
list(APPEND WebCore_SOURCES
platform/graphics/ANGLEWebKitBridge.cpp
+ platform/graphics/FormatConverter.cpp
platform/graphics/GraphicsContext3D.cpp
- platform/graphics/FormatConverter.cpp
)
endif ()
@@ -3159,16 +3163,17 @@
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 @@
)
list(APPEND WebCore_SOURCES
bindings/js/JSUserMessageHandlersNamespaceCustom.cpp
+
page/UserMessageHandler.cpp
page/UserMessageHandlerDescriptor.cpp
page/UserMessageHandlersNamespace.cpp
@@ -3222,7 +3228,6 @@
testing/InternalSettings.cpp
testing/Internals.cpp
-
testing/MicroTaskTest.cpp
testing/MockPageOverlayClient.cpp
Modified: trunk/Source/WebCore/ChangeLog (185357 => 185358)
--- trunk/Source/WebCore/ChangeLog 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebCore/ChangeLog 2015-06-09 09:46:19 UTC (rev 185358)
@@ -1,3 +1,17 @@
+2015-06-09 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]> and Youenn Fablet <[email protected]>
[Streams API] ReadableJSStream should handle JS source getters that throw
Modified: trunk/Source/WebCore/PlatformEfl.cmake (185357 => 185358)
--- trunk/Source/WebCore/PlatformEfl.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -480,8 +480,8 @@
${ESPEAK_LIBRARIES}
)
list(APPEND WebCore_SOURCES
+ platform/efl/PlatformSpeechSynthesisProviderEfl.cpp
platform/efl/PlatformSpeechSynthesizerEfl.cpp
- platform/efl/PlatformSpeechSynthesisProviderEfl.cpp
)
endif ()
@@ -493,25 +493,26 @@
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/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
- crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.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/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
- crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
+ crypto/gnutls/CryptoAlgorithmRegistryGnuTLS.cpp
crypto/gnutls/CryptoDigestGnuTLS.cpp
crypto/gnutls/CryptoKeyRSAGnuTLS.cpp
crypto/gnutls/SerializedCryptoKeyWrapGnuTLS.cpp
Modified: trunk/Source/WebCore/PlatformGTK.cmake (185357 => 185358)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -45,22 +45,23 @@
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 @@
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 @@
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 @@
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 @@
platform/text/gtk/HyphenationLibHyphen.cpp
platform/text/gtk/TextBreakIteratorInternalICUGtk.cpp
-
- platform/network/gtk/CredentialBackingStore.cpp
)
list(APPEND WebCorePlatformGTK_SOURCES
@@ -401,13 +402,15 @@
"${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 @@
page/Screen.idl
page/UserMessageHandler.idl
page/UserMessageHandlersNamespace.idl
+ page/WebKitNamespace.idl
page/WebKitPoint.idl
- page/WebKitNamespace.idl
plugins/DOMMimeType.idl
plugins/DOMMimeTypeArray.idl
@@ -889,25 +892,26 @@
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/CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp
crypto/algorithms/CryptoAlgorithmRSA_OAEP.cpp
- crypto/algorithms/CryptoAlgorithmRSASSA_PKCS1_v1_5.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/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
crypto/gnutls/CryptoAlgorithmRSA_OAEPGnuTLS.cpp
- crypto/gnutls/CryptoAlgorithmRSASSA_PKCS1_v1_5GnuTLS.cpp
+ crypto/gnutls/CryptoAlgorithmRegistryGnuTLS.cpp
crypto/gnutls/CryptoDigestGnuTLS.cpp
crypto/gnutls/CryptoKeyRSAGnuTLS.cpp
crypto/gnutls/SerializedCryptoKeyWrapGnuTLS.cpp
Modified: trunk/Source/WebCore/PlatformMac.cmake (185357 => 185358)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -155,8 +155,8 @@
platform/cocoa/SystemVersion.mm
platform/cocoa/TelephoneNumberDetectorCocoa.cpp
+ platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm
- platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm
platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
@@ -194,14 +194,6 @@
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 @@
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 @@
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 @@
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 @@
# 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 @@
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_FILES
+ Modules/webdatabase/DatabaseDetails.h
+
bridge/IdentifierRep.h
bridge/npruntime_impl.h
bridge/npruntime_internal.h
@@ -470,8 +477,6 @@
loader/mac/LoaderNSURLExtras.h
- Modules/webdatabase/DatabaseDetails.h
-
platform/DisplaySleepDisabler.h
platform/PlatformExportMacros.h
@@ -488,11 +493,11 @@
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
Modified: trunk/Source/WebCore/PlatformWin.cmake (185357 => 185358)
--- trunk/Source/WebCore/PlatformWin.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebCore/PlatformWin.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -75,9 +75,9 @@
endif ()
set(WebCore_FORWARDING_HEADERS_DIRECTORIES
+ Modules/indexeddb
+
bridge/c
-
- Modules/indexeddb
)
WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES})
Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (185357 => 185358)
--- trunk/Source/WebCore/PlatformWinCairo.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -122,8 +122,8 @@
platform/network/curl/ProxyServerCurl.cpp
platform/network/curl/ResourceHandleCurl.cpp
platform/network/curl/ResourceHandleManager.cpp
+ platform/network/curl/SSLHandle.cpp
platform/network/curl/SocketStreamHandleCurl.cpp
- platform/network/curl/SSLHandle.cpp
platform/network/win/DownloadBundleWin.cpp
Modified: trunk/Source/WebKit/ChangeLog (185357 => 185358)
--- trunk/Source/WebKit/ChangeLog 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebKit/ChangeLog 2015-06-09 09:46:19 UTC (rev 185358)
@@ -1,3 +1,12 @@
+2015-06-09 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
Remove WebNSArrayExtras
Modified: trunk/Source/WebKit/PlatformMac.cmake (185357 => 185358)
--- trunk/Source/WebKit/PlatformMac.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -103,6 +103,15 @@
)
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 @@
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)
Modified: trunk/Source/WebKit2/CMakeLists.txt (185357 => 185358)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-06-09 09:46:19 UTC (rev 185358)
@@ -177,12 +177,14 @@
)
set(WebKit2_SOURCES
+ DatabaseProcess/DatabaseProcess.cpp
DatabaseProcess/DatabaseToWebProcessConnection.cpp
- DatabaseProcess/DatabaseProcess.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 @@
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 @@
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 @@
Shared/Authentication/AuthenticationManager.cpp
Shared/Databases/DatabaseProcessCreationParameters.cpp
+
Shared/Databases/IndexedDB/IDBUtilities.cpp
Shared/Downloads/Download.cpp
@@ -346,9 +349,6 @@
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 @@
UIProcess/WebIconDatabaseClient.cpp
UIProcess/WebInspectorProxy.cpp
UIProcess/WebKeyValueStorageManager.cpp
+ UIProcess/WebMediaCacheManagerProxy.cpp
UIProcess/WebNavigationState.cpp
- UIProcess/WebMediaCacheManagerProxy.cpp
UIProcess/WebOpenPanelResultListenerProxy.cpp
UIProcess/WebOriginDataManagerProxy.cpp
UIProcess/WebPageDiagnosticLoggingClient.cpp
@@ -382,6 +382,9 @@
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 @@
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 @@
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/WKBackForwardListItemRef.cpp
UIProcess/API/C/WKBackForwardListRef.cpp
- UIProcess/API/C/WKBackForwardListItemRef.cpp
UIProcess/API/C/WKBatteryManager.cpp
UIProcess/API/C/WKBatteryStatus.cpp
UIProcess/API/C/WKContext.cpp
@@ -489,6 +491,8 @@
UIProcess/WebsiteData/WebsiteDataRecord.cpp
UIProcess/WebsiteData/WebsiteDataStore.cpp
+ UIProcess/WebsiteData/unix/WebsiteDataStoreUnix.cpp
+
WebProcess/WebConnectionToUIProcess.cpp
WebProcess/WebProcess.cpp
@@ -499,9 +503,10 @@
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 @@
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 @@
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/DatabaseProcess.messages.in
DatabaseProcess/DatabaseToWebProcessConnection.messages.in
- DatabaseProcess/DatabaseProcess.messages.in
+
DatabaseProcess/IndexedDB/DatabaseProcessIDBConnection.messages.in
NetworkProcess/NetworkConnectionToWebProcess.messages.in
@@ -649,15 +657,14 @@
Shared/Authentication/AuthenticationManager.messages.in
+ Shared/Network/CustomProtocols/CustomProtocolManager.messages.in
+
Shared/Plugins/NPObjectMessageReceiver.messages.in
- Shared/Network/CustomProtocols/CustomProtocolManager.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 @@
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
Modified: trunk/Source/WebKit2/ChangeLog (185357 => 185358)
--- trunk/Source/WebKit2/ChangeLog 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-09 09:46:19 UTC (rev 185358)
@@ -1,3 +1,14 @@
+2015-06-09 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
[iOS] UI process memory spike, hang when uploading a very large JPEG
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (185357 => 185358)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -58,8 +58,8 @@
Shared/cairo/ShareableBitmapCairo.cpp
Shared/gtk/ArgumentCodersGtk.cpp
+ Shared/gtk/KeyedDecoder.cpp
Shared/gtk/KeyedEncoder.cpp
- Shared/gtk/KeyedDecoder.cpp
Shared/gtk/NativeContextMenuItemGtk.cpp
Shared/gtk/NativeWebKeyboardEventGtk.cpp
Shared/gtk/NativeWebMouseEventGtk.cpp
@@ -84,9 +84,6 @@
Shared/unix/ChildProcessMain.cpp
UIProcess/BackingStore.cpp
-
- UIProcess/Databases/gtk/DatabaseProcessProxyGtk.cpp
-
UIProcess/DefaultUndoController.cpp
UIProcess/DrawingAreaProxyImpl.cpp
@@ -177,14 +174,14 @@
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 @@
UIProcess/API/gtk/WebKitURISchemeRequest.cpp
UIProcess/API/gtk/WebKitURISchemeRequest.h
UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h
+ UIProcess/API/gtk/WebKitUserContent.cpp
UIProcess/API/gtk/WebKitUserContent.h
- UIProcess/API/gtk/WebKitUserContent.cpp
- UIProcess/API/gtk/WebKitUserContentPrivate.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 @@
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,9 +264,11 @@
UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
+ UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp
UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp
- UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp
+ UIProcess/Network/soup/NetworkProcessProxySoup.cpp
+
UIProcess/Plugins/gtk/PluginInfoCache.cpp
UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
@@ -294,7 +295,6 @@
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 @@
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 @@
Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp
Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
Shared/CoordinatedGraphics/SimpleViewportController.cpp
+
+ Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp
Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
- Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp
+
WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
)
list(APPEND WebKit2_INCLUDE_DIRECTORIES
@@ -997,6 +999,6 @@
)
set(WEBKIT2_EXTRA_DEPENDENCIES
+ WebKit2-fake-api-headers
WebKit2-forwarding-headers
- WebKit2-fake-api-headers
)
Modified: trunk/Source/WebKit2/PlatformMac.cmake (185357 => 185358)
--- trunk/Source/WebKit2/PlatformMac.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -48,11 +48,16 @@
set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
Shared/API/c
+
Shared/API/c/mac
+
+ UIProcess/Cocoa
+
UIProcess/API/C
- UIProcess/Cocoa
+
+ WebProcess/WebPage
+
WebProcess/InjectedBundle/API/c
- WebProcess/WebPage
)
WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
Modified: trunk/Tools/ChangeLog (185357 => 185358)
--- trunk/Tools/ChangeLog 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Tools/ChangeLog 2015-06-09 09:46:19 UTC (rev 185358)
@@ -1,3 +1,13 @@
+2015-06-09 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
Fix a typo in r185345.
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (185357 => 185358)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-06-09 09:46:19 UTC (rev 185358)
@@ -39,15 +39,15 @@
)
set(test_webcore_LIBRARIES
- gtest
WTF
WebCore
+ gtest
)
set(test_webkit2_api_LIBRARIES
+ _javascript_Core
TestWebKitAPIBase
WTF
- _javascript_Core
WebKit2
gtest
)
@@ -58,8 +58,8 @@
)
set(TestJavaScriptCore_LIBRARIES
+ _javascript_Core
gtest
- _javascript_Core
)
set(TestWTF_SOURCES
Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (185357 => 185358)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2015-06-09 08:18:31 UTC (rev 185357)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2015-06-09 09:46:19 UTC (rev 185358)
@@ -65,8 +65,8 @@
AboutBlankLoad
CloseThenTerminate
CookieManager
+ DOMWindowExtensionNoCache
DidAssociateFormControls
- DOMWindowExtensionNoCache
DocumentStartUserScriptAlertCrash
EvaluateJavaScript
FailedLoad
@@ -98,8 +98,10 @@
WKStringJSString
WKURL
WillSendSubmitEvent
+
CoordinatedGraphics/WKViewRestoreZoomAndScrollBackForward
CoordinatedGraphics/WKViewUserViewportToContents
+
efl/WKViewClientWebProcessCallbacks
efl/WKViewScrollTo
)
