diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-07-30 15:23:17 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-04 13:01:35 +0100 |
| commit | 3327b402405fd9155abbcf63c0ea972f77a3d35c (patch) | |
| tree | 236f6fb8ff133e9f230c323fe59a72df4fd6f093 /WebCore | |
| parent | 12c3bcdf8b6154d6be87a0b8d88e6f8de9ff222a (diff) | |
| download | external_webkit-3327b402405fd9155abbcf63c0ea972f77a3d35c.zip external_webkit-3327b402405fd9155abbcf63c0ea972f77a3d35c.tar.gz external_webkit-3327b402405fd9155abbcf63c0ea972f77a3d35c.tar.bz2 | |
Merge Webkit at r64264 : Fix Makefiles.
Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 5 | ||||
| -rw-r--r-- | WebCore/Android.mk | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index bca703f..06865c1 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -612,14 +612,9 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) # These headers are required by the V8 bindings even when Inspector is disabled GEN := \ $(intermediates)/bindings/V8InjectedScriptHost.h \ -<<<<<<< HEAD $(intermediates)/bindings/V8Inspector.h \ - $(intermediates)/bindings/V8InspectorBackend.h \ $(intermediates)/bindings/V8InspectorFrontendHost.h \ $(intermediates)/bindings/V8ScriptProfile.h -======= - $(intermediates)/bindings/V8InspectorFrontendHost.h ->>>>>>> webkit.org at r64264 $(GEN): PRIVATE_PATH := $(LOCAL_PATH) $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --outputdir $(dir $@) $< diff --git a/WebCore/Android.mk b/WebCore/Android.mk index d43fabc..82b444a 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -189,6 +189,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/UIEvent.cpp \ dom/UIEventWithKeyState.cpp \ dom/UserGestureIndicator.cpp \ + dom/UserTypingGestureIndicator.cpp \ dom/ViewportArguments.cpp \ dom/WebKitAnimationEvent.cpp \ dom/WebKitTransitionEvent.cpp \ @@ -437,6 +438,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/LinkHash.cpp \ platform/Logging.cpp \ platform/MIMETypeRegistry.cpp \ + platform/SchemeRegistry.cpp \ platform/ScrollView.cpp \ platform/Scrollbar.cpp \ platform/ScrollbarThemeComposite.cpp \ |