From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- ANGLE/ChangeLog | 10 - ANGLE/src/libEGL/libEGL.vcproj | 504 +- ANGLE/src/libGLESv2/libGLESv2.vcproj | 730 +- JavaScriptCore/CMakeListsEfl.txt | 1 - JavaScriptCore/ChangeLog | 469 +- JavaScriptCore/Configurations/Version.xcconfig | 2 +- JavaScriptCore/GNUmakefile.am | 6 +- JavaScriptCore/JavaScriptCore.exp | 12 +- JavaScriptCore/JavaScriptCore.gypi | 2 - .../JavaScriptCore.vcproj/JavaScriptCore.sln | 190 +- .../JavaScriptCore/JavaScriptCore.def | 6 +- .../JavaScriptCore/JavaScriptCore.vcproj | 3949 +- .../JavaScriptCore/JavaScriptCoreCF.vsprops | 22 +- .../JavaScriptCore/JavaScriptCoreCFLite.vsprops | 22 +- .../JavaScriptCore/JavaScriptCoreCommon.vsprops | 52 +- .../JavaScriptCore/JavaScriptCoreGenerated.vcproj | 182 +- .../JavaScriptCoreGeneratedCommon.vsprops | 30 +- .../JavaScriptCore/JavaScriptCorePostBuild.cmd | 1 - .../JavaScriptCore/JavaScriptCorePreBuild.cmd | 8 - .../JavaScriptCore/JavaScriptCorePreLink.cmd | 9 - .../JavaScriptCore/react-to-vsprops-changes.py | 26 +- .../JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln | 166 +- .../JavaScriptCore.vcproj/WTF/WTF.vcproj | 1785 +- .../JavaScriptCore.vcproj/WTF/WTFCommon.vsprops | 48 +- .../JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd | 1 - .../JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd | 6 - .../JavaScriptCore.vcproj/jsc/jsc.vcproj | 825 +- .../JavaScriptCore.vcproj/jsc/jscCommon.vsprops | 52 +- .../JavaScriptCore.vcproj/jsc/jscPostBuild.cmd | 23 - .../JavaScriptCore.vcproj/jsc/jscPreBuild.cmd | 6 - .../JavaScriptCore.vcproj/jsc/jscPreLink.cmd | 9 - .../JavaScriptCore.vcproj/testapi/testapi.vcproj | 897 +- .../testapi/testapiCommon.vsprops | 52 +- .../testapi/testapiPostBuild.cmd | 3 - .../testapi/testapiPreBuild.cmd | 6 - .../testapi/testapiPreLink.cmd | 9 - .../JavaScriptCore.xcodeproj/project.pbxproj | 21 +- JavaScriptCore/create_regex_tables | 4 +- JavaScriptCore/jsc.cpp | 11 +- JavaScriptCore/runtime/MarkStack.h | 5 +- JavaScriptCore/runtime/MarkStackNone.cpp | 49 + JavaScriptCore/runtime/MarkStackPosix.cpp | 9 + JavaScriptCore/runtime/MarkStackSymbian.cpp | 10 + JavaScriptCore/runtime/MarkStackWin.cpp | 11 + JavaScriptCore/runtime/Structure.cpp | 1 - JavaScriptCore/wtf/BumpPointerAllocator.h | 5 +- JavaScriptCore/wtf/DateMath.cpp | 4 +- JavaScriptCore/wtf/DateMath.h | 7 - JavaScriptCore/wtf/OSAllocator.h | 46 - JavaScriptCore/wtf/OSAllocatorPosix.cpp | 87 - JavaScriptCore/wtf/OSAllocatorSymbian.cpp | 60 - JavaScriptCore/wtf/OSAllocatorWin.cpp | 64 - JavaScriptCore/wtf/PageAllocation.h | 19 +- JavaScriptCore/wtf/Vector3.h | 138 + JavaScriptCore/wtf/text/CString.cpp | 7 +- JavaScriptCore/wtf/unicode/UTF8.cpp | 90 +- JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h | 31 +- JavaScriptCore/wtf/wtf.pri | 3 - JavaScriptCore/yarr/RegexCompiler.cpp | 11 +- JavaScriptCore/yarr/RegexInterpreter.cpp | 16 +- JavaScriptCore/yarr/RegexJIT.cpp | 6 +- JavaScriptCore/yarr/RegexParser.h | 137 +- JavaScriptCore/yarr/RegexPattern.h | 4 +- JavaScriptGlue/ChangeLog | 6 - JavaScriptGlue/Configurations/Version.xcconfig | 2 +- JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h | 1 - .../create-event-onorientationchange-expected.txt | 16 + .../create-event-onorientationchange.html | 13 + .../create-event-onorientationchange.js | 18 + LayoutTests/fast/js/resources/standalone-pre.js | 2 - .../private-browsing-affects-storage-expected.txt | 8 +- .../private-browsing-affects-storage-expected.txt | 8 +- SunSpider/ChangeLog | 10 - SunSpider/resources/sunspider-standalone-driver.js | 5 +- WebCore/CMakeLists.txt | 110 +- WebCore/ChangeLog | 2470 - WebCore/Configurations/Version.xcconfig | 2 +- WebCore/English.lproj/localizedStrings.js | Bin 53080 -> 52846 bytes WebCore/ForwardingHeaders/wtf/OSAllocator.h | 1 - WebCore/GNUmakefile.am | 20 +- WebCore/WebCore.exp.in | 13 +- WebCore/WebCore.gyp/WebCore.gyp | 19 +- WebCore/WebCore.gypi | 2 - WebCore/WebCore.pri | 1 - WebCore/WebCore.pro | 12 +- WebCore/WebCore.vcproj/QTMovieWin.vcproj | 973 +- WebCore/WebCore.vcproj/QTMovieWinCommon.vsprops | 48 +- WebCore/WebCore.vcproj/QTMovieWinPostBuild.cmd | 4 - WebCore/WebCore.vcproj/QTMovieWinPreBuild.cmd | 9 - WebCore/WebCore.vcproj/WebCore.sln | 100 +- WebCore/WebCore.vcproj/WebCore.submit.sln | 104 +- WebCore/WebCore.vcproj/WebCore.vcproj | 131541 +++++++++--------- WebCore/WebCore.vcproj/WebCoreCFNetwork.vsprops | 22 +- WebCore/WebCore.vcproj/WebCoreCG.vsprops | 22 +- WebCore/WebCore.vcproj/WebCoreCURL.vsprops | 24 +- WebCore/WebCore.vcproj/WebCoreCairo.vsprops | 23 +- WebCore/WebCore.vcproj/WebCoreCommon.vsprops | 42 +- WebCore/WebCore.vcproj/WebCoreGenerated.vcproj | 188 +- .../WebCore.vcproj/WebCoreGeneratedCairo.vsprops | 24 +- .../WebCore.vcproj/WebCoreGeneratedCommon.vsprops | 30 +- WebCore/WebCore.vcproj/WebCoreMediaQT.vsprops | 22 +- WebCore/WebCore.vcproj/WebCorePostBuild.cmd | 1 - WebCore/WebCore.vcproj/WebCorePreBuild.cmd | 12 - WebCore/WebCore.vcproj/WebCorePthreads.vsprops | 22 +- WebCore/WebCore.vcproj/WebCoreQuartzCore.vsprops | 24 +- WebCore/WebCore.xcodeproj/project.pbxproj | 12 - .../accessibility/AccessibilityImageMapLink.cpp | 8 +- WebCore/accessibility/AccessibilityImageMapLink.h | 10 +- .../accessibility/AccessibilityMenuListOption.cpp | 7 +- .../accessibility/AccessibilityMenuListOption.h | 1 - .../accessibility/AccessibilityRenderObject.cpp | 23 +- WebCore/accessibility/AccessibilityRenderObject.h | 1 - WebCore/accessibility/gtk/AXObjectCacheAtk.cpp | 11 +- .../gtk/AccessibilityObjectWrapperAtk.cpp | 146 +- .../bindings/js/JSAudioBufferSourceNodeCustom.cpp | 47 - WebCore/bindings/js/JSCSSRuleCustom.cpp | 11 - .../bindings/js/JSCSSStyleDeclarationCustom.cpp | 3 - WebCore/bindings/js/JSConsoleCustom.cpp | 8 +- WebCore/bindings/js/JSConvolverNodeCustom.cpp | 47 - .../bindings/js/JSJavaScriptAudioNodeCustom.cpp | 45 - WebCore/bindings/js/JSXMLHttpRequestCustom.cpp | 4 - WebCore/bindings/js/ScriptCallStackFactory.cpp | 8 +- WebCore/bindings/js/ScriptCallStackFactory.h | 6 +- WebCore/bindings/js/ScriptHeapSnapshot.h | 15 +- WebCore/bindings/scripts/CodeGenerator.pm | 4 +- WebCore/bindings/scripts/CodeGeneratorCPP.pm | 2 + WebCore/bindings/scripts/CodeGeneratorJS.pm | 8 +- WebCore/bindings/scripts/CodeGeneratorObjC.pm | 3 +- WebCore/bindings/scripts/CodeGeneratorV8.pm | 26 +- WebCore/bindings/scripts/test/JS/JSTestObj.cpp | 6 +- WebCore/bindings/scripts/test/V8/V8TestObj.cpp | 6 +- WebCore/bindings/v8/ScriptCallStackFactory.cpp | 10 +- WebCore/bindings/v8/ScriptCallStackFactory.h | 13 +- WebCore/bindings/v8/ScriptControllerQt.cpp | 2 +- WebCore/bindings/v8/ScriptHeapSnapshot.cpp | 62 +- WebCore/bindings/v8/ScriptHeapSnapshot.h | 10 +- WebCore/bindings/v8/V8ConsoleMessage.cpp | 6 +- WebCore/bindings/v8/V8ConsoleMessage.h | 2 +- WebCore/bindings/v8/V8GCController.cpp | 2 +- WebCore/bindings/v8/V8NPUtils.cpp | 4 +- WebCore/bindings/v8/custom/V8ConsoleCustom.cpp | 20 +- .../bindings/v8/custom/V8XMLHttpRequestCustom.cpp | 7 - WebCore/css/CSSImportRule.cpp | 2 +- WebCore/css/CSSRule.idl | 1 - WebCore/css/CSSStyleSelector.cpp | 10 +- WebCore/css/MediaQueryEvaluator.cpp | 2 +- WebCore/css/StyleSheet.cpp | 8 - WebCore/css/themeChromiumSkia.css | 37 - WebCore/dom/ClientRect.cpp | 5 - WebCore/dom/ClientRect.h | 2 - WebCore/dom/Document.cpp | 19 +- WebCore/dom/Element.cpp | 6 +- WebCore/dom/Node.h | 5 - WebCore/dom/ProgressEvent.cpp | 10 +- WebCore/dom/ProgressEvent.h | 59 +- WebCore/dom/ProgressEvent.idl | 15 +- WebCore/dom/Range.cpp | 4 +- WebCore/dom/ScriptElement.cpp | 36 +- WebCore/dom/ScriptElement.h | 17 +- WebCore/dom/SelectElement.cpp | 8 +- WebCore/editing/CompositeEditCommand.cpp | 4 +- WebCore/editing/CorrectionPanelInfo.h | 3 +- WebCore/editing/Editor.cpp | 170 +- WebCore/editing/Editor.h | 16 +- WebCore/editing/FindOptions.h | 46 - WebCore/editing/InsertListCommand.cpp | 5 - WebCore/editing/TextCheckingHelper.cpp | 2 +- WebCore/editing/TextCheckingHelper.h | 2 +- WebCore/editing/TextIterator.cpp | 216 +- WebCore/editing/TextIterator.h | 5 +- WebCore/editing/visible_units.cpp | 39 + WebCore/fileapi/FileReader.cpp | 13 +- WebCore/fileapi/FileReaderLoader.cpp | 35 +- WebCore/fileapi/FileWriter.cpp | 3 +- WebCore/html/BaseButtonInputType.cpp | 38 - WebCore/html/BaseButtonInputType.h | 3 - WebCore/html/BaseCheckableInputType.cpp | 22 - WebCore/html/BaseCheckableInputType.h | 2 - WebCore/html/BaseDateAndTimeInputType.cpp | 11 - WebCore/html/BaseDateAndTimeInputType.h | 1 - WebCore/html/CheckboxInputType.cpp | 10 - WebCore/html/CheckboxInputType.h | 1 - WebCore/html/DateTimeInputType.cpp | 6 - WebCore/html/DateTimeInputType.h | 1 - WebCore/html/HTMLFieldSetElement.h | 1 - WebCore/html/HTMLInputElement.cpp | 283 +- WebCore/html/HTMLInputElement.h | 1 - WebCore/html/HTMLKeygenElement.h | 1 + WebCore/html/HTMLMeterElement.cpp | 10 +- WebCore/html/HTMLMeterElement.h | 4 +- WebCore/html/HTMLProgressElement.h | 2 +- WebCore/html/HTMLScriptElement.cpp | 10 +- WebCore/html/HTMLScriptElement.h | 6 +- WebCore/html/HTMLTagNames.in | 4 +- WebCore/html/InputType.cpp | 32 - WebCore/html/InputType.h | 7 - WebCore/html/MonthInputType.cpp | 17 - WebCore/html/MonthInputType.h | 1 - WebCore/html/RadioInputType.cpp | 99 +- WebCore/html/RadioInputType.h | 2 - WebCore/html/RangeInputType.cpp | 14 +- WebCore/html/RangeInputType.h | 1 - WebCore/html/TextFieldInputType.cpp | 6 - WebCore/html/TextFieldInputType.h | 1 - WebCore/html/TimeInputType.cpp | 18 - WebCore/html/TimeInputType.h | 1 - WebCore/html/canvas/ArrayBuffer.cpp | 5 +- WebCore/html/canvas/CanvasRenderingContext2D.cpp | 9 +- WebCore/inspector/CodeGeneratorInspector.pm | 1 - WebCore/inspector/ConsoleMessage.cpp | 3 +- WebCore/inspector/ConsoleMessage.h | 6 +- WebCore/inspector/Inspector.idl | 4 +- WebCore/inspector/InspectorCSSAgent.cpp | 10 +- WebCore/inspector/InspectorCSSAgent.h | 2 +- WebCore/inspector/InspectorController.cpp | 11 +- WebCore/inspector/InspectorController.h | 4 +- WebCore/inspector/InspectorProfilerAgent.cpp | 23 +- WebCore/inspector/InspectorStyleSheet.cpp | 8 +- WebCore/inspector/ScriptArguments.cpp | 5 - WebCore/inspector/ScriptArguments.h | 9 +- WebCore/inspector/ScriptCallFrame.h | 2 +- WebCore/inspector/ScriptCallStack.cpp | 9 +- WebCore/inspector/ScriptCallStack.h | 14 +- WebCore/inspector/front-end/CSSStyleModel.js | 13 +- WebCore/inspector/front-end/HeapSnapshotView.js | 203 +- WebCore/inspector/front-end/HelpScreen.js | 16 +- WebCore/inspector/front-end/InjectedScript.js | 8 +- WebCore/inspector/front-end/NetworkItemView.js | 9 +- WebCore/inspector/front-end/ProfilesPanel.js | 20 - WebCore/inspector/front-end/Resource.js | 61 +- WebCore/inspector/front-end/ResourcesPanel.js | 47 +- WebCore/inspector/front-end/ScriptsPanel.js | 13 +- WebCore/inspector/front-end/Settings.js | 1 - WebCore/inspector/front-end/SourceView.js | 24 +- WebCore/inspector/front-end/TimelinePanel.js | 2 +- WebCore/inspector/front-end/inspector.html | 1 - WebCore/inspector/front-end/inspector.js | 10 - WebCore/loader/EmptyClients.h | 4 +- WebCore/loader/ResourceLoadScheduler.cpp | 1 - WebCore/loader/cache/MemoryCache.cpp | 14 +- WebCore/loader/loader.cpp | 1 - .../autocorrection/dismiss-multiple-guesses.html | 49 - .../select-from-multiple-guesses.html | 49 - .../input-type-datetime-default-value.html | 80 - WebCore/mathml/RenderMathMLRoot.cpp | 10 +- WebCore/mathml/RenderMathMLSquareRoot.cpp | 12 +- WebCore/page/ChromeClient.h | 13 - WebCore/page/Console.cpp | 36 +- WebCore/page/Console.h | 38 +- WebCore/page/EditorClient.h | 5 +- WebCore/page/Frame.cpp | 2 +- WebCore/page/FrameView.cpp | 6 +- WebCore/page/Page.cpp | 19 +- WebCore/page/Page.h | 7 +- WebCore/page/Settings.cpp | 30 - WebCore/page/Settings.h | 20 - WebCore/page/SpatialNavigation.cpp | 2 +- WebCore/page/mac/WebCoreFrameView.h | 2 - WebCore/platform/ScrollView.cpp | 60 +- WebCore/platform/ScrollView.h | 21 - WebCore/platform/audio/Cone.cpp | 8 +- WebCore/platform/audio/Cone.h | 4 +- WebCore/platform/graphics/ContextShadow.h | 2 + WebCore/platform/graphics/FloatPoint3D.h | 22 - WebCore/platform/graphics/GraphicsContext.h | 12 +- WebCore/platform/graphics/GraphicsContextPrivate.h | 3 + WebCore/platform/graphics/MediaPlayer.cpp | 1 - WebCore/platform/graphics/TextRun.h | 5 +- .../platform/graphics/cairo/ContextShadowCairo.cpp | 16 +- .../graphics/cairo/GraphicsContextCairo.cpp | 48 +- .../cairo/GraphicsContextPlatformPrivateCairo.h | 2 + WebCore/platform/graphics/cg/GraphicsContextCG.cpp | 99 +- .../graphics/chromium/ContentLayerChromium.cpp | 23 +- WebCore/platform/graphics/chromium/FontLinux.cpp | 9 +- .../gstreamer/MediaPlayerPrivateGStreamer.cpp | 49 +- .../gstreamer/MediaPlayerPrivateGStreamer.h | 9 +- .../graphics/haiku/GraphicsContextHaiku.cpp | 14 +- .../graphics/mac/ComplexTextController.cpp | 4 +- .../graphics/openvg/GraphicsContextOpenVG.cpp | 26 +- WebCore/platform/graphics/qt/GraphicsContextQt.cpp | 151 +- .../platform/graphics/skia/GraphicsContextSkia.cpp | 18 +- WebCore/platform/graphics/skia/ImageSkia.cpp | 22 +- .../platform/graphics/win/cairo/FontPlatformData.h | 8 +- .../graphics/wince/GraphicsContextWinCE.cpp | 12 +- WebCore/platform/graphics/wx/GraphicsContextWx.cpp | 20 +- WebCore/platform/graphics/wx/ImageBufferWx.cpp | 2 +- WebCore/platform/gtk/PopupMenuGtk.cpp | 112 +- WebCore/platform/gtk/PopupMenuGtk.h | 11 +- WebCore/platform/mac/ScrollViewMac.mm | 10 +- WebCore/platform/network/NetworkingContext.h | 9 - .../platform/network/android/CookieJarAndroid.cpp | 16 +- .../network/android/ProxyServerAndroid.cpp | 40 - .../network/android/ResourceHandleAndroid.cpp | 32 +- .../network/android/ResourceRequestAndroid.cpp | 7 - .../network/soup/cache/soup-http-input-stream.c | 1 - .../network/soup/cache/webkit/soup-cache.c | 20 +- WebCore/platform/text/TextBoundaries.cpp | 28 - WebCore/platform/text/TextBoundaries.h | 3 - WebCore/platform/text/TextCodecUTF16.cpp | 11 +- WebCore/platform/win/FileSystemWin.cpp | 5 +- WebCore/platform/wince/FileSystemWinCE.cpp | 42 +- WebCore/platform/wx/LocalizedStringsWx.cpp | 2 +- WebCore/rendering/InlineTextBox.cpp | 5 +- WebCore/rendering/InlineTextBox.h | 2 +- WebCore/rendering/RenderBlock.cpp | 32 +- WebCore/rendering/RenderBox.cpp | 15 +- WebCore/rendering/RenderBox.h | 2 - WebCore/rendering/RenderBoxModelObject.cpp | 6 +- WebCore/rendering/RenderEmbeddedObject.cpp | 6 +- WebCore/rendering/RenderFlexibleBox.cpp | 19 +- WebCore/rendering/RenderIFrame.cpp | 1 - WebCore/rendering/RenderImage.cpp | 5 +- WebCore/rendering/RenderLayer.cpp | 41 +- WebCore/rendering/RenderLayer.h | 33 +- WebCore/rendering/RenderLayerBacking.cpp | 2 +- WebCore/rendering/RenderLayerCompositor.cpp | 33 +- WebCore/rendering/RenderLayerCompositor.h | 7 +- WebCore/rendering/RenderObject.cpp | 3 +- WebCore/rendering/RenderObject.h | 17 +- WebCore/rendering/RenderReplaced.cpp | 1 - WebCore/rendering/RenderReplica.cpp | 1 - WebCore/rendering/RenderSVGResource.h | 3 +- WebCore/rendering/RenderSVGResourceClipper.cpp | 4 +- WebCore/rendering/RenderSVGResourceFilter.cpp | 2 +- WebCore/rendering/RenderSVGResourceFilter.h | 2 +- WebCore/rendering/RenderSVGResourceGradient.cpp | 8 +- WebCore/rendering/RenderSVGResourceGradient.h | 2 +- WebCore/rendering/RenderSVGResourcePattern.cpp | 8 +- WebCore/rendering/RenderSVGResourcePattern.h | 2 +- WebCore/rendering/RenderSVGResourceSolidColor.cpp | 19 +- WebCore/rendering/RenderSVGResourceSolidColor.h | 2 +- WebCore/rendering/RenderSlider.cpp | 1 - WebCore/rendering/RenderTable.cpp | 2 - WebCore/rendering/RenderTableRow.cpp | 1 - WebCore/rendering/RenderTableSection.cpp | 1 - WebCore/rendering/RenderText.cpp | 2 +- WebCore/rendering/RenderTextControlSingleLine.cpp | 15 - WebCore/rendering/RenderTextControlSingleLine.h | 4 - WebCore/rendering/RenderThemeChromiumSkia.cpp | 3 +- WebCore/rendering/RenderView.cpp | 30 +- WebCore/rendering/RenderView.h | 5 + WebCore/rendering/SVGRenderSupport.cpp | 2 +- WebCore/rendering/TextControlInnerElements.cpp | 1 - WebCore/rendering/style/RenderStyle.h | 5 - WebCore/rendering/svg/RenderSVGPath.cpp | 23 +- WebCore/rendering/svg/SVGInlineTextBox.cpp | 10 +- WebCore/rendering/svg/SVGInlineTextBox.h | 2 +- WebCore/storage/Storage.cpp | 11 +- WebCore/svg/SVGAngle.h | 8 +- WebCore/svg/SVGAnimatedLength.h | 7 - WebCore/svg/SVGAnimatedLengthList.h | 7 - WebCore/svg/SVGAnimatedNumber.h | 11 - WebCore/svg/SVGAnimatedNumberList.h | 7 - WebCore/svg/SVGAnimatedTransformList.h | 7 - WebCore/svg/SVGCircleElement.cpp | 5 - WebCore/svg/SVGCircleElement.h | 41 +- .../svg/SVGComponentTransferFunctionElement.cpp | 8 - WebCore/svg/SVGComponentTransferFunctionElement.h | 43 +- WebCore/svg/SVGCursorElement.cpp | 4 - WebCore/svg/SVGCursorElement.h | 49 +- WebCore/svg/SVGEllipseElement.cpp | 6 - WebCore/svg/SVGEllipseElement.h | 45 +- WebCore/svg/SVGFEColorMatrixElement.cpp | 3 - WebCore/svg/SVGFEColorMatrixElement.h | 5 +- WebCore/svg/SVGFECompositeElement.cpp | 6 - WebCore/svg/SVGFECompositeElement.h | 10 +- WebCore/svg/SVGFEConvolveMatrixElement.cpp | 11 +- WebCore/svg/SVGFEConvolveMatrixElement.h | 16 +- WebCore/svg/SVGFEDiffuseLightingElement.cpp | 6 - WebCore/svg/SVGFEDiffuseLightingElement.h | 9 +- WebCore/svg/SVGFEDisplacementMapElement.cpp | 3 - WebCore/svg/SVGFEDisplacementMapElement.h | 6 +- WebCore/svg/SVGFEGaussianBlurElement.cpp | 4 - WebCore/svg/SVGFEGaussianBlurElement.h | 6 +- WebCore/svg/SVGFELightElement.cpp | 12 - WebCore/svg/SVGFELightElement.h | 23 +- WebCore/svg/SVGFEMorphologyElement.cpp | 4 - WebCore/svg/SVGFEMorphologyElement.h | 6 +- WebCore/svg/SVGFEOffsetElement.cpp | 4 - WebCore/svg/SVGFEOffsetElement.h | 6 +- WebCore/svg/SVGFESpecularLightingElement.cpp | 7 - WebCore/svg/SVGFESpecularLightingElement.h | 12 +- WebCore/svg/SVGFETurbulenceElement.cpp | 5 - WebCore/svg/SVGFETurbulenceElement.h | 8 +- WebCore/svg/SVGFilterElement.cpp | 6 - WebCore/svg/SVGFilterElement.h | 9 +- .../svg/SVGFilterPrimitiveStandardAttributes.cpp | 6 - WebCore/svg/SVGFilterPrimitiveStandardAttributes.h | 9 +- WebCore/svg/SVGFont.cpp | 5 +- WebCore/svg/SVGFontFaceElement.cpp | 1 - WebCore/svg/SVGForeignObjectElement.cpp | 8 +- WebCore/svg/SVGForeignObjectElement.h | 50 +- WebCore/svg/SVGGradientElement.cpp | 3 - WebCore/svg/SVGGradientElement.h | 44 +- WebCore/svg/SVGImageElement.cpp | 6 - WebCore/svg/SVGImageElement.h | 77 +- WebCore/svg/SVGLength.h | 9 +- WebCore/svg/SVGLengthList.h | 8 - WebCore/svg/SVGLineElement.cpp | 6 - WebCore/svg/SVGLineElement.h | 49 +- WebCore/svg/SVGLinearGradientElement.cpp | 6 - WebCore/svg/SVGLinearGradientElement.h | 38 +- WebCore/svg/SVGMarkerElement.cpp | 8 +- WebCore/svg/SVGMarkerElement.h | 11 +- WebCore/svg/SVGMaskElement.cpp | 9 +- WebCore/svg/SVGMaskElement.h | 55 +- WebCore/svg/SVGNumberList.h | 10 +- WebCore/svg/SVGPathElement.cpp | 3 - WebCore/svg/SVGPathElement.h | 5 +- WebCore/svg/SVGPatternElement.cpp | 14 +- WebCore/svg/SVGPatternElement.h | 96 +- WebCore/svg/SVGPointList.h | 8 +- WebCore/svg/SVGPolygonElement.cpp | 2 - WebCore/svg/SVGPolylineElement.cpp | 2 - WebCore/svg/SVGPreserveAspectRatio.h | 8 +- WebCore/svg/SVGRadialGradientElement.cpp | 8 +- WebCore/svg/SVGRadialGradientElement.h | 40 +- WebCore/svg/SVGRect.h | 51 - WebCore/svg/SVGRectElement.cpp | 8 - WebCore/svg/SVGRectElement.h | 49 +- WebCore/svg/SVGSVGElement.cpp | 14 +- WebCore/svg/SVGSVGElement.h | 218 +- WebCore/svg/SVGScriptElement.cpp | 16 +- WebCore/svg/SVGScriptElement.h | 4 +- WebCore/svg/SVGStopElement.cpp | 3 - WebCore/svg/SVGStopElement.h | 29 +- WebCore/svg/SVGStringList.h | 7 +- WebCore/svg/SVGStyledTransformableElement.cpp | 3 - WebCore/svg/SVGStyledTransformableElement.h | 7 +- WebCore/svg/SVGSymbolElement.h | 2 - WebCore/svg/SVGTextContentElement.cpp | 3 - WebCore/svg/SVGTextContentElement.h | 73 +- WebCore/svg/SVGTextElement.cpp | 4 +- WebCore/svg/SVGTextElement.h | 51 +- WebCore/svg/SVGTextPathElement.cpp | 9 +- WebCore/svg/SVGTextPathElement.h | 78 +- WebCore/svg/SVGTextPositioningElement.cpp | 7 - WebCore/svg/SVGTextPositioningElement.h | 37 +- WebCore/svg/SVGTransformList.h | 9 +- WebCore/svg/SVGUseElement.cpp | 6 - WebCore/svg/SVGUseElement.h | 130 +- WebCore/svg/SVGViewElement.h | 6 +- WebCore/svg/SVGViewSpec.h | 2 - WebCore/svg/properties/SVGAnimatedPropertyMacros.h | 59 +- WebCore/svg/properties/SVGListProperty.h | 2 +- WebCore/svg/properties/SVGPropertyTraits.h | 81 +- .../properties/SVGTransformListPropertyTearOff.h | 1 - WebCore/webaudio/AudioBufferSourceNode.idl | 2 +- WebCore/webaudio/AudioListener.h | 34 +- WebCore/webaudio/AudioPannerNode.cpp | 48 +- WebCore/webaudio/AudioPannerNode.h | 21 +- WebCore/webaudio/ConvolverNode.idl | 2 +- WebCore/xml/XMLHttpRequest.cpp | 20 +- WebCore/xml/XMLHttpRequest.h | 3 - WebCore/xml/XMLHttpRequestProgressEvent.h | 50 +- WebCore/xml/XMLHttpRequestProgressEvent.idl | 6 +- .../xml/XMLHttpRequestProgressEventThrottle.cpp | 2 +- WebCore/xml/XMLHttpRequestProgressEventThrottle.h | 6 +- WebCore/xml/XSLTProcessorQt.cpp | 2 +- WebKit/chromium/ChangeLog | 202 - WebKit/chromium/DEPS | 15 +- WebKit/chromium/public/WebDevToolsAgent.h | 11 +- WebKit/chromium/public/WebFrameClient.h | 2 +- WebKit/chromium/public/WebKitClient.h | 6 +- WebKit/chromium/public/WebSettings.h | 5 - WebKit/chromium/src/ChromeClientImpl.cpp | 21 +- WebKit/chromium/src/ChromeClientImpl.h | 3 +- WebKit/chromium/src/ChromiumBridge.cpp | 2 +- WebKit/chromium/src/EditorClientImpl.cpp | 3 +- WebKit/chromium/src/EditorClientImpl.h | 1 - WebKit/chromium/src/LocalizedStrings.cpp | 32 +- WebKit/chromium/src/WebDevToolsAgentImpl.cpp | 11 - WebKit/chromium/src/WebDevToolsAgentImpl.h | 1 - WebKit/chromium/src/WebSettingsImpl.cpp | 25 - WebKit/chromium/src/WebSettingsImpl.h | 5 - WebKit/chromium/src/WebViewImpl.cpp | 18 +- WebKit/chromium/src/js/DevTools.js | 1 - WebKit/efl/ChangeLog | 14 - WebKit/efl/WebCoreSupport/EditorClientEfl.cpp | 2 +- WebKit/efl/WebCoreSupport/EditorClientEfl.h | 2 +- WebKit/gtk/ChangeLog | 76 - WebKit/gtk/NEWS | 17 - WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp | 9 +- WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp | 2 +- WebKit/gtk/WebCoreSupport/EditorClientGtk.h | 2 +- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp | 32 + WebKit/gtk/tests/testatk.c | 148 +- WebKit/gtk/webkit/webkitwebdatasource.cpp | 2 +- WebKit/gtk/webkit/webkitwebframe.cpp | 4 +- WebKit/gtk/webkit/webkitwebview.cpp | 6 +- WebKit/haiku/ChangeLog | 14 - WebKit/haiku/WebCoreSupport/EditorClientHaiku.cpp | 2 +- WebKit/haiku/WebCoreSupport/EditorClientHaiku.h | 2 +- WebKit/mac/ChangeLog | 105 - WebKit/mac/Configurations/Version.xcconfig | 2 +- WebKit/mac/WebCoreSupport/WebEditorClient.h | 4 +- WebKit/mac/WebCoreSupport/WebEditorClient.mm | 71 +- WebKit/mac/WebView/WebDocumentInternal.h | 9 +- WebKit/mac/WebView/WebDynamicScrollBarsView.h | 6 - WebKit/mac/WebView/WebDynamicScrollBarsView.mm | 73 - WebKit/mac/WebView/WebFrameView.mm | 4 - WebKit/mac/WebView/WebHTMLView.mm | 38 +- WebKit/mac/WebView/WebPDFView.mm | 10 +- WebKit/mac/WebView/WebView.mm | 82 +- WebKit/mac/WebView/WebViewPrivate.h | 46 +- WebKit/qt/Api/qwebframe.cpp | 5 - WebKit/qt/ChangeLog | 92 - WebKit/qt/WebCoreSupport/ChromeClientQt.cpp | 7 +- WebKit/qt/WebCoreSupport/ChromeClientQt.h | 2 +- .../qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp | 26 - WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h | 1 - WebKit/qt/WebCoreSupport/EditorClientQt.cpp | 2 +- WebKit/qt/WebCoreSupport/EditorClientQt.h | 2 +- WebKit/win/ChangeLog | 65 - WebKit/win/WebCoreSupport/WebEditorClient.cpp | 2 +- WebKit/win/WebCoreSupport/WebEditorClient.h | 2 +- WebKit/win/WebKit.vcproj/Interfaces.vcproj | 9365 +- WebKit/win/WebKit.vcproj/InterfacesCommon.vsprops | 36 +- WebKit/win/WebKit.vcproj/InterfacesPostBuild.cmd | 7 - WebKit/win/WebKit.vcproj/InterfacesPreBuild.cmd | 9 - WebKit/win/WebKit.vcproj/WebKit.sln | 830 +- WebKit/win/WebKit.vcproj/WebKit.submit.sln | 106 +- WebKit/win/WebKit.vcproj/WebKit.vcproj | 2639 +- WebKit/win/WebKit.vcproj/WebKitGUID.vcproj | 697 +- WebKit/win/WebKit.vcproj/WebKitGUIDCommon.vsprops | 46 +- WebKit/win/WebKit.vcproj/WebKitGUIDPostBuild.cmd | 1 - WebKit/win/WebKit.vcproj/WebKitGUIDPreBuild.cmd | 6 - WebKit/win/WebKit.vcproj/WebKitLibCommon.vsprops | 52 +- WebKit/win/WebKit.vcproj/WebKitLibPostBuild.cmd | 19 - WebKit/win/WebKit.vcproj/WebKitLibPreBuild.cmd | 16 - WebKit/wince/ChangeLog | 24 - WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp | 2 +- WebKit/wince/WebCoreSupport/EditorClientWinCE.h | 2 +- WebKit/wince/WebView.cpp | 454 - WebKit/wince/WebView.h | 100 - WebKit/wx/ChangeLog | 14 - WebKit/wx/WebKitSupport/EditorClientWx.cpp | 6 +- WebKit/wx/WebKitSupport/EditorClientWx.h | 4 +- WebKitLibraries/ChangeLog | 64 - WebKitLibraries/WebKitSystemInterface.h | 21 +- WebKitLibraries/win/tools/vsprops/WinCairo.vsprops | 34 +- WebKitLibraries/win/tools/vsprops/cURL.vsprops | 26 +- WebKitLibraries/win/tools/vsprops/common.vsprops | 14 +- .../win/tools/vsprops/debug_wincairo.vsprops | 68 +- WebKitLibraries/win/tools/vsprops/release.vsprops | 4 + WebKitTools/CLWrapper/CLWrapper.sln | 40 +- WebKitTools/CLWrapper/CLWrapper.vcproj | 398 +- WebKitTools/ChangeLog | 434 - WebKitTools/DumpRenderTree/DumpRenderTree.sln | 166 +- .../DumpRenderTree.xcodeproj/project.pbxproj | 4 - .../DumpRenderTree/LayoutTestController.cpp | 17 - WebKitTools/DumpRenderTree/LayoutTestController.h | 3 +- .../TestNetscapePlugIn/PluginTest.cpp | 5 - .../DumpRenderTree/TestNetscapePlugIn/PluginTest.h | 1 - .../Tests/GetUserAgentWithNullNPPFromNPPNew.cpp | 56 - .../DumpRenderTree/TestNetscapePlugIn/main.cpp | 6 +- .../win/TestNetscapePlugin.vcproj | 1013 +- .../win/TestNetscapePluginCommon.vsprops | 46 +- .../win/TestNetscapePluginPostBuild.cmd | 1 - .../win/TestNetscapePluginPreBuild.cmd | 6 - .../chromium/LayoutTestController.cpp | 10 +- .../gtk/AccessibilityUIElementGtk.cpp | 11 +- .../DumpRenderTree/gtk/LayoutTestControllerGtk.cpp | 6 - .../DumpRenderTree/mac/LayoutTestControllerMac.mm | 36 - .../DumpRenderTreeSupportPregenerated.pm | 54 - .../mac/PerlSupport/DumpRenderTreeSupportTiger.pm | 54 + .../DumpRenderTreeSupport_wrapPregenerated.c | 1167 - .../PerlSupport/DumpRenderTreeSupport_wrapTiger.c | 1167 + .../DumpRenderTree/mac/PerlSupport/Makefile | 19 +- .../DumpRenderTree/qt/LayoutTestControllerQt.cpp | 5 - .../DumpRenderTree/qt/LayoutTestControllerQt.h | 1 - .../qt/TestNetscapePlugin/TestNetscapePlugin.pro | 1 - .../unix/TestNetscapePlugin/TestNetscapePlugin.cpp | 8 +- .../DumpRenderTree/win/DumpRenderTree.vcproj | 1441 +- .../DumpRenderTree/win/DumpRenderTreeApple.vsprops | 30 +- .../win/DumpRenderTreeCFLite.vsprops | 22 +- .../DumpRenderTree/win/DumpRenderTreeCairo.vsprops | 22 +- .../win/DumpRenderTreeCommon.vsprops | 48 +- .../DumpRenderTree/win/DumpRenderTreePostBuild.cmd | 40 - .../DumpRenderTree/win/DumpRenderTreePreBuild.cmd | 14 - WebKitTools/DumpRenderTree/win/ImageDiff.vcproj | 791 +- .../DumpRenderTree/win/ImageDiffCommon.vsprops | 42 +- .../DumpRenderTree/win/ImageDiffPostBuild.cmd | 1 - .../DumpRenderTree/win/ImageDiffPreBuild.cmd | 6 - .../DumpRenderTree/win/LayoutTestControllerWin.cpp | 6 - .../DumpRenderTree/wx/LayoutTestControllerWx.cpp | 6 - WebKitTools/FindSafari/FindSafari.vcproj | 841 +- WebKitTools/FindSafari/FindSafariCommon.vsprops | 26 +- WebKitTools/GNUmakefile.am | 1 - WebKitTools/MIDLWrapper/MIDLWrapper.sln | 40 +- WebKitTools/MIDLWrapper/MIDLWrapper.vcproj | 398 +- .../Configurations/MiniBrowserCFLite.vsprops | 26 +- .../Configurations/MiniBrowserCommon.vsprops | 28 +- .../MiniBrowserCoreFoundation.vsprops | 26 +- WebKitTools/MiniBrowser/MiniBrowser.vcproj | 1017 +- WebKitTools/MiniBrowser/MiniBrowserPostBuild.cmd | 33 - WebKitTools/MiniBrowser/MiniBrowserPreBuild.cmd | 5 - .../MiniBrowser/mac/BrowserWindowController.m | 3 +- .../MiniBrowser/mac/WebBundle/WebBundleMain.m | 1 - WebKitTools/MiniBrowser/win/BrowserView.cpp | 2 +- WebKitTools/Scripts/update-webkit | 3 - WebKitTools/Scripts/webkitdirs.pm | 23 +- .../Scripts/webkitpy/common/config/committers.py | 1 - .../Scripts/webkitpy/common/config/ports.py | 1 - .../webkitpy/common/config/ports_unittest.py | 4 +- .../webkitpy/common/system/filesystem_mock.py | 11 +- .../Scripts/webkitpy/layout_tests/port/base.py | 2 +- .../Scripts/webkitpy/layout_tests/port/config.py | 2 +- .../webkitpy/layout_tests/port/config_unittest.py | 1 - .../webkitpy/layout_tests/run_webkit_tests.py | 40 +- .../layout_tests/run_webkit_tests_unittest.py | 7 - .../tool/commands/data/rebaselineserver/main.css | 17 - .../tool/commands/data/rebaselineserver/main.js | 25 +- .../tool/commands/data/rebaselineserver/util.js | 10 - .../webkitpy/tool/commands/rebaselineserver.py | 34 +- .../tool/commands/rebaselineserver_unittest.py | 37 +- .../Configurations/TestWebKitAPICFLite.vsprops | 22 +- .../Configurations/TestWebKitAPICommon.vsprops | 42 +- .../TestWebKitAPICoreFoundation.vsprops | 22 +- .../TestWebKitAPI/InjectedBundleController.cpp | 22 +- .../TestWebKitAPI/InjectedBundleController.h | 9 +- WebKitTools/TestWebKitAPI/InjectedBundleTest.h | 3 +- WebKitTools/TestWebKitAPI/PlatformUtilities.cpp | 12 +- WebKitTools/TestWebKitAPI/PlatformUtilities.h | 2 +- WebKitTools/TestWebKitAPI/PlatformWebView.h | 2 +- .../WebKit2/DocumentStartUserScriptAlertCrash.cpp | 6 +- .../DocumentStartUserScriptAlertCrash_Bundle.cpp | 14 +- .../TestWebKitAPI/mac/PlatformWebViewMac.mm | 4 +- .../TestWebKitAPI/win/PlatformWebViewWin.cpp | 4 +- WebKitTools/TestWebKitAPI/win/TestWebKitAPI.sln | 108 +- WebKitTools/TestWebKitAPI/win/TestWebKitAPI.vcproj | 1055 +- .../win/TestWebKitAPIGenerated.vcproj | 164 +- .../win/TestWebKitAPIGeneratedCommon.vsprops | 26 +- .../TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd | 1 - .../TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd | 6 - WebKitTools/WebKitAPITest/WebKitAPITest.vcproj | 837 +- .../WebKitAPITest/WebKitAPITestCommon.vsprops | 50 +- .../WebKitAPITest/WebKitAPITestPostBuild.cmd | 1 - .../WebKitAPITest/WebKitAPITestPreBuild.cmd | 6 - .../WebKitLauncherWin/WebKitLauncherWin.vcproj | 853 +- .../WebKitLauncherWinCommon.vsprops | 24 +- .../Configurations/InjectedBundleCFLite.vsprops | 24 +- .../Configurations/InjectedBundleCommon.vsprops | 32 +- .../InjectedBundleCoreFoundation.vsprops | 24 +- .../Configurations/WebKitTestRunnerCFLite.vsprops | 22 +- .../Configurations/WebKitTestRunnerCommon.vsprops | 48 +- .../WebKitTestRunnerCoreFoundation.vsprops | 22 +- .../Bindings/LayoutTestController.idl | 3 - .../InjectedBundle/InjectedBundle.cpp | 13 +- .../InjectedBundle/InjectedBundle.h | 6 +- .../InjectedBundle/LayoutTestController.cpp | 44 +- .../InjectedBundle/LayoutTestController.h | 3 - WebKitTools/WebKitTestRunner/TestController.cpp | 1 - WebKitTools/WebKitTestRunner/WebKitTestRunner.sln | 182 +- .../WebKitTestRunner/win/InjectedBundle.vcproj | 985 +- .../win/InjectedBundleGenerated.vcproj | 174 +- .../win/InjectedBundleGeneratedCommon.vsprops | 30 +- .../win/InjectedBundlePostBuild.cmd | 1 - .../win/InjectedBundlePreBuild.cmd | 6 - .../WebKitTestRunner/win/PlatformWebViewWin.cpp | 2 +- .../WebKitTestRunner/win/WebKitTestRunner.vcproj | 865 +- .../win/WebKitTestRunnerPostBuild.cmd | 38 - .../win/WebKitTestRunnerPreBuild.cmd | 6 - WebKitTools/WinCELauncher/main.cpp | 132 - WebKitTools/WinLauncher/WinLauncher.vcproj | 997 +- WebKitTools/WinLauncher/WinLauncherCommon.vsprops | 40 +- WebKitTools/WinLauncher/WinLauncherPostBuild.cmd | 1 - WebKitTools/WinLauncher/WinLauncherPreBuild.cmd | 6 - .../record-memory-win-common.vsprops | 22 +- .../record-memory-win/record-memory-win.vcproj | 829 +- WebKitTools/wx/build/settings.py | 8 +- 671 files changed, 89676 insertions(+), 97629 deletions(-) delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPostBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreLink.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd delete mode 100644 JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreLink.cmd create mode 100644 JavaScriptCore/runtime/MarkStackNone.cpp delete mode 100644 JavaScriptCore/wtf/OSAllocator.h delete mode 100644 JavaScriptCore/wtf/OSAllocatorPosix.cpp delete mode 100644 JavaScriptCore/wtf/OSAllocatorSymbian.cpp delete mode 100644 JavaScriptCore/wtf/OSAllocatorWin.cpp create mode 100644 JavaScriptCore/wtf/Vector3.h delete mode 100644 JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h create mode 100644 LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt create mode 100644 LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html create mode 100644 LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js delete mode 100644 WebCore/ForwardingHeaders/wtf/OSAllocator.h delete mode 100644 WebCore/WebCore.vcproj/QTMovieWinPostBuild.cmd delete mode 100644 WebCore/WebCore.vcproj/QTMovieWinPreBuild.cmd delete mode 100644 WebCore/WebCore.vcproj/WebCorePostBuild.cmd delete mode 100644 WebCore/WebCore.vcproj/WebCorePreBuild.cmd delete mode 100644 WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp delete mode 100644 WebCore/bindings/js/JSConvolverNodeCustom.cpp delete mode 100644 WebCore/bindings/js/JSJavaScriptAudioNodeCustom.cpp delete mode 100644 WebCore/css/themeChromiumSkia.css delete mode 100644 WebCore/editing/FindOptions.h delete mode 100644 WebCore/manual-tests/autocorrection/dismiss-multiple-guesses.html delete mode 100644 WebCore/manual-tests/autocorrection/select-from-multiple-guesses.html delete mode 100644 WebCore/manual-tests/input-type-datetime-default-value.html delete mode 100644 WebCore/platform/network/android/ProxyServerAndroid.cpp delete mode 100644 WebCore/svg/SVGRect.h delete mode 100644 WebKit/win/WebKit.vcproj/InterfacesPostBuild.cmd delete mode 100644 WebKit/win/WebKit.vcproj/InterfacesPreBuild.cmd delete mode 100644 WebKit/win/WebKit.vcproj/WebKitGUIDPostBuild.cmd delete mode 100644 WebKit/win/WebKit.vcproj/WebKitGUIDPreBuild.cmd delete mode 100644 WebKit/win/WebKit.vcproj/WebKitLibPostBuild.cmd delete mode 100644 WebKit/win/WebKit.vcproj/WebKitLibPreBuild.cmd delete mode 100644 WebKit/wince/WebView.cpp delete mode 100644 WebKit/wince/WebView.h delete mode 100644 WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp delete mode 100644 WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePluginPostBuild.cmd delete mode 100644 WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePluginPreBuild.cmd delete mode 100644 WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm create mode 100644 WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportTiger.pm delete mode 100644 WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c create mode 100644 WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapTiger.c delete mode 100644 WebKitTools/DumpRenderTree/win/DumpRenderTreePostBuild.cmd delete mode 100644 WebKitTools/DumpRenderTree/win/DumpRenderTreePreBuild.cmd delete mode 100644 WebKitTools/DumpRenderTree/win/ImageDiffPostBuild.cmd delete mode 100644 WebKitTools/DumpRenderTree/win/ImageDiffPreBuild.cmd delete mode 100644 WebKitTools/MiniBrowser/MiniBrowserPostBuild.cmd delete mode 100644 WebKitTools/MiniBrowser/MiniBrowserPreBuild.cmd delete mode 100644 WebKitTools/TestWebKitAPI/win/TestWebKitAPIPostBuild.cmd delete mode 100644 WebKitTools/TestWebKitAPI/win/TestWebKitAPIPreBuild.cmd delete mode 100644 WebKitTools/WebKitAPITest/WebKitAPITestPostBuild.cmd delete mode 100644 WebKitTools/WebKitAPITest/WebKitAPITestPreBuild.cmd delete mode 100644 WebKitTools/WebKitTestRunner/win/InjectedBundlePostBuild.cmd delete mode 100644 WebKitTools/WebKitTestRunner/win/InjectedBundlePreBuild.cmd delete mode 100644 WebKitTools/WebKitTestRunner/win/WebKitTestRunnerPostBuild.cmd delete mode 100644 WebKitTools/WebKitTestRunner/win/WebKitTestRunnerPreBuild.cmd delete mode 100644 WebKitTools/WinCELauncher/main.cpp delete mode 100644 WebKitTools/WinLauncher/WinLauncherPostBuild.cmd delete mode 100644 WebKitTools/WinLauncher/WinLauncherPreBuild.cmd diff --git a/ANGLE/ChangeLog b/ANGLE/ChangeLog index 4246845..78a4d12 100644 --- a/ANGLE/ChangeLog +++ b/ANGLE/ChangeLog @@ -1,13 +1,3 @@ -2010-12-01 Steve Falkenburg - - Reviewed by Adam Roben. - - vcproj changes can't be applied cleanly by the Windows EWS bot - https://bugs.webkit.org/show_bug.cgi?id=50328 - - * src/libEGL/libEGL.vcproj: Added property svn:eol-style. - * src/libGLESv2/libGLESv2.vcproj: Added property svn:eol-style. - 2010-11-03 Darin Adler Updated Xcode projects by opening them with Xcode 3.2.4. diff --git a/ANGLE/src/libEGL/libEGL.vcproj b/ANGLE/src/libEGL/libEGL.vcproj index 4f8d0b2..505f4d9 100644 --- a/ANGLE/src/libEGL/libEGL.vcproj +++ b/ANGLE/src/libEGL/libEGL.vcproj @@ -1,252 +1,252 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ANGLE/src/libGLESv2/libGLESv2.vcproj b/ANGLE/src/libGLESv2/libGLESv2.vcproj index 1f43e7a..f9e34d0 100644 --- a/ANGLE/src/libGLESv2/libGLESv2.vcproj +++ b/ANGLE/src/libGLESv2/libGLESv2.vcproj @@ -1,365 +1,365 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaScriptCore/CMakeListsEfl.txt b/JavaScriptCore/CMakeListsEfl.txt index 9d3c71e..90ee22b 100644 --- a/JavaScriptCore/CMakeListsEfl.txt +++ b/JavaScriptCore/CMakeListsEfl.txt @@ -2,7 +2,6 @@ LIST(APPEND JavaScriptCore_SOURCES jit/ExecutableAllocatorFixedVMPool.cpp jit/ExecutableAllocator.cpp runtime/MarkStackPosix.cpp - wtf/OSAllocatorPosix.cpp ) LIST(APPEND JavaScriptCore_LIBRARIES diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 7175c5d..f5176f2 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,480 +1,19 @@ -2010-12-01 Geoffrey Garen - - Try to fix the GTK build. - - * GNUmakefile.am: Use a full path to OSAllocator*.cpp. - -2010-12-01 Geoffrey Garen - - Try to fix the EFL Linux build. - - * CMakeListsEfl.txt: Added OSAllocator to the project. - -2010-12-01 Geoffrey Garen - - Try to fix the Qt build: Include all OS files for Qt's sake, and then - use #ifdefs in the files to exclude things based on OS. - - This is a pretty bad way to manage platforms -- hopefully we can - fix the Qt build system and move away from this in the future. - - * wtf/OSAllocatorPosix.cpp: - * wtf/OSAllocatorSymbian.cpp: - * wtf/OSAllocatorWin.cpp: - * wtf/wtf.pri: - -2010-12-01 Geoffrey Garen - - Try to fix the Chromium build. - - * JavaScriptCore.gypi: This is a Windows build file, so use OSAllocatorWin.cpp. - -2010-12-01 Geoffrey Garen - - Try to fix the GTK build. - - * GNUmakefile.am: Added OSAllocator to another project. - -2010-12-01 Geoffrey Garen - - Try to fix the GTK Linux build. - - * JavaScriptCore.gypi: Added OSAllocator to the project. - -2010-12-01 Geoffrey Garen - - Try to fix the Qt Linux build. - - * wtf/OSAllocatorPosix.cpp: Use the right errno.h. - -2010-12-01 Geoffrey Garen - - Try to fix Windows build: export some more symbols. - - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: - -2010-12-01 Geoffrey Garen - - Try to fix the Qt Linux build. - - * wtf/wtf.pri: Use the POSIX OSAllocator for Qt Linux. - -2010-12-01 Geoffrey Garen - - Windows build fix: commit doesn't have a return value. - - * wtf/OSAllocatorWin.cpp: - (WTF::OSAllocator::commit): - -2010-12-01 Geoffrey Garen - - Build fix: Export some symbols. - - * JavaScriptCore.exp: - -2010-12-01 Geoffrey Garen - - Build fix. - - * JavaScriptCore.xcodeproj/project.pbxproj: Export OSAllocator.h as private - so other projects can see it. - - * wtf/OSAllocatorPosix.cpp: #include UnusedParam.h for UNUSED_PARAM. - -2010-12-01 Geoffrey Garen - - Reviewed by Sam Weinig. - - Baby step toward a cross-platform virtual memory abstraction: created - an all-static OSAllocator class and changed MarkStack to use it. - - * JavaScriptCore.exp: These functions are inlined now. - - * JavaScriptCore.vcproj/WTF/WTF.vcproj: Added OSAllocatorWin.cpp. - - * JavaScriptCore.xcodeproj/project.pbxproj: Added OSAllocatorPosix.cpp. - - * runtime/MarkStack.h: - (JSC::MarkStack::allocateStack): - (JSC::MarkStack::releaseStack): Use OSAllocator instead of rolling our - own platform-specific code. - - * runtime/MarkStackNone.cpp: Removed. Nothing used this. - - * runtime/MarkStackPosix.cpp: - * runtime/MarkStackSymbian.cpp: - * runtime/MarkStackWin.cpp: Removed custom platform-specific code, since - we use the OSAllocator abstraction now. - - * wtf/OSAllocator.h: Added. - * wtf/OSAllocatorPosix.cpp: Added. - (WTF::OSAllocator::reserve): - (WTF::OSAllocator::reserveAndCommit): - (WTF::OSAllocator::commit): - (WTF::OSAllocator::decommit): - (WTF::OSAllocator::release): - * wtf/OSAllocatorSymbian.cpp: Added. - (WTF::OSAllocator::reserve): - (WTF::OSAllocator::reserveAndCommit): - (WTF::OSAllocator::commit): - (WTF::OSAllocator::decommit): - (WTF::OSAllocator::release): - * wtf/OSAllocatorWin.cpp: Added. - (WTF::OSAllocator::reserve): - (WTF::OSAllocator::reserveAndCommit): - (WTF::OSAllocator::commit): - (WTF::OSAllocator::decommit): - (WTF::OSAllocator::release): The new OSAllocator abstraction. - - * wtf/wtf.pri: Added OSAllocatorSymbian.cpp. - -2010-12-01 Steve Falkenburg - - Reviewed by Adam Roben. - - WinCairo build should not use link-time code generation (LTCG) - https://bugs.webkit.org/show_bug.cgi?id=50353 - - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: - * JavaScriptCore.vcproj/WTF/WTF.vcproj: - * JavaScriptCore.vcproj/jsc/jsc.vcproj: - * JavaScriptCore.vcproj/testapi/testapi.vcproj: - -010-12-01 Steve Falkenburg - - Reviewed by Adam Roben. - - vcproj changes can't be applied cleanly by the Windows EWS bot - https://bugs.webkit.org/show_bug.cgi?id=50328 - - * JavaScriptCore.vcproj/JavaScriptCore.sln: Modified property svn:eol-style. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Modified property svn:eol-style. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops: Added property svn:eol-style. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops: Added property svn:eol-style. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: Added property svn:eol-style. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj: Modified property svn:eol-style. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops: Added property svn:eol-style. - * JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln: Modified property svn:eol-style. - * JavaScriptCore.vcproj/WTF/WTF.vcproj: Modified property svn:eol-style. - * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: Added property svn:eol-style. - * JavaScriptCore.vcproj/jsc/jsc.vcproj: Modified property svn:eol-style. - * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: Added property svn:eol-style. - * JavaScriptCore.vcproj/testapi/testapi.vcproj: Modified property svn:eol-style. - * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: Added property svn:eol-style. - -2010-12-01 Gavin Barraclough - - Reviewed by Sam Weinig. - - Bug 50298 - /()()()()()()()()()(?:(\10a|b)(X|Y))+/.exec("bXXaYYaY") ASSERTs - - For unmatched subpattens we previously used to set the subpattern end to -1, - but now we only set the start value. E.g. consider the following: - /a(b)?c/.exec("ac"); - Previously we would generate an internal results array of: - [ 0, 2, -1, -1 ] - Since fairly recently we have generated results of: - [ 0, 2, -1, ??? ] - (With the end index of the subpattern uninitialized). - - Update these ASSERTs to account for this. - - Also, when stripping out self-referencing backreferences, (e.g. /(\1)/) we - were checking the wrong property on the pattern term. We should have been - looking at term.parentheses.subpatternId, but instead were checking - term.subpatternId. The latter is actually only the subpatternId for - back reference terms. Rename this to backReferenceSubpatternId. - - * yarr/RegexInterpreter.cpp: - (JSC::Yarr::Interpreter::matchBackReference): - (JSC::Yarr::Interpreter::backtrackBackReference): - -2010-11-30 Gavin Barraclough - - Rubber stamped by Sam Weinig. - - Bug 50297 - \s in YARR should match BOMs. - - From section 15.10.2.12 CharacterClassEscape contains: - - The production CharacterClassEscape :: s evaluates by returning the set of characters containing the - characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions. - - Table 2 in section 7.2 contains: - - \uFEFF Byte Order Mark - - * create_regex_tables: - Add BOM to spaces table. - -2010-11-30 Gavin Barraclough - - Reviewed by Darin Adler. - - Fixed review comments following bug #48101. - Mostly typos, plus gave quantifyInfinite a symbolic name. - - * yarr/RegexCompiler.cpp: - (JSC::Yarr::RegexPatternConstructor::quantifyAtom): - (JSC::Yarr::RegexPatternConstructor::checkForTerminalParentheses): - * yarr/RegexInterpreter.cpp: - (JSC::Yarr::Interpreter::backtrackParenthesesOnceEnd): - (JSC::Yarr::Interpreter::matchParenthesesTerminalBegin): - (JSC::Yarr::Interpreter::backtrackParenthesesTerminalBegin): - (JSC::Yarr::Interpreter::backtrackParenthesesTerminalEnd): - * yarr/RegexJIT.cpp: - (JSC::Yarr::RegexGenerator::generatePatternCharacterGreedy): - (JSC::Yarr::RegexGenerator::generatePatternCharacterNonGreedy): - (JSC::Yarr::RegexGenerator::generateCharacterClassGreedy): - * yarr/RegexParser.h: - (JSC::Yarr::Parser::parseTokens): - (JSC::Yarr::parse): - -2010-11-30 Steve Falkenburg - - Reviewed by Darin Adler. - - WTF project missing build-stopping code from its pre-build event - https://bugs.webkit.org/show_bug.cgi?id=50281 - - * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd: - -2010-11-30 Patrick Gansterer - - Reviewed by Darin Adler. - - Cleanup UTF8.cpp - https://bugs.webkit.org/show_bug.cgi?id=49581 - - Use macros and functions instead of range values directly. - - * wtf/unicode/UTF8.cpp: - (WTF::Unicode::inlineUTF8SequenceLength): - (WTF::Unicode::UTF8SequenceLength): - (WTF::Unicode::convertUTF16ToUTF8): - (WTF::Unicode::readUTF8Sequence): - (WTF::Unicode::convertUTF8ToUTF16): - * wtf/unicode/UnicodeMacrosFromICU.h: Added U_IS_SUPPLEMENTARY macro. - -2010-11-30 Geoffrey Garen - - Reviewed by Gavin Barraclough. - - Fixed a crash seen when using a PageAllocation to store itself. - - * wtf/PageAllocation.h: - (WTF::PageAllocation::systemDeallocate): Zero out m_base before unmapping - it, in case unmapping m_base unmaps the PageAllocation. - - * wtf/BumpPointerAllocator.h: - (WTF::BumpPointerPool::destroy): Now this work-around isn't needed! - -2010-11-30 Xan Lopez - - Reviewed by Darin Adler. - - m_hasNonEnumerableProperties is never initialized in Structure - https://bugs.webkit.org/show_bug.cgi?id=50266 - - * runtime/Structure.cpp: - (JSC::Structure::Structure): initialize member variable. - -2010-11-29 Steve Falkenburg - - Windows build fix (part 1). Use correct environment variable syntax in cmd files. - - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd: - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd: - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd: - * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd: - * JavaScriptCore.vcproj/jsc/jscPostBuild.cmd: - * JavaScriptCore.vcproj/jsc/jscPreBuild.cmd: - * JavaScriptCore.vcproj/jsc/jscPreLink.cmd: - * JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd: - * JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd: - * JavaScriptCore.vcproj/testapi/testapiPreLink.cmd: - -2010-11-29 Dan Bernstein - - Reviewed by Darin Adler. - - WTF support for adding word-prefix search options to the text search API. - https://bugs.webkit.org/show_bug.cgi?id=50038 - - * wtf/unicode/UnicodeMacrosFromICU.h: Copied additional macros from icu/unicode/utf16.h. - -2010-11-29 Steve Falkenburg - - Reviewed by Darin Adler. - - JavaScriptCore projects on Windows should use cmd files for build events - https://bugs.webkit.org/show_bug.cgi?id=50193 - - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd: Added. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd: Added. - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd: Added. - * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd: Added property svn:eol-style. - * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd: Added property svn:eol-style. - * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: - * JavaScriptCore.vcproj/jsc/jscPostBuild.cmd: Added. - * JavaScriptCore.vcproj/jsc/jscPreBuild.cmd: Added. - * JavaScriptCore.vcproj/jsc/jscPreLink.cmd: Added. - * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: - * JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd: Added. - * JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd: Added. - * JavaScriptCore.vcproj/testapi/testapiPreLink.cmd: Added. - -2010-11-29 Dai Mikurube - - Reviewed by Kent Tamura. - - when empty, clicking "down" on outer-spin-button returns "max value" - https://bugs.webkit.org/show_bug.cgi?id=45491 - - It is required to calculate UTC/DST offsets to retrieve the current local milliseconds for - date/time type inputs. WTF::currentTimeMS() returns a UTC time, and WTF::getLocalTime() - returns a struct tm, not milliseconds. - - Calculating milliseconds from a struct tm is not simple since timegm() cannot be used in all - environments. This calculation is already done in calculateUTCOffset(), and complicated. - Duplicating this complicated calculation is unreasonable because of maintainability. - To achieve this without duplication, we must call calculate{UTC|DST}Offset in some way. - - * JavaScriptCore.exp: - * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def: - * wtf/DateMath.cpp: Changed calculateUTCOffset() and calculateDSTOffset() to external functions. - (WTF::calculateUTCOffset): - (WTF::calculateDSTOffset): - * wtf/DateMath.h: - -2010-11-29 Chris Rogers - - Reviewed by Kenneth Russell. - - Switch web audio code to use FloatPoint3D instead of Vector3 - https://bugs.webkit.org/show_bug.cgi?id=50186 - - * wtf/Vector3.h: Removed. - -2010-11-29 Steve Falkenburg - - Reviewed by Adam Roben. - - Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files - https://bugs.webkit.org/show_bug.cgi?id=49858 - - We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files: - - To simplify editing (editing vsprops build steps is confusing). - - For more readable diffs. - - * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: - * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd: Added. - * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd: Added. - -2010-11-29 Geoffrey Garen - - Reviewed by Gavin Barraclough. - - Improved accuracy of command-line SunSpider. - - * jsc.cpp: - (functionRun): Changed the "run" function to run a given test in - its own global object. Previously, all tests ran in the same global - object, which created name conflicts, and made globals from previous - tests artificially survive into later tests. - - Also changed "run" to return the elapsed milliseconds when running a - given test, for slightly more accurate numbers. - - (functionCheckSyntax): Ditto on returning elapsed milliseconds. - -2010-11-29 Darin Adler - - Reviewed by Andreas Kling. - - Remove a couple unneeded overflow checks - https://bugs.webkit.org/show_bug.cgi?id=49816 - - * wtf/text/CString.cpp: - (WTF::CString::init): Use an ASSERT instead of - an overflow check with CRASH. - -2010-11-29 Adam Roben - - Robustify react-to-vsprops-changes.py against changes to its location - or the location of the .vsprops files - - Suggested by John Sullivan. - - * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py: - Removed file_modification_times. - (main): Use glob.glob to find the .vsprops files and assert that we found some. - -2010-11-29 Adam Roben - - Touch wtf/Platform.h whenever any .vsprops file changes - - This will cause all files to be recompiled, which will make changes to - preprocessor macros (e.g., ENABLE_*) actually take effect. - - Fixes Windows build fails when ENABLE_* - macros are changed (because not enough files are rebuilt) - - Reviewed by John Sullivan. - - * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py: - (main): Touch wtf/Platform.h if it's older than any .vsprops file. Also - added some comments and logging to make it clearer what the script is - doing and why. - -2010-11-29 Adam Roben - - Update react-to-vsprops-changes.py after r72555 - - .vsprops files are no longer accessed relative to $WebKitLibrariesDir. - - Fixes REGRESSION (r72555): - react-to-vsprops-changes.py no longer works for people with a - non-default $WebKitLibrariesDir - - Reviewed by John Sullivan. - - * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py: - (main): Always look in WebKitLibraries/win for .vsprops files, not in - $WebKitLibrariesDir. - -2010-11-28 Gavin Barraclough - - Reviewed by Sam Weinig. - - Bug 48100 - YARR allows what seems like a bogus character-class range - - Per ECMA-262 character classes containing character ranges containing - character classes are invalid, eg: - /[\d-x]/ - /[x-\d]/ - /[\d-\d]/ - These should throw a syntax error. - - * yarr/RegexParser.h: - 2010-11-27 Gavin Barraclough Reviewed by Sam Weinig. Bug 48101 - Yarr gives different results for /(?:a*?){2,}/ - The test cases in the linked mozilla bug demonstrate a couple of + The test cases in the linked mozilla bug demostrate a couple of problems in subpattern matching. These bugs lie in the optimized cases - for matching parentheses with a quantity count of 1, and for matching greedy quantified parentheses at the end of a regex (which do not backtrack). In both of these cases we are failing to correctly handle empty - matches. In the case of parentheses-single matches (quantity count + matches. In the case of parenthese-single matches (quantity count one) we are failing to test for empty matches at all. In the case - of terminal subpattern matches we do currently check, however there + of terminal subpattern matches we do currenty check, however there is a subtler bug here too. In the case of an empty match we will presently immediately fall through to the next alternative (or complete the regex match), whereas upon a failed match we should @@ -486,7 +25,7 @@ which point the non-greedy a?? will match, and as such the result should be "ab", not "a"). - Terminal subpattern matching contains a second bug, too. The frame + Terminal sunpattern matching contains a second bug, too. The frame location values in the subpattern should be being allocated with the outer disjunction's frame (as we do for the parentheses-single optimization). Consider the following three regexes: diff --git a/JavaScriptCore/Configurations/Version.xcconfig b/JavaScriptCore/Configurations/Version.xcconfig index ee86a20..d4cb8e7 100644 --- a/JavaScriptCore/Configurations/Version.xcconfig +++ b/JavaScriptCore/Configurations/Version.xcconfig @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 14; +MINOR_VERSION = 13; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am index 89f9ab7..f7806b4 100644 --- a/JavaScriptCore/GNUmakefile.am +++ b/JavaScriptCore/GNUmakefile.am @@ -554,13 +554,11 @@ javascriptcore_sources += \ if TARGET_WIN32 javascriptcore_sources += \ - JavaScriptCore/runtime/MarkStackWin.cpp \ - JavaScriptCore/wtf/OSAllocatorWin.cpp + JavaScriptCore/runtime/MarkStackWin.cpp else javascriptcore_sources += \ JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp \ - JavaScriptCore/runtime/MarkStackPosix.cpp \ - JavaScriptCore/wtf/OSAllocatorPosix.cpp + JavaScriptCore/runtime/MarkStackPosix.cpp endif # ---- diff --git a/JavaScriptCore/JavaScriptCore.exp b/JavaScriptCore/JavaScriptCore.exp index 193fa08..ac5d0d7 100644 --- a/JavaScriptCore/JavaScriptCore.exp +++ b/JavaScriptCore/JavaScriptCore.exp @@ -306,6 +306,8 @@ __ZN3JSC8evaluateEPNS_9ExecStateERNS_10ScopeChainERKNS_10SourceCodeENS_7JSValueE __ZN3JSC9CodeBlockD1Ev __ZN3JSC9CodeBlockD2Ev __ZN3JSC9MarkStack10s_pageSizeE +__ZN3JSC9MarkStack12releaseStackEPvm +__ZN3JSC9MarkStack13allocateStackEm __ZN3JSC9MarkStack18initializePagesizeEv __ZN3JSC9Structure13hasTransitionEPN3WTF10StringImplEj __ZN3JSC9Structure17stopIgnoringLeaksEv @@ -359,12 +361,8 @@ __ZN3WTF10StringImplD1Ev __ZN3WTF10fastCallocEmm __ZN3WTF10fastMallocEm __ZN3WTF10fastStrDupEPKc -__ZN3WTF11OSAllocator16reserveAndCommitEm -__ZN3WTF11OSAllocator7releaseEPvm __ZN3WTF11commentAtomE __ZN3WTF11currentTimeEv -__ZN3WTF11dtoaRoundDPEPcdiRbRiRj -__ZN3WTF11dtoaRoundSFEPcdiRbRiRj __ZN3WTF11fastReallocEPvm __ZN3WTF12AtomicString11addSlowCaseEPNS_10StringImplE __ZN3WTF12AtomicString3addEPKc @@ -406,8 +404,6 @@ __ZN3WTF17charactersToFloatEPKtmPb __ZN3WTF17equalIgnoringCaseEPKtPKcj __ZN3WTF17equalIgnoringCaseEPNS_10StringImplEPKc __ZN3WTF17equalIgnoringCaseEPNS_10StringImplES1_ -__ZN3WTF18calculateDSTOffsetEdd -__ZN3WTF18calculateUTCOffsetEv __ZN3WTF18charactersToDoubleEPKtmPb __ZN3WTF18dateToDaysFrom1970Eiii __ZN3WTF18monthFromDayInYearEib @@ -435,7 +431,6 @@ __ZN3WTF39initializeMainThreadToProcessMainThreadEv __ZN3WTF3MD58addBytesEPKhm __ZN3WTF3MD58checksumERNS_6VectorIhLm16EEE __ZN3WTF3MD5C1Ev -__ZN3WTF4dtoaEPcdRbRiRj __ZN3WTF5Mutex4lockEv __ZN3WTF5Mutex6unlockEv __ZN3WTF5Mutex7tryLockEv @@ -550,6 +545,9 @@ __ZNK3JSC8JSObject9toBooleanEPNS_9ExecStateE __ZNK3JSC8JSString11resolveRopeEPNS_9ExecStateE __ZNK3JSC9HashTable11createTableEPNS_12JSGlobalDataE __ZNK3JSC9HashTable11deleteTableEv +__ZN3WTF11dtoaRoundSFEPcdiRbRiRj +__ZN3WTF11dtoaRoundDPEPcdiRbRiRj +__ZN3WTF4dtoaEPcdRbRiRj __ZNK3WTF12AtomicString5lowerEv __ZNK3WTF13DecimalNumber15toStringDecimalEPtj __ZNK3WTF13DecimalNumber28bufferLengthForStringDecimalEv diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi index 676a35d..deb36fb 100644 --- a/JavaScriptCore/JavaScriptCore.gypi +++ b/JavaScriptCore/JavaScriptCore.gypi @@ -400,8 +400,6 @@ 'wtf/NonCopyingSort.h', 'wtf/Noncopyable.h', 'wtf/NotFound.h', - 'wtf/OSAllocatorWin.cpp', - 'wtf/OSAllocator.h', 'wtf/OwnArrayPtr.h', 'wtf/OwnFastMallocPtr.h', 'wtf/OwnPtr.h', diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln index b67d254..47371c5 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln @@ -1,95 +1,95 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}" - ProjectSection(ProjectDependencies) = postProject - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}" - ProjectSection(ProjectDependencies) = postProject - {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} - {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindSafari", "..\..\WebKitTools\FindSafari\FindSafari.vcproj", "{DA31DA52-6675-48D4-89E0-333A7144397C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_All|Win32 = Debug_All|Win32 - Debug|Win32 = Debug|Win32 - Release_LTCG|Win32 = Release_LTCG|Win32 - Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32 - Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32 - {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}" + ProjectSection(ProjectDependencies) = postProject + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}" + ProjectSection(ProjectDependencies) = postProject + {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} + {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindSafari", "..\..\WebKitTools\FindSafari\FindSafari.vcproj", "{DA31DA52-6675-48D4-89E0-333A7144397C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_All|Win32 = Debug_All|Win32 + Debug|Win32 = Debug|Win32 + Release_LTCG|Win32 = Release_LTCG|Win32 + Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32 + Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32 + {DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def index 1bc488f..449c0bb 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def @@ -58,8 +58,6 @@ EXPORTS ?attach@Debugger@JSC@@QAEXPAVJSGlobalObject@2@@Z ?broadcast@ThreadCondition@WTF@@QAEXXZ ?bufferLengthForStringDecimal@DecimalNumber@WTF@@QBEIXZ - ?calculateDSTOffset@WTF@@YANNN@Z - ?calculateUTCOffset@WTF@@YAHXZ ?calculatedFunctionName@DebuggerCallFrame@JSC@@QBE?AVUString@2@XZ ?call@JSC@@YA?AVJSValue@1@PAVExecState@1@V21@W4CallType@1@ABTCallData@1@1ABVArgList@1@@Z ?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z @@ -263,9 +261,7 @@ EXPORTS ?recompileAllJSFunctions@Debugger@JSC@@QAEXPAVJSGlobalData@2@@Z ?recordExtraCost@Heap@JSC@@AAEXI@Z ?reifyString@StringBuilder@WTF@@AAEXXZ - ?release@OSAllocator@WTF@@SAXPAXI@Z ?releaseStack@MarkStack@JSC@@CAXPAXI@Z - ?reserveAndCommit@OSAllocator@WTF@@SAPAXI@Z ?reset@ParserArena@JSC@@QAEXXZ ?reset@TimeoutChecker@JSC@@QAEXXZ ?resetDateCache@JSGlobalData@JSC@@QAEXXZ @@ -326,10 +322,10 @@ EXPORTS ?toPrimitive@JSCell@JSC@@UBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z ?toPrimitive@JSString@JSC@@EBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z ?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z + ?toStringDecimal@DecimalNumber@WTF@@QBEIPA_WI@Z ?toString@JSCell@JSC@@UBE?AVUString@2@PAVExecState@2@@Z ?toString@JSObject@JSC@@UBE?AVUString@2@PAVExecState@2@@Z ?toString@JSString@JSC@@EBE?AVUString@2@PAVExecState@2@@Z - ?toStringDecimal@DecimalNumber@WTF@@QBEIPA_WI@Z ?toThisObject@JSCell@JSC@@UBEPAVJSObject@2@PAVExecState@2@@Z ?toThisObject@JSObject@JSC@@UBEPAV12@PAVExecState@2@@Z ?toThisObject@JSString@JSC@@EBEPAVJSObject@2@PAVExecState@2@@Z diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj index 202742d..7ecd766 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj @@ -1,1974 +1,1975 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops index 61e10b4..fe884aa 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops @@ -1,11 +1,11 @@ - - - - + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops index 1e7aed7..8c9e31f 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops @@ -1,11 +1,11 @@ - - - - + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops index f0b759f..6929c8a 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops @@ -1,20 +1,32 @@ - - - - - + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj index 6dad054..b7a7320 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj @@ -1,91 +1,91 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops index 786be86..44ae1d9 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops @@ -1,15 +1,15 @@ - - - - + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd deleted file mode 100644 index f011495..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd +++ /dev/null @@ -1 +0,0 @@ -if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed" diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd deleted file mode 100644 index cdacbf1..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd +++ /dev/null @@ -1,8 +0,0 @@ -%SystemDrive%\cygwin\bin\which.exe bash -if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% -cmd /c -if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed" -if errorlevel 1 exit 1 -echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed" - -bash "%WEBKITLIBRARIESDIR%\tools\scripts\auto-version.sh" "%INTDIR%" diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd deleted file mode 100644 index 3ff5069..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd +++ /dev/null @@ -1,9 +0,0 @@ -mkdir 2>NUL "%IntDir%\lib" - -if exist "%WebKitLibrariesDir%\lib\icuuc%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\icuuc%LibraryConfigSuffix%.lib" "%IntDir%\lib\libicuuc%LibraryConfigSuffix%.lib" -if exist "%WebKitLibrariesDir%\lib\icuin%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\icuin%LibraryConfigSuffix%.lib" "%IntDir%\lib\libicuin%LibraryConfigSuffix%.lib" - -if exist "%WebKitLibrariesDir%\lib\libicuuc%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\libicuuc%LibraryConfigSuffix%.lib" "%IntDir%\lib" -if exist "%WebKitLibrariesDir%\lib\libicuin%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\libicuin%LibraryConfigSuffix%.lib" "%IntDir%\lib" - -cmd /c diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py index 0d5d6fb..a2a0543 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py @@ -6,32 +6,22 @@ import re import sys -def main(): - # It's a little unfortunate that we're relying on the location of this - # script to find the top-level source directory. - top_level_directory = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) +def file_modification_times(directory): + for dirpath, dirnames, filenames in os.walk(directory): + for filename in filenames: + yield os.path.getmtime(os.path.join(dirpath, filename)) + - vsprops_directory = os.path.join(top_level_directory, 'WebKitLibraries', 'win', 'tools', 'vsprops') - vsprops_files = glob.glob(os.path.join(vsprops_directory, '*.vsprops')) - assert len(vsprops_files), "Couldn't find any .vsprops files in %s" % vsprops_directory - newest_vsprops_time = max(map(os.path.getmtime, vsprops_files)) +def main(): + vsprops_directory = os.path.join(os.environ['WEBKITLIBRARIESDIR'], 'tools', 'vsprops') + newest_vsprops_time = max(file_modification_times(vsprops_directory)) - # Delete any manifest-related files because Visual Studio isn't smart - # enough to figure out that it might need to rebuild them. obj_directory = os.path.join(os.environ['WEBKITOUTPUTDIR'], 'obj') for manifest_file in glob.iglob(os.path.join(obj_directory, '*', '*', '*.manifest*')): manifest_time = os.path.getmtime(manifest_file) if manifest_time < newest_vsprops_time: - print 'Deleting %s' % manifest_file os.remove(manifest_file) - # Touch wtf/Platform.h so all files will be recompiled. This is necessary - # to pick up changes to preprocessor macros (e.g., ENABLE_*). - wtf_platform_h = os.path.join(top_level_directory, 'JavaScriptCore', 'wtf', 'Platform.h') - if os.path.getmtime(wtf_platform_h) < newest_vsprops_time: - print 'Touching wtf/Platform.h' - os.utime(wtf_platform_h, None) - if __name__ == '__main__': sys.exit(main()) diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln index f55e7d6..e85ff9d 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln +++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln @@ -1,83 +1,83 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}" - ProjectSection(ProjectDependencies) = postProject - {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" - ProjectSection(ProjectDependencies) = postProject - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}" - ProjectSection(ProjectDependencies) = postProject - {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_All|Win32 = Debug_All|Win32 - Debug|Win32 = Debug|Win32 - Release_LTCG|Win32 = Release_LTCG|Win32 - Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32 - Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32 - {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32 - {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32 - {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32 - {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}" + ProjectSection(ProjectDependencies) = postProject + {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" + ProjectSection(ProjectDependencies) = postProject + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}" + ProjectSection(ProjectDependencies) = postProject + {011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_All|Win32 = Debug_All|Win32 + Debug|Win32 = Debug|Win32 + Release_LTCG|Win32 = Release_LTCG|Win32 + Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32 + Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32 + {011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32 + {AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32 + {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32 + {C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj index 4a3e859..3609939 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj +++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj @@ -1,894 +1,891 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops index 07f679f..d81a604 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops +++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops @@ -1,20 +1,28 @@ - - - - - + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd deleted file mode 100644 index f011495..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd +++ /dev/null @@ -1 +0,0 @@ -if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed" diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd deleted file mode 100644 index 3a84c26..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd +++ /dev/null @@ -1,6 +0,0 @@ -%SystemDrive%\cygwin\bin\which.exe bash -if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% -cmd /c -if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed" -if errorlevel 1 exit 1 -echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed" diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj index a6b59d3..ef5e114 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj +++ b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj @@ -1,412 +1,413 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops index fed83cd..b63729c 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops +++ b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops @@ -1,20 +1,32 @@ - - - - - + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPostBuild.cmd deleted file mode 100644 index c81e940..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPostBuild.cmd +++ /dev/null @@ -1,23 +0,0 @@ -if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed" - -mkdir 2>NUL "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icudt44.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt44.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icudt44%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt44%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\libicuin%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libicuin%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\libicuuc%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libicuuc%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icudt40.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt40.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icudt40%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt40%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icudt42.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt42.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icudt42%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt42%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\CoreFoundation%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CoreFoundation%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\CoreFoundation.resources" xcopy /y /d /e /i "%WEBKITLIBRARIESDIR%\bin\CoreFoundation.resources" "%WEBKITOUTPUTDIR%\bin\CoreFoundation.resources" -if exist "%WEBKITLIBRARIESDIR%\bin\pthreadVC2%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\pthreadVC2%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\objc%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\objc%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\ASL%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\ASL%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" -if exist "%WEBKITLIBRARIESDIR%\bin\libdispatch%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libdispatch%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin" - -cmd /c diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreBuild.cmd deleted file mode 100644 index 3a84c26..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreBuild.cmd +++ /dev/null @@ -1,6 +0,0 @@ -%SystemDrive%\cygwin\bin\which.exe bash -if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% -cmd /c -if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed" -if errorlevel 1 exit 1 -echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed" diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreLink.cmd b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreLink.cmd deleted file mode 100644 index 8523026..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreLink.cmd +++ /dev/null @@ -1,9 +0,0 @@ -mkdir 2>NUL "%INTDIR%\lib" - -if exist "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" -if exist "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" - -if exist "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib" -if exist "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib" - -cmd /c diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj index e0011e3..17f8312 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj +++ b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj @@ -1,448 +1,449 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops index d0fea83..a1a7267 100644 --- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops +++ b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops @@ -1,20 +1,32 @@ - - - - - + + + + + + + + diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd deleted file mode 100644 index af5c949..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd +++ /dev/null @@ -1,3 +0,0 @@ -if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed" - -xcopy /y /d "%PROJECTDIR%\..\..\API\tests\testapi.js" "%OUTDIR%" diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd deleted file mode 100644 index 3a84c26..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd +++ /dev/null @@ -1,6 +0,0 @@ -%SystemDrive%\cygwin\bin\which.exe bash -if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH% -cmd /c -if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed" -if errorlevel 1 exit 1 -echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed" diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreLink.cmd b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreLink.cmd deleted file mode 100644 index 8523026..0000000 --- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreLink.cmd +++ /dev/null @@ -1,9 +0,0 @@ -mkdir 2>NUL "%INTDIR%\lib" - -if exist "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" -if exist "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" - -if exist "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib" -if exist "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib" - -cmd /c diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj index e7de0e1..a1e1c5c 100644 --- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj +++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj @@ -48,8 +48,6 @@ 0BDFFAE10FC6193100D69EF4 /* OwnFastMallocPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BDFFAD10FC616EC00D69EF4 /* OwnFastMallocPtr.h */; settings = {ATTRIBUTES = (Private, ); }; }; 0BF28A2911A33DC300638F84 /* SizeLimits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF28A2811A33DC300638F84 /* SizeLimits.cpp */; }; 0F29479C126E698C00B3ABF5 /* DecimalNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */; }; - 1400067712A6F7830064D123 /* OSAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1400067612A6F7830064D123 /* OSAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 1400069312A6F9E10064D123 /* OSAllocatorPosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1400069212A6F9E10064D123 /* OSAllocatorPosix.cpp */; }; 14035DB110DBFB2A00FFFFE7 /* WeakGCPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 14035DB010DBFB2A00FFFFE7 /* WeakGCPtr.h */; settings = {ATTRIBUTES = (Private, ); }; }; 140566C4107EC255005DBC8D /* JSAPIValueWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0894D50FAFBA2D00001865 /* JSAPIValueWrapper.cpp */; }; 140566D1107EC267005DBC8D /* JSStaticScopeObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E42C190E3938830065A544 /* JSStaticScopeObject.cpp */; }; @@ -651,8 +649,6 @@ 0BDFFAD40FC6171000D69EF4 /* CrossThreadRefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadRefCounted.h; sourceTree = ""; }; 0BF28A2811A33DC300638F84 /* SizeLimits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SizeLimits.cpp; sourceTree = ""; }; 0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DecimalNumber.cpp; sourceTree = ""; }; - 1400067612A6F7830064D123 /* OSAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSAllocator.h; sourceTree = ""; }; - 1400069212A6F9E10064D123 /* OSAllocatorPosix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OSAllocatorPosix.cpp; sourceTree = ""; }; 14035DB010DBFB2A00FFFFE7 /* WeakGCPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakGCPtr.h; sourceTree = ""; }; 140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBasePrivate.h; sourceTree = ""; }; 141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minidom.c; path = tests/minidom.c; sourceTree = ""; }; @@ -1476,6 +1472,10 @@ 65162EF108E6A21C007556CD /* wtf */ = { isa = PBXGroup; children = ( + 9714AF2F122F27C60092D9F5 /* url */, + 06D358A00DAAD9C4003B174E /* mac */, + 8656573E115BE35200291F40 /* text */, + E195678D09E7CF1200B89D13 /* unicode */, 93AA4F770957251F0084B3A7 /* AlwaysInline.h */, 938C4F690CA06BC700D9310A /* ASCIICType.h */, 65E217B808E7EECC0023E5F6 /* Assertions.cpp */, @@ -1491,8 +1491,8 @@ 180B9AF00F16C569009BDBC5 /* CurrentTime.h */, 41359CF40FDD89CB00206180 /* DateMath.cpp */, 41359CF50FDD89CB00206180 /* DateMath.h */, - 0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */, 862AF4B512239C7B0024E5B8 /* DecimalNumber.h */, + 0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */, 5186111D0CC824830081412B /* Deque.h */, 938C4F6B0CA06BCE00D9310A /* DisallowCType.h */, 651F6412039D5B5F0078395C /* dtoa.cpp */, @@ -1514,7 +1514,6 @@ 657EB7450B708F540063461B /* ListHashSet.h */, 148A1626095D16BB00666D0D /* ListRefPtr.h */, E1EE79270D6C964500FEA3BA /* Locker.h */, - 06D358A00DAAD9C4003B174E /* mac */, 06D358A20DAAD9C4003B174E /* MainThread.cpp */, 06D358A30DAAD9C4003B174E /* MainThread.h */, 5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */, @@ -1522,12 +1521,10 @@ 511FC4C7117EE23D00425272 /* MD5.cpp */, 511FC4CA117EE2A800425272 /* MD5.h */, E1EE798B0D6CA53D00FEA3BA /* MessageQueue.h */, - 9303F5690991190000AD71B8 /* Noncopyable.h */, 65E1A2F4122B880D00B26097 /* NonCopyingSort.h */, + 9303F5690991190000AD71B8 /* Noncopyable.h */, C0A2723F0E509F1E00E96E15 /* NotFound.h */, 933F5CDB126922690049191E /* NullPtr.h */, - 1400069212A6F9E10064D123 /* OSAllocatorPosix.cpp */, - 1400067612A6F7830064D123 /* OSAllocator.h */, 9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */, BCFBE697122561D200309E9D /* OwnArrayPtrCommon.h */, 0BDFFAD10FC616EC00D69EF4 /* OwnFastMallocPtr.h */, @@ -1561,7 +1558,6 @@ 6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */, 6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */, 6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */, - 8656573E115BE35200291F40 /* text */, 18BAB52710DADFCD000D945B /* ThreadIdentifierDataPthreads.cpp */, 18BAB52810DADFCD000D945B /* ThreadIdentifierDataPthreads.h */, 5D6A566A0F05995500266145 /* Threading.cpp */, @@ -1572,9 +1568,7 @@ E1B7C8BD0DA3A3360074B0DC /* ThreadSpecific.h */, 0B330C260F38C62300692DE3 /* TypeTraits.cpp */, 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */, - E195678D09E7CF1200B89D13 /* unicode */, 935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */, - 9714AF2F122F27C60092D9F5 /* url */, E17FF770112131D200076A19 /* ValueCheck.h */, 6592C316098B7DE10003D4F6 /* Vector.h */, 6592C317098B7DE10003D4F6 /* VectorTraits.h */, @@ -2359,7 +2353,6 @@ A730B6121250068F009D25B1 /* StrictEvalActivation.h in Headers */, 933F5CDC1269229B0049191E /* NullPtr.h in Headers */, F3BD31ED126735770065467F /* TextPosition.h in Headers */, - 1400067712A6F7830064D123 /* OSAllocator.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2453,7 +2446,6 @@ isa = PBXProject; buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */; compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English, @@ -2818,7 +2810,6 @@ A730B6131250068F009D25B1 /* StrictEvalActivation.cpp in Sources */, 86438FC41265503E00E0DFCA /* StringBuilder.cpp in Sources */, 0F29479C126E698C00B3ABF5 /* DecimalNumber.cpp in Sources */, - 1400069312A6F9E10064D123 /* OSAllocatorPosix.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/JavaScriptCore/create_regex_tables b/JavaScriptCore/create_regex_tables index d1cc1c2..b436eee 100644 --- a/JavaScriptCore/create_regex_tables +++ b/JavaScriptCore/create_regex_tables @@ -25,8 +25,8 @@ types = { "wordchar": { "UseTable" : True, "data": ['_', ('0','9'), ('A', 'Z'), ('a','z')]}, "nonwordchar": { "UseTable" : True, "Inverse": "wordchar", "data": ['`', (0, ord('0') - 1), (ord('9') + 1, ord('A') - 1), (ord('Z') + 1, ord('_') - 1), (ord('z') + 1, 0xffff)]}, "newline": { "UseTable" : False, "data": ['\n', '\r', 0x2028, 0x2029]}, - "spaces": { "UseTable" : True, "data": [' ', ('\t', '\r'), 0xa0, 0x1680, 0x180e, 0x2028, 0x2029, 0x202f, 0x205f, 0x3000, (0x2000, 0x200a), 0xfeff]}, - "nonspaces": { "UseTable" : True, "Inverse": "spaces", "data": [(0, ord('\t') - 1), (ord('\r') + 1, ord(' ') - 1), (ord(' ') + 1, 0x009f), (0x00a1, 0x167f), (0x1681, 0x180d), (0x180f, 0x1fff), (0x200b, 0x2027), (0x202a, 0x202e), (0x2030, 0x205e), (0x2060, 0x2fff), (0x3001, 0xfefe), (0xff00, 0xffff)]}, + "spaces": { "UseTable" : True, "data": [' ', ('\t', '\r'), 0xa0, 0x1680, 0x180e, 0x2028, 0x2029, 0x202f, 0x205f, 0x3000, (0x2000, 0x200a)]}, + "nonspaces": { "UseTable" : True, "Inverse": "spaces", "data": [(0, ord('\t') - 1), (ord('\r') + 1, ord(' ') - 1), (ord(' ') + 1, 0x009f), (0x00a1, 0x167f), (0x1681, 0x180d), (0x180f, 0x1fff), (0x200b, 0x2027), (0x202a, 0x202e), (0x2030, 0x205e), (0x2060, 0x2fff), (0x3001, 0xffff)]}, "digits": { "UseTable" : False, "data": [('0', '9')]}, "nondigits": { "UseTable" : False, "Inverse": "digits", "data": [(0, ord('0') - 1), (ord('9') + 1, 0xffff)] } } diff --git a/JavaScriptCore/jsc.cpp b/JavaScriptCore/jsc.cpp index 5439bad..00581e5 100644 --- a/JavaScriptCore/jsc.cpp +++ b/JavaScriptCore/jsc.cpp @@ -208,14 +208,14 @@ EncodedJSValue JSC_HOST_CALL functionVersion(ExecState*) EncodedJSValue JSC_HOST_CALL functionRun(ExecState* exec) { + StopWatch stopWatch; UString fileName = exec->argument(0).toString(exec); Vector script; if (!fillBufferWithContentsOfFile(fileName, script)) return JSValue::encode(throwError(exec, createError(exec, "Could not open file."))); - GlobalObject* globalObject = new (&exec->globalData()) GlobalObject(Vector()); + JSGlobalObject* globalObject = exec->lexicalGlobalObject(); - StopWatch stopWatch; stopWatch.start(); evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script.data(), fileName)); stopWatch.stop(); @@ -245,15 +245,10 @@ EncodedJSValue JSC_HOST_CALL functionCheckSyntax(ExecState* exec) return JSValue::encode(throwError(exec, createError(exec, "Could not open file."))); JSGlobalObject* globalObject = exec->lexicalGlobalObject(); - - StopWatch stopWatch; - stopWatch.start(); Completion result = checkSyntax(globalObject->globalExec(), makeSource(script.data(), fileName)); - stopWatch.stop(); - if (result.complType() == Throw) throwError(exec, result.value()); - return JSValue::encode(jsNumber(stopWatch.getElapsedMS())); + return JSValue::encode(result.value()); } #if ENABLE(SAMPLING_FLAGS) diff --git a/JavaScriptCore/runtime/MarkStack.h b/JavaScriptCore/runtime/MarkStack.h index c3efc8f..c551bac 100644 --- a/JavaScriptCore/runtime/MarkStack.h +++ b/JavaScriptCore/runtime/MarkStack.h @@ -28,7 +28,6 @@ #include "JSValue.h" #include -#include namespace JSC { @@ -86,8 +85,8 @@ namespace JSC { MarkSetProperties m_properties; }; - static void* allocateStack(size_t size) { return OSAllocator::reserveAndCommit(size); } - static void releaseStack(void* addr, size_t size) { OSAllocator::release(addr, size); } + static void* allocateStack(size_t size); + static void releaseStack(void* addr, size_t size); static void initializePagesize(); static size_t pageSize() diff --git a/JavaScriptCore/runtime/MarkStackNone.cpp b/JavaScriptCore/runtime/MarkStackNone.cpp new file mode 100644 index 0000000..b1ff48b --- /dev/null +++ b/JavaScriptCore/runtime/MarkStackNone.cpp @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009 Company 100, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +#include "MarkStack.h" + +#include "FastMalloc.h" + +namespace JSC { + +void MarkStack::initializePagesize() +{ + MarkStack::s_pageSize = 4096; +} + +void* MarkStack::allocateStack(size_t size) +{ + return fastMalloc(size); +} + +void MarkStack::releaseStack(void* addr, size_t) +{ + return fastFree(addr); +} + +} diff --git a/JavaScriptCore/runtime/MarkStackPosix.cpp b/JavaScriptCore/runtime/MarkStackPosix.cpp index 2a5b298..c28bc0d 100644 --- a/JavaScriptCore/runtime/MarkStackPosix.cpp +++ b/JavaScriptCore/runtime/MarkStackPosix.cpp @@ -38,6 +38,15 @@ void MarkStack::initializePagesize() MarkStack::s_pageSize = getpagesize(); } +void* MarkStack::allocateStack(size_t size) +{ + return mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); +} +void MarkStack::releaseStack(void* addr, size_t size) +{ + munmap(addr, size); +} + } #endif diff --git a/JavaScriptCore/runtime/MarkStackSymbian.cpp b/JavaScriptCore/runtime/MarkStackSymbian.cpp index a3893d7..bda14ac 100644 --- a/JavaScriptCore/runtime/MarkStackSymbian.cpp +++ b/JavaScriptCore/runtime/MarkStackSymbian.cpp @@ -33,6 +33,16 @@ void MarkStack::initializePagesize() MarkStack::s_pageSize = page_size; } +void* MarkStack::allocateStack(size_t size) +{ + return fastMalloc(size); +} + +void MarkStack::releaseStack(void* addr, size_t size) +{ + return fastFree(addr); +} + } #endif diff --git a/JavaScriptCore/runtime/MarkStackWin.cpp b/JavaScriptCore/runtime/MarkStackWin.cpp index 2d2a1b3..a171c78 100644 --- a/JavaScriptCore/runtime/MarkStackWin.cpp +++ b/JavaScriptCore/runtime/MarkStackWin.cpp @@ -39,6 +39,17 @@ void MarkStack::initializePagesize() MarkStack::s_pageSize = system_info.dwPageSize; } +void* MarkStack::allocateStack(size_t size) +{ + return VirtualAlloc(0, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); +} +void MarkStack::releaseStack(void* addr, size_t) +{ + // According to http://msdn.microsoft.com/en-us/library/aa366892(VS.85).aspx, + // dwSize must be 0 if dwFreeType is MEM_RELEASE. + VirtualFree(addr, 0, MEM_RELEASE); +} + } #endif diff --git a/JavaScriptCore/runtime/Structure.cpp b/JavaScriptCore/runtime/Structure.cpp index 0179eed..d06a239 100644 --- a/JavaScriptCore/runtime/Structure.cpp +++ b/JavaScriptCore/runtime/Structure.cpp @@ -233,7 +233,6 @@ Structure::Structure(JSValue prototype, const TypeInfo& typeInfo, unsigned anony , m_dictionaryKind(NoneDictionaryKind) , m_isPinnedPropertyTable(false) , m_hasGetterSetterProperties(false) - , m_hasNonEnumerableProperties(false) , m_attributesInPrevious(0) , m_specificFunctionThrashCount(0) , m_anonymousSlotCount(anonymousSlotCount) diff --git a/JavaScriptCore/wtf/BumpPointerAllocator.h b/JavaScriptCore/wtf/BumpPointerAllocator.h index 682283c..3deefe6 100644 --- a/JavaScriptCore/wtf/BumpPointerAllocator.h +++ b/JavaScriptCore/wtf/BumpPointerAllocator.h @@ -138,7 +138,10 @@ private: void destroy() { - m_allocation.deallocate(); + // Don't call deallocate on allocation, because allocation is *inside* allocation, + // and it will get deallocated before deallocate has completed! + PageAllocation allocation = m_allocation; + allocation.deallocate(); } static BumpPointerPool* ensureCapacityCrossPool(BumpPointerPool* previousPool, size_t size) diff --git a/JavaScriptCore/wtf/DateMath.cpp b/JavaScriptCore/wtf/DateMath.cpp index 675f093..f3627e6 100644 --- a/JavaScriptCore/wtf/DateMath.cpp +++ b/JavaScriptCore/wtf/DateMath.cpp @@ -379,7 +379,7 @@ int equivalentYearForDST(int year) return year; } -int32_t calculateUTCOffset() +static int32_t calculateUTCOffset() { #if PLATFORM(BREWMP) time_t localTime = static_cast(currentTime()); @@ -449,7 +449,7 @@ static double calculateDSTOffsetSimple(double localTimeSeconds, double utcOffset } // Get the DST offset, given a time in UTC -double calculateDSTOffset(double ms, double utcOffset) +static double calculateDSTOffset(double ms, double utcOffset) { // On Mac OS X, the call to localtime (see calculateDSTOffsetSimple) will return historically accurate // DST information (e.g. New Zealand did not have DST from 1946 to 1974) however the JavaScript diff --git a/JavaScriptCore/wtf/DateMath.h b/JavaScriptCore/wtf/DateMath.h index cb84708..be51947 100644 --- a/JavaScriptCore/wtf/DateMath.h +++ b/JavaScriptCore/wtf/DateMath.h @@ -84,10 +84,6 @@ int dayInYear(double ms, int year); int monthFromDayInYear(int dayInYear, bool leapYear); int dayInMonthFromDayInYear(int dayInYear, bool leapYear); -// Returns offset milliseconds for UTC and DST. -int32_t calculateUTCOffset(); -double calculateDSTOffset(double ms, double utcOffset); - } // namespace WTF using WTF::dateToDaysFrom1970; @@ -96,13 +92,10 @@ using WTF::dayInYear; using WTF::minutesPerHour; using WTF::monthFromDayInYear; using WTF::msPerDay; -using WTF::msPerMinute; using WTF::msPerSecond; using WTF::msToYear; using WTF::secondsPerMinute; using WTF::parseDateFromNullTerminatedCharacters; -using WTF::calculateUTCOffset; -using WTF::calculateDSTOffset; #if USE(JSC) namespace JSC { diff --git a/JavaScriptCore/wtf/OSAllocator.h b/JavaScriptCore/wtf/OSAllocator.h deleted file mode 100644 index 9d80714..0000000 --- a/JavaScriptCore/wtf/OSAllocator.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2010 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef OSAllocator_h -#define OSAllocator_h - -namespace WTF { - -class OSAllocator { -public: - static void* reserve(size_t); - static void* reserveAndCommit(size_t); - - static void commit(void*, size_t); - static void decommit(void*, size_t); - - static void release(void*, size_t); -}; - -} // namespace WTF - -using WTF::OSAllocator; - -#endif // OSAllocator_h diff --git a/JavaScriptCore/wtf/OSAllocatorPosix.cpp b/JavaScriptCore/wtf/OSAllocatorPosix.cpp deleted file mode 100644 index d1d4af5..0000000 --- a/JavaScriptCore/wtf/OSAllocatorPosix.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2010 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "OSAllocator.h" - -#if OS(UNIX) && !OS(SYMBIAN) - -#include -#include -#include -#include - -namespace WTF { - -void* OSAllocator::reserve(size_t bytes) -{ - // From a bookkeeping perspective, POSIX reservations start out in the committed state. - void* result = mmap(0, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); - if (result == MAP_FAILED) - CRASH(); -#if HAVE(MADV_FREE_REUSE) - while (madvise(result, bytes, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN) { } -#endif - return result; -} - -void* OSAllocator::reserveAndCommit(size_t bytes) -{ - // From a bookkeeping perspective, POSIX reservations start out in the committed state. - return reserve(bytes); -} - -void OSAllocator::commit(void* address, size_t bytes) -{ -#if HAVE(MADV_FREE_REUSE) - while (madvise(address, bytes, MADV_FREE_REUSE) == -1 && errno == EAGAIN) { } -#else - UNUSED_PARAM(address); - UNUSED_PARAM(bytes); -#endif -} - -void OSAllocator::decommit(void* address, size_t bytes) -{ -#if HAVE(MADV_FREE_REUSE) - while (madvise(address, bytes, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN) { } -#elif HAVE(MADV_FREE) - while (madvise(address, bytes, MADV_FREE) == -1 && errno == EAGAIN) { } -#elif HAVE(MADV_DONTNEED) - while (madvise(address, bytes, MADV_DONTNEED) == -1 && errno == EAGAIN) { } -#else - UNUSED_PARAM(address); - UNUSED_PARAM(bytes); -#endif -} - -void OSAllocator::release(void* address, size_t bytes) -{ - munmap(address, bytes); -} - -} // namespace WTF - -#endif diff --git a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp deleted file mode 100644 index c1cc08c..0000000 --- a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2010 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "OSAllocator.h" - -#if OS(SYMBIAN) - -#include - -namespace WTF { - -void* OSAllocator::reserve(size_t bytes) -{ - return fastMalloc(bytes); -} - -void* OSAllocator::reserveAndCommit(size_t bytes) -{ - return reserve(bytes); -} - -void OSAllocator::commit(void*, size_t) -{ -} - -void OSAllocator::decommit(void*, size_t) -{ -} - -void OSAllocator::release(void* address, size_t) -{ - fastFree(address); -} - -} // namespace WTF - -#endif diff --git a/JavaScriptCore/wtf/OSAllocatorWin.cpp b/JavaScriptCore/wtf/OSAllocatorWin.cpp deleted file mode 100644 index 384fe13..0000000 --- a/JavaScriptCore/wtf/OSAllocatorWin.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2010 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "OSAllocator.h" - -#if OS(WINDOWS) - -#include "windows.h" - -namespace WTF { - -void* OSAllocator::reserve(size_t bytes) -{ - return VirtualAlloc(0, bytes, MEM_RESERVE, PAGE_READWRITE); -} - -void* OSAllocator::reserveAndCommit(size_t bytes) -{ - return VirtualAlloc(0, bytes, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); -} - -void OSAllocator::commit(void* address, size_t bytes) -{ - VirtualAlloc(address, bytes, MEM_COMMIT, PAGE_READWRITE); -} - -void OSAllocator::decommit(void* address, size_t bytes) -{ - VirtualFree(address, bytes, MEM_DECOMMIT); -} - -void OSAllocator::release(void* address, size_t bytes) -{ - // According to http://msdn.microsoft.com/en-us/library/aa366892(VS.85).aspx, - // dwSize must be 0 if dwFreeType is MEM_RELEASE. - VirtualFree(address, 0, MEM_RELEASE); -} - -} // namespace WTF - -#endif diff --git a/JavaScriptCore/wtf/PageAllocation.h b/JavaScriptCore/wtf/PageAllocation.h index c13821c..26d53a5 100644 --- a/JavaScriptCore/wtf/PageAllocation.h +++ b/JavaScriptCore/wtf/PageAllocation.h @@ -29,7 +29,6 @@ #include #include #include -#include #if OS(DARWIN) #include @@ -267,11 +266,9 @@ inline PageAllocation PageAllocation::systemAllocateAligned(size_t size, Usage u inline void PageAllocation::systemDeallocate(bool) { - void* tmp = 0; - std::swap(tmp, m_base); - - int result = munmap(tmp, m_size); + int result = munmap(m_base, m_size); ASSERT_UNUSED(result, !result); + m_base = 0; } inline size_t PageAllocation::systemPageSize() @@ -306,16 +303,14 @@ inline PageAllocation PageAllocation::systemAllocateAligned(size_t size, Usage u inline void PageAllocation::systemDeallocate(bool committed) { - void* tmp = 0; - std::swap(tmp, m_base); - #if OS(WINCE) if (committed) - VirtualFree(tmp, m_size, MEM_DECOMMIT); + VirtualFree(m_base, m_size, MEM_DECOMMIT); #else UNUSED_PARAM(committed); #endif - VirtualFree(tmp, 0, MEM_RELEASE); + VirtualFree(m_base, 0, MEM_RELEASE); + m_base = 0; } inline size_t PageAllocation::systemPageSize() @@ -343,11 +338,9 @@ inline PageAllocation PageAllocation::systemAllocate(size_t size, Usage usage, b inline void PageAllocation::systemDeallocate(bool) { - void* tmp = 0; - std::swap(tmp, m_base); - m_chunk->Close(); delete m_chunk; + m_base = 0; } inline size_t PageAllocation::systemPageSize() diff --git a/JavaScriptCore/wtf/Vector3.h b/JavaScriptCore/wtf/Vector3.h new file mode 100644 index 0000000..1850929 --- /dev/null +++ b/JavaScriptCore/wtf/Vector3.h @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2010 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * its contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef WTF_Vector3_h +#define WTF_Vector3_h + +#include + +namespace WTF { + +class Vector3 { +public: + Vector3() + : m_x(0.0) + , m_y(0.0) + , m_z(0.0) + { + } + + Vector3(double x, double y, double z) + : m_x(x) + , m_y(y) + , m_z(z) + { + } + + Vector3(const float p[3]) + : m_x(p[0]) + , m_y(p[1]) + , m_z(p[2]) + { + } + + Vector3(const double p[3]) + : m_x(p[0]) + , m_y(p[1]) + , m_z(p[2]) + { + } + + double abs() const + { + return sqrt(m_x * m_x + m_y * m_y + m_z * m_z); + } + + bool isZero() const + { + return !m_x && !m_y && !m_z; + } + + void normalize() + { + double absValue = abs(); + if (!absValue) + return; + + double k = 1.0 / absValue; + m_x *= k; + m_y *= k; + m_z *= k; + } + + double x() const { return m_x; } + double y() const { return m_y; } + double z() const { return m_z; } + +private: + double m_x; + double m_y; + double m_z; +}; + +inline Vector3 operator+(const Vector3& v1, const Vector3& v2) +{ + return Vector3(v1.x() + v2.x(), v1.y() + v2.y(), v1.z() + v2.z()); +} + +inline Vector3 operator-(const Vector3& v1, const Vector3& v2) +{ + return Vector3(v1.x() - v2.x(), v1.y() - v2.y(), v1.z() - v2.z()); +} + +inline Vector3 operator*(double k, const Vector3& v) +{ + return Vector3(k * v.x(), k * v.y(), k * v.z()); +} + +inline Vector3 operator*(const Vector3& v, double k) +{ + return Vector3(k * v.x(), k * v.y(), k * v.z()); +} + +inline double dot(const Vector3& v1, const Vector3& v2) +{ + return v1.x() * v2.x() + v1.y() * v2.y() + v1.z() * v2.z(); +} + +inline Vector3 cross(const Vector3& v1, const Vector3& v2) +{ + double x3 = v1.y() * v2.z() - v1.z() * v2.y(); + double y3 = v1.z() * v2.x() - v1.x() * v2.z(); + double z3 = v1.x() * v2.y() - v1.y() * v2.x(); + return Vector3(x3, y3, z3); +} + +inline double distance(const Vector3& v1, const Vector3& v2) +{ + return (v1 - v2).abs(); +} + +} // WTF + +#endif // WTF_Vector3_h diff --git a/JavaScriptCore/wtf/text/CString.cpp b/JavaScriptCore/wtf/text/CString.cpp index 981d77a..db6443f 100644 --- a/JavaScriptCore/wtf/text/CString.cpp +++ b/JavaScriptCore/wtf/text/CString.cpp @@ -49,11 +49,8 @@ void CString::init(const char* str, size_t length) if (!str) return; - // We need to be sure we can add 1 to length without overflowing. - // Since the passed-in length is the length of an actual existing - // string, and we know the string doesn't occupy the entire address - // space, we can assert here and there's no need for a runtime check. - ASSERT(length < numeric_limits::max()); + if (length >= numeric_limits::max()) + CRASH(); m_buffer = CStringBuffer::create(length + 1); memcpy(m_buffer->mutableData(), str, length); diff --git a/JavaScriptCore/wtf/unicode/UTF8.cpp b/JavaScriptCore/wtf/unicode/UTF8.cpp index ca4fc1c..40c5609 100644 --- a/JavaScriptCore/wtf/unicode/UTF8.cpp +++ b/JavaScriptCore/wtf/unicode/UTF8.cpp @@ -26,14 +26,9 @@ #include "config.h" #include "UTF8.h" -#include "ASCIICType.h" - namespace WTF { namespace Unicode { -// FIXME: Use definition from CharacterNames.h. -const UChar replacementCharacter = 0xFFFD; - inline int inlineUTF8SequenceLengthNonASCII(char b0) { if ((b0 & 0xC0) != 0xC0) @@ -49,12 +44,12 @@ inline int inlineUTF8SequenceLengthNonASCII(char b0) inline int inlineUTF8SequenceLength(char b0) { - return isASCII(b0) ? 1 : inlineUTF8SequenceLengthNonASCII(b0); + return (b0 & 0x80) == 0 ? 1 : inlineUTF8SequenceLengthNonASCII(b0); } int UTF8SequenceLength(char b0) { - return isASCII(b0) ? 1 : inlineUTF8SequenceLengthNonASCII(b0); + return (b0 & 0x80) == 0 ? 1 : inlineUTF8SequenceLengthNonASCII(b0); } int decodeUTF8Sequence(const char* sequence) @@ -177,7 +172,7 @@ ConversionResult convertUTF16ToUTF8( bytesToWrite = 4; } else { bytesToWrite = 3; - ch = replacementCharacter; + ch = 0xFFFD; } target += bytesToWrite; @@ -236,23 +231,6 @@ static bool isLegalUTF8(const unsigned char* source, int length) static const UChar32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 0x03C82080UL, 0xFA082080UL, 0x82082080UL }; -static inline UChar32 readUTF8Sequence(const char*& sequence, unsigned length) -{ - UChar32 character = 0; - - // The cases all fall through. - switch (length) { - case 6: character += static_cast(*sequence++); character <<= 6; - case 5: character += static_cast(*sequence++); character <<= 6; - case 4: character += static_cast(*sequence++); character <<= 6; - case 3: character += static_cast(*sequence++); character <<= 6; - case 2: character += static_cast(*sequence++); character <<= 6; - case 1: character += static_cast(*sequence++); - } - - return character - offsetsFromUTF8[length - 1]; -} - ConversionResult convertUTF8ToUTF16( const char** sourceStart, const char* sourceEnd, UChar** targetStart, UChar* targetEnd, bool strict) @@ -261,52 +239,60 @@ ConversionResult convertUTF8ToUTF16( const char* source = *sourceStart; UChar* target = *targetStart; while (source < sourceEnd) { - int utf8SequenceLength = inlineUTF8SequenceLength(*source); - if (sourceEnd - source < utf8SequenceLength) { + UChar32 ch = 0; + int extraBytesToRead = inlineUTF8SequenceLength(*source) - 1; + if (source + extraBytesToRead >= sourceEnd) { result = sourceExhausted; break; } // Do this check whether lenient or strict - if (!isLegalUTF8(reinterpret_cast(source), utf8SequenceLength)) { + if (!isLegalUTF8(reinterpret_cast(source), extraBytesToRead + 1)) { result = sourceIllegal; break; } - - UChar32 character = readUTF8Sequence(source, utf8SequenceLength); + // The cases all fall through. + switch (extraBytesToRead) { + case 5: ch += static_cast(*source++); ch <<= 6; // remember, illegal UTF-8 + case 4: ch += static_cast(*source++); ch <<= 6; // remember, illegal UTF-8 + case 3: ch += static_cast(*source++); ch <<= 6; + case 2: ch += static_cast(*source++); ch <<= 6; + case 1: ch += static_cast(*source++); ch <<= 6; + case 0: ch += static_cast(*source++); + } + ch -= offsetsFromUTF8[extraBytesToRead]; if (target >= targetEnd) { - source -= utf8SequenceLength; // Back up source pointer! - result = targetExhausted; - break; + source -= (extraBytesToRead + 1); // Back up source pointer! + result = targetExhausted; break; } - - if (U_IS_BMP(character)) { + if (ch <= 0xFFFF) { // UTF-16 surrogate values are illegal in UTF-32 - if (U_IS_SURROGATE(character)) { + if (ch >= 0xD800 && ch <= 0xDFFF) { if (strict) { - source -= utf8SequenceLength; // return to the illegal value itself + source -= (extraBytesToRead + 1); // return to the illegal value itself result = sourceIllegal; break; } else - *target++ = replacementCharacter; + *target++ = 0xFFFD; } else - *target++ = character; // normal case - } else if (U_IS_SUPPLEMENTARY(character)) { + *target++ = (UChar)ch; // normal case + } else if (ch > 0x10FFFF) { + if (strict) { + result = sourceIllegal; + source -= (extraBytesToRead + 1); // return to the start + break; // Bail out; shouldn't continue + } else + *target++ = 0xFFFD; + } else { // target is a character in range 0xFFFF - 0x10FFFF if (target + 1 >= targetEnd) { - source -= utf8SequenceLength; // Back up source pointer! + source -= (extraBytesToRead + 1); // Back up source pointer! result = targetExhausted; break; } - *target++ = U16_LEAD(character); - *target++ = U16_TRAIL(character); - } else { - if (strict) { - source -= utf8SequenceLength; // return to the start - result = sourceIllegal; - break; // Bail out; shouldn't continue - } else - *target++ = replacementCharacter; + ch -= 0x0010000UL; + *target++ = (UChar)((ch >> 10) + 0xD800); + *target++ = (UChar)((ch & 0x03FF) + 0xDC00); } } *sourceStart = source; @@ -314,5 +300,5 @@ ConversionResult convertUTF8ToUTF16( return result; } -} // namespace Unicode -} // namespace WTF +} +} diff --git a/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h b/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h index 8959912..f865ef1 100644 --- a/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h +++ b/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h @@ -1,5 +1,4 @@ /* - * Copyright (C) 1999-2004, International Business Machines Corporation and others. All Rights Reserved. * Copyright (C) 2006 George Staikos * Copyright (C) 2006 Alexey Proskuryakov * Copyright (C) 2007 Apple Computer, Inc. All rights reserved. @@ -39,28 +38,11 @@ #define U16_TRAIL(supplementary) (UChar)(((supplementary)&0x3ff)|0xdc00) #define U16_LENGTH(c) ((uint32_t)(c) <= 0xffff ? 1 : 2) -#define U_IS_SUPPLEMENTARY(c) ((UChar32)((c)-0x10000)<=0xfffff) #define U_IS_SURROGATE(c) (((c)&0xfffff800)==0xd800) #define U16_IS_SINGLE(c) !U_IS_SURROGATE(c) #define U16_IS_SURROGATE(c) U_IS_SURROGATE(c) #define U16_IS_SURROGATE_LEAD(c) (((c)&0x400)==0) -#define U16_GET(s, start, i, length, c) { \ - (c)=(s)[i]; \ - if(U16_IS_SURROGATE(c)) { \ - uint16_t __c2; \ - if(U16_IS_SURROGATE_LEAD(c)) { \ - if((i)+1<(length) && U16_IS_TRAIL(__c2=(s)[(i)+1])) { \ - (c)=U16_GET_SUPPLEMENTARY((c), __c2); \ - } \ - } else { \ - if((i)-1>=(start) && U16_IS_LEAD(__c2=(s)[(i)-1])) { \ - (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \ - } \ - } \ - } \ -} - #define U16_PREV(s, start, i, c) { \ (c)=(s)[--(i)]; \ if(U16_IS_TRAIL(c)) { \ @@ -72,12 +54,6 @@ } \ } -#define U16_BACK_1(s, start, i) { \ - if(U16_IS_TRAIL((s)[--(i)]) && (i)>(start) && U16_IS_LEAD((s)[(i)-1])) { \ - --(i); \ - } \ -} - #define U16_NEXT(s, i, length, c) { \ (c)=(s)[(i)++]; \ if(U16_IS_LEAD(c)) { \ @@ -89,12 +65,7 @@ } \ } -#define U16_FWD_1(s, i, length) { \ - if(U16_IS_LEAD((s)[(i)++]) && (i)<(length) && U16_IS_TRAIL((s)[i])) { \ - ++(i); \ - } \ -} - #define U_MASK(x) ((uint32_t)1<<(x)) #endif + diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri index 0f7241c..1780334 100644 --- a/JavaScriptCore/wtf/wtf.pri +++ b/JavaScriptCore/wtf/wtf.pri @@ -13,9 +13,6 @@ SOURCES += \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ - wtf/OSAllocatorPosix.cpp \ - wtf/OSAllocatorSymbian.cpp \ - wtf/OSAllocatorWin.cpp \ wtf/qt/MainThreadQt.cpp \ wtf/qt/StringQt.cpp \ wtf/qt/ThreadingQt.cpp \ diff --git a/JavaScriptCore/yarr/RegexCompiler.cpp b/JavaScriptCore/yarr/RegexCompiler.cpp index e40c791..06ecbad 100644 --- a/JavaScriptCore/yarr/RegexCompiler.cpp +++ b/JavaScriptCore/yarr/RegexCompiler.cpp @@ -520,7 +520,7 @@ public: PatternTerm& term = currentAlternative->lastTerm(); ASSERT((term.type == PatternTerm::TypeParenthesesSubpattern) || (term.type == PatternTerm::TypeParentheticalAssertion)); - if ((term.type == PatternTerm::TypeParenthesesSubpattern) && term.invertOrCapture && (subpatternId == term.parentheses.subpatternId)) { + if ((term.type == PatternTerm::TypeParenthesesSubpattern) && term.invertOrCapture && (subpatternId == term.subpatternId)) { m_alternative->m_terms.append(PatternTerm::ForwardReference()); return; } @@ -595,7 +595,7 @@ public: term.quantify(min, QuantifierFixedCount); m_alternative->m_terms.append(copyTerm(term)); // NOTE: this term is interesting from an analysis perspective, in that it can be ignored..... - m_alternative->lastTerm().quantify((max == quantifyInfinite) ? max : max - min, greedy ? QuantifierGreedy : QuantifierNonGreedy); + m_alternative->lastTerm().quantify((max == UINT_MAX) ? max : max - min, greedy ? QuantifierGreedy : QuantifierNonGreedy); if (m_alternative->lastTerm().type == PatternTerm::TypeParenthesesSubpattern) m_alternative->lastTerm().parentheses.isCopy = true; } @@ -734,8 +734,7 @@ public: // This optimization identifies sets of parentheses that we will never need to backtrack. // In these cases we do not need to store state from prior iterations. // We can presently avoid backtracking for: - // * where the parens are at the end of the regular expression (last term in any of the - // alternatives of the main body disjunction). + // * a set of parens at the end of the regular expression (last term in any of the alternatives of the main body disjunction). // * where the parens are non-capturing, and quantified unbounded greedy (*). // * where the parens do not contain any capturing subpatterns. void checkForTerminalParentheses() @@ -746,13 +745,13 @@ public: return; Vector& alternatives = m_pattern.m_body->m_alternatives; - for (size_t i = 0; i < alternatives.size(); ++i) { + for (unsigned i =0; i < alternatives.size(); ++i) { Vector& terms = alternatives[i]->m_terms; if (terms.size()) { PatternTerm& term = terms.last(); if (term.type == PatternTerm::TypeParenthesesSubpattern && term.quantityType == QuantifierGreedy - && term.quantityCount == quantifyInfinite + && term.quantityCount == UINT_MAX && !term.capture()) term.parentheses.isTerminal = true; } diff --git a/JavaScriptCore/yarr/RegexInterpreter.cpp b/JavaScriptCore/yarr/RegexInterpreter.cpp index a51cd25..164158e 100644 --- a/JavaScriptCore/yarr/RegexInterpreter.cpp +++ b/JavaScriptCore/yarr/RegexInterpreter.cpp @@ -515,7 +515,8 @@ public: if (matchEnd == -1) return true; - ASSERT((matchBegin == -1) || (matchBegin <= matchEnd)); + ASSERT((matchBegin == -1) == (matchEnd == -1)); + ASSERT(matchBegin <= matchEnd); if (matchBegin == matchEnd) return true; @@ -557,7 +558,8 @@ public: int matchBegin = output[(term.atom.subpatternId << 1)]; int matchEnd = output[(term.atom.subpatternId << 1) + 1]; - ASSERT((matchBegin == -1) || (matchBegin <= matchEnd)); + ASSERT((matchBegin == -1) == (matchEnd == -1)); + ASSERT(matchBegin <= matchEnd); if (matchBegin == matchEnd) return false; @@ -717,7 +719,7 @@ public: if (term.capture()) { // Technically this access to inputPosition should be accessing the begin term's // inputPosition, but for repeats other than fixed these values should be - // the same anyway! (We don't pre-check for greedy or non-greedy matches.) + // the same anyway! (we don't pre-check for greedy or non-greedy matches.) ASSERT((&term - term.atom.parenthesesWidth)->type == ByteTerm::TypeParenthesesSubpatternOnceBegin); ASSERT((&term - term.atom.parenthesesWidth)->inputPosition == term.inputPosition); unsigned subpatternId = term.atom.subpatternId; @@ -737,7 +739,7 @@ public: { ASSERT(term.type == ByteTerm::TypeParenthesesSubpatternTerminalBegin); ASSERT(term.atom.quantityType == QuantifierGreedy); - ASSERT(term.atom.quantityCount == quantifyInfinite); + ASSERT(term.atom.quantityCount == UINT_MAX); ASSERT(!term.capture()); BackTrackInfoParenthesesTerminal* backTrack = reinterpret_cast(context->frame + term.frameLocation); @@ -763,7 +765,7 @@ public: { ASSERT(term.type == ByteTerm::TypeParenthesesSubpatternTerminalBegin); ASSERT(term.atom.quantityType == QuantifierGreedy); - ASSERT(term.atom.quantityCount == quantifyInfinite); + ASSERT(term.atom.quantityCount == UINT_MAX); ASSERT(!term.capture()); // If we backtrack to this point, we have failed to match this iteration of the parens. @@ -775,7 +777,7 @@ public: bool backtrackParenthesesTerminalEnd(ByteTerm&, DisjunctionContext*) { // 'Terminal' parentheses are at the end of the regex, and as such a match past end - // should always be returned as a successful match - we should never backtrack to here. + // should always be returned as a successful match - we should never becktrack to here. ASSERT_NOT_REACHED(); return false; } @@ -1826,7 +1828,7 @@ public: break; case PatternTerm::TypeBackReference: - atomBackReference(term.backReferenceSubpatternId, term.inputPosition - currentCountAlreadyChecked, term.frameLocation, term.quantityCount, term.quantityType); + atomBackReference(term.subpatternId, term.inputPosition - currentCountAlreadyChecked, term.frameLocation, term.quantityCount, term.quantityType); break; case PatternTerm::TypeForwardReference: diff --git a/JavaScriptCore/yarr/RegexJIT.cpp b/JavaScriptCore/yarr/RegexJIT.cpp index 1eac667..acbd458 100644 --- a/JavaScriptCore/yarr/RegexJIT.cpp +++ b/JavaScriptCore/yarr/RegexJIT.cpp @@ -624,7 +624,7 @@ class RegexGenerator : private MacroAssembler { add32(Imm32(1), countRegister); add32(Imm32(1), index); - if (term.quantityCount != quantifyInfinite) { + if (term.quantityCount != 0xffffffff) { branch32(NotEqual, countRegister, Imm32(term.quantityCount)).linkTo(loop, this); failures.append(jump()); } else @@ -662,7 +662,7 @@ class RegexGenerator : private MacroAssembler { loadFromFrame(term.frameLocation, countRegister); atEndOfInput().linkTo(hardFail, this); - if (term.quantityCount != quantifyInfinite) + if (term.quantityCount != 0xffffffff) branch32(Equal, countRegister, Imm32(term.quantityCount), hardFail); if (m_pattern.m_ignoreCase && isASCIIAlpha(ch)) { readCharacter(state.inputOffset(), character); @@ -749,7 +749,7 @@ class RegexGenerator : private MacroAssembler { add32(Imm32(1), countRegister); add32(Imm32(1), index); - if (term.quantityCount != quantifyInfinite) { + if (term.quantityCount != 0xffffffff) { branch32(NotEqual, countRegister, Imm32(term.quantityCount)).linkTo(loop, this); failures.append(jump()); } else diff --git a/JavaScriptCore/yarr/RegexParser.h b/JavaScriptCore/yarr/RegexParser.h index 8392cdf..a5c0ba2 100644 --- a/JavaScriptCore/yarr/RegexParser.h +++ b/JavaScriptCore/yarr/RegexParser.h @@ -33,8 +33,6 @@ namespace JSC { namespace Yarr { -static const unsigned quantifyInfinite = UINT_MAX; - enum BuiltInCharacterClassID { DigitClassID, SpaceClassID, @@ -58,7 +56,6 @@ private: ParenthesesUnmatched, ParenthesesTypeInvalid, CharacterClassUnmatched, - CharacterClassInvalidRange, CharacterClassOutOfOrder, EscapeUnterminated, NumberOfErrorCodes @@ -78,7 +75,7 @@ private: CharacterClassParserDelegate(Delegate& delegate, ErrorCode& err) : m_delegate(delegate) , m_err(err) - , m_state(Empty) + , m_state(empty) { } @@ -93,88 +90,65 @@ private: } /* - * atomPatternCharacter(): + * atomPatternCharacterUnescaped(): * - * This method is called either from parseCharacterClass() (for an unescaped - * character in a character class), or from parseEscape(). In the former case - * the value true will be passed for the argument 'hyphenIsRange', and in this - * mode we will allow a hypen to be treated as indicating a range (i.e. /[a-z]/ - * is different to /[a\-z]/). + * This method is called directly from parseCharacterClass(), to report a new + * pattern character token. This method differs from atomPatternCharacter(), + * which will be called from parseEscape(), since a hypen provided via this + * method may be indicating a character range, but a hyphen parsed by + * parseEscape() cannot be interpreted as doing so. */ - void atomPatternCharacter(UChar ch, bool hyphenIsRange = false) + void atomPatternCharacterUnescaped(UChar ch) { switch (m_state) { - case AfterCharacterClass: - // Following a builtin character class we need look out for a hyphen. - // We're looking for invalid ranges, such as /[\d-x]/ or /[\d-\d]/. - // If we see a hyphen following a charater class then unlike usual - // we'll report it to the delegate immediately, and put ourself into - // a poisoned state. Any following calls to add another character or - // character class will result in an error. (A hypen following a - // character-class is itself valid, but only at the end of a regex). - if (hyphenIsRange && ch == '-') { - m_delegate.atomCharacterClassAtom('-'); - m_state = AfterCharacterClassHyphen; - return; - } - // Otherwise just fall through - cached character so treat this as Empty. - - case Empty: + case empty: m_character = ch; - m_state = CachedCharacter; - return; + m_state = cachedCharacter; + break; - case CachedCharacter: - if (hyphenIsRange && ch == '-') - m_state = CachedCharacterHyphen; + case cachedCharacter: + if (ch == '-') + m_state = cachedCharacterHyphen; else { m_delegate.atomCharacterClassAtom(m_character); m_character = ch; } - return; + break; - case CachedCharacterHyphen: - if (ch < m_character) { + case cachedCharacterHyphen: + if (ch >= m_character) + m_delegate.atomCharacterClassRange(m_character, ch); + else m_err = CharacterClassOutOfOrder; - return; - } - m_delegate.atomCharacterClassRange(m_character, ch); - m_state = Empty; - return; - - case AfterCharacterClassHyphen: - // Error! We have something like /[\d-x]/. - m_err = CharacterClassInvalidRange; - return; + m_state = empty; } } /* + * atomPatternCharacter(): + * + * Adds a pattern character, called by parseEscape(), as such will not + * interpret a hyphen as indicating a character range. + */ + void atomPatternCharacter(UChar ch) + { + // Flush if a character is already pending to prevent the + // hyphen from begin interpreted as indicating a range. + if((ch == '-') && (m_state == cachedCharacter)) + flush(); + + atomPatternCharacterUnescaped(ch); + } + + /* * atomBuiltInCharacterClass(): * * Adds a built-in character class, called by parseEscape(). */ void atomBuiltInCharacterClass(BuiltInCharacterClassID classID, bool invert) { - switch (m_state) { - case CachedCharacter: - // Flush the currently cached character, then fall through. - m_delegate.atomCharacterClassAtom(m_character); - - case Empty: - case AfterCharacterClass: - m_state = AfterCharacterClass; - m_delegate.atomCharacterClassBuiltIn(classID, invert); - return; - - case CachedCharacterHyphen: - case AfterCharacterClassHyphen: - // Error! If we hit either of these cases, we have an - // invalid range that looks something like /[x-\d]/ - // or /[\d-\d]/. - m_err = CharacterClassInvalidRange; - return; - } + flush(); + m_delegate.atomCharacterClassBuiltIn(classID, invert); } /* @@ -184,12 +158,7 @@ private: */ void end() { - if (m_state == CachedCharacter) - m_delegate.atomCharacterClassAtom(m_character); - else if (m_state == CachedCharacterHyphen) { - m_delegate.atomCharacterClassAtom(m_character); - m_delegate.atomCharacterClassAtom('-'); - } + flush(); m_delegate.atomCharacterClassEnd(); } @@ -199,14 +168,21 @@ private: void atomBackReference(unsigned) { ASSERT_NOT_REACHED(); } private: + void flush() + { + if (m_state != empty) // either cachedCharacter or cachedCharacterHyphen + m_delegate.atomCharacterClassAtom(m_character); + if (m_state == cachedCharacterHyphen) + m_delegate.atomCharacterClassAtom('-'); + m_state = empty; + } + Delegate& m_delegate; ErrorCode& m_err; enum CharacterClassConstructionState { - Empty, - CachedCharacter, - CachedCharacterHyphen, - AfterCharacterClass, - AfterCharacterClassHyphen, + empty, + cachedCharacter, + cachedCharacterHyphen, } m_state; UChar m_character; }; @@ -452,7 +428,7 @@ private: break; default: - characterClassConstructor.atomPatternCharacter(consume(), true); + characterClassConstructor.atomPatternCharacterUnescaped(consume()); } if (m_err) @@ -596,13 +572,13 @@ private: case '*': consume(); - parseQuantifier(lastTokenWasAnAtom, 0, quantifyInfinite); + parseQuantifier(lastTokenWasAnAtom, 0, UINT_MAX); lastTokenWasAnAtom = false; break; case '+': consume(); - parseQuantifier(lastTokenWasAnAtom, 1, quantifyInfinite); + parseQuantifier(lastTokenWasAnAtom, 1, UINT_MAX); lastTokenWasAnAtom = false; break; @@ -621,7 +597,7 @@ private: unsigned max = min; if (tryConsume(',')) - max = peekIsDigit() ? consumeNumber() : quantifyInfinite; + max = peekIsDigit() ? consumeNumber() : UINT_MAX; if (tryConsume('}')) { if (min <= max) @@ -681,7 +657,6 @@ private: "unmatched parentheses", "unrecognized character after (?", "missing terminating ] for character class", - "invalid range in character class", "range out of order in character class", "\\ at end of pattern" }; @@ -863,7 +838,7 @@ private: */ template -const char* parse(Delegate& delegate, const UString& pattern, unsigned backReferenceLimit = quantifyInfinite) +const char* parse(Delegate& delegate, const UString& pattern, unsigned backReferenceLimit = UINT_MAX) { return Parser(delegate, pattern, backReferenceLimit).parse(); } diff --git a/JavaScriptCore/yarr/RegexPattern.h b/JavaScriptCore/yarr/RegexPattern.h index 8a7d35b..c76c641 100644 --- a/JavaScriptCore/yarr/RegexPattern.h +++ b/JavaScriptCore/yarr/RegexPattern.h @@ -107,7 +107,7 @@ struct PatternTerm { union { UChar patternCharacter; CharacterClass* characterClass; - unsigned backReferenceSubpatternId; + unsigned subpatternId; struct { PatternDisjunction* disjunction; unsigned subpatternId; @@ -162,7 +162,7 @@ struct PatternTerm { : type(TypeBackReference) , invertOrCapture(false) { - backReferenceSubpatternId = spatternId; + subpatternId = spatternId; quantityType = QuantifierFixedCount; quantityCount = 1; } diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog index 9693952..c7b2dce 100644 --- a/JavaScriptGlue/ChangeLog +++ b/JavaScriptGlue/ChangeLog @@ -1,9 +1,3 @@ -2010-12-01 Geoffrey Garen - - Build fix: Added a forwarding header. - - * ForwardingHeaders/wtf/OSAllocator.h: Added. - 2010-10-25 Oliver Hunt Reviewed by Gavin Barraclough. diff --git a/JavaScriptGlue/Configurations/Version.xcconfig b/JavaScriptGlue/Configurations/Version.xcconfig index ee86a20..d4cb8e7 100644 --- a/JavaScriptGlue/Configurations/Version.xcconfig +++ b/JavaScriptGlue/Configurations/Version.xcconfig @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 14; +MINOR_VERSION = 13; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); diff --git a/JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h b/JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h deleted file mode 100644 index 637611a..0000000 --- a/JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt new file mode 100644 index 0000000..0f0aac6 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange-expected.txt @@ -0,0 +1,16 @@ +Tests that document.createEvent() works with orientationChange + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + + +FAIL... orientationChange event doesn't appear to be enabled or implemented. + + +PASS successfullyParsed is true + +TEST COMPLETE + + + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html new file mode 100644 index 0000000..7a033e0 --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/create-event-onorientationchange.html @@ -0,0 +1,13 @@ + + + + + + +

