[haiku-webkit-commits] r427 - webkit/trunk
- From: webkit@xxxxxxxxxxxxxxx
- To: haiku-webkit-commits@xxxxxxxxxxxxx
- Date: Mon, 19 Apr 2010 21:12:02 +0000
Author: mmlr
Date: Mon Apr 19 21:12:01 2010
New Revision: 427
URL: http://mmlr.dyndns.org/changeset/427
Log:
Commit the mergelog from the original two webkit merges.
Added:
webkit/trunk/mergelog.log
Added: webkit/trunk/mergelog.log
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ webkit/trunk/mergelog.log Mon Apr 19 21:12:01 2010 (r427)
@@ -0,0 +1,674 @@
+--- Merging (from foreign repository) r54662 through r54683 into 'local':
+U local/JavaScriptCore/runtime/Collector.cpp
+U local/JavaScriptCore/runtime/CollectorHeapIterator.h
+U local/JavaScriptCore/runtime/Collector.h
+U local/JavaScriptCore/ChangeLog
+U local/JavaScriptCore/JavaScriptCore.exp
+U local/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
+U local/WebKit/mac/ChangeLog
+U local/WebKit/mac/Misc/WebCoreStatistics.h
+U local/WebKit/mac/Misc/WebCoreStatistics.mm
+U local/WebKit/chromium/ChangeLog
+U local/WebKit/chromium/src/js/ProfilerAgent.js
+U local/WebKit/win/WebView.cpp
+U local/WebCore/WebCore.pro
+U local/WebCore/ChangeLog
+U local/WebCore/WebCore.vcproj/WebCore.vcproj
+U local/WebCore/page/DOMWindow.idl
+U local/WebCore/GNUmakefile.am
+U local/WebCore/platform/graphics/GraphicsContext3D.h
+U local/WebCore/WebCore.gypi
+U local/WebCore/bindings/scripts/CodeGeneratorV8.pm
+U local/WebCore/bindings/v8/V8DOMWrapper.cpp
+U local/WebCore/bindings/v8/V8DOMWrapper.h
+A local/WebCore/rendering/BidiRun.cpp
+U local/WebCore/rendering/RenderSVGModelObject.cpp
+U local/WebCore/rendering/RenderBlockLineLayout.cpp
+A local/WebCore/rendering/InlineIterator.h
+U local/WebCore/rendering/RenderBlock.h
+U local/WebCore/rendering/SVGRenderSupport.cpp
+U local/WebCore/rendering/RenderSVGImage.cpp
+U local/WebCore/rendering/RenderSVGText.cpp
+U local/WebCore/rendering/RenderSVGRoot.h
+A local/WebCore/rendering/BidiRun.h
+U local/WebCore/rendering/RenderSVGImage.h
+U local/WebCore/rendering/SVGRootInlineBox.h
+U local/WebCore/WebCore.xcodeproj/project.pbxproj
+U local/ChangeLog
+ C local/LayoutTests
+U local/configure.ac
+U local/WebKitTools/Scripts/check-for-global-initializers
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+U local/WebKitTools/ChangeLog
+Summary of conflicts:
+ Tree conflicts: 1
+
+--- Merging (from foreign repository) r54684 through r54986 into 'local':
+U local/JavaScriptCore/runtime/Structure.h
+U local/JavaScriptCore/runtime/JSString.h
+U local/JavaScriptCore/runtime/Identifier.cpp
+U local/JavaScriptCore/runtime/JSPropertyNameIterator.cpp
+U local/JavaScriptCore/runtime/JSONObject.cpp
+U local/JavaScriptCore/runtime/JSString.cpp
+U local/JavaScriptCore/runtime/UStringImpl.h
+U local/JavaScriptCore/runtime/Identifier.h
+U local/JavaScriptCore/runtime/ArrayPrototype.cpp
+U local/JavaScriptCore/runtime/NumberPrototype.cpp
+U local/JavaScriptCore/runtime/SmallStrings.cpp
+U local/JavaScriptCore/runtime/Structure.cpp
+U local/JavaScriptCore/runtime/StringPrototype.cpp
+U local/JavaScriptCore/runtime/UString.h
+U local/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
+U local/JavaScriptCore/runtime/UString.cpp
+U local/JavaScriptCore/runtime/Collector.cpp
+U local/JavaScriptCore/runtime/Operations.h
+U local/JavaScriptCore/runtime/JSPropertyNameIterator.h
+U local/JavaScriptCore/runtime/UStringImpl.cpp
+U local/JavaScriptCore/runtime/StructureTransitionTable.h
+U local/JavaScriptCore/runtime/RegExp.cpp
+U local/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.h
+U local/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue_generated.cpp
+U local/JavaScriptCore/qt/api/qscriptvalue_p.h
+U local/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+U local/JavaScriptCore/bytecompiler/NodesCodegen.cpp
+U local/JavaScriptCore/wtf/gtk/GOwnPtr.cpp
+U local/JavaScriptCore/wtf/gtk/GOwnPtr.h
+D local/JavaScriptCore/wtf/PtrAndFlags.h
+U local/JavaScriptCore/wtf/PassRefPtr.h
+U local/JavaScriptCore/wtf/AlwaysInline.h
+U local/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
+U local/JavaScriptCore/wtf/RefPtr.h
+A local/JavaScriptCore/wtf/Complex.h
+C local/JavaScriptCore/wtf/MathExtras.h
+U local/JavaScriptCore/interpreter/Interpreter.cpp
+U local/JavaScriptCore/API/JSStringRef.h
+U local/JavaScriptCore/API/APIShims.h
+U local/JavaScriptCore/API/JSClassRef.cpp
+U local/JavaScriptCore/API/JSContextRef.cpp
+U
local/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+U local/JavaScriptCore/create_rvct_stubs
+U local/JavaScriptCore/jit/JITOpcodes.cpp
+U local/JavaScriptCore/jit/JITStubs.cpp
+U local/JavaScriptCore/jit/JITPropertyAccess.cpp
+U local/JavaScriptCore/jit/JIT.cpp
+U local/JavaScriptCore/ChangeLog
+U local/JavaScriptCore/bytecode/CodeBlock.cpp
+U local/JavaScriptCore/bytecode/CodeBlock.h
+U local/JavaScriptCore/bytecode/EvalCodeCache.h
+U local/JavaScriptCore/JavaScriptCore.exp
+U local/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+U local/WebKitLibraries/ChangeLog
+U local/WebKitLibraries/win/tools/vsprops/common.vsprops
+U local/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
+U
local/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+U local/WebKitLibraries/win/lib/WebKitSystemInterface.lib
+U local/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
+U local/WebKit.pro
+U local/WebKit/mac/Plugins/WebNetscapePluginView.mm
+U local/WebKit/mac/Plugins/WebNetscapePluginView.h
+U local/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+U local/WebKit/mac/Plugins/Hosted/WebKitPluginClient.defs
+U local/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm
+U local/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+U local/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h
+U local/WebKit/mac/Plugins/Hosted/ProxyInstance.mm
+U local/WebKit/mac/Plugins/WebBaseNetscapePluginView.h
+U local/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+U local/WebKit/mac/WebCoreSupport/WebChromeClient.mm
+U local/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+U local/WebKit/mac/WebCoreSupport/WebChromeClient.h
+U local/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
+U local/WebKit/mac/ChangeLog
+U local/WebKit/mac/Misc/WebKitStatistics.h
+U local/WebKit/mac/WebView/WebPreferencesPrivate.h
+U local/WebKit/mac/WebView/WebViewInternal.h
+U local/WebKit/mac/WebView/WebPDFRepresentation.mm
+U local/WebKit/mac/WebView/WebFrameInternal.h
+U local/WebKit/mac/WebView/WebPDFDocumentExtras.h
+U local/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
+U local/WebKit/mac/WebView/WebFrameView.mm
+U local/WebKit/mac/WebView/WebHTMLRepresentation.mm
+U local/WebKit/mac/WebView/WebPDFDocumentExtras.mm
+U local/WebKit/mac/WebView/WebView.mm
+U local/WebKit/mac/WebView/WebDataSource.mm
+U local/WebKit/mac/WebView/WebFrame.mm
+U local/WebKit/mac/WebView/WebHTMLView.mm
+U local/WebKit/mac/WebView/WebPreferences.mm
+U local/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp
+C local/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp
+U local/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h
+C local/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h
+U local/WebKit/haiku/ChangeLog
+U local/WebKit/chromium/WebKit.gyp
+U local/WebKit/chromium/features.gypi
+U local/WebKit/chromium/ChangeLog
+U local/WebKit/chromium/src/FrameLoaderClientImpl.h
+U local/WebKit/chromium/src/WebSettingsImpl.cpp
+U local/WebKit/chromium/src/js/devTools.css
+U local/WebKit/chromium/src/js/DebuggerAgent.js
+U local/WebKit/chromium/src/ChromeClientImpl.cpp
+U local/WebKit/chromium/src/ChromiumBridge.cpp
+U local/WebKit/chromium/src/WebStorageAreaImpl.h
+U local/WebKit/chromium/src/ChromeClientImpl.h
+U local/WebKit/chromium/src/WebDragData.cpp
+U local/WebKit/chromium/src/StorageNamespaceProxy.cpp
+U local/WebKit/chromium/src/WebFrameImpl.cpp
+U local/WebKit/chromium/src/GraphicsContext3D.cpp
+A local/WebKit/chromium/src/GeolocationServiceBridgeChromium.cpp
+U local/WebKit/chromium/src/WebFrameImpl.h
+U local/WebKit/chromium/src/WebElement.cpp
+U local/WebKit/chromium/src/WebDocument.cpp
+U local/WebKit/chromium/src/WebSettingsImpl.h
+U local/WebKit/chromium/src/WebInputElement.cpp
+U local/WebKit/chromium/src/WebStorageAreaImpl.cpp
+U local/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+U local/WebKit/chromium/src/WebFormElement.cpp
+U local/WebKit/chromium/src/DebuggerAgentImpl.cpp
+U local/WebKit/chromium/public/WebStorageArea.h
+U local/WebKit/chromium/public/WebSettings.h
+A local/WebKit/chromium/public/WebCookieJar.h
+U local/WebKit/chromium/public/WebDragData.h
+U local/WebKit/chromium/public/WebDocument.h
+U local/WebKit/chromium/public/WebFrame.h
+A local/WebKit/chromium/public/GeolocationServiceBridgeChromium.h
+U local/WebKit/chromium/public/WebViewClient.h
+U local/WebKit/chromium/public/WebKitClient.h
+U local/WebKit/chromium/public/WebFrameClient.h
+U local/WebKit/qt/QGVLauncher/main.cpp
+U local/WebKit/qt/symbian/eabi/QtWebKitu.def
+U local/WebKit/qt/tests/hybridPixmap/test.html
+U local/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+U local/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+U local/WebKit/qt/tests/tests.pri
+U local/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+U local/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+U local/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+U local/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+U local/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
+U local/WebKit/qt/ChangeLog
+U local/WebKit/qt/Api/qgraphicswebview.cpp
+U local/WebKit/qt/Api/qwebframe.h
+U local/WebKit/qt/Api/qwebsettings.h
+U local/WebKit/qt/Api/qwebpage.cpp
+U local/WebKit/qt/Api/DerivedSources.pro
+U local/WebKit/qt/Api/qwebframe.cpp
+U local/WebKit/qt/Api/qwebelement.h
+U local/WebKit/qt/Api/qwebsettings.cpp
+U local/WebKit/qt/Api/qgraphicswebview.h
+A local/WebKit/qt/Api/headers.pri
+U local/WebKit/qt/Api/qwebframe_p.h
+U local/WebKit/gtk/tests/testdownload.c
+U local/WebKit/gtk/tests/testwebview.c
+U local/WebKit/gtk/tests/testmimehandling.c
+U local/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+U local/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+U local/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
+U local/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h
+U local/WebKit/gtk/webkit/webkitdownload.cpp
+U local/WebKit/gtk/webkit/webkitwebsettings.cpp
+U local/WebKit/gtk/webkit/webkitwebview.cpp
+U local/WebKit/gtk/ChangeLog
+U local/WebKit/gtk/docs/webkitgtk-sections.txt
+U local/WebKit/gtk/docs/webkitgtk.types
+U local/WebKit/gtk/po/pt_BR.po
+U local/WebKit/gtk/po/es.po
+U local/WebKit/gtk/po/webkit.pot
+U local/WebKit/gtk/po/nl.po
+U local/WebKit/gtk/po/ChangeLog
+U local/WebKit/gtk/po/en_GB.po
+U local/WebKit/gtk/po/it.po
+U local/WebKit/gtk/po/sr@xxxxxxxx
+U local/WebKit/gtk/po/vi.po
+U local/WebKit/gtk/po/lt.po
+U local/WebKit/gtk/po/sr.po
+U local/WebKit/gtk/po/ru.po
+U local/WebKit/gtk/po/de.po
+U local/WebKit/gtk/po/sv.po
+A local/WebKit/gtk/po/he.po
+A local/WebKit/gtk/po/pa.po
+U local/WebKit/gtk/po/zh_CN.po
+U local/WebKit/win/WebPreferences.h
+U local/WebKit/win/ChangeLog
+U local/WebKit/win/WebView.cpp
+U local/WebKit/win/WebPreferenceKeysPrivate.h
+U local/WebKit/win/WebPreferences.cpp
+U local/WebKit/win/WebFrame.h
+U local/WebKit/win/Interfaces/WebKit.idl
+U local/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
+U local/WebKit/win/Interfaces/IWebFramePrivate.idl
+U local/WebKit/win/WebCoreSupport/WebChromeClient.cpp
+U local/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+U local/WebKit/win/WebCoreSupport/WebChromeClient.h
+U local/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
+U local/WebKit/win/WebFrame.cpp
+U local/WebKit/win/WebKitGraphics.cpp
+U local/WebKit/win/WebKit.vcproj/WebKit.def
+U local/WebKit/win/WebKit.vcproj/WebKit_debug.def
+U local/WebKit/win/WebKitGraphics.h
+U local/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+U local/WebKit/wx/WebKitSupport/ChromeClientWx.h
+U local/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h
+U local/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
+U local/WebKit/wx/ChangeLog
+U local/WebCore/Android.derived.jscbindings.mk
+U local/WebCore/storage/OriginUsageRecord.cpp
+U local/WebCore/dom/Document.cpp
+U local/WebCore/dom/Node.cpp
+U local/WebCore/Android.derived.v8bindings.mk
+U local/WebCore/plugins/PluginView.h
+U local/WebCore/plugins/qt/PluginPackageQt.cpp
+U local/WebCore/plugins/gtk/PluginViewGtk.cpp
+U local/WebCore/plugins/gtk/PluginPackageGtk.cpp
+U local/WebCore/plugins/PluginPackage.cpp
+U local/WebCore/plugins/mac/PluginPackageMac.cpp
+U local/WebCore/plugins/PluginDatabase.cpp
+U local/WebCore/plugins/PluginView.cpp
+U local/WebCore/plugins/win/PluginPackageWin.cpp
+U local/WebCore/plugins/PluginPackage.h
+U local/WebCore/plugins/symbian/PluginPackageSymbian.cpp
+U local/WebCore/editing/ReplaceSelectionCommand.cpp
+U local/WebCore/editing/SelectionController.h
+U local/WebCore/editing/ReplaceSelectionCommand.h
+U local/WebCore/editing/SelectionController.cpp
+U local/WebCore/WebCore.pro
+U local/WebCore/ChangeLog
+U local/WebCore/WebCore.vcproj/WebCore.vcproj
+U local/WebCore/WebCore.base.exp
+U local/WebCore/wml/WMLInputElement.h
+U local/WebCore/wml/WMLInputElement.cpp
+U local/WebCore/page/Settings.h
+U local/WebCore/page/DOMWindow.h
+U local/WebCore/page/Page.cpp
+U local/WebCore/page/SecurityOrigin.cpp
+U local/WebCore/page/ChromeClient.h
+U local/WebCore/page/DOMTimer.h
+U local/WebCore/page/Frame.h
+U local/WebCore/page/DOMWindow.cpp
+U local/WebCore/page/win/PageWin.cpp
+U local/WebCore/page/Page.h
+U local/WebCore/page/Chrome.h
+U local/WebCore/page/Chrome.cpp
+A local/WebCore/page/MediaCanStartListener.h
+U local/WebCore/page/Settings.cpp
+U local/WebCore/page/Geolocation.h
+U local/WebCore/page/DOMTimer.cpp
+U local/WebCore/page/SecurityOrigin.h
+U local/WebCore/page/Frame.cpp
+U local/WebCore/GNUmakefile.am
+A local/WebCore/platform/chromium/GeolocationServiceChromium.h
+U local/WebCore/platform/chromium/ChromiumDataObject.cpp
+U local/WebCore/platform/chromium/ClipboardChromium.cpp
+U local/WebCore/platform/chromium/ChromiumBridge.h
+U local/WebCore/platform/chromium/ChromiumDataObject.h
+U local/WebCore/platform/chromium/GeolocationServiceChromium.cpp
+U local/WebCore/platform/FileChooser.cpp
+U local/WebCore/platform/text/StringImpl.cpp
+U local/WebCore/platform/text/AtomicString.cpp
+U local/WebCore/platform/text/StringImpl.h
+U local/WebCore/platform/qt/CookieJarQt.cpp
+U local/WebCore/platform/gtk/RenderThemeGtk.cpp
+U local/WebCore/platform/gtk/WidgetGtk.cpp
+A local/WebCore/platform/brew/SystemTimeBrew.cpp
+A local/WebCore/platform/brew/PlatformKeyboardEventBrew.cpp
+A local/WebCore/platform/brew/CursorBrew.cpp
+U local/WebCore/platform/mac/CookieJar.mm
+C local/WebCore/platform/haiku/FileSystemHaiku.cpp
+U local/WebCore/platform/haiku/CookieJarHaiku.cpp
+U local/WebCore/platform/GeolocationService.cpp
+U local/WebCore/platform/FileChooser.h
+U local/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp
+U local/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+U local/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+U local/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
+U local/WebCore/platform/graphics/qt/IconQt.cpp
+U local/WebCore/platform/graphics/gtk/IconGtk.cpp
+U local/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
+U local/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h
+U local/WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.cpp
+U local/WebCore/platform/graphics/gtk/WebKitWebSourceGStreamer.h
+U local/WebCore/platform/graphics/mac/IconMac.mm
+U local/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
+U local/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
+U local/WebCore/platform/graphics/mac/ComplexTextController.cpp
+U local/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
+U local/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp
+U local/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+U local/WebCore/platform/graphics/mac/ComplexTextController.h
+U local/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+U local/WebCore/platform/graphics/FloatRect.h
+U local/WebCore/platform/graphics/Icon.h
+U local/WebCore/platform/graphics/MediaPlayer.h
+U local/WebCore/platform/graphics/GraphicsContext3D.h
+U local/WebCore/platform/graphics/Gradient.h
+U local/WebCore/platform/graphics/FloatSize.h
+U local/WebCore/platform/graphics/skia/PlatformContextSkia.cpp
+A local/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
+A local/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
+U local/WebCore/platform/graphics/cg/GradientCG.cpp
+U local/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.h
+U local/WebCore/platform/graphics/win/IconWin.cpp
+U local/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeWin.cpp
+U local/WebCore/platform/graphics/MediaPlayerPrivate.h
+U local/WebCore/platform/graphics/BitmapImage.cpp
+A local/WebCore/platform/graphics/GraphicsContext3D.cpp
+U local/WebCore/platform/graphics/MediaPlayer.cpp
+U local/WebCore/platform/Logging.cpp
+U local/WebCore/platform/GeolocationService.h
+U local/WebCore/platform/network/android/CookieJarAndroid.cpp
+U local/WebCore/platform/network/chromium/ResourceRequest.cpp
+U local/WebCore/platform/network/chromium/CookieJarChromium.cpp
+U local/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+U local/WebCore/platform/network/soup/CookieJarSoup.cpp
+A local/WebCore/platform/network/brew
+A local/WebCore/platform/network/brew/DNSBrew.cpp
+U local/WebCore/platform/network/curl/CookieJarCurl.cpp
+U local/WebCore/platform/network/win/CookieJarCFNetWin.cpp
+U local/WebCore/platform/network/win/CookieJarWin.cpp
+U local/WebCore/platform/CookieJar.h
+U local/WebCore/platform/PlatformKeyboardEvent.h
+U local/WebCore/platform/Logging.h
+U local/WebCore/platform/image-decoders/png/PNGImageDecoder.h
+U local/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
+U local/WebCore/platform/image-decoders/qt/RGBA32BufferQt.cpp
+U local/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp
+U local/WebCore/platform/image-decoders/gif/GIFImageReader.h
+U local/WebCore/platform/image-decoders/gif/GIFImageDecoder.h
+U local/WebCore/platform/image-decoders/gif/GIFImageReader.cpp
+U local/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
+U local/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h
+U local/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp
+U local/WebCore/platform/image-decoders/ImageDecoder.cpp
+U local/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp
+U local/WebCore/platform/image-decoders/ico/ICOImageDecoder.h
+U local/WebCore/platform/image-decoders/ImageDecoder.h
+U local/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp
+U local/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp
+U local/WebCore/platform/image-decoders/bmp/BMPImageReader.h
+U local/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h
+U local/WebCore/WebCore.gyp/WebCore.gyp
+U local/WebCore/workers/WorkerThread.cpp
+U local/WebCore/WebCore.gypi
+U local/WebCore/bindings/scripts/CodeGeneratorV8.pm
+A local/WebCore/bindings/js/JavaScriptProfileNode.h
+U local/WebCore/bindings/js/JSWorkerContextCustom.cpp
+U local/WebCore/bindings/js/JSDOMBinding.h
+A local/WebCore/bindings/js/JavaScriptProfile.h
+U local/WebCore/bindings/js/ScheduledAction.cpp
+U local/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
+U local/WebCore/bindings/js/JSDOMBinding.cpp
+A local/WebCore/bindings/js/JavaScriptProfile.cpp
+A local/WebCore/bindings/js/JavaScriptProfileNode.cpp
+U local/WebCore/bindings/js/JSDOMWindowCustom.cpp
+U local/WebCore/bindings/js/ScheduledAction.h
+U local/WebCore/bindings/v8/V8DOMWrapper.cpp
+U local/WebCore/bindings/v8/V8Proxy.h
+U local/WebCore/bindings/v8/V8NPUtils.h
+U local/WebCore/bindings/v8/V8DOMWindowShell.h
+U local/WebCore/bindings/v8/V8Proxy.cpp
+U local/WebCore/bindings/v8/V8DOMWrapper.h
+U local/WebCore/bindings/v8/ScriptController.cpp
+U local/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
+U local/WebCore/bindings/v8/V8DOMWindowShell.cpp
+U local/WebCore/bindings/v8/NPV8Object.cpp
+U local/WebCore/bindings/v8/npruntime_priv.h
+U local/WebCore/bindings/v8/V8Index.h
+U local/WebCore/bindings/v8/DOMObjectsInclude.h
+U local/WebCore/bindings/v8/V8Index.cpp
+U local/WebCore/bindings/v8/NPV8Object.h
+U local/WebCore/bindings/v8/V8NPObject.h
+U local/WebCore/bindings/v8/npruntime_impl.h
+U local/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp
+U local/WebCore/bindings/v8/custom/V8DocumentCustom.cpp
+U local/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp
+U local/WebCore/bindings/v8/custom/V8EventCustom.cpp
+U local/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp
+U local/WebCore/bindings/v8/custom/V8CustomVoidCallback.h
+U local/WebCore/svg/SVGLength.cpp
+U local/WebCore/svg/SVGForeignObjectElement.cpp
+U local/WebCore/svg/graphics/SVGImage.cpp
+U local/WebCore/svg/SVGSVGElement.cpp
+U local/WebCore/html/HTMLMediaElement.cpp
+U local/WebCore/html/HTMLInputElement.cpp
+U local/WebCore/html/HTMLFormCollection.cpp
+U local/WebCore/html/HTMLVideoElement.h
+U local/WebCore/html/HTMLMediaElement.h
+U local/WebCore/html/HTMLInputElement.h
+U local/WebCore/html/HTMLTextAreaElement.h
+U local/WebCore/html/HTMLFrameElementBase.h
+U local/WebCore/html/HTMLFrameOwnerElement.h
+U local/WebCore/html/HTMLAudioElement.h
+U local/WebCore/html/HTMLTextAreaElement.cpp
+U local/WebCore/html/HTMLFrameElementBase.cpp
+U local/WebCore/html/ValidityState.cpp
+U local/WebCore/html/HTMLPlugInElement.cpp
+U local/WebCore/inspector/InspectorController.cpp
+U local/WebCore/inspector/front-end/Section.js
+A local/WebCore/inspector/front-end/popover.css
+U local/WebCore/inspector/front-end/TextViewer.js
+U local/WebCore/inspector/front-end/EventListenersSidebarPane.js
+U local/WebCore/inspector/front-end/SourceFrame.js
+U local/WebCore/inspector/front-end/SourceHTMLTokenizer.js
+U local/WebCore/inspector/front-end/StylesSidebarPane.js
+U local/WebCore/inspector/front-end/SourceJavaScriptTokenizer.js
+U local/WebCore/inspector/front-end/textViewer.css
+U local/WebCore/inspector/front-end/SourceHTMLTokenizer.re2js
+U local/WebCore/inspector/front-end/ResourcesPanel.js
+U local/WebCore/inspector/front-end/ElementsTreeOutline.js
+U local/WebCore/inspector/front-end/Settings.js
+U local/WebCore/inspector/front-end/ObjectPropertiesSection.js
+U local/WebCore/inspector/front-end/TextEditorHighlighter.js
+U local/WebCore/inspector/front-end/inspector.css
+A local/WebCore/inspector/front-end/Images/thumbHoverHoriz.png
+A local/WebCore/inspector/front-end/Images/thumbHoverVert.png
+A local/WebCore/inspector/front-end/Images/thumbActiveHoriz.png
+A local/WebCore/inspector/front-end/Images/thumbActiveVert.png
+A local/WebCore/inspector/front-end/Images/thumbVert.png
+A local/WebCore/inspector/front-end/Images/gearButtonGlyph.png
+A local/WebCore/inspector/front-end/Images/thumbHoriz.png
+A local/WebCore/inspector/front-end/Images/trackVert.png
+A local/WebCore/inspector/front-end/Images/trackHoriz.png
+A local/WebCore/inspector/front-end/Images/popoverArrows.png
+A local/WebCore/inspector/front-end/Images/popoverBackground.png
+D local/WebCore/inspector/front-end/Popup.js
+D local/WebCore/inspector/JavaScriptProfile.h
+D local/WebCore/inspector/JavaScriptProfileNode.cpp
+D local/WebCore/inspector/JavaScriptProfileNode.h
+D local/WebCore/inspector/JavaScriptProfile.cpp
+U local/WebCore/inspector/front-end/PropertiesSidebarPane.js
+U local/WebCore/inspector/front-end/SourceTokenizer.js
+U local/WebCore/inspector/front-end/inspector.html
+U local/WebCore/inspector/front-end/DOMAgent.js
+U local/WebCore/inspector/front-end/Panel.js
+U local/WebCore/inspector/front-end/inspector.js
+U local/WebCore/inspector/front-end/ObjectProxy.js
+U local/WebCore/inspector/front-end/InjectedScript.js
+U local/WebCore/inspector/front-end/utilities.js
+U local/WebCore/inspector/front-end/inspectorSyntaxHighlight.css
+U local/WebCore/inspector/front-end/SourceJavaScriptTokenizer.re2js
+U local/WebCore/inspector/front-end/ElementsPanel.js
+A local/WebCore/inspector/front-end/Popover.js
+U local/WebCore/inspector/front-end/WebKit.qrc
+U local/WebCore/websockets/WebSocketChannel.cpp
+U local/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h
+U local/WebCore/websockets/WebSocketChannelClient.h
+U local/WebCore/websockets/WebSocketChannel.h
+U local/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp
+U local/WebCore/websockets/WebSocket.cpp
+U local/WebCore/websockets/WorkerThreadableWebSocketChannel.h
+U local/WebCore/websockets/WebSocket.h
+U local/WebCore/websockets/WebSocketHandshake.cpp
+A local/WebCore/manual-tests/match-marker-rects.html
+A local/WebCore/manual-tests/media-elements
+A local/WebCore/manual-tests/media-elements/video-replaces-poster.html
+U local/WebCore/rendering/RenderObject.cpp
+U local/WebCore/rendering/RenderThemeMac.mm
+U local/WebCore/rendering/RenderVideo.h
+U local/WebCore/rendering/SVGRootInlineBox.cpp
+U local/WebCore/rendering/RenderSVGBlock.h
+U local/WebCore/rendering/RenderTableCell.cpp
+U local/WebCore/rendering/RenderBox.h
+U local/WebCore/rendering/RenderObject.h
+U local/WebCore/rendering/RenderLayer.cpp
+U local/WebCore/rendering/RenderForeignObject.cpp
+U local/WebCore/rendering/RenderSlider.cpp
+U local/WebCore/rendering/RenderRubyText.cpp
+U local/WebCore/rendering/RenderTextControlSingleLine.h
+U local/WebCore/rendering/RenderTextControlMultiLine.cpp
+U local/WebCore/rendering/RenderRuby.cpp
+U local/WebCore/rendering/RenderText.cpp
+U local/WebCore/rendering/InlineTextBox.cpp
+U local/WebCore/rendering/RenderTextControlSingleLine.cpp
+U local/WebCore/rendering/RenderThemeChromiumMac.mm
+U local/WebCore/rendering/RenderInline.cpp
+U local/WebCore/rendering/RenderBox.cpp
+U local/WebCore/rendering/RenderBlock.cpp
+U local/WebCore/rendering/RenderLayerBacking.cpp
+U local/WebCore/rendering/RenderInline.h
+U local/WebCore/rendering/RenderFileUploadControl.cpp
+U local/WebCore/rendering/RenderTextControl.cpp
+U local/WebCore/rendering/RenderBlock.h
+U local/WebCore/rendering/RenderRubyBase.cpp
+U local/WebCore/rendering/RenderSVGRoot.h
+U local/WebCore/rendering/RenderForeignObject.h
+U local/WebCore/rendering/RenderSVGRoot.cpp
+U local/WebCore/rendering/RenderRubyRun.cpp
+U local/WebCore/rendering/RenderVideo.cpp
+U local/WebCore/rendering/RenderSVGBlock.cpp
+U local/WebCore/rendering/RenderTextControlMultiLine.h
+U local/WebCore/rendering/style/RenderStyle.cpp
+U local/WebCore/rendering/style/RenderStyleConstants.h
+U local/WebCore/rendering/style/RenderStyle.h
+U local/WebCore/rendering/RenderFileUploadControl.h
+U local/WebCore/rendering/RenderTextControl.h
+U local/WebCore/rendering/SVGCharacterLayoutInfo.h
+U local/WebCore/rendering/RenderTableCell.h
+U local/WebCore/English.lproj/localizedStrings.js
+U local/WebCore/WebCore.xcodeproj/project.pbxproj
+U local/WebCore/css/CSSStyleSelector.cpp
+U local/WebCore/css/mediaControlsGtk.css
+U local/WebCore/css/CSSStyleSelector.h
+U local/WebCore/css/CSSParser.cpp
+U local/WebCore/css/SVGCSSStyleSelector.cpp
+U local/WebCore/bridge/jni/jsc/JavaStringJSC.h
+U local/WebCore/bridge/NP_jsobject.cpp
+U local/WebCore/bridge/qt/qt_pixmapruntime.cpp
+U local/WebCore/bridge/qt/qt_runtime.cpp
+U local/WebCore/bridge/runtime_root.h
+U local/WebCore/bridge/runtime_root.cpp
+D local/WebCore/ForwardingHeaders/wtf/PtrAndFlags.h
+U local/WebCore/Android.v8bindings.mk
+U local/WebCore/loader/FrameLoader.cpp
+U local/WebCore/loader/EmptyClients.h
+U local/WebCore/loader/HistoryController.cpp
+U local/WebCore/loader/FrameLoaderClient.h
+U local/WebCore/loader/ProgressTracker.cpp
+U local/ChangeLog
+ C local/LayoutTests
+U local/configure.ac
+U local/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
+U local/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+U local/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+U local/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+U local/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+U local/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+U local/WebKitTools/DumpRenderTree/wx/LayoutTestControllerWx.cpp
+U local/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+U local/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
+U local/WebKitTools/DumpRenderTree/LayoutTestController.cpp
+U
local/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp
+U local/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp
+U local/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp
+U local/WebKitTools/DumpRenderTree/LayoutTestController.h
+U local/WebKitTools/Scripts/resolve-ChangeLogs
+U local/WebKitTools/Scripts/build-webkit
+A local/WebKitTools/Scripts/run-gtk-tests
+A local/WebKitTools/Scripts/webkitperl/features.pm
+ C local/WebKitTools/Scripts/build-drawtest
+ C local/WebKitTools/Scripts/run-drawtest
+U local/WebKitTools/Scripts/webkitdirs.pm
+U local/WebKitTools/Scripts/check-webkit-style
+U local/WebKitTools/Scripts/rebaseline-chromium-webkit-tests
+U local/WebKitTools/Scripts/webkit-build-directory
+U local/WebKitTools/Scripts/run-webkit-tests
+U local/WebKitTools/Scripts/webkitpy/credentials.py
+A local/WebKitTools/Scripts/webkitpy/grammar_unittest.py
+U local/WebKitTools/Scripts/webkitpy/committers.py
+U local/WebKitTools/Scripts/webkitpy/grammar.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/driver_test.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
+A local/WebKitTools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/test.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+U local/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
+A local/WebKitTools/Scripts/webkitpy/layout_tests/__init__.py
+U
local/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/test_expectations.py
+U
local/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
+U local/WebKitTools/Scripts/webkitpy/bugzilla.py
+U local/WebKitTools/Scripts/webkitpy/style/error_handlers_unittest.py
+U local/WebKitTools/Scripts/webkitpy/style/error_handlers.py
+U local/WebKitTools/Scripts/webkitpy/style/processors/cpp_unittest.py
+U local/WebKitTools/Scripts/webkitpy/style/processors/cpp.py
+ U local/WebKitTools/Scripts/webkitpy/style/processors
+U local/WebKitTools/Scripts/webkitpy/style/checker_unittest.py
+U local/WebKitTools/Scripts/webkitpy/style/checker.py
+U local/WebKitTools/Scripts/webkitpy/style/filter_unittest.py
+U local/WebKitTools/Scripts/webkitpy/style/filter.py
+U local/WebKitTools/Scripts/webkitpy/commands/upload_unittest.py
+U local/WebKitTools/Scripts/webkitpy/commands/upload.py
+A local/WebKitTools/Scripts/webkitpy/user_unittest.py
+U local/WebKitTools/Scripts/webkitpy/user.py
+U local/WebKitTools/Scripts/webkitpy/mock_bugzillatool.py
+U local/WebKitTools/Scripts/run-webkit-websocketserver
+U local/WebKitTools/Scripts/test-webkitpy
+U local/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+U local/WebKitTools/ChangeLog
+ C local/WebKitTools/DrawTest/DrawTestDocument.h
+ C local/WebKitTools/DrawTest/DrawTest.xcodeproj/project.pbxproj
+ C local/WebKitTools/DrawTest/DrawTest_Prefix.pch
+ C local/WebKitTools/DrawTest/DrawTestView.m
+ C local/WebKitTools/DrawTest/DrawTestInspectorController.m
+ C local/WebKitTools/DrawTest/SVGTest.h
+ C local/WebKitTools/DrawTest/Info.plist
+ C local/WebKitTools/DrawTest/DrawTestDocument.m
+ C local/WebKitTools/DrawTest/SVGTest.m
+ C local/WebKitTools/DrawTest/TestViewerSplitView.h
+ C local/WebKitTools/DrawTest/AppDelegate.h
+ C local/WebKitTools/DrawTest/TestViewerSplitView.m
+ C local/WebKitTools/DrawTest/ScalingImageView.h
+ C local/WebKitTools/DrawTest/AppDelegate.m
+ C local/WebKitTools/DrawTest/ScalingImageView.m
+ C local/WebKitTools/DrawTest/TestController.h
+ C local/WebKitTools/DrawTest/DrawTestToolbarController.h
+ C local/WebKitTools/DrawTest/DrawTestView.h
+ C local/WebKitTools/DrawTest/DrawTestInspectorController.h
+ C local/WebKitTools/DrawTest/TestController.m
+ C local/WebKitTools/DrawTest/DrawTestToolbarController.m
+ C local/WebKitTools/DrawTest/main.m
+D local/WebKitTools/DrawTest/English.lproj/MainMenu.nib/info.nib
+D local/WebKitTools/DrawTest/English.lproj/MainMenu.nib/classes.nib
+ C local/WebKitTools/DrawTest/English.lproj/InfoPlist.strings
+D local/WebKitTools/DrawTest/English.lproj/MainMenu.nib/keyedobjects.nib
+D local/WebKitTools/DrawTest/English.lproj/DrawTestDocument.nib/info.nib
+D local/WebKitTools/DrawTest/English.lproj/DrawTestDocument.nib/classes.nib
+D
local/WebKitTools/DrawTest/English.lproj/DrawTestDocument.nib/keyedobjects.nib
+D local/WebKitTools/DrawTest/English.lproj/TestViewer.nib/info.nib
+D local/WebKitTools/DrawTest/English.lproj/TestViewer.nib/classes.nib
+D local/WebKitTools/DrawTest/English.lproj/TestViewer.nib/keyedobjects.nib
+D local/WebKitTools/DrawTest/English.lproj/Inspector.nib/info.nib
+D local/WebKitTools/DrawTest/English.lproj/Inspector.nib/classes.nib
+D local/WebKitTools/DrawTest/English.lproj/Inspector.nib/keyedobjects.nib
+U local/WebKitTools/pywebsocket/setup.py
+U local/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
+U local/WebKitTools/QtLauncher/main.cpp
+U local/WebKitTools/QtLauncher/webview.cpp
+U local/WebKitTools/QtLauncher/mainwindow.cpp
+U local/.gitattributes
+ C local/WebKitSite
+U local/WebKit.pri
+Summary of conflicts:
+ Text conflicts: 4
+ Tree conflicts: 27
Other related posts:
- » [haiku-webkit-commits] r427 - webkit/trunk - webkit
