Merge Status as of Tuesday, January 06, 2009 @ 02:07PM PST

Total Files:
227
Lines of code added to WebKit trunk since last merge:
2108
Lines of code that are not yet in WebKit trunk:
31431
File vs. WebKit@39606 vs. WebKit@HEAD WebKit Bug Owner Blame Rietveld Issue ID Status/Comments
WebCore/css/CSSStyleSelector.cpp
5992 lines, +127, -36
6000 lines, +44, -127
18085 jungshik jungshik priliminary patch is uploaded, but needs more work.
WebCore/dom/Document.cpp
4498 lines, +121, -3
4498 lines, +3, -121
18085 jungshik jungshik \
WebCore/dom/Document.h
1140 lines, +19, -0
1140 lines, +0, -19
jungshik dominantScript
WebCore/dom/Document.idl
275 lines, +27, -7
275 lines, +7, -27
WebCore/dom/DOMTimer.h
13 lines, +13, -0
13 lines, +0, -13
WebCore/dom/Node.idl
152 lines, +16, -4
152 lines, +4, -16
WebCore/history/BackForwardList.cpp
359 lines, +77, -4
359 lines, +4, -77
WebCore/history/BackForwardList.h
120 lines, +25, -0
120 lines, +0, -25
WebCore/html/HTMLCanvasElement.idl
50 lines, +4, -2
50 lines, +2, -4
WebCore/html/HTMLDocument.idl
71 lines, +4, -0
71 lines, +0, -4
WebCore/html/HTMLPlugInElement.cpp
208 lines, +8, -1
208 lines, +1, -8
dglazkov pkasting JSInstanceHolder
WebCore/inspector/InspectorController.h
417 lines, +89, -12
417 lines, +12, -89
V8 related
WebCore/inspector/front-end/debugger.css
35 lines, +35, -0
35 lines, +0, -35
WebCore/inspector/front-end/debugger.html
31 lines, +31, -0
31 lines, +0, -31
WebCore/inspector/front-end/DebuggerConsole.js
173 lines, +173, -0
173 lines, +0, -173
WebCore/inspector/front-end/DebuggerIPC.js
109 lines, +109, -0
109 lines, +0, -109
WebCore/inspector/front-end/DebuggerPanel.js
201 lines, +201, -0
201 lines, +0, -201
WebCore/inspector/front-end/DebuggerShell.js
1327 lines, +1327, -0
1327 lines, +0, -1327
WebCore/inspector/front-end/inspector.js
1301 lines, +34, -3
1301 lines, +3, -34
yurys Unsupported tabs are disabled, some stubs for InspectorController methods are defined. This should go away when Chrome inspector catches up with that in WebKit
WebCore/inspector/InspectorController.idl
34 lines, +34, -0
34 lines, +0, -34
WebCore/inspector/InspectorController.cpp
3606 lines, +678, -1761
3609 lines, +1764, -681
WebCore/inspector/InspectorController.h
417 lines, +89, -12
417 lines, +12, -89
WebCore/loader/appcache/ApplicationCacheGroup.cpp
736 lines, +25, -5
736 lines, +5, -25
WebCore/loader/appcache/DOMApplicationCache.cpp
287 lines, +1, -1
287 lines, +1, -1
WebCore/loader/appcache/ManifestParser.cpp
192 lines, +5, -22
192 lines, +22, -5
WebCore/loader/CachedCSSStyleSheet.cpp
150 lines, +2, -2
150 lines, +2, -2
WebCore/loader/CachedImage.cpp
383 lines, +1, -1
383 lines, +1, -1
WebCore/loader/CachedResource.cpp
403 lines, +6, -19
403 lines, +19, -6
WebCore/loader/CachedResource.h
251 lines, +1, -1
251 lines, +1, -1
WebCore/loader/CachedScript.cpp
134 lines, +3, -1
134 lines, +1, -3
WebCore/loader/DocumentLoader.cpp
966 lines, +16, -1
966 lines, +1, -16
WebCore/loader/DocumentLoader.h
305 lines, +2, -0
305 lines, +0, -2
WebCore/loader/FrameLoader.cpp
5369 lines, +102, -21
5369 lines, +21, -102
21949 jnd, darin historyItem stuff reverted locally.
WebCore/loader/FrameLoader.h
695 lines, +8, -0
695 lines, +0, -8
some bad merge, V8 related
WebCore/loader/loader.cpp
498 lines, +11, -4
498 lines, +4, -11
WebCore/loader/loader.h
118 lines, +3, -21
118 lines, +21, -3
WebCore/loader/MainResourceLoader.cpp
521 lines, +7, -1
521 lines, +1, -7
WebCore/loader/TextResourceDecoder.cpp
905 lines, +105, -4
905 lines, +4, -105
16482 jungshik jungshik patch uploaded to webkit. blocked by a layout test bug (webkit bug 20534 for which Glenn asked for review early October, but review hasn't yet been granted)
WebCore/loader/TextResourceDecoder.h
89 lines, +9, -3
89 lines, +3, -9
16482 jungshik jungshik ditto
WebCore/page/chromium/AccessibilityObjectChromium.cpp
37 lines, +37, -0
37 lines, +0, -37
WebCore/page/chromium/AccessibilityObjectWrapper.h
50 lines, +50, -0
50 lines, +0, -50
WebCore/page/chromium/AXObjectCacheChromium.cpp
61 lines, +61, -0
61 lines, +0, -61
WebCore/page/chromium/ChromeClientChromium.h
30 lines, +30, -0
30 lines, +0, -30
WebCore/page/chromium/DragControllerChromium.cpp
77 lines, +77, -0
77 lines, +0, -77
WebCore/page/chromium/EventHandlerChromium.cpp
155 lines, +155, -0
155 lines, +0, -155
WebCore/page/chromium/FrameChromium.cpp
104 lines, +104, -0
104 lines, +0, -104
WebCore/page/chromium/FrameChromium.h
38 lines, +38, -0
38 lines, +0, -38
WebCore/page/AccessibilityRenderObject.cpp
2391 lines, +4, -2
2391 lines, +2, -4
awalker awalker 6315 mac related
WebCore/page/DOMWindow.cpp
1515 lines, +271, -3
1515 lines, +3, -271
fqian, pjohnson V8 related, pref for allowing scripts to close windows
WebCore/page/DOMWindow.h
353 lines, +46, -0
353 lines, +0, -46
fqian V8 related
WebCore/page/DOMWindow.idl
498 lines, +65, -14
498 lines, +14, -65
WebCore/page/EventHandler.cpp
2241 lines, +1, -1
2241 lines, +1, -1
aa bad merge?
WebCore/page/Frame.cpp
1911 lines, +31, -2
1911 lines, +2, -31
fqian V8 related, ignore window.stop in unload, split window stuff
WebCore/page/History.idl
47 lines, +6, -3
47 lines, +3, -6
WebCore/page/Location.h
90 lines, +19, -0
90 lines, +0, -19
v8-dev V8 related
WebCore/page/Location.idl
85 lines, +28, -2
85 lines, +2, -28
WebCore/page/Navigator.cpp
152 lines, +8, -1
152 lines, +1, -8
fqian added null checking
WebCore/page/Page.h
267 lines, +8, -1
267 lines, +1, -8
InspectorController ownership. Someone needs to look into whether we really need it to be a RefPtr and upstream if so.
WebCore/page/Settings.cpp
421 lines, +13, -0
421 lines, +0, -13
16482 jungshik jungshik,pjohnson 2915 we added some prefs, one of prefs (encoding detector) will be taken care of when TextResourceDecoder.cpp is resolved. for the other pref, bug was filed, but no patch was made
WebCore/page/Settings.h
272 lines, +11, -2
272 lines, +2, -11
16482 jungshik,pjohnson 2915 we added some prefs
WebCore/platform/chromium/ChromiumBridge.h
177 lines, +177, -0
177 lines, +0, -177
WebCore/platform/chromium/ChromiumDataObject.cpp
53 lines, +53, -0
53 lines, +0, -53
WebCore/platform/chromium/ChromiumDataObject.h
70 lines, +70, -0
70 lines, +0, -70
WebCore/platform/chromium/ChromiumUtilsWin.cpp
54 lines, +54, -0
54 lines, +0, -54
WebCore/platform/chromium/ChromiumUtilsWin.h
38 lines, +38, -0
38 lines, +0, -38
WebCore/platform/chromium/ClipboardChromium.cpp
367 lines, +367, -0
367 lines, +0, -367
WebCore/platform/chromium/ClipboardChromium.h
84 lines, +84, -0
84 lines, +0, -84
WebCore/platform/chromium/ClipboardUtilitiesChromium.cpp
66 lines, +66, -0
66 lines, +0, -66
WebCore/platform/chromium/ClipboardUtilitiesChromium.h
40 lines, +40, -0
40 lines, +0, -40
WebCore/platform/chromium/ContextMenuChromium.cpp
87 lines, +87, -0
87 lines, +0, -87
WebCore/platform/chromium/ContextMenuItemChromium.cpp
106 lines, +106, -0
106 lines, +0, -106
WebCore/platform/chromium/CursorChromium.cpp
313 lines, +313, -0
313 lines, +0, -313
WebCore/platform/chromium/DragDataChromium.cpp
151 lines, +151, -0
151 lines, +0, -151
WebCore/platform/chromium/DragDataRef.h
41 lines, +41, -0
41 lines, +0, -41
WebCore/platform/chromium/DragImageChromium.cpp
91 lines, +91, -0
91 lines, +0, -91
WebCore/platform/chromium/DragImageRef.h
79 lines, +30, -24
79 lines, +24, -30
WebCore/platform/chromium/EditorChromium.cpp
40 lines, +40, -0
40 lines, +0, -40
WebCore/platform/chromium/FileChooserChromium.cpp
60 lines, +60, -0
60 lines, +0, -60
WebCore/platform/chromium/FileSystemChromium.cpp
82 lines, +82, -0
82 lines, +0, -82
WebCore/platform/chromium/FileSystemChromiumLinux.cpp
39 lines, +39, -0
39 lines, +0, -39
WebCore/platform/chromium/FileSystemChromiumMac.mm
42 lines, +42, -0
42 lines, +0, -42
WebCore/platform/chromium/FileSystemChromiumWin.cpp
42 lines, +42, -0
42 lines, +0, -42
WebCore/platform/chromium/FramelessScrollView.cpp
86 lines, +86, -0
86 lines, +0, -86
WebCore/platform/chromium/FramelessScrollView.h
59 lines, +59, -0
59 lines, +0, -59
WebCore/platform/chromium/FramelessScrollViewClient.h
17 lines, +17, -0
17 lines, +0, -17
WebCore/platform/chromium/gtk2drawing.c
2815 lines, +2815, -0
2815 lines, +0, -2815
WebCore/platform/chromium/gtkdrawing.h
390 lines, +390, -0
390 lines, +0, -390
WebCore/platform/chromium/KeyboardCodes.h
41 lines, +41, -0
41 lines, +0, -41
WebCore/platform/chromium/KeyboardCodesPosix.h
547 lines, +547, -0
547 lines, +0, -547
WebCore/platform/chromium/KeyboardCodesWin.h
552 lines, +552, -0
552 lines, +0, -552
WebCore/platform/chromium/KeyCodeConversion.h
30 lines, +30, -0
30 lines, +0, -30
WebCore/platform/chromium/KeyCodeConversionGtk.cpp
363 lines, +363, -0
363 lines, +0, -363
WebCore/platform/chromium/Language.cpp
46 lines, +46, -0
46 lines, +0, -46
WebCore/platform/chromium/LinkHashChromium.cpp
47 lines, +47, -0
47 lines, +0, -47
WebCore/platform/chromium/MimeTypeRegistryChromium.cpp
147 lines, +147, -0
147 lines, +0, -147
WebCore/platform/chromium/PasteboardChromium.cpp
173 lines, +173, -0
173 lines, +0, -173
WebCore/platform/chromium/PasteboardPrivate.h
47 lines, +47, -0
47 lines, +0, -47
WebCore/platform/chromium/PlatformCursor.h
106 lines, +106, -0
106 lines, +0, -106
WebCore/platform/chromium/PlatformKeyboardEventChromium.cpp
82 lines, +82, -0
82 lines, +0, -82
WebCore/platform/chromium/PlatformScreenChromium.cpp
63 lines, +63, -0
63 lines, +0, -63
WebCore/platform/chromium/PlatformWidget.h
38 lines, +38, -0
38 lines, +0, -0
WebCore/platform/chromium/PopupMenuChromium.cpp
1112 lines, +1112, -0
1112 lines, +0, -1112
WebCore/platform/chromium/PopupMenuChromium.h
95 lines, +95, -0
95 lines, +0, -95
WebCore/platform/chromium/PopupMenuPrivate.h
46 lines, +46, -0
46 lines, +0, -46
WebCore/platform/chromium/RenderThemeGtk.cpp
535 lines, +535, -0
535 lines, +0, -535
WebCore/platform/chromium/RenderThemeGtk.h
142 lines, +142, -0
142 lines, +0, -142
WebCore/platform/chromium/ScrollbarThemeChromium.cpp
199 lines, +199, -0
199 lines, +0, -199
WebCore/platform/chromium/ScrollbarThemeChromium.h
79 lines, +79, -0
79 lines, +0, -79
WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
154 lines, +154, -0
154 lines, +0, -154
WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp
210 lines, +210, -0
210 lines, +0, -210
WebCore/platform/chromium/SearchPopupMenuChromium.cpp
49 lines, +49, -0
49 lines, +0, -49
WebCore/platform/chromium/SharedTimerChromium.cpp
46 lines, +46, -0
46 lines, +0, -46
WebCore/platform/chromium/SoundChromiumPosix.cpp
41 lines, +41, -0
41 lines, +0, -41
WebCore/platform/chromium/SoundChromiumWin.cpp
35 lines, +35, -0
35 lines, +0, -35
WebCore/platform/chromium/SSLKeyGeneratorChromium.cpp
51 lines, +51, -0
51 lines, +0, -51
WebCore/platform/chromium/SystemTimeChromium.cpp
47 lines, +47, -0
47 lines, +0, -47
WebCore/platform/chromium/TemporaryLinkStubs.cpp
58 lines, +58, -0
58 lines, +0, -58
WebCore/platform/chromium/TextBreakIteratorInternalICUChromium.cpp
31 lines, +31, -0
31 lines, +0, -31
WebCore/platform/chromium/WidgetChromium.cpp
81 lines, +81, -0
81 lines, +0, -81
WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp
635 lines, +635, -0
635 lines, +0, -635
WebCore/platform/graphics/chromium/FontCacheLinux.cpp
154 lines, +154, -0
154 lines, +0, -154
WebCore/platform/graphics/chromium/FontChromiumWin.cpp
290 lines, +290, -0
290 lines, +0, -290
WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp
226 lines, +226, -0
226 lines, +0, -226
WebCore/platform/graphics/chromium/FontCustomPlatformData.h
68 lines, +68, -0
68 lines, +0, -68
WebCore/platform/graphics/chromium/FontLinux.cpp
85 lines, +85, -0
85 lines, +0, -85
WebCore/platform/graphics/chromium/FontPlatformData.h
22 lines, +22, -0
22 lines, +0, -22
WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
152 lines, +152, -0
152 lines, +0, -152
WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.h
130 lines, +130, -0
130 lines, +0, -130
WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp
109 lines, +109, -0
109 lines, +0, -109
WebCore/platform/graphics/chromium/FontPlatformDataLinux.h
90 lines, +90, -0
90 lines, +0, -90
WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp
338 lines, +338, -0
338 lines, +0, -338
WebCore/platform/graphics/chromium/FontUtilsChromiumWin.h
98 lines, +98, -0
98 lines, +0, -98
WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp
249 lines, +249, -0
249 lines, +0, -249
WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux.cpp
72 lines, +72, -0
72 lines, +0, -72
WebCore/platform/graphics/chromium/IconChromiumLinux.cpp
58 lines, +58, -0
58 lines, +0, -58
WebCore/platform/graphics/chromium/IconChromiumMac.cpp
59 lines, +59, -0
59 lines, +0, -59
WebCore/platform/graphics/chromium/IconChromiumWin.cpp
78 lines, +78, -0
78 lines, +0, -78
WebCore/platform/graphics/chromium/ImageBufferData.h
56 lines, +56, -0
56 lines, +0, -56
WebCore/platform/graphics/chromium/ImageChromiumMac.mm
33 lines, +33, -0
33 lines, +0, -33
WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h
98 lines, +98, -0
98 lines, +0, -98
WebCore/platform/graphics/chromium/PlatformIcon.h
41 lines, +41, -0
41 lines, +0, -41
WebCore/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp
168 lines, +168, -0
168 lines, +0, -168
WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp
136 lines, +136, -0
136 lines, +0, -136
WebCore/platform/graphics/chromium/ThemeHelperChromiumWin.cpp
102 lines, +102, -0
102 lines, +0, -102
WebCore/platform/graphics/chromium/ThemeHelperChromiumWin.h
93 lines, +93, -0
93 lines, +0, -93
WebCore/platform/graphics/chromium/UniscribeHelper.cpp
868 lines, +868, -0
868 lines, +0, -868
WebCore/platform/graphics/chromium/UniscribeHelper.h
404 lines, +404, -0
404 lines, +0, -404
WebCore/platform/graphics/chromium/UniscribeHelperTextRun.cpp
135 lines, +135, -0
135 lines, +0, -135
WebCore/platform/graphics/chromium/UniscribeHelperTextRun.h
99 lines, +99, -0
99 lines, +0, -99
WebCore/platform/graphics/mac/FontCacheMac.mm
250 lines, +47, -0
250 lines, +0, -47
WebCore/platform/graphics/mac/SimpleFontDataMac.mm
441 lines, +7, -0
441 lines, +0, -7
WebCore/platform/graphics/skia/AffineTransformSkia.cpp
220 lines, +220, -0
220 lines, +0, -220
WebCore/platform/graphics/skia/BitmapImageSingleFrameSkia.h
62 lines, +62, -0
62 lines, +0, -62
WebCore/platform/graphics/skia/ColorSkia.cpp
43 lines, +43, -0
43 lines, +0, -43
WebCore/platform/graphics/skia/FloatPointSkia.cpp