Permalink
Browse files

Merge WebKit at r76408: Fix Makefiles.

Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
  • Loading branch information...
1 parent ab9e7a1 commit 61f2d6a1f71aa7a52ec56b93958324b8b6de1b6a Ben Murdoch committed May 17, 2011
@@ -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 \
@@ -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 \
@@ -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 \
@@ -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 \

0 comments on commit 61f2d6a

Please sign in to comment.