diff options
| -rw-r--r-- | WebCore/Android.derived.mk | 14 | ||||
| -rw-r--r-- | WebCore/Android.mk | 4 | ||||
| -rw-r--r-- | WebCore/Android.v8.mk | 1 | ||||
| -rw-r--r-- | WebCore/page/android/InspectorControllerAndroid.cpp | 5 |
4 files changed, 5 insertions, 19 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index a992811..ddc87c7 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -441,20 +441,6 @@ LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/canvas/%.cpp : $(intermediates)/html/canvas/%.h GEN := \ - $(intermediates)/inspector/JSInspectorBackend.h \ - $(intermediates)/inspector/JSJavaScriptCallFrame.h - -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/inspector/JS%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/inspector/%.cpp : $(intermediates)/inspector/%.h - -GEN := \ $(intermediates)/loader/appcache/JSDOMApplicationCache.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 7afe803..0fb4b06 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -200,9 +200,6 @@ LOCAL_SRC_FILES := \ bindings/js/JSImageConstructor.cpp \ bindings/js/JSImageDataCustom.cpp \ bindings/js/JSInspectedObjectWrapper.cpp \ - bindings/js/JSInspectorBackendCustom.cpp \ - bindings/js/JSInspectorCallbackWrapper.cpp \ - bindings/js/JSJavaScriptCallFrameCustom.cpp \ bindings/js/JSLazyEventListener.cpp \ bindings/js/JSLocationCustom.cpp \ bindings/js/JSMessageChannelConstructor.cpp \ @@ -630,7 +627,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ page/android/DragControllerAndroid.cpp \ page/android/EventHandlerAndroid.cpp \ - page/android/InspectorControllerAndroid.cpp \ \ page/animation/AnimationBase.cpp \ page/animation/AnimationController.cpp \ diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk index dffe8a3..c92a6eb 100644 --- a/WebCore/Android.v8.mk +++ b/WebCore/Android.v8.mk @@ -437,7 +437,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ page/android/DragControllerAndroid.cpp \ page/android/EventHandlerAndroid.cpp \ - page/android/InspectorControllerAndroid.cpp \ \ page/animation/AnimationBase.cpp \ page/animation/AnimationController.cpp \ diff --git a/WebCore/page/android/InspectorControllerAndroid.cpp b/WebCore/page/android/InspectorControllerAndroid.cpp index 3c6a3a2..c72cbf9 100644 --- a/WebCore/page/android/InspectorControllerAndroid.cpp +++ b/WebCore/page/android/InspectorControllerAndroid.cpp @@ -37,6 +37,11 @@ #if USE(JSC) #include "Profile.h" #endif + +// Now that Inspector call sites are properly guarded with ENABLE(INSPECTOR), +// this stub is no longer needed. +// TODO: Upstream this to webkit.org. + // This stub file was created to avoid building and linking in all the // Inspector codebase. If you would like to enable the Inspector, do the // following steps: |