diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 20:31:45 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 20:31:45 +0000 |
| commit | a1054ccdc3b6ecff66ceef2ecfe3798c6ddfa25f (patch) | |
| tree | e4c6f82083edf4504031ab1c3ee81cf2ed67616f /webkit | |
| parent | 712fb2bb58859b16e5ace6845afad9d58851533b (diff) | |
| download | chromium_src-a1054ccdc3b6ecff66ceef2ecfe3798c6ddfa25f.zip chromium_src-a1054ccdc3b6ecff66ceef2ecfe3798c6ddfa25f.tar.gz chromium_src-a1054ccdc3b6ecff66ceef2ecfe3798c6ddfa25f.tar.bz2 | |
Linux fixes for the WebKit merge.
Review URL: http://codereview.chromium.org/8746
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/SConscript.port | 2 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 3 | ||||
| -rw-r--r-- | webkit/port/platform/GKURL_unittest.cpp | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index c93f33e..2c483cc 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -50,11 +50,11 @@ input_files = [ '$PORT_DIR/platform/chromium/DragDataChromium.cpp', '$PORT_DIR/platform/chromium/DragImageChromium.cpp', '$PORT_DIR/platform/chromium/FileChooserChromium.cpp', + '$PORT_DIR/platform/chromium/FileSystemChromium.cpp', '$PORT_DIR/platform/chromium/FramelessScrollView.cpp', '$PORT_DIR/platform/chromium/Language.cpp', '$PORT_DIR/platform/chromium/MimeTypeRegistryChromium.cpp', '$PORT_DIR/platform/chromium/PlatformKeyboardEventChromium.cpp', - '$PORT_DIR/platform/chromium/PlatformScrollBarChromium.cpp', '$PORT_DIR/platform/chromium/PopupMenuChromium.cpp', '$PORT_DIR/platform/chromium/SSLKeyGeneratorChromium.cpp', '$PORT_DIR/platform/chromium/SearchPopupMenuChromium.cpp', diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index 06c16a0..c8e9cf5 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -155,7 +155,9 @@ inputs = [ '$DERIVED_DIR/V8KeyboardEvent.cpp', '$DERIVED_DIR/V8Location.cpp', '$DERIVED_DIR/V8MediaList.cpp', + '$DERIVED_DIR/V8MessageChannel.cpp', '$DERIVED_DIR/V8MessageEvent.cpp', + '$DERIVED_DIR/V8MessagePort.cpp', '$DERIVED_DIR/V8MimeType.cpp', '$DERIVED_DIR/V8MimeTypeArray.cpp', '$DERIVED_DIR/V8MouseEvent.cpp', @@ -324,6 +326,7 @@ inputs = [ '$PORT_DIR/bindings/v8/v8_npobject.cpp', '$PORT_DIR/bindings/v8/v8_proxy.cpp', '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp', + '$PORT_DIR/bindings/v8/V8MessagePortCustom.cpp', '$PORT_DIR/bindings/v8/V8XMLHttpRequestCustom.cpp', '$PORT_DIR/page/inspector/InspectorController.cpp', ] diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index e592c47..17f771d 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -345,6 +345,7 @@ input_files = [ '$WEBCORE_DIR/loader/archive/ArchiveResourceCollection.cpp', '$WEBCORE_DIR/page/AccessibilityImageMapLink.cpp', + '$WEBCORE_DIR/page/AccessibilityList.cpp', '$WEBCORE_DIR/page/AccessibilityListBox.cpp', '$WEBCORE_DIR/page/AccessibilityListBoxOption.cpp', '$WEBCORE_DIR/page/AccessibilityObject.cpp', @@ -481,6 +482,7 @@ input_files = [ '$WEBCORE_DIR/rendering/InlineFlowBox.cpp', '$WEBCORE_DIR/rendering/InlineTextBox.cpp', '$WEBCORE_DIR/rendering/LayoutState.cpp', + '$WEBCORE_DIR/rendering/Length.cpp', '$WEBCORE_DIR/rendering/ListMarkerBox.cpp', '$WEBCORE_DIR/rendering/MediaControlElements.cpp', '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp', @@ -789,6 +791,7 @@ if env['PLATFORM'] in ('darwin'): if env['PLATFORM'] == 'posix': input_files.extend([ '$WEBCORE_DIR/platform/posix/FileSystemPOSIX.cpp', + '$WEBCORE_DIR/platform/gtk/ScrollbarThemeGtk.cpp', ]) # Windows specific files. diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index 7010b0f..4a80e3a 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -195,6 +195,7 @@ idl_files = [ 'dom/EventTarget.idl', 'dom/EventTargetNode.idl', 'dom/KeyboardEvent.idl', + 'dom/MessageChannel.idl', 'dom/MessageEvent.idl', 'dom/MessagePort.idl', 'dom/MouseEvent.idl', @@ -276,7 +277,6 @@ idl_files = [ 'html/HTMLQuoteElement.idl', 'html/HTMLScriptElement.idl', 'html/HTMLSelectElement.idl', - 'html/HTMLSelectionInputElement.idl', 'html/HTMLSourceElement.idl', 'html/HTMLStyleElement.idl', 'html/HTMLTableCaptionElement.idl', @@ -304,7 +304,6 @@ idl_files = [ 'page/DOMSelection.idl', 'page/DOMWindow.idl', 'page/History.idl', - 'page/JavaScriptCallFrame.idl', 'page/Location.idl', 'page/Navigator.idl', 'page/Screen.idl', diff --git a/webkit/port/platform/GKURL_unittest.cpp b/webkit/port/platform/GKURL_unittest.cpp index 4da8c94..4286d0a 100644 --- a/webkit/port/platform/GKURL_unittest.cpp +++ b/webkit/port/platform/GKURL_unittest.cpp @@ -587,4 +587,4 @@ TEST(GKURL, Offsets) { EXPECT_TRUE(kurl3.pathStart() == gurl3.pathStart()); EXPECT_TRUE(kurl3.pathEnd() == gurl3.pathEnd()); EXPECT_TRUE(kurl3.pathAfterLastSlash() == gurl3.pathAfterLastSlash()); -}
\ No newline at end of file +} |