+

+
+ + + + diff --git a/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js b/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js new file mode 100644 index 0000000..a63685b --- /dev/null +++ b/LayoutTests/fast/dom/DeviceOrientation/script-tests/create-event-onorientationchange.js @@ -0,0 +1,18 @@ +description('Tests that document.createEvent() works with orientationChange') + +function handleOrientationChange() +{ + document.getElementById('result').innerHTML = "PASS"; +} + +window.addEventListener('onorientationchange', handleOrientationChange, false); + +try { + var event = document.createEvent("OrientationEvent"); + event.initEvent("orientationchange", false, false); + window.dispatchEvent(event); +} catch(e) { + document.getElementById('result').innerHTML = "FAIL... orientationChange event doesn't appear to be enabled or implemented."; +} + +window.successfullyParsed = true; diff --git a/LayoutTests/fast/js/resources/standalone-pre.js b/LayoutTests/fast/js/resources/standalone-pre.js index b80c3cb..692f1c1 100644 --- a/LayoutTests/fast/js/resources/standalone-pre.js +++ b/LayoutTests/fast/js/resources/standalone-pre.js @@ -27,8 +27,6 @@ function testFailed(msg) function areArraysEqual(_a, _b) { - if (Object.prototype.toString.call(_a) != Object.prototype.toString.call([])) - return false; if (_a.length !== _b.length) return false; for (var i = 0; i < _a.length; i++) diff --git a/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt b/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt index 2fea061..6de4296 100644 --- a/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt +++ b/LayoutTests/storage/domstorage/localstorage/private-browsing-affects-storage-expected.txt @@ -1,7 +1,7 @@ This is a test to make sure that when private browsing is on any attempt to change the localStorage area fail. -Initial value of testItem is: null +Initial value of testItem is: InitialValue Caught exception trying to change item: Error: QUOTA_EXCEEDED_ERR: DOM Exception 22 -After change attempt, testItem is: null -After remove attempt, testItem is: null -After clear attempt, testItem is: null +After change attempt, testItem is: InitialValue +After remove attempt, testItem is: InitialValue +After clear attempt, testItem is: InitialValue diff --git a/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt b/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt index 58c99f2..ed2017a 100644 --- a/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt +++ b/LayoutTests/storage/domstorage/sessionstorage/private-browsing-affects-storage-expected.txt @@ -1,7 +1,7 @@ This is a test to make sure that when private browsing is on any attempt to change the sessionStorage area fail. -Initial value of testItem is: null +Initial value of testItem is: InitialValue Caught exception trying to change item: Error: QUOTA_EXCEEDED_ERR: DOM Exception 22 -After change attempt, testItem is: null -After remove attempt, testItem is: null -After clear attempt, testItem is: null +After change attempt, testItem is: InitialValue +After remove attempt, testItem is: InitialValue +After clear attempt, testItem is: InitialValue diff --git a/SunSpider/ChangeLog b/SunSpider/ChangeLog index 8241848..279a389 100644 --- a/SunSpider/ChangeLog +++ b/SunSpider/ChangeLog @@ -1,13 +1,3 @@ -2010-11-29 Geoffrey Garen - - Reviewed by Gavin Barraclough. - - Improved accuracy of command-line SunSpider. - - * resources/sunspider-standalone-driver.js: Use the returned number of - elapsed milliseconds from "run" and "checkSyntax" instead of measuring - ourselves, for slightly more accurate numbers. - 2010-09-16 Gavin Barraclough Reviewed by Mark Rowe. diff --git a/SunSpider/resources/sunspider-standalone-driver.js b/SunSpider/resources/sunspider-standalone-driver.js index 136e6b7..a015822 100644 --- a/SunSpider/resources/sunspider-standalone-driver.js +++ b/SunSpider/resources/sunspider-standalone-driver.js @@ -35,9 +35,10 @@ for (var j = 0; j < tests.length; j++) { var testName = suitePath + "/" + tests[j] + ".js"; var startTime = new Date; if (testName.indexOf('parse-only') >= 0) - times[j] = checkSyntax(testName); + checkSyntax(testName); else - times[j] = run(testName); + load(testName); + times[j] = new Date() - startTime; gc(); } diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt index f35da2f..fa3ce9c 100644 --- a/WebCore/CMakeLists.txt +++ b/WebCore/CMakeLists.txt @@ -539,6 +539,12 @@ IF (ENABLE_SVG) ENDIF() SET(WebCore_SOURCES + ${DERIVED_SOURCES_DIR}/DocTypeStrings.cpp + ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp + ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp + ${DERIVED_SOURCES_DIR}/ColorData.cpp + ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp + ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp ${DERIVED_SOURCES_DIR}/JSWebSocket.cpp @@ -1613,25 +1619,6 @@ SET(WebCore_SOURCES xml/XSLTUnicodeSort.cpp ) -SET(WebCore_CSS_PROPERTY_NAMES - ${WEBCORE_DIR}/css/CSSPropertyNames.in -) - -SET(WebCore_CSS_VALUE_KEYWORDS - ${WEBCORE_DIR}/css/CSSValueKeywords.in -) - -SET(WebCore_USER_AGENT_STYLE_SHEETS - ${WEBCORE_DIR}/css/html.css - ${WEBCORE_DIR}/css/mathml.css - ${WEBCORE_DIR}/css/mediaControls.css - ${WEBCORE_DIR}/css/mediaControlsGtk.css - ${WEBCORE_DIR}/css/quirks.css - ${WEBCORE_DIR}/css/svg.css - ${WEBCORE_DIR}/css/view-source.css - ${WEBCORE_DIR}/css/wml.css -) - IF (ENABLE_BLOB) LIST(APPEND WebCore_SOURCES fileapi/FileReader.cpp @@ -1942,14 +1929,6 @@ IF (ENABLE_SVG) svg/graphics/filters/SVGFilterBuilder.cpp svg/properties/SVGPathSegListPropertyTearOff.cpp ) - - LIST(APPEND WebCore_CSS_PROPERTY_NAMES - ${WEBCORE_DIR}/css/SVGCSSPropertyNames.in - ) - - LIST(APPEND WebCore_CSS_VALUE_KEYWORDS - ${WEBCORE_DIR}/css/SVGCSSValueKeywords.in - ) ENDIF() IF (ENABLE_VIDEO) @@ -2033,73 +2012,17 @@ GENERATE_INSPECTOR_FROM_IDL(inspector/Inspector.idl) LIST(APPEND WebCore_SOURCES ${JS_IDL_FILES} ${Inspector_IDL_FILES}) -MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData) -LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/ColorData.cpp) +GENERATE_ENTITIES(${WEBCORE_DIR}/html/parser/HTMLEntityNames.in ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/create-html-entity-table) +MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData) +ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/platform/graphics/Color.cpp ColorData.cpp) MAKE_HASH_TOOLS(${WEBCORE_DIR}/html/DocTypeStrings) -LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/DocTypeStrings.cpp) - - -# Generate HTML entity table -ADD_CUSTOM_COMMAND( - OUTPUT ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp - MAIN_DEPENDENCY ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in - DEPENDS ${WEBCORE_DIR}/html/parser/create-html-entity-table - COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in - VERBATIM) -LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp) - - -# Generate tokenizer -FILE(TO_NATIVE_PATH ${PERL_EXECUTABLE} PERL_EXECUTABLE_NATIVE_PATH) -ADD_CUSTOM_COMMAND( - OUTPUT ${DERIVED_SOURCES_DIR}/tokenizer.cpp - MAIN_DEPENDENCY ${WEBCORE_DIR}/css/maketokenizer - DEPENDS ${WEBCORE_DIR}/css/tokenizer.flex - COMMAND ${FLEX_EXECUTABLE} -t ${WEBCORE_DIR}/css/tokenizer.flex | ${PERL_EXECUTABLE_NATIVE_PATH} ${WEBCORE_DIR}/css/maketokenizer > ${DERIVED_SOURCES_DIR}/tokenizer.cpp - VERBATIM) -ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp) +ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLDocument.cpp DocTypeStrings.cpp) -# Generate CSS property names -ADD_CUSTOM_COMMAND ( - OUTPUT ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf - MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl - DEPENDS ${WebCore_CSS_PROPERTY_NAMES} - WORKING_DIRECTORY ${DERIVED_SOURCES_DIR} - COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in - COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makeprop.pl - VERBATIM) -LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp) -ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h) -ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSPropertyNames.h) - - -# Generate CSS value keywords -ADD_CUSTOM_COMMAND ( - OUTPUT ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp ${DERIVED_SOURCES_DIR}/CSSValueKeywords.gperf - MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makevalues.pl - DEPENDS ${WebCore_CSS_VALUE_KEYWORDS} - WORKING_DIRECTORY ${DERIVED_SOURCES_DIR} - COMMAND ${PERL_EXECUTABLE} -ne "print lc" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in - COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl - VERBATIM) -LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp) -ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h) -ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h) -ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSValueKeywords.h) - - -# Generate user agent styles -ADD_CUSTOM_COMMAND( - OUTPUT ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h - MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl - DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS} - COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS} - VERBATIM) -LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp) -ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h) +GENERATE_TOKENIZER() +GENERATE_USER_AGENT_STYLES() GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y ${DERIVED_SOURCES_DIR}/CSSGrammar.h ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp) @@ -2110,8 +2033,17 @@ GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_DIR LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XPathGrammar.cpp) +GENERATE_CSS_PROPERTY_NAMES() +GENERATE_CSS_VALUE_KEYWORDS() + +ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/HashTools.h DocTypeStrings.cpp CSSValueKeywords.cpp CSSPropertyNames.cpp ColorData.cpp) +ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSValueKeywords.h) +ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSPropertyNames.h) +ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h) +ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp) ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp) +ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h) GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "${HTML_FEATURES}") diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 9bddde5..77f0da5 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,2473 +1,3 @@ -2010-12-01 Geoffrey Garen - - Build fix: Added a forwarding header. - - * ForwardingHeaders/wtf/OSAllocator.h: Added. - -2010-12-01 Jia Pu - - Reviewed by Darin Adler. - - Support multiple correction candidates panel for misspelled word on Mac OS X. - https://bugs.webkit.org/show_bug.cgi?id=50137 - - - Test: platform/mac/editing/spelling/delete-autocorrected-word-1.html - Manual test: WebCore/manual-tests/autocorrection/dismiss-multiple-guesses.html - WebCore/manual-tests/autocorrection/select-from-multiple-guesses.html - - This patch is for supporting multiple correction suggestion panel on Mac OS X. - The behavior and implementation is similar to that of reversion candiate panel. - - * WebCore.exp.in: Added and removed symbols. - - * editing/CorrectionPanelInfo.h: Added new correction panel type, PanelTypeSpellingSuggestions. - - * editing/Editor.cpp: - (WebCore::markerTypesForAutocorrection): Convenient function for getting marker types to - be added to autocorrected word. - (WebCore::boundingBoxForRange): Convenient function for calculating the bounding box of a range. - (WebCore::markerTypesForReplacement): Convenient function for getting marker types to - be added to word that has been replaced by various correction panel. - (WebCore::Editor::respondToChangedSelection): Added code to trigger timer for multiple - suggestion panel. - (WebCore::Editor::guessesForMisspelledSelection): Adopted new signature of EditorClient::getGuessesForWord(). - (WebCore::Editor::markMisspellingsAfterTypingToWord): Adopted new signature of applyCorrectionPanelInfo(). - (WebCore::Editor::markAllMisspellingsAndBadGrammarInRanges): Ditto. - (WebCore::Editor::correctionPanelTimerFired): Added code to handle new multiple suggestion panel. - (WebCore::Editor::handleCorrectionPanelResult): Replaced handleRejectedCorrection(), since - with new AppKit correction panel API, not only rejection, but also confirmation can be - handled in callback. - (WebCore::Editor::stopCorrectionPanelTimer): Moved the code that clears correction panel info - from dismissCorrectionPanel() to this function to fix a bug that would occur when deleting - autocorrected word. - (WebCore::Editor::dismissCorrectionPanel): Ditto. - (WebCore::Editor::applyCorrectionPanelInfo): Added code to handle new multiple suggestion panel. - - * editing/Editor.h: Replaced handleRejectedCorrection() with handleCorrectionPanelResult(). - Changed the signature of applyCorrectionPanelInfo() to hanlde new correction panel type. - - * editing/TextCheckingHelper.cpp: - (WebCore::TextCheckingHelper::guessesForMisspelledOrUngrammaticalRange): Adopted new EditorClient::getGuessesForWord(). - - * editing/TextCheckingHelper.h: Made paragraphRange() public. - - * loader/EmptyClients.h: - (WebCore::EmptyEditorClient::showCorrectionPanel): Adopted new signature defined in base class. - (WebCore::EmptyEditorClient::getGuessesForWord): Ditto. - - * manual-tests/autocorrection/dismiss-multiple-guesses.html: Added. - - * manual-tests/autocorrection/select-from-multiple-guesses.html: Added. - - * page/EditorClient.h: Changed showCorrectionPanel() to allow passing multiple correction - candidates. Changed getGuessesForWord() to allow passing in contextual text for better - correction suggestions (for those spellcheckers that utilizes such contextual information). - -2010-12-01 David Hyatt - - Reviewed by James Robinson. - - https://bugs.webkit.org/show_bug.cgi?id=50360 - - Make sure to include the origin adjustment code that I added on Mac to keep truncation-rtl.html passing. - - * platform/ScrollView.cpp: - (WebCore::ScrollView::updateScrollbars): - -2010-12-01 David Hyatt - - Reviewed by Dan Bernstein. - - https://bugs.webkit.org/show_bug.cgi?id=46645 - - Generalize overflow section scrollOriginX code to be a point and to work in both horizontal - and vertical modes. - - Not testable yet, since the rightmost/leftmost/topmost/lowestPosition functions are returning - horrendously wrong values in the vertical text case for overflow:auto objects. - - * rendering/RenderLayer.cpp: - (WebCore::RenderLayer::RenderLayer): - (WebCore::RenderLayer::scrollToOffset): - (WebCore::RenderLayer::computeScrollDimensions): - (WebCore::RenderLayer::updateOverflowStatus): - * rendering/RenderLayer.h: - (WebCore::RenderLayer::scrolledContentOffset): - (WebCore::RenderLayer::scrollXOffset): - (WebCore::RenderLayer::scrollYOffset): - (WebCore::RenderLayer::scrollToXOffset): - (WebCore::RenderLayer::scrollToYOffset): - -2010-12-01 Steve Falkenburg - - Reviewed by Adam Roben. - - WinCairo build should not use link-time code generation (LTCG) - https://bugs.webkit.org/show_bug.cgi?id=50353 - - * WebCore.vcproj/QTMovieWin.vcproj: - * WebCore.vcproj/WebCore.vcproj: - -2010-12-01 David Hyatt - - Reviewed by Darin Adler. - - https://bugs.webkit.org/show_bug.cgi?id=46645 - - Part 1 of making scrolling work with vertical text. This patch generalizes the scrollOriginX concept - recently added for horizontal RTL documents and applies it to writing modes as well. Now the - scrollOrigin is a point, since you can start off locked to the bottom or locked to the right. - - This patch also fixes numerous bugs with the scrollOrigin code using native Mac NSScrollViews and - makes them behave the same as the cross-platform code (allowing for cross-platform results to be - landed). - - * page/FrameView.cpp: - (WebCore::FrameView::adjustViewSize): - * page/mac/WebCoreFrameView.h: - * platform/ScrollView.cpp: - (WebCore::ScrollView::ScrollView): - (WebCore::ScrollView::maximumScrollPosition): - (WebCore::ScrollView::minimumScrollPosition): - (WebCore::ScrollView::valueChanged): - (WebCore::ScrollView::updateScrollbars): - (WebCore::ScrollView::wheelEvent): - * platform/ScrollView.h: - (WebCore::ScrollView::scrollOrigin): - * platform/mac/ScrollViewMac.mm: - (WebCore::ScrollView::platformSetScrollPosition): - (WebCore::ScrollView::platformSetScrollOrigin): - * rendering/RenderBox.cpp: - (WebCore::RenderBox::paintRootBoxDecorations): - * rendering/RenderView.cpp: - (WebCore::RenderView::layout): - (WebCore::RenderView::docTop): - (WebCore::RenderView::docHeight): - (WebCore::RenderView::docLeft): - (WebCore::RenderView::docWidth): - * rendering/RenderView.h: - -2010-11-30 Steve Block - - Reviewed by Jeremy Orlow. - - Upstream recent changes to WebCore/platform/network/android - https://bugs.webkit.org/show_bug.cgi?id=50224 - - Android implementation changes only, no new tests. - - * platform/network/NetworkingContext.h: - * platform/network/android/CookieJarAndroid.cpp: - (WebCore::setCookies): - (WebCore::cookies): - (WebCore::cookieRequestHeaderFieldValue): - (WebCore::cookiesEnabled): - * platform/network/android/ProxyServerAndroid.cpp: Added. - (WebCore::proxyServersForURL): - * platform/network/android/ResourceHandleAndroid.cpp: - (WebCore::ResourceHandle::start): - (WebCore::ResourceHandle::loadResourceSynchronously): - * platform/network/android/ResourceRequestAndroid.cpp: - (WebCore::initializeMaximumHTTPConnectionCountPerHost): - -2010-12-01 Steve Falkenburg - - Reviewed by Adam Roben. - - vcproj changes can't be applied cleanly by the Windows EWS bot - https://bugs.webkit.org/show_bug.cgi?id=50328 - - * WebCore.vcproj/QTMovieWin.vcproj: Modified property svn:eol-style. - * WebCore.vcproj/QTMovieWinCommon.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCore.sln: Modified property svn:eol-style. - * WebCore.vcproj/WebCore.submit.sln: Modified property svn:eol-style. - * WebCore.vcproj/WebCore.vcproj: Modified property svn:eol-style. - * WebCore.vcproj/WebCoreCFNetwork.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreCG.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreCURL.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreCairo.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreCommon.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreGenerated.vcproj: Modified property svn:eol-style. - * WebCore.vcproj/WebCoreGeneratedCairo.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreGeneratedCommon.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreMediaQT.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCorePthreads.vsprops: Added property svn:eol-style. - * WebCore.vcproj/WebCoreQuartzCore.vsprops: Added property svn:eol-style. - -2010-11-30 Vangelis Kokkevis - - Reviewed by Darin Fisher. - - Adds accelerated compositing trigger flags to Settings to allow - ports to set them via command line flags, etc. - https://bugs.webkit.org/show_bug.cgi?id=50301 - - * page/Settings.cpp: - (WebCore::Settings::Settings): - (WebCore::Settings::setAcceleratedCompositingFor3DTransformsEnabled): - (WebCore::Settings::setAcceleratedCompositingForVideoEnabled): - (WebCore::Settings::setAcceleratedCompositingForPluginsEnabled): - (WebCore::Settings::setAcceleratedCompositingForCanvasEnabled): - (WebCore::Settings::setAcceleratedCompositingForAnimationEnabled): - * page/Settings.h: - (WebCore::Settings::acceleratedCompositingFor3DTransformsEnabled): - (WebCore::Settings::acceleratedCompositingForVideoEnabled): - (WebCore::Settings::acceleratedCompositingForPluginsEnabled): - (WebCore::Settings::acceleratedCompositingForCanvasEnabled): - (WebCore::Settings::acceleratedCompositingForAnimationEnabled): - -2010-12-01 Darin Adler - - Fixed warning seen on buildbot. - - * platform/graphics/chromium/ContentLayerChromium.cpp: - (WebCore::ContentLayerChromium::SharedValues::SharedValues): Added #if. - -2010-12-01 Ryosuke Niwa - - Reviewed by Darin Adler, Tony Chang, and unofficially by Enrica Casucci. - - chrome.dll!WebCore::RangeBoundaryPoint::toPosition ReadAV@NULL (cf0d0f28bc56f2591cc74f71b46036ea) - https://bugs.webkit.org/show_bug.cgi?id=47808 - - The crash was caused by moveParagraphWithClones' not copying the entire paragraph - when called by doApplyForSingleParagraph, which was induced by a bug in - cloneParagraphUnderNewElement which ended the cloning process early when the start node - and the end node didn't share the same parent node. Fixed the bug in cloneParagraphUnderNewElement - by calling traverseNextSibling(outerNode) instead of nextSibling(). - - Also added an early exit to InsertListCommand::doApply when lastSelectionRange is null. - - Tests: editing/execCommand/switch-multiple-list-items-crash.html - editing/execCommand/switch-multiple-list-items.html - - * editing/CompositeEditCommand.cpp: - (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement): - * editing/InsertListCommand.cpp: - (WebCore::InsertListCommand::doApply): - -2010-12-01 Kevin Ollivier - - [wx] Build fixes after recent trunk changes. - - * platform/graphics/wx/ImageBufferWx.cpp: - (WebCore::ImageBuffer::ImageBuffer): - * platform/wx/LocalizedStringsWx.cpp: - (WebCore::platformDefaultLanguage): - -2010-12-01 Sheriff Bot - - Unreviewed, rolling out r73047. - http://trac.webkit.org/changeset/73047 - https://bugs.webkit.org/show_bug.cgi?id=50339 - - missing bug number (Requested by rniwa on #webkit). - - * editing/CompositeEditCommand.cpp: - (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement): - * editing/InsertListCommand.cpp: - (WebCore::InsertListCommand::doApply): - -2010-12-01 Ryosuke Niwa - - Reviewed by Darin Adler, Tony Chang, and unofficially by Enrica Casucci. - - The crash was caused by moveParagraphWithClones' not copying the entire paragraph - when called by doApplyForSingleParagraph, which was induced by a bug in - cloneParagraphUnderNewElement which ended the cloning process early when the start node - and the end node didn't share the same parent node. Fixed the bug in cloneParagraphUnderNewElement - by calling traverseNextSibling(outerNode) instead of nextSibling(). - - Also added an early exit to InsertListCommand::doApply when lastSelectionRange is null. - - Tests: editing/execCommand/switch-multiple-list-items-crash.html - editing/execCommand/switch-multiple-list-items.html - - * editing/CompositeEditCommand.cpp: - (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement): - * editing/InsertListCommand.cpp: - (WebCore::InsertListCommand::doApply): - -2010-12-01 Grace Kloba - - Reviewed by Kenneth Russell. - - [chromium] ContentLayerChromium shader should honor the platform Sk_x_SHIFT value instead of assuming BGRA color - https://bugs.webkit.org/show_bug.cgi?id=50189 - - * platform/graphics/chromium/ContentLayerChromium.cpp: - (WebCore::ContentLayerChromium::SharedValues::SharedValues):Use SK_B32_SHIFT to decide whether to use RGBA or BGRA shader for Skia port. - -2010-12-01 Nico Weber - - Reviewed by Dimitri Glazkov. - - Fix clang warnings caused by -Wlogical-op-parentheses - https://bugs.webkit.org/show_bug.cgi?id=50324 - - * platform/graphics/mac/ComplexTextController.cpp: - (WebCore::ComplexTextController::adjustGlyphsAndAdvances): - -2010-12-01 Martin Robinson - - Build fix for GTK+. - - * platform/gtk/PopupMenuGtk.cpp: - (WebCore::PopupMenuGtk::typeAheadFind): Uncomment mistakenly commented line. - -2010-12-01 Apelete Seketeli and Martin Robinson - - Reviewed by Xan Lopez. - - [Gtk] Open menulists should support typeahead find - https://bugs.webkit.org/show_bug.cgi?id=27443 - - Added typeahead find support for open GTK+ menulists. - - Test: platform/gtk/fast/forms/menulist-typeahead-find.html - - * platform/gtk/PopupMenuGtk.cpp: - (WebCore::PopupMenuGtk::PopupMenuGtk): Initialize new members. - (WebCore::PopupMenuGtk::show): Track currently selected menu item - via a signal handler. - (WebCore::PopupMenuGtk::typeAheadFind): Added. - (WebCore::PopupMenuGtk::menuUnmapped): Reset typeahead find state - when menu is unmapped. - (WebCore::PopupMenuGtk::resetTypeAheadFindState): Added. - (WebCore::PopupMenuGtk::selectItemCallback): Added. - (WebCore::PopupMenuGtk::keyPressEventCallback): Added. - * platform/gtk/PopupMenuGtk.h: Added new members to track typeahead - find state. - -2010-12-01 Nikolas Zimmermann - - Reviewed by Xan Lopez. - - Split DECLARE_ANIMATED_PROPERTY* in DECLARE/DEFINE parts for SVGAnimatedNumber - https://bugs.webkit.org/show_bug.cgi?id=50323 - - Continuing the work on bug 42025: Introduce DECLARE_ANIMATED_NUMBER / DEFINE_ANIMATED_NUMBER. - The animated property declaration lives in the header, the definition in the cpp file, to avoid the dependency on SVGNames.h in all headers. - - No functional changes, thus no new tests. - - * svg/SVGAnimatedNumber.h: - * svg/SVGComponentTransferFunctionElement.cpp: - * svg/SVGComponentTransferFunctionElement.h: - * svg/SVGFECompositeElement.cpp: - * svg/SVGFECompositeElement.h: - * svg/SVGFEConvolveMatrixElement.cpp: - * svg/SVGFEConvolveMatrixElement.h: - * svg/SVGFEDiffuseLightingElement.cpp: - * svg/SVGFEDiffuseLightingElement.h: - * svg/SVGFEDisplacementMapElement.cpp: - * svg/SVGFEDisplacementMapElement.h: - * svg/SVGFEGaussianBlurElement.cpp: - * svg/SVGFEGaussianBlurElement.h: - * svg/SVGFELightElement.cpp: - * svg/SVGFELightElement.h: - * svg/SVGFEMorphologyElement.cpp: - * svg/SVGFEMorphologyElement.h: - * svg/SVGFEOffsetElement.cpp: - * svg/SVGFEOffsetElement.h: - * svg/SVGFESpecularLightingElement.cpp: - * svg/SVGFESpecularLightingElement.h: - * svg/SVGFETurbulenceElement.cpp: - * svg/SVGFETurbulenceElement.h: - * svg/SVGPathElement.cpp: - * svg/SVGPathElement.h: - * svg/SVGStopElement.cpp: - * svg/SVGStopElement.h: - (WebCore::SVGStopElement::isGradientStop): - -2010-12-01 Martin Robinson - - Reviewed by Xan Lopez. - - Sliders are not transformed after r50188 - https://bugs.webkit.org/show_bug.cgi?id=50317 - - Need to call updateLayerTransform during slider layout, as sliders - may be transformed. - - No new tests. This patch should make fast/forms/slider-transformed.html - pass on the GTK+ bots. - - * rendering/RenderSlider.cpp: - (WebCore::RenderSlider::layout): Call updateLayerTransform here. - -2010-11-30 Pavel Feldman - - Reviewed by Yury Semikhatsky. - - Web Inspector: do not make helpScreen.css lazily loaded. - https://bugs.webkit.org/show_bug.cgi?id=50304 - - * inspector/front-end/HelpScreen.js: - (WebInspector.HelpScreen): - (WebInspector.HelpScreen.prototype._onBlur): - * inspector/front-end/inspector.html: - -2010-12-01 Nikolas Zimmermann - - Reviewed by Xan Lopez. - - Split DECLARE_ANIMATED_PROPERTY* in DECLARE/DEFINE parts for SVGLengthList/SVGNumberList/SVGTransformList - https://bugs.webkit.org/show_bug.cgi?id=50322 - - Continuing the work on bug 42025: Introduce DECLARE_ANIMATED_(LENGTH|NUMBER|TRANSFORM)_LIST / DEFINE_ANIMATED_(LENGTH|NUMBER|TRANSFORM). - The animated property declaration lives in the header, the definition in the cpp file, to avoid the dependency on SVGNames.h in all headers. - - No functional changes, thus no new tests. - - * svg/SVGAnimatedLengthList.h: - * svg/SVGAnimatedNumberList.h: - * svg/SVGAnimatedTransformList.h: - * svg/SVGComponentTransferFunctionElement.cpp: - * svg/SVGComponentTransferFunctionElement.h: - * svg/SVGFEColorMatrixElement.cpp: - * svg/SVGFEColorMatrixElement.h: - * svg/SVGFEConvolveMatrixElement.cpp: - * svg/SVGFEConvolveMatrixElement.h: - * svg/SVGGradientElement.cpp: - * svg/SVGGradientElement.h: - (WebCore::SVGGradientElement::needsPendingResourceHandling): - * svg/SVGPatternElement.cpp: - * svg/SVGPatternElement.h: - * svg/SVGPolygonElement.cpp: - * svg/SVGPolylineElement.cpp: - * svg/SVGStyledTransformableElement.cpp: - * svg/SVGStyledTransformableElement.h: - * svg/SVGTextElement.cpp: - (WebCore::SVGTextElement::SVGTextElement): - * svg/SVGTextElement.h: - (WebCore::SVGTextElement::localCoordinateSpaceTransform): - * svg/SVGTextPositioningElement.cpp: - * svg/SVGTextPositioningElement.h: - * svg/properties/SVGAnimatedPropertyMacros.h: - -2010-12-01 Alexander Pavlov - - Reviewed by Yury Semikhatsky. - - Web Inspector: name-only property appears in style declaration but not in the Styles pane - https://bugs.webkit.org/show_bug.cgi?id=49663 - - Check that at least one property has been parsed from the user input. - - * inspector/InspectorStyleSheet.cpp: - (WebCore::InspectorStyle::setPropertyText): - -2010-12-01 Andrey Kosyakov - - Reviewed by Pavel Feldman. - - Web Inspector: disable cookies tab in network resource view by default, enable for chromium - https://bugs.webkit.org/show_bug.cgi?id=50249 - - * inspector/front-end/NetworkItemView.js: - (WebInspector.NetworkItemView): - (WebInspector.NetworkItemView.prototype.resize): - * inspector/front-end/Settings.js: - -2010-12-01 Nikolas Zimmermann - - Reviewed by Xan Lopez. - - Split DECLARE_ANIMATED_PROPERTY* in DECLARE/DEFINE parts for SVGLength - https://bugs.webkit.org/show_bug.cgi?id=50316 - - Introduce DECLARE_ANIMATED_LENGTH / DEFINE_ANIMATED_LENGTH, splitting up the original DECLARE_ANIMATED_PROPERTY_NEW macro - in a part that goes in the .cpp file and another that remains in the header. This avoids having to include SVGNames.h - in all SVG*Element files. - - No functional changes, thus no new tests. - - * svg/SVGAnimatedLength.h: - * svg/SVGCircleElement.cpp: - * svg/SVGCircleElement.h: - (WebCore::SVGCircleElement::isValid): - * svg/SVGCursorElement.cpp: - * svg/SVGCursorElement.h: - (WebCore::SVGCursorElement::isValid): - * svg/SVGEllipseElement.cpp: - * svg/SVGEllipseElement.h: - (WebCore::SVGEllipseElement::isValid): - * svg/SVGFilterElement.cpp: - * svg/SVGFilterElement.h: - * svg/SVGFilterPrimitiveStandardAttributes.cpp: - * svg/SVGFilterPrimitiveStandardAttributes.h: - * svg/SVGForeignObjectElement.cpp: - (WebCore::SVGForeignObjectElement::SVGForeignObjectElement): - * svg/SVGForeignObjectElement.h: - (WebCore::SVGForeignObjectElement::isValid): - * svg/SVGImageElement.cpp: - * svg/SVGImageElement.h: - (WebCore::SVGImageElement::isValid): - * svg/SVGLineElement.cpp: - * svg/SVGLineElement.h: - (WebCore::SVGLineElement::isValid): - (WebCore::SVGLineElement::supportsMarkers): - * svg/SVGLinearGradientElement.cpp: - * svg/SVGLinearGradientElement.h: - * svg/SVGMarkerElement.cpp: - (WebCore::SVGMarkerElement::SVGMarkerElement): - * svg/SVGMarkerElement.h: - * svg/SVGMaskElement.cpp: - * svg/SVGMaskElement.h: - (WebCore::SVGMaskElement::isValid): - (WebCore::SVGMaskElement::needsPendingResourceHandling): - * svg/SVGPatternElement.cpp: - * svg/SVGPatternElement.h: - (WebCore::SVGPatternElement::isValid): - (WebCore::SVGPatternElement::needsPendingResourceHandling): - * svg/SVGRadialGradientElement.cpp: - * svg/SVGRadialGradientElement.h: - * svg/SVGRectElement.cpp: - * svg/SVGRectElement.h: - (WebCore::SVGRectElement::isValid): - * svg/SVGSVGElement.cpp: - (WebCore::SVGSVGElement::SVGSVGElement): - * svg/SVGSVGElement.h: - (WebCore::SVGSVGElement::isValid): - (WebCore::SVGSVGElement::setContainerSize): - (WebCore::SVGSVGElement::containerSize): - (WebCore::SVGSVGElement::hasSetContainerSize): - (WebCore::SVGSVGElement::currentTranslate): - (WebCore::SVGSVGElement::timeContainer): - (WebCore::SVGSVGElement::isSVG): - (WebCore::SVGSVGElement::rendererIsNeeded): - * svg/SVGTextContentElement.cpp: - * svg/SVGTextContentElement.h: - (WebCore::SVGTextContentElement::isValid): - (WebCore::SVGTextContentElement::isTextContent): - * svg/SVGTextPathElement.cpp: - * svg/SVGTextPathElement.h: - * svg/SVGTextPositioningElement.h: - * svg/SVGUseElement.cpp: - * svg/SVGUseElement.h: - (WebCore::SVGUseElement::isValid): - (WebCore::SVGUseElement::setUpdatesBlocked): - (WebCore::SVGUseElement::isPendingResource): - * svg/properties/SVGAnimatedPropertyMacros.h: - -2010-12-01 Anton D'Auria - - Reviewed by Kevin Decker. - - Deny access to local and session storage in private browsing mode. - https://bugs.webkit.org/show_bug.cgi?id=49329 - - * storage/Storage.cpp: - (WebCore::Storage::length): - (WebCore::Storage::key): - (WebCore::Storage::getItem): - (WebCore::Storage::contains): - -2010-12-01 Philippe Normand - - Reviewed by Martin Robinson. - - Volume control not correctly initialized - https://bugs.webkit.org/show_bug.cgi?id=36299 - - Replaced the mute/volume Timers with g_timeouts which are (for - now, at least) more reliable than Timers for one-shot-fire-now - actions. - - Test: media/video-volume.html - - * platform/graphics/MediaPlayer.cpp: - (WebCore::MediaPlayer::~MediaPlayer): Reset the raw pointers to 0 - when destructing the player. - * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: - (WebCore::mediaPlayerPrivateVolumeChangeTimeoutCallback): - (WebCore::mediaPlayerPrivateMuteChangeTimeoutCallback): - (WebCore::MediaPlayerPrivateGStreamer::~MediaPlayerPrivateGStreamer): - (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVolumeChange): - (WebCore::MediaPlayerPrivateGStreamer::volumeChanged): - (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfMute): - (WebCore::MediaPlayerPrivateGStreamer::muteChanged): - (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Set - playbin2 volume/mute base on MediaPlayer related values. - * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: - -2010-12-01 Patrick Gansterer - - Reviewed by Andreas Kling. - - Cleanup main CMakeLists.txt after r72664, r72672 and r72667 - https://bugs.webkit.org/show_bug.cgi?id=50232 - - * CMakeLists.txt: Removed obsolete dependencies. - -2010-12-01 Nikolas Zimmermann - - Reviewed by Dirk Schulze. - - Cleanup SVGPropertyTraits - https://bugs.webkit.org/show_bug.cgi?id=50229 - - Move all template specializations for non-POD types (eg. SVGLength, SVGLengthList, etc.) from SVGPropertyTraits - into the right SVG* classes, to avoid having to include a dozen SVG*.h files in SVGPropertyTraits.h, which is - included by all DOM/JS/V8 binding files and SVGElement.h. - - No new functionality, thus no new tests. - - * GNUmakefile.am: - * WebCore.gypi: - * WebCore.pro: - * WebCore.xcodeproj/project.pbxproj: - * bindings/scripts/CodeGenerator.pm: - * bindings/scripts/CodeGeneratorObjC.pm: - * bindings/scripts/CodeGeneratorV8.pm: - * svg/SVGAngle.h: - * svg/SVGLength.h: - * svg/SVGLengthList.h: - * svg/SVGMarkerElement.h: - * svg/SVGNumberList.h: - * svg/SVGPatternElement.h: - * svg/SVGPointList.h: - * svg/SVGPreserveAspectRatio.h: - * svg/SVGRect.h: Added. - * svg/SVGSVGElement.h: - * svg/SVGStringList.h: - * svg/SVGSymbolElement.h: - * svg/SVGTransformList.h: - * svg/SVGViewElement.h: - * svg/SVGViewSpec.h: - * svg/properties/SVGListProperty.h: - * svg/properties/SVGPropertyTraits.h: - * svg/properties/SVGTransformListPropertyTearOff.h: - -2010-11-30 Kent Tamura - - Reviewed by Darin Adler. - - Refactor HTMLInputElement: Move a part of HTMLInputElement:: - defaultEventHandler() to InputTypes - https://bugs.webkit.org/show_bug.cgi?id=50097 - - Move all of keyboard-related event handling to InputType. - - No new tests because this should not change any behavior. - - * html/BaseButtonInputType.cpp: - (WebCore::BaseButtonInputType::handleKeydownEvent): - (WebCore::BaseButtonInputType::handleKeypressEvent): - (WebCore::BaseButtonInputType::handleKeyupEvent): - * html/BaseButtonInputType.h: - * html/BaseCheckableInputType.cpp: - (WebCore::BaseCheckableInputType::handleKeydownEvent): - (WebCore::BaseCheckableInputType::handleKeypressEvent): - * html/BaseCheckableInputType.h: - * html/CheckboxInputType.cpp: - (WebCore::CheckboxInputType::handleKeyupEvent): - * html/CheckboxInputType.h: - * html/HTMLInputElement.cpp: - (WebCore::HTMLInputElement::defaultEventHandler): - We remove !implicitSubmission check for callBaseClassEarly because - implicitSubmission can not be true for keydown event and keypress - event at this point. - * html/InputType.cpp: - (WebCore::InputType::shouldSubmitImplicitly): - Returns true for a keypress event with "\r". Note that we don't overload - this function for BUTTON, FILE, IMAGE, RESET, and SUBMIT because a - keypress event with "\r" for these types returns from HTMLInputElement::defaultEventHandler() - before implicit submission checking. - (WebCore::InputType::handleKeypressEvent): - (WebCore::InputType::handleKeyupEvent): - * html/InputType.h: - * html/RadioInputType.cpp: - (WebCore::RadioInputType::handleKeydownEvent): - (WebCore::RadioInputType::handleKeyupEvent): - * html/RadioInputType.h: - * html/TextFieldInputType.cpp: - (WebCore::TextFieldInputType::shouldSubmitImplicitly): - * html/TextFieldInputType.h: - ->>>>>>> .r73054 -2010-11-30 Patrick Gansterer - - Reviewed by Andreas Kling. - - Move CSS generator logic into main CMakeLists.txt file - https://bugs.webkit.org/show_bug.cgi?id=50230 - - * CMakeLists.txt: - -2010-11-30 Ojan Vafai - - Revert r72876. It caused a ~30% perf regression in chromium's bloat-http test - https://bugs.webkit.org/show_bug.cgi?id=50288 - - 2010-11-29 Adam Barth - Reviewed by Darin Adler. - Introduce the notion of a "display-isolated" URL scheme for use by Chrome-internal URLs - https://bugs.webkit.org/show_bug.cgi?id=50182 - A display-isolated URL can only be displayed (e.g., put in an iframe, - hyperlinked to) by documents from that scheme. In a sense, this is a - generalization of some of the protections we give file URLs, but - instead of lumping them all together into one "local" bucket, this - patch creates a separate bucket for each scheme. - For a while, I tried using a separate bucket for each origin. That - would have played nicely with what Blob URLs are trying to do, but some - "chrome" URL pages rely on being able to display other chrome URL - pages, even in different origins. For example, the New Tab Page shows - thumbnails from the "thumbnail" host. - This patch also removes a bunch of unused code. I've also propagated - the "deprecated" status of deprecatedCanDisplay to - deprecatedShouldTreatURLAsLocal because that method has no other - callers and is really asking for uppercase/lowercase bugs. I dream of - someday removing these functions. - page/SecurityOrigin.cpp: - (WebCore::SecurityOrigin::canDisplay): - (WebCore::SecurityOrigin::deprecatedCanDisplay): - platform/SchemeRegistry.cpp: - (WebCore::displayIsolatedURLSchemes): - (WebCore::SchemeRegistry::registerURLSchemeAsLocal): - (WebCore::SchemeRegistry::deprecatedShouldTreatURLAsLocal): - (WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal): - (WebCore::SchemeRegistry::registerURLSchemeAsDisplayIsolated): - (WebCore::SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated): - platform/SchemeRegistry.h: - 2010-11-29 Adam Barth - Reviewed by Darin Adler. - Introduce the notion of a "display-isolated" URL scheme for use by Chrome-internal URLs - https://bugs.webkit.org/show_bug.cgi?id=50182 - This patch adds a Chromium API for registering schemes as - display-isolated. In a subsequent patch, I'll change the "chrome" - scheme in Chrome to be display isolated instead of local. That will - prevent file URLs from linking to chrome URLs. - public/WebSecurityPolicy.h: - src/WebSecurityPolicy.cpp: - (WebKit::WebSecurityPolicy::registerURLSchemeAsDisplayIsolated): - - * page/SecurityOrigin.cpp: - (WebCore::SecurityOrigin::canDisplay): - (WebCore::SecurityOrigin::deprecatedCanDisplay): - * platform/SchemeRegistry.cpp: - (WebCore::SchemeRegistry::registerURLSchemeAsLocal): - (WebCore::SchemeRegistry::removeURLSchemeRegisteredAsLocal): - (WebCore::SchemeRegistry::localURLSchemes): - (WebCore::SchemeRegistry::shouldTreatURLAsLocal): - (WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal): - * platform/SchemeRegistry.h: - -2010-11-30 Chris Fleizach - - Reviewed by Beth Dakin. - - WebKit duplicates AXValue and AXDescription on abbr - https://bugs.webkit.org/show_bug.cgi?id=50260 - - stringValue() and accessibilityDescription() were returning the same value for static text with - an aria-label. Static text elements should not have an accessibility description, they - should only have a stringValue. - - Test: platform/mac/accessibility/static-text-with-aria-label.html - - * accessibility/AccessibilityRenderObject.cpp: - (WebCore::AccessibilityRenderObject::ariaAccessibilityDescription): - (WebCore::AccessibilityRenderObject::accessibilityDescription): - (WebCore::AccessibilityRenderObject::text): - * accessibility/AccessibilityRenderObject.h: - -2010-11-30 Ryosuke Niwa - - Reviewed by Darin Adler. - - [HTML5] Rename member variables of HTMLScriptElement - https://bugs.webkit.org/show_bug.cgi?id=49705 - - Renamed m_wasCreatedByParser to m_wasInsertedByParser, m_requested to m_isExternalScript, - m_isEvaluated to m_wasAlreadyStarted, and m_firedLoad to m_haveFiredLoad. - - Also made ScriptElement's haveFiredLoadEvent and removed HTMLScriptElement's haveFiredLoadEvent. - This effectively adds the same function to SVGScriptElement, which isn't currently used anywhere. - - No new tests are added since this is a refactoring. - - * dom/ScriptElement.cpp: - (WebCore::ScriptElement::ScriptElement): - (WebCore::ScriptElement::insertedIntoDocument): - (WebCore::ScriptElement::childrenChanged): - (WebCore::ScriptElement::finishParsingChildren): - (WebCore::ScriptElement::requestScript): - (WebCore::ScriptElement::evaluateScript): - (WebCore::ScriptElement::executeScript): - (WebCore::ScriptElement::ignoresLoadRequest): - * dom/ScriptElement.h: - (WebCore::ScriptElement::haveFiredLoadEvent): - (WebCore::ScriptElement::setHaveFiredLoadEvent): - (WebCore::ScriptElement::wasInsertedByParser): - (WebCore::ScriptElement::wasAlreadyStarted): - * html/HTMLScriptElement.cpp: - (WebCore::HTMLScriptElement::HTMLScriptElement): - (WebCore::HTMLScriptElement::create): - (WebCore::HTMLScriptElement::cloneElementWithoutAttributesAndChildren): - * html/HTMLScriptElement.h: - * svg/SVGScriptElement.cpp: - (WebCore::SVGScriptElement::SVGScriptElement): - (WebCore::SVGScriptElement::create): - (WebCore::SVGScriptElement::svgAttributeChanged): - (WebCore::SVGScriptElement::insertedIntoDocument): - (WebCore::SVGScriptElement::dispatchLoadEvent): - (WebCore::SVGScriptElement::cloneElementWithoutAttributesAndChildren): - * svg/SVGScriptElement.h: - -2010-11-30 Darin Adler - - Rolled back most of the FileReaderLoader changes to fix 32-bit builds. - - * fileapi/FileReaderLoader.cpp: Changed types back to unsigned from unsigned long long - * fileapi/FileReaderLoader.h: Ditto. - -2010-11-30 Dan Bernstein - - Reviewed by Darin Adler. - - Text search should treat all matches as word-start matches when the target begins with a separator character - https://bugs.webkit.org/show_bug.cgi?id=50302 - - * editing/TextIterator.cpp: - (WebCore::SearchBuffer::SearchBuffer): Disable the AtWordStarts option if it was specified and - the target string begins with one of the "separator" characters. - -2010-11-30 Pavel Feldman - - Reviewed by Dave Hyatt. - - Web Inspector: [CRASH] on "Revert to this revision" of style with import. - https://bugs.webkit.org/show_bug.cgi?id=50256 - - Rolled back one line from http://trac.webkit.org/changeset/36904 as agreed with - David. - - * css/CSSImportRule.cpp: - (WebCore::CSSImportRule::insertedIntoParent): - -2010-11-30 Martin Robinson - - Reviewed by Xan Lopez. - - [GTK] fillRect shadow has incorrect behavior when using ctx.scale(x,y) - https://bugs.webkit.org/show_bug.cgi?id=50283 - - Adjust the mask rectangle for Cairo shadows, so that the origin - is not affected by the scale of the transformation matrix. - - * platform/graphics/ContextShadow.h: Make this Qt-only member global. - * platform/graphics/cairo/ContextShadowCairo.cpp: - (WebCore::ContextShadow::beginShadowLayer): Save the original layer area. - (WebCore::ContextShadow::endShadowLayer): If the target context has a scale - transform, make sure not to scale the blur distance when blitting the shadow. - -2010-11-30 Darin Adler - - Reviewed by Alexey Proskuryakov. - - Make ProgressEvent 64-bit instead of 32-bit - https://bugs.webkit.org/show_bug.cgi?id=50289 - - * dom/ProgressEvent.cpp: - (WebCore::ProgressEvent::ProgressEvent): Changed arguments to unsigned long long. - (WebCore::ProgressEvent::initProgressEvent): Ditto. - - * dom/ProgressEvent.h: Fixed formatting. Changed types to unsigned long long. - Made isProgressEvent override private. - - * dom/ProgressEvent.idl: Tweaked formatting and changed types to unsigned long long. - - * fileapi/FileReader.cpp: Removed unneeded includes. - Used static on const so we'd get an error if the same constant was in a header. - (WebCore::FileReader::didReceiveData): Removed unneeded WTF prefix. - (WebCore::FileReader::fireEvent): Got rid of local variables that would narrow - bytes loaded and total bytes to 32-bit. - - * fileapi/FileReaderLoader.cpp: - (WebCore::FileReaderLoader::didReceiveResponse): Restructured code a bit and - added comments. Also added handling for when ArrayBuffer::create returns 0. - (WebCore::FileReaderLoader::didReceiveData): Fixed handling of case where more - data arrives than is expected so it won't overrun the buffer. Also broke an - assertion into two and improved a comment. - - * fileapi/FileReaderLoader.h: Changed bytesLoaded and totalBytes to unsigned long long. - - * fileapi/FileWriter.cpp: - (WebCore::FileWriter::fireEvent): Removed narrowing casts in call to - ProgressEvent::create. - - * html/canvas/ArrayBuffer.cpp: - (WebCore::ArrayBuffer::tryAllocate): Added a comment because the code here seems wrong. - - * xml/XMLHttpRequest.cpp: - (WebCore::XMLHttpRequest::didSendData): Removed narrowing casts in call to - XMLHttpRequestProgressEvent::create. - (WebCore::XMLHttpRequest::didReceiveData): Removed narrowing casts in call to - dispatchProgressEvent. - - * xml/XMLHttpRequestProgressEvent.h: Fixed formatting. Changed types to unsigned long long. - Made isXMLHttpRequestProgressEvent override private. - - * xml/XMLHttpRequestProgressEvent.idl: Tweaked formatting and changed types to unsigned long long. - - * xml/XMLHttpRequestProgressEventThrottle.cpp: - (WebCore::XMLHttpRequestProgressEventThrottle::dispatchProgressEvent): Changed types to - unsigned long long. - - * xml/XMLHttpRequestProgressEventThrottle.h: Changed types to unsigned long long. - -2010-11-30 Yael Aharon - - Reviewed by Darin Adler. - - Progress and meter elements should take a form in their constructor like any other form control. - https://bugs.webkit.org/show_bug.cgi?id=50195 - - Tests: fast/dom/HTMLMeterElement/meter-element-form.html - fast/dom/HTMLProgressElement/progress-element-form.html - - * html/HTMLMeterElement.cpp: - (WebCore::HTMLMeterElement::HTMLMeterElement): - (WebCore::HTMLMeterElement::create): - * html/HTMLMeterElement.h: - * html/HTMLProgressElement.h: - * html/HTMLTagNames.in: - -2010-11-30 Tony Chang - - Reviewed by Adam Barth. - - [chromium] fix get-int-identifier-special-values.html using TestNetscapePlugIn - https://bugs.webkit.org/show_bug.cgi?id=49036 - - No new tests: Covered by plugins/npruntime/get-int-identifier-special-values.html - - In http://codereview.chromium.org/11574, the forked chromium test - plugin changed how it testGetIntIdentifier to work around a change - caused by a silverlight specific plugin fix: - http://codereview.chromium.org/11569/diff/1/2 - - It's not clear to me that this change is needed anymore since - silverlight has had multiple releases, testing without this patch - works on a test windows build, and safari win seems to run silverlight - without this either. Since there's no test for this behavior, I'm - rolling it out so we can match the upstream test. - - * bindings/v8/V8NPUtils.cpp: - (WebCore::convertV8ObjectToNPVariant): - -2010-11-30 Chris Guillory - - Reviewed by Chris Fleizach. - - Computing style on a stale node while sending pending accessibility notification. - https://bugs.webkit.org/show_bug.cgi?id=50162 - - Retain node pointer members of AccessibilityImageMapLink. - - Test: accessibility/image-map-title-causes-crash.html - - * accessibility/AccessibilityImageMapLink.cpp: - (WebCore::AccessibilityImageMapLink::parentObject): - (WebCore::AccessibilityImageMapLink::anchorElement): - (WebCore::AccessibilityImageMapLink::url): - (WebCore::AccessibilityImageMapLink::elementRect): - * accessibility/AccessibilityImageMapLink.h: - (WebCore::AccessibilityImageMapLink::areaElement): - (WebCore::AccessibilityImageMapLink::mapElement): - (WebCore::AccessibilityImageMapLink::node): - * dom/Document.cpp: - (WebCore::Document::clearAXObjectCache): - -2010-11-30 James Robinson - - Reviewed by Tony Chang. - - Build fix - add parens in foo || bar && baz to make gcc happy - https://bugs.webkit.org/show_bug.cgi?id=50276 - - gcc 4.4 warns that statements of the form "foo || bar && baz". It wants - parens around the "bar && baz" part to make it clear which way the logical - operators bind. - - * editing/TextIterator.cpp: - (WebCore::SearchBuffer::search): - -2010-11-30 Daniel Bates - - Reviewed by David Hyatt. - - Focused should use CSS properties of instead of associated - https://bugs.webkit.org/show_bug.cgi?id=49888 - - Fixes an issue where the CSS properties of an were not used when - the was focused. - - Currently, when focusing an (say by pressing option + tab in Mac - Safari) we use the CSS style information for the associated with - the . Instead, we should use the CSS style information for the - focused . In particular, this will make the us honor the outline- - color property of a focused when drawing its focus ring. - - Tests: fast/images/imagemap-focus-ring-outline-color-explicitly-inherited-from-map.html - fast/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html - fast/images/imagemap-focus-ring-outline-color.html - - * rendering/RenderImage.cpp: - (WebCore::RenderImage::paintFocusRing): Use the style information of - the focused when drawing the focus ring for it. - -2010-11-30 Tony Chang - - Reviewed by James Robinson. - - [chromium] enable WebCore compiler warnings on Linux take 3 - https://bugs.webkit.org/show_bug.cgi?id=50258 - - * WebCore.gyp/WebCore.gyp: - -2010-11-30 Mario Sanchez Prada - - Reviewed by Chris Fleizach. - - [GTK] Implement ROLE_COMBO_BOX - https://bugs.webkit.org/show_bug.cgi?id=25678 - - Implement the remaining bits for combo boxes. - - This patch finishes the implementation, from the point of view of - the Atk library, of those objects exposed to ATK as combo boxes, - and their related elements (menus and menu items). It therefore - implements the proper interfaces for each type of object related - to combo boxes (AtkSelection for the combo box, AtkText for every - menu item and AtkAction for the combo box, the menu and the menu - items), takes care of emitting the proper signals when focus or a - given a selection changes and adds a new unit test to check all - this new stuff. - - Make possible to ask an AccessibleMenuListOption for a sensible - string representation, so far only available through the private - and MSAA related method nameForMSAA. Just moved the implementation - of that method to an overriden version of stringValue(), which is - platform independent, and called that from nameForMSAA(). - - * accessibility/AccessibilityMenuListOption.h: - * accessibility/AccessibilityMenuListOption.cpp: - (WebCore::AccessibilityMenuListOption::nameForMSAA): Just call to - stringValue(), which holds from now on that used to be here. - (WebCore::AccessibilityMenuListOption::stringValue): New, override - of AccessibilityObject::stringValue() to return a proper string. - - Emit the missing signals when a selection is made. - - * accessibility/gtk/AXObjectCacheAtk.cpp: - (WebCore::AXObjectCache::postPlatformNotification): Emit the usual - 'focus' signals when a selection is made over the combo box. - - * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: - (setAtkStateSetFromCoreObject): Ensure the EXPANDABLE and EXPANDED - Atk states are added to the state set when needed. - (listObjectForSelection): New, returns the proper list object (the - one holding the list of available options as its children) for an - specific AtkObject implementing AtkSelection. This is needed - because sometimes the selectable options are not directly children - of the AtkSelection object (i.e. a combo box has a 'menu' object - as its only child of it, holding the list of options as children). - (optionFromList): Use listObjectForSelection() to get the actual - object holding the list of children as the available options. - (optionFromSelection): Add support for combo boxes. - (webkit_accessible_selection_add_selection): Ditto. - (webkit_accessible_selection_clear_selection): Ditto. - (webkit_accessible_selection_get_selection_count): Ditto. - (webkit_accessible_selection_is_child_selected): Ditto. - (webkit_accessible_selection_remove_selection): Ditto. - (webkit_accessible_text_get_text): Makes sure stringValue() is - considered to get the result substring when it was already - considered when checking the maximum text length for the object. - (getInterfaceMaskFromObject): Make sure the AtkSelection interface - is implemented for the combo boxes, that the AtkText is - implemented for the menu items and that the AtkAction interface is - now implemented for every object (WebCore will decide what to do). - - Avoid a segfault crash when using this from unit tests. - - * platform/gtk/PopupMenuGtk.cpp: - (WebCore::PopupMenuGtk::show): Make sure we got a valid GdkWindow - before calling gdk_window_get_origin() over it. - -2010-11-30 Andreas Kling - - Reviewed by Tor Arne Vestbø. - - [Qt] GraphicsContext: Avoid unnecessarily copying the painter's QTransform - - Stash the transform in a const reference (QPainter::transform() returns one) - instead of making a copy in the shadow drawing parts of fillPath, strokePath and fillRect. - - * platform/graphics/qt/GraphicsContextQt.cpp: - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - (WebCore::GraphicsContext::fillRect): - -2010-11-30 Vangelis Kokkevis - - Reviewed by Simon Fraser. - - Provide more fine grained control to ports over when to turn on - accelerated compositing. - https://bugs.webkit.org/show_bug.cgi?id=49998 - - The RenderLayerCompositor now checks with the chrome client whether - 3d transforms, video, plugins, canvas and animation require - switching over to the composited path. Layers that overlap composited - content will still turn into composited layers regardless of the - setting. - - * css/MediaQueryEvaluator.cpp: - (WebCore::transform_3dMediaFeatureEval): - * page/ChromeClient.h: - (WebCore::ChromeClient::allowedCompositingTriggers): - * rendering/RenderLayer.cpp: - (WebCore::RenderLayer::canRender3DTransforms): - (WebCore::RenderLayer::updateTransform): - (WebCore::RenderLayer::currentTransform): - * rendering/RenderLayer.h: - * rendering/RenderLayerBacking.cpp: - (WebCore::RenderLayerBacking::updateLayerTransform): - * rendering/RenderLayerCompositor.cpp: - (WebCore::RenderLayerCompositor::RenderLayerCompositor): - (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags): - (WebCore::RenderLayerCompositor::canRender3DTransforms): - (WebCore::RenderLayerCompositor::requiresCompositingLayer): - (WebCore::RenderLayerCompositor::requiresCompositingForTransform): - (WebCore::RenderLayerCompositor::requiresCompositingForVideo): - (WebCore::RenderLayerCompositor::requiresCompositingForCanvas): - (WebCore::RenderLayerCompositor::requiresCompositingForPlugin): - (WebCore::RenderLayerCompositor::requiresCompositingForAnimation): - * rendering/RenderLayerCompositor.h: - -2010-11-30 Xan Lopez - - Reviewed by Martin Robinson. - - [GTK] Plug leak in SoupCache - https://bugs.webkit.org/show_bug.cgi?id=50142 - - Free the cache file contents when we don't need them anymore. - - * platform/network/soup/cache/webkit/soup-cache.c: - (webkit_soup_cache_load): - -2010-11-30 Andras Becsi - - Reviewed by Csaba Osztrogonác. - - [Qt][V8] Make QtWebKit with V8 build on Linux. - https://bugs.webkit.org/show_bug.cgi?id=50244 - - No new tests needed. - - * WebCore.pri: add missing idl file - * WebCore.pro: enable Linux build - * bindings/scripts/CodeGeneratorV8.pm: add missing headers - * bindings/v8/ScriptControllerQt.cpp: fix instantiation - (WebCore::ScriptController::qtScriptEngine): - * bindings/v8/V8GCController.cpp: fix guard - (WebCore::V8GCController::checkMemoryUsage): - * inspector/CodeGeneratorInspector.pm: add missing header - * loader/ResourceLoadScheduler.cpp: ditto - * loader/cache/MemoryCache.cpp: ditto - * loader/loader.cpp: ditto - -2010-11-30 David Hyatt - - Reviewed by Simon Fraser. - - https://bugs.webkit.org/show_bug.cgi?id=50183 - - Code got commented out by accident during render tree refactoring last year. Put the code back in, since - it hurts performance to have that line commented out. - - In order to put this code back in, I had to fix some bugs with preferred width computations and - overflow: scroll. Make the pref widths computation create the scrollbar if it doesn't exist yet. - - Make sure the scrollbar size is included prior to checking for defined width/min-width/max-width values. Otherwise - the scrollbar inflates the width beyond the fixed size that was specified. - - For table cells, there is an additional wrinkle. Make sure not to include the scrollbar size as part of the minimum - intrinsic width so that we don't incorrectly grow. - - * rendering/RenderBlock.cpp: - (WebCore::RenderBlock::layoutPositionedObjects): - (WebCore::RenderBlock::computePreferredLogicalWidths): - * rendering/RenderFlexibleBox.cpp: - (WebCore::RenderFlexibleBox::computePreferredLogicalWidths): - -2010-11-30 Vitaly Repeshko - - Unreviewed. - - Attempt to fix windows debug chromium build. - - * html/TimeInputType.cpp: Added include providing isfinite. - -2010-11-30 Darin Adler - - Reviewed by Jon Honeycutt. - - DOM binding code generator scripts import unused File::stat Perl module - https://bugs.webkit.org/show_bug.cgi?id=50250 - - * bindings/scripts/CodeGeneratorCPP.pm: Removed "using File::stat". - * bindings/scripts/CodeGeneratorJS.pm: Ditto. - * bindings/scripts/CodeGeneratorObjC.pm: Ditto. - * bindings/scripts/CodeGeneratorV8.pm: Ditto. - -2010-11-30 Pavel Feldman - - Reviewed by Yury Semikhatsky. - - Web Inspector: implement "Revert to this revision" in resources panel. - https://bugs.webkit.org/show_bug.cgi?id=50107 - - * inspector/Inspector.idl: - * inspector/InspectorCSSAgent.cpp: - (WebCore::InspectorCSSAgent::setStyleSheetText2): - * inspector/InspectorCSSAgent.h: - * inspector/InspectorStyleSheet.cpp: - (WebCore::InspectorStyleSheet::reparseStyleSheet): - * inspector/front-end/CSSStyleModel.js: - (WebInspector.CSSStyleModel.prototype._styleSheetChanged.callback): - (WebInspector.CSSStyleModel.prototype._styleSheetChanged): - (WebInspector.CSSStyleModel.prototype._onRevert): - * inspector/front-end/Resource.js: - (WebInspector.Resource.prototype.get contentTimestamp): - (WebInspector.Resource.prototype.setInitialContent): - (WebInspector.Resource.prototype.isLocallyModified): - (WebInspector.Resource.prototype.setContent.else.finished): - (WebInspector.Resource.prototype.setContent): - (WebInspector.Resource.prototype.revertToThis.callback): - (WebInspector.Resource.prototype.revertToThis): - (WebInspector.Resource.prototype.get baseRevision): - (WebInspector.Resource.prototype._innerRequestContent): - * inspector/front-end/ResourcesPanel.js: - (WebInspector.ResourcesPanel.prototype._showResourceView): - (WebInspector.FrameResourceTreeElement.prototype._contentChanged): - (WebInspector.ResourceRevisionTreeElement): - (WebInspector.ResourceRevisionTreeElement.prototype.onattach): - (WebInspector.ResourceRevisionTreeElement.prototype._ondragstart): - (WebInspector.ResourceRevisionTreeElement.prototype._handleContextMenuEvent): - * inspector/front-end/ScriptsPanel.js: - (WebInspector.ScriptsPanel.prototype.editScriptSource.mycallback): - (WebInspector.ScriptsPanel.prototype.editScriptSource): - * inspector/front-end/SourceView.js: - (WebInspector.SourceView.prototype._editLine): - (WebInspector.SourceView.prototype._editLineComplete): - (WebInspector.SourceView.prototype._revertEditLine): - -2010-11-30 Adam Roben - - Clean up WebCore.vcproj's bindings filter - - I added files that we compile (via an all-in-one file) but weren't in - the .vcproj, removed files that no longer exist, and added the scripts - we use. - - Fixes WebCore.vcproj's bindings filter is - out-of-date - - Reviewed by Darin Adler. - - * WebCore.vcproj/WebCore.vcproj: - -2010-11-30 Adam Roben - - Move JSIDB* files to the DerivedSources filter - - This correctly reflects their location on disk. (They were formerly - listed under bindings/js.) - - * WebCore.vcproj/WebCore.vcproj: - -2010-11-30 Xiaomei Ji - - Reviewed by David Hyatt. - - Remove clampNegativeToZero in adjustScrollPositionWithinRange. - https://bugs.webkit.org/show_bug.cgi?id=50203 - - * platform/ScrollView.cpp: - (WebCore::ScrollView::adjustScrollPositionWithinRange): - -2010-11-30 Adam Roben - - Remove duplicate files from WebCore.vcproj - - Rubber-stamped by Steve Falkenburg. - - * WebCore.vcproj/WebCore.vcproj: - -2010-11-30 Adam Roben - - Let VS do its thang with WebCore.vcproj - - I just removed and readded AnimationBase.cpp. - - Rubber-stamped by Steve Falkenburg. - - * WebCore.vcproj/WebCore.vcproj: - -2010-11-30 Mario Sanchez Prada - - Reviewed by Chris Fleizach. - - ASSERT failing for combo boxes when selection changes - https://bugs.webkit.org/show_bug.cgi?id=50062 - - Don't call listBoxOnChange for elements using menu lists. - - Test: fast/forms/select-option-accesskey-crash.html - - * dom/SelectElement.cpp: - (WebCore::SelectElement::accessKeySetSelectedIndex): Extra check - to decide whether to call menuListOnChange() or listBoxOnChange() - instead of always calling listBoxOnChange(). - -2010-11-30 Andreas Kling - - Reviewed by Dirk Schulze. - - GraphicsContext: Remove "current path" and have strokePath, fillPath and clipPath take a Path argument. - https://bugs.webkit.org/show_bug.cgi?id=48516 - - No new tests, this is refactoring only. - - fillPath() -> fillPath(const Path&) - strokePath() -> strokePath(const Path&) - clipPath(WindRule) -> clipPath(const Path&, WindRule) - - drawPath() was only used by CG, so made it PLATFORM(CG) specific. - - The Qt, CG and Cairo implementations are best-effort. - For the rest, I've put beginPath/addPath and FIXMEs in the three affected methods. - - * WebCore.exp.in: - * html/canvas/CanvasRenderingContext2D.cpp: - (WebCore::CanvasRenderingContext2D::fill): - (WebCore::CanvasRenderingContext2D::stroke): - * inspector/InspectorController.cpp: - (WebCore::drawOutlinedQuad): - * mathml/RenderMathMLRoot.cpp: - (WebCore::RenderMathMLRoot::paint): - * mathml/RenderMathMLSquareRoot.cpp: - (WebCore::RenderMathMLSquareRoot::paint): - * platform/graphics/GraphicsContext.h: - * platform/graphics/GraphicsContextPrivate.h: - * platform/graphics/cairo/GraphicsContextCairo.cpp: - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - (WebCore::GraphicsContext::clipPath): - * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h: - * platform/graphics/cg/GraphicsContextCG.cpp: - (WebCore::GraphicsContext::drawEllipse): - (WebCore::addConvexPolygonToPath): - (WebCore::GraphicsContext::drawConvexPolygon): - (WebCore::GraphicsContext::clipConvexPolygon): - (WebCore::GraphicsContext::drawPath): - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - (WebCore::GraphicsContext::fillRoundedRect): - (WebCore::GraphicsContext::clipPath): - * platform/graphics/haiku/GraphicsContextHaiku.cpp: - (WebCore::GraphicsContext::strokePath): - (WebCore::GraphicsContext::fillPath): - * platform/graphics/openvg/GraphicsContextOpenVG.cpp: - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - (WebCore::GraphicsContext::clipPath): - * platform/graphics/qt/GraphicsContextQt.cpp: - (WebCore::GraphicsContext::restorePlatformState): - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - (WebCore::GraphicsContext::clipPath): - (WebCore::GraphicsContext::strokeRect): - (WebCore::GraphicsContext::translate): - (WebCore::GraphicsContext::rotate): - (WebCore::GraphicsContext::scale): - (WebCore::GraphicsContext::concatCTM): - * platform/graphics/skia/GraphicsContextSkia.cpp: - (WebCore::GraphicsContext::clipPath): - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - * platform/graphics/wince/GraphicsContextWinCE.cpp: - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - (WebCore::GraphicsContext::clipPath): - * platform/graphics/wx/GraphicsContextWx.cpp: - (WebCore::GraphicsContext::clipPath): - (WebCore::GraphicsContext::fillPath): - (WebCore::GraphicsContext::strokePath): - * rendering/RenderBoxModelObject.cpp: - (WebCore::RenderBoxModelObject::paintBorder): - (WebCore::RenderBoxModelObject::paintBoxShadow): - * rendering/RenderEmbeddedObject.cpp: - (WebCore::RenderEmbeddedObject::paintReplaced): - * rendering/RenderObject.cpp: - (WebCore::RenderObject::drawBoxSideFromPath): - * rendering/RenderSVGResource.h: - (WebCore::RenderSVGResource::postApplyResource): - * rendering/RenderSVGResourceClipper.cpp: - (WebCore::RenderSVGResourceClipper::pathOnlyClipping): - * rendering/RenderSVGResourceFilter.cpp: - (WebCore::RenderSVGResourceFilter::postApplyResource): - * rendering/RenderSVGResourceFilter.h: - * rendering/RenderSVGResourceGradient.cpp: - (WebCore::RenderSVGResourceGradient::applyResource): - * rendering/RenderSVGResourceGradient.h: - * rendering/RenderSVGResourcePattern.cpp: - (WebCore::RenderSVGResourcePattern::postApplyResource): - * rendering/RenderSVGResourcePattern.h: - * rendering/RenderSVGResourceSolidColor.cpp: - (WebCore::RenderSVGResourceSolidColor::postApplyResource): - * rendering/RenderSVGResourceSolidColor.h: - * rendering/SVGRenderSupport.cpp: - (WebCore::SVGRenderSupport::finishRenderSVGContent): - * rendering/svg/RenderSVGPath.cpp: - (WebCore::RenderSVGPath::fillAndStrokePath): - * rendering/svg/SVGInlineTextBox.cpp: - (WebCore::SVGInlineTextBox::releasePaintingResource): - (WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting): - (WebCore::SVGInlineTextBox::paintDecorationWithStyle): - * rendering/svg/SVGInlineTextBox.h: - * svg/SVGFont.cpp: - (WebCore::Font::drawTextUsingSVGFont): - -2010-11-30 Alexey Proskuryakov - - Reviewed by Darin Adler and Geoff Garen. - - https://bugs.webkit.org/show_bug.cgi?id=44152 - CSSOM should match DOM in discarding wrapper-less parents. - - We have existing behaviors where parent objects in detached subtrees are not preserved: - - if a root of a node tree doesn't have a wrapper, it's immediately destroyed, making - its children parentNode attribute null; - - relationship between a - - - - -Dismiss Multiple Guesses Test - - -

