summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2009-02-24 22:44:19 +0000
committermark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2009-02-24 22:44:19 +0000
commit07080ba7ee55ad9be7e39939a56a1c3dde0b6fe4 (patch)
tree0b93d7d8681ccb83d0e7cc3daca2d73d637c6ab0 /samples
parent76977ee1c79c21bd612eb60de590cd263a0c08e4 (diff)
downloadgyp-07080ba7ee55ad9be7e39939a56a1c3dde0b6fe4.tar.gz
webkit.gyp: Add files from Chromium r10283, which merged WebKit r41181.
chrome.gyp: Add ported file from r10293. git-svn-id: http://gyp.googlecode.com/svn/trunk@299 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
-rw-r--r--samples/chrome.gyp1
-rw-r--r--samples/webkit.gyp15
2 files changed, 15 insertions, 1 deletions
diff --git a/samples/chrome.gyp b/samples/chrome.gyp
index 710986a8..0f4cf126 100644
--- a/samples/chrome.gyp
+++ b/samples/chrome.gyp
@@ -1151,7 +1151,6 @@
'browser/bookmarks/bookmark_context_menu.cc',
'browser/bookmarks/bookmark_drag_data.cc',
'browser/bookmarks/bookmark_drop_info.cc',
- 'browser/bookmarks/bookmark_utils.cc',
'browser/debugger/debugger_view.cc',
'browser/debugger/debugger_window.cc',
'browser/importer/firefox2_importer.cc',
diff --git a/samples/webkit.gyp b/samples/webkit.gyp
index 4a8f79b1..064c2b6d 100644
--- a/samples/webkit.gyp
+++ b/samples/webkit.gyp
@@ -970,6 +970,18 @@
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGElementInstanceCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGLengthCustom.cpp',
'../third_party/WebKit/WebCore/bindings/v8/custom/V8SVGMatrixCustom.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptCachedFrameData.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptCallFrame.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptCallFrame.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptCallStack.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptCallStack.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptInstance.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptInstance.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptSourceCode.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptState.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptString.h',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptValue.cpp',
+ '../third_party/WebKit/WebCore/bindings/v8/ScriptValue.h',
'../third_party/WebKit/WebCore/bindings/v8/V8Binding.h',
'../third_party/WebKit/WebCore/bindings/v8/V8Proxy.h',
'port/bindings/v8/extensions/GCController.cpp',
@@ -1957,6 +1969,9 @@
'../third_party/WebKit/WebCore/platform/chromium/ChromiumDataObject.h',
'../third_party/WebKit/WebCore/platform/chromium/ClipboardChromium.cpp',
'../third_party/WebKit/WebCore/platform/chromium/ClipboardChromium.h',
+ '../third_party/WebKit/WebCore/platform/chromium/ClipboardChromiumLinux.cpp',
+ '../third_party/WebKit/WebCore/platform/chromium/ClipboardChromiumMac.cpp',
+ '../third_party/WebKit/WebCore/platform/chromium/ClipboardChromiumWin.cpp',
'../third_party/WebKit/WebCore/platform/chromium/ClipboardUtilitiesChromium.cpp',
'../third_party/WebKit/WebCore/platform/chromium/ClipboardUtilitiesChromium.h',
'../third_party/WebKit/WebCore/platform/chromium/ContextMenuChromium.cpp',