diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-17 14:00:19 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
| commit | 61f2d6a1f71aa7a52ec56b93958324b8b6de1b6a (patch) | |
| tree | c2725562177e2bdf3ea86a323a0b39b9d2edfd46 /Source/WebCore | |
| parent | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (diff) | |
| download | external_webkit-61f2d6a1f71aa7a52ec56b93958324b8b6de1b6a.zip external_webkit-61f2d6a1f71aa7a52ec56b93958324b8b6de1b6a.tar.gz external_webkit-61f2d6a1f71aa7a52ec56b93958324b8b6de1b6a.tar.bz2 | |
Merge WebKit at r76408: Fix Makefiles.
Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/Android.derived.jscbindings.mk | 1 | ||||
| -rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 1 | ||||
| -rw-r--r-- | Source/WebCore/Android.mk | 2 | ||||
| -rw-r--r-- | Source/WebCore/Android.v8bindings.mk | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk index 641727c..002440a 100644 --- a/Source/WebCore/Android.derived.jscbindings.mk +++ b/Source/WebCore/Android.derived.jscbindings.mk @@ -250,6 +250,7 @@ GEN := \ $(intermediates)/html/JSHTMLImageElement.h \ $(intermediates)/html/JSHTMLInputElement.h \ $(intermediates)/html/JSHTMLIsIndexElement.h \ + $(intermediates)/html/JSHTMLKeygenElement.h \ $(intermediates)/html/JSHTMLLIElement.h \ $(intermediates)/html/JSHTMLLabelElement.h \ $(intermediates)/html/JSHTMLLegendElement.h \ diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index e6ac529..70b6377 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -234,6 +234,7 @@ GEN := \ $(intermediates)/bindings/V8HTMLImageElement.h \ $(intermediates)/bindings/V8HTMLInputElement.h \ $(intermediates)/bindings/V8HTMLIsIndexElement.h \ + $(intermediates)/bindings/V8HTMLKeygenElement.h \ $(intermediates)/bindings/V8HTMLLIElement.h \ $(intermediates)/bindings/V8HTMLLabelElement.h \ $(intermediates)/bindings/V8HTMLLegendElement.h \ diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index a3e6d09..a222521 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -530,7 +530,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/ScrollAnimator.cpp \ platform/ScrollView.cpp \ platform/Scrollbar.cpp \ - platform/ScrollbarClient.cpp \ + platform/ScrollableArea.cpp \ platform/ScrollbarThemeComposite.cpp \ platform/SharedBuffer.cpp \ platform/Theme.cpp \ diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk index 63b6ae1..710d381 100644 --- a/Source/WebCore/Android.v8bindings.mk +++ b/Source/WebCore/Android.v8bindings.mk @@ -69,7 +69,6 @@ LOCAL_SRC_FILES += \ bindings/v8/V8AbstractEventListener.cpp \ bindings/v8/V8Binding.cpp \ bindings/v8/V8Collection.cpp \ - bindings/v8/V8ConsoleMessage.cpp \ bindings/v8/V8DOMMap.cpp \ bindings/v8/V8DOMWindowShell.cpp \ bindings/v8/V8DOMWrapper.cpp \ @@ -87,6 +86,7 @@ LOCAL_SRC_FILES += \ bindings/v8/V8NodeFilterCondition.cpp \ bindings/v8/V8Proxy.cpp \ bindings/v8/V8Utilities.cpp \ + bindings/v8/V8WindowErrorHandler.cpp \ bindings/v8/V8WorkerContextEventListener.cpp \ bindings/v8/WorkerContextExecutionProxy.cpp \ bindings/v8/WorkerScriptController.cpp \ |