Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed)

Created:
12 years, 1 month ago by ojan
Modified:
9 years, 7 months ago
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Do another merge using nifty new merge script (CL for that coming soon). Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=5360

Patch Set 1 #

Patch Set 2 : '' #

Patch Set 3 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1262 lines, -327 lines) Patch
M WEBKIT_MERGE_REVISION View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/JavaScriptCore/ChangeLog View 1 chunk +73 lines, -0 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/VM/CTI.h View 1 chunk +3 lines, -1 line 0 comments Download
M third_party/WebKit/JavaScriptCore/VM/CTI.cpp View 10 chunks +59 lines, -50 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/VM/CodeBlock.cpp View 2 chunks +11 lines, -15 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/VM/Machine.h View 3 chunks +5 lines, -5 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/VM/Machine.cpp View 26 chunks +100 lines, -121 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.h View 2 chunks +3 lines, -3 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/bytecompiler/CodeGenerator.cpp View 5 chunks +50 lines, -18 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/parser/Nodes.h View 1 chunk +3 lines, -3 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/parser/Nodes.cpp View 5 chunks +22 lines, -16 lines 0 comments Download
M third_party/WebKit/JavaScriptCore/runtime/JSGlobalData.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/WebCore/ChangeLog View 1 chunk +193 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/GNUmakefile.am View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/WebCore.pro View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/WebCore.vcproj/WebCore.vcproj View 2 chunks +9 lines, -1 line 0 comments Download
M third_party/WebKit/WebCore/WebCore.xcodeproj/project.pbxproj View 5 chunks +8 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/WebCoreSources.bkl View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/editing/DeleteSelectionCommand.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/editing/DeleteSelectionCommand.cpp View 4 chunks +25 lines, -1 line 0 comments Download
M third_party/WebKit/WebCore/editing/htmlediting.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/editing/htmlediting.cpp View 1 chunk +10 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/inspector/InspectorController.cpp View 4 chunks +81 lines, -38 lines 0 comments Download
M third_party/WebKit/WebCore/platform/graphics/AffineTransform.h View 2 chunks +3 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/platform/graphics/AffineTransform.cpp View 2 chunks +11 lines, -0 lines 0 comments Download
A third_party/WebKit/WebCore/platform/graphics/FloatQuad.h View 1 chunk +138 lines, -0 lines 0 comments Download
A third_party/WebKit/WebCore/platform/graphics/FloatQuad.cpp View 1 chunk +60 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/platform/graphics/cairo/PatternCairo.cpp View 1 chunk +2 lines, -1 line 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderBox.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderBox.cpp View 2 chunks +76 lines, -47 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderContainer.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderContainer.cpp View 1 chunk +17 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderInline.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderInline.cpp View 1 chunk +16 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderObject.h View 4 chunks +14 lines, -1 line 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderObject.cpp View 4 chunks +53 lines, -2 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderPath.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderPath.cpp View 1 chunk +5 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGContainer.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGContainer.cpp View 1 chunk +5 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGHiddenContainer.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGHiddenContainer.cpp View 1 chunk +5 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGImage.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGImage.cpp View 2 chunks +6 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGInlineText.h View 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp View 2 chunks +6 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGRoot.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGRoot.cpp View 1 chunk +6 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGTSpan.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGTSpan.cpp View 1 chunk +21 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGText.h View 1 chunk +2 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGText.cpp View 1 chunk +26 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGTextPath.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderSVGTextPath.cpp View 1 chunk +21 lines, -0 lines 0 comments Download
third_party/WebKit/WebCore/rendering/RenderTableCell.h View 1 chunk +1 line, -0 lines 0 comments Download
third_party/WebKit/WebCore/rendering/RenderTableCell.cpp View 2 chunks +11 lines, -1 line 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderText.h View 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderText.cpp View 1 chunk +43 lines, -0 lines 0 comments Download
third_party/WebKit/WebCore/rendering/RenderView.h View 2 chunks +2 lines, -0 lines 0 comments Download
M third_party/WebKit/WebCore/rendering/RenderView.cpp View 2 chunks +14 lines, -0 lines 0 comments Download
third_party/WebKit/WebKit/mac/ChangeLog View 1 chunk +9 lines, -0 lines 0 comments Download
M third_party/WebKit/WebKit/mac/Plugins/WebNetscapePluginView.mm View 1 chunk +1 line, -1 line 0 comments Download
M third_party/WebKit/WebKit/win/WebKitPrefix.cpp View 1 chunk +1 line, -0 lines 0 comments Download
M webkit/build/WebCore/SConscript View 1 chunk +1 line, -0 lines 0 comments Download
M webkit/build/WebCore/WebCore.vcproj View 1 chunk +8 lines, -0 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
ojan
Merge number two of the day! This time using a merge script! Will send out ...
12 years, 1 month ago (2008-11-13 01:17:59 UTC) #1
darin (slow to review)
12 years, 1 month ago (2008-11-13 01:24:03 UTC) #2
AWESOME, LGTM !!

Powered by Google App Engine
This is Rietveld 408576698