This test verifies that pressing ESC key diusmisses multiple guesses panel correctly

-

After seeing the panel with multiple candidates, pressing ESC key to dismiss the panel.

-

Note, this test can fail due to user specific spell checking data. To fix this, remove all files in ~/Library/Spelling, then kill AppleSpell.service process.

-
- -
- - - - - - diff --git a/WebCore/manual-tests/autocorrection/select-from-multiple-guesses.html b/WebCore/manual-tests/autocorrection/select-from-multiple-guesses.html deleted file mode 100644 index dc8881f..0000000 --- a/WebCore/manual-tests/autocorrection/select-from-multiple-guesses.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - -Select From Multiple Guesses Test - - -

This test verifies that multiple guesses on mispelled word is working correctly

-

After seeing the panel with multiple candidates, use left and/or right arrow key to select the desired candidate, and then use return key to confirm. You can also use this test to test that pressing ESC key will dismiss the panel.

-

Note, this test can fail due to user specific spell checking data. To fix this, remove all files in ~/Library/Spelling, then kill AppleSpell.service process.

-
- -
- - - - - - diff --git a/WebCore/manual-tests/input-type-datetime-default-value.html b/WebCore/manual-tests/input-type-datetime-default-value.html deleted file mode 100644 index 8be15d8..0000000 --- a/WebCore/manual-tests/input-type-datetime-default-value.html +++ /dev/null @@ -1,80 +0,0 @@ - - -Default values for date/time input (type= date, datetime, datetime-local, month, time, week) - -

