diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-13 05:20:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 05:20:16 -0700 |
| commit | f4958a7d95cd5fbc1c74905e229b02c95cd5ee78 (patch) | |
| tree | 14a0f1b07a19948c2ed93d0d8547caa7fe10aa0e /WebCore/DerivedSources.make | |
| parent | d074a7997da8ce379434eb6e208b97cde8a0841c (diff) | |
| parent | f964bc1fd59a545a80a0cc2529ad8830be514871 (diff) | |
| download | external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.zip external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.gz external_webkit-f4958a7d95cd5fbc1c74905e229b02c95cd5ee78.tar.bz2 | |
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Diffstat (limited to 'WebCore/DerivedSources.make')
| -rw-r--r-- | WebCore/DerivedSources.make | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make index 3f2f0f4..f25e91e 100644 --- a/WebCore/DerivedSources.make +++ b/WebCore/DerivedSources.make @@ -28,6 +28,7 @@ VPATH = \ $(WebCore) \ + $(WebCore)/bindings/generic \ $(WebCore)/bindings/js \ $(WebCore)/bindings/objc \ $(WebCore)/css \ @@ -126,6 +127,7 @@ DOM_CLASSES = \ Database \ DatabaseCallback \ DatabaseSync \ + DeviceMotionEvent \ DeviceOrientationEvent \ Document \ DocumentFragment \ @@ -225,18 +227,20 @@ DOM_CLASSES = \ HTMLVideoElement \ History \ IDBAny \ + IDBCursor \ IDBDatabaseError \ IDBDatabaseException \ - IDBDatabaseRequest \ + IDBDatabase \ IDBErrorEvent \ IDBEvent \ IDBFactory \ IDBIndex \ IDBKey \ IDBKeyRange \ - IDBObjectStoreRequest \ + IDBObjectStore \ IDBRequest \ IDBSuccessEvent \ + IDBTransaction \ ImageData \ InjectedScriptHost \ InspectorFrontendHost \ @@ -490,8 +494,6 @@ WEB_DOM_HEADERS := $(filter-out WebDOMXSLTProcessor.h,$(DOM_CLASSES:%=WebDOM%.h) endif # BUILDING_WX all : \ - remove-stray-plugin-and-mime-type-files \ - \ $(JS_DOM_HEADERS) \ $(WEB_DOM_HEADERS) \ \ @@ -558,12 +560,6 @@ endif # -------- -# Temporary build rule. Take out once some time has passed. - -.PHONY : remove-stray-plugin-and-mime-type-files -remove-stray-plugin-and-mime-type-files : - (rm DOMMimeTypeArray.h DOMMimeTypeArray.mm DOMMimeTypeArrayInternal.h DOMPluginArray.h DOMPluginArray.mm DOMPluginArrayInternal.h 2> /dev/null) || echo -n - # CSS property names and value keywords WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in |