|
|
WebKit side of merge from r41149 to r41181.
Some of the JavaScriptCore/JIT/ files were out of date, so I pulled ToT copies.
There were 2 changes in InspectorController.cpp. One applied cleanly, the other had to do with profiler, so I dropped it (we don't have a profiler).
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10283
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+2129 lines, -554 lines) |
Patch |
 |
M |
JavaScriptCore/API/JSBasePrivate.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/API/JSContextRef.h
|
View
|
|
4 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/API/JSObjectRef.h
|
View
|
|
4 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/API/WebKitAvailability.h
|
View
|
|
2 chunks |
+43 lines, -42 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/ChangeLog
|
View
|
|
1 chunk |
+126 lines, -0 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/GNUmakefile.am
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/JavaScriptCore.exp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
|
View
|
|
2 chunks |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/interpreter/Interpreter.h
|
View
|
|
3 chunks |
+1 line, -21 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/interpreter/Interpreter.cpp
|
View
|
|
6 chunks |
+10 lines, -50 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/jit/JIT.h
|
View
|
|
2 chunks |
+4 lines, -3 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/jit/JIT.cpp
|
View
|
|
9 chunks |
+17 lines, -14 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/jit/JITArithmetic.cpp
|
View
|
|
1 chunk |
+11 lines, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/jit/JITCall.cpp
|
View
|
|
6 chunks |
+6 lines, -6 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/jit/JITPropertyAccess.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/jit/JITStubs.h
|
View
|
|
1 chunk |
+190 lines, -0 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/jit/JITStubs.cpp
|
View
|
|
103 chunks |
+171 lines, -182 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/ArrayPrototype.cpp
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/FunctionPrototype.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/JSArray.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/JSByteArray.h
|
View
|
|
2 chunks |
+6 lines, -3 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/JSCell.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/JSFunction.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/JSGlobalData.h
|
View
|
|
6 chunks |
+31 lines, -25 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/JSGlobalData.cpp
|
View
|
|
5 chunks |
+50 lines, -9 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/JSString.h
|
View
|
|
2 chunks |
+3 lines, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/runtime/Operations.h
|
View
|
|
2 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/wrec/WREC.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
JavaScriptCore/wtf/MessageQueue.h
|
View
|
|
4 chunks |
+17 lines, -37 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/wtf/ThreadingQt.cpp
|
View
|
|
1 chunk |
+6 lines, -4 lines |
0 comments
|
Download
|
|
M |
JavaScriptCore/wtf/ThreadingWin.cpp
|
View
|
|
1 chunk |
+6 lines, -3 lines |
0 comments
|
Download
|
|
M |
WebCore/ChangeLog
|
View
|
|
1 chunk |
+287 lines, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/bindings/js/WorkerScriptController.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptCachedFrameData.h
|
View
|
|
1 chunk |
+52 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptCallFrame.h
|
View
|
|
1 chunk |
+73 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptCallFrame.cpp
|
View
|
|
1 chunk |
+62 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptCallStack.h
|
View
|
|
1 chunk |
+59 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptCallStack.cpp
|
View
|
|
1 chunk |
+58 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptInstance.h
|
View
|
|
1 chunk |
+63 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptInstance.cpp
|
View
|
|
1 chunk |
+83 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptSourceCode.h
|
View
|
|
1 chunk |
+72 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptState.h
|
View
|
|
1 chunk |
+51 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptString.h
|
View
|
|
1 chunk |
+66 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptValue.h
|
View
|
|
1 chunk |
+134 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/bindings/v8/ScriptValue.cpp
|
View
|
|
1 chunk |
+50 lines, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/bridge/qt/qt_runtime.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/dom/Element.cpp
|
View
|
|
1 chunk |
+6 lines, -5 lines |
0 comments
|
Download
|
|
M |
WebCore/dom/WorkerContext.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/dom/WorkerRunLoop.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/dom/WorkerRunLoop.cpp
|
View
|
|
2 chunks |
+4 lines, -10 lines |
0 comments
|
Download
|
|
M |
WebCore/html/HTMLElement.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
|
M |
WebCore/html/HTMLElement.cpp
|
View
|
|
1 chunk |
+0 lines, -17 lines |
0 comments
|
Download
|
|
M |
WebCore/inspector/InspectorController.cpp
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
WebCore/loader/DocumentThreadableLoader.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/loader/ThreadableLoaderClient.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/loader/ThreadableLoaderClientWrapper.h
|
View
|
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/loader/WorkerThreadableLoader.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/loader/WorkerThreadableLoader.cpp
|
View
|
|
1 chunk |
+11 lines, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/loader/appcache/ApplicationCacheGroup.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/platform/chromium/ClipboardChromium.cpp
|
View
|
|
1 chunk |
+5 lines, -4 lines |
0 comments
|
Download
|
|
A |
WebCore/platform/chromium/ClipboardChromiumLinux.cpp
|
View
|
|
1 chunk |
+41 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/platform/chromium/ClipboardChromiumMac.cpp
|
View
|
|
1 chunk |
+41 lines, -0 lines |
0 comments
|
Download
|
|
A |
WebCore/platform/chromium/ClipboardChromiumWin.cpp
|
View
|
|
1 chunk |
+56 lines, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/platform/text/TextCodecICU.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/rendering/InlineFlowBox.cpp
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/rendering/InlineTextBox.cpp
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
WebCore/rendering/RenderBlock.h
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
WebCore/rendering/RenderBlock.cpp
|
View
|
|
5 chunks |
+55 lines, -29 lines |
0 comments
|
Download
|
|
M |
WebCore/rendering/RenderLayer.h
|
View
|
|
5 chunks |
+8 lines, -8 lines |
0 comments
|
Download
|
|
M |
WebCore/rendering/RenderLayer.cpp
|
View
|
|
14 chunks |
+38 lines, -38 lines |
0 comments
|
Download
|
|
M |
WebCore/rendering/RenderTreeAsText.cpp
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
WebCore/xml/XMLHttpRequest.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
WebCore/xml/XMLHttpRequest.cpp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
Total messages: 2 (0 generated)
|
Chromium Code Reviews
Issue
28077:
WebKit side of merge from r41149 to r41181. (Closed)