Enter Up or Down, or click the spin buttons for each input field.

- -
-
    -
  • Emtpy values, no steps -
      -
    • date: -
    • datetime: -
    • datetime-local: -
    • month: -
    • time: -
    • week -
    -
  • Invalid values, no steps -
      -
    • date: -
    • datetime: -
    • datetime-local: -
    • month: -
    • time: -
    • week -
    -
  • Emtpy values, invalid steps -
      -
    • date: -
    • datetime: -
    • datetime-local: -
    • month: -
    • time: -
    • week -
    -
  • Invalid values, invalid steps -
      -
    • date: -
    • datetime: -
    • datetime-local: -
    • month: -
    • time: -
    • week -
    -
  • Emtpy values, step=any -
      s -
    • date: -
    • datetime: -
    • datetime-local: -
    • month: -
    • time: -
    • week -
    -
  • Invalid values, step=any -
      -
    • date: -
    • datetime: -
    • datetime-local: -
    • month: -
    • time: -
    • week -
    -
-
- -

The input fields should show the current local/UTC date/time (with + or - a unit date/time described below except for step=any).

- -

Unit dates/times

-
    -
  • date: 1 day (local time) -
  • datetime: 1 minute (UTC) -
  • datetime-local: 1 minute (local time) -
  • month: 1 month (local time) -
  • time: 1 minute (local time) -
  • week: 1 week (local time) -
- -

As for step=any, the values don't change by stepping-up/-down.

- - diff --git a/WebCore/mathml/RenderMathMLRoot.cpp b/WebCore/mathml/RenderMathMLRoot.cpp index f0a7abb..ba60c9f 100644 --- a/WebCore/mathml/RenderMathMLRoot.cpp +++ b/WebCore/mathml/RenderMathMLRoot.cpp @@ -167,7 +167,9 @@ void RenderMathMLRoot::paint(PaintInfo& info, int tx, int ty) // draw to end root.addLineTo(leftEnd); - info.context->strokePath(root); + info.context->beginPath(); + info.context->addPath(root); + info.context->strokePath(); info.context->save(); @@ -179,6 +181,8 @@ void RenderMathMLRoot::paint(PaintInfo& info, int tx, int ty) mask.addLineTo(topLeft); mask.addLineTo(FloatPoint(2 * topLeft.x() - leftEnd.x(), 2 * topLeft.y() - leftEnd.y())); + info.context->beginPath(); + info.context->addPath(mask); info.context->clip(mask); // Draw the thick part of the root. @@ -189,7 +193,9 @@ void RenderMathMLRoot::paint(PaintInfo& info, int tx, int ty) line.moveTo(bottomLeft); line.addLineTo(topLeft); - info.context->strokePath(line); + info.context->beginPath(); + info.context->addPath(line); + info.context->strokePath(); info.context->restore(); diff --git a/WebCore/mathml/RenderMathMLSquareRoot.cpp b/WebCore/mathml/RenderMathMLSquareRoot.cpp index 1285acd..862d8a4 100644 --- a/WebCore/mathml/RenderMathMLSquareRoot.cpp +++ b/WebCore/mathml/RenderMathMLSquareRoot.cpp @@ -132,8 +132,10 @@ void RenderMathMLSquareRoot::paint(PaintInfo& info, int tx, int ty) root.addLineTo(topLeft); // draw to end root.addLineTo(leftEnd); - - info.context->strokePath(root); + + info.context->beginPath(); + info.context->addPath(root); + info.context->strokePath(); info.context->save(); @@ -145,6 +147,8 @@ void RenderMathMLSquareRoot::paint(PaintInfo& info, int tx, int ty) mask.addLineTo(topLeft); mask.addLineTo(FloatPoint(2 * topLeft.x() - leftEnd.x(), 2 * topLeft.y() - leftEnd.y())); + info.context->beginPath(); + info.context->addPath(mask); info.context->clip(mask); // Draw the thick part of the root. @@ -155,7 +159,9 @@ void RenderMathMLSquareRoot::paint(PaintInfo& info, int tx, int ty) line.moveTo(bottomLeft); line.addLineTo(topLeft); - info.context->strokePath(line); + info.context->beginPath(); + info.context->addPath(line); + info.context->strokePath(); info.context->restore(); diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h index d224726..0725f46 100644 --- a/WebCore/page/ChromeClient.h +++ b/WebCore/page/ChromeClient.h @@ -236,19 +236,6 @@ namespace WebCore { // Returns whether or not the client can render the composited layer, // regardless of the settings. virtual bool allowsAcceleratedCompositing() const { return true; } - - enum CompositingTrigger { - ThreeDTransformTrigger = 1 << 0, - VideoTrigger = 1 << 1, - PluginTrigger = 1 << 2, - CanvasTrigger = 1 << 3, - AnimationTrigger = 1 << 4, - AllTriggers = 0xFFFFFFFF - }; - typedef unsigned CompositingTriggerFlags; - - // Returns a bitfield indicating conditions that can trigger the compositor. - virtual CompositingTriggerFlags allowedCompositingTriggers() const { return static_cast(AllTriggers); } #endif virtual bool supportsFullscreenForNode(const Node*) { return false; } diff --git a/WebCore/page/Console.cpp b/WebCore/page/Console.cpp index 219647d..34db538 100644 --- a/WebCore/page/Console.cpp +++ b/WebCore/page/Console.cpp @@ -137,7 +137,7 @@ void Console::addMessage(MessageSource source, MessageType type, MessageLevel le addMessage(source, type, level, message, lineNumber, sourceURL, 0); } -void Console::addMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL, PassRefPtr callStack) +void Console::addMessage(MessageSource source, MessageType type, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL, PassOwnPtr callStack) { Page* page = this->page(); if (!page) @@ -162,7 +162,7 @@ void Console::addMessage(MessageSource source, MessageType type, MessageLevel le printf(" %s\n", message.utf8().data()); } -void Console::addMessage(MessageType type, MessageLevel level, PassRefPtr arguments, PassRefPtr callStack, bool acceptNoArguments) +void Console::addMessage(MessageType type, MessageLevel level, PassOwnPtr arguments, PassOwnPtr callStack, bool acceptNoArguments) { Page* page = this->page(); if (!page) @@ -194,39 +194,39 @@ void Console::addMessage(MessageType type, MessageLevel level, PassRefPtr