diff options
author | Andrei Popescu <andreip@google.com> | 2009-08-19 14:08:17 +0100 |
---|---|---|
committer | Andrei Popescu <andreip@google.com> | 2009-08-19 14:08:17 +0100 |
commit | b025c93b6adb8f94f5604f6a595b2e67522cb67c (patch) | |
tree | 55dec1b0880002720841a34aa55305cc4ad0695e | |
parent | 76de9f7763de0e4568056a5a26c93030f21e0b90 (diff) | |
download | external_webkit-b025c93b6adb8f94f5604f6a595b2e67522cb67c.zip external_webkit-b025c93b6adb8f94f5604f6a595b2e67522cb67c.tar.gz external_webkit-b025c93b6adb8f94f5604f6a595b2e67522cb67c.tar.bz2 |
Revert "Continue with JSC errors."
This reverts commit 76de9f7763de0e4568056a5a26c93030f21e0b90.
-rwxr-xr-x | WebCore/Android.derived.mk | 13 | ||||
-rw-r--r-- | WebCore/Android.mk | 16 | ||||
-rw-r--r-- | WebCore/bindings/js/JSDOMWindowCustom.cpp | 5 | ||||
-rw-r--r-- | WebCore/bindings/js/JSEventCustom.cpp | 2 |
4 files changed, 23 insertions, 13 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index 319ba86..0af323f 100755 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -207,7 +207,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ bindings/scripts/generate-bindings.pl \ ) -FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 +FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 GEN := \ $(intermediates)/css/JSCSSCharsetRule.h \ @@ -257,8 +257,8 @@ GEN := \ $(intermediates)/dom/JSAttr.h \ $(intermediates)/dom/JSCDATASection.h \ $(intermediates)/dom/JSCharacterData.h \ - $(intermediates)/dom/JSClientRect.h \ - $(intermediates)/dom/JSClientRectList.h \ + $(intermediates)/dom/JSClientRect.h \ + $(intermediates)/dom/JSClientRectList.h \ $(intermediates)/dom/JSClipboard.h \ $(intermediates)/dom/JSComment.h \ $(intermediates)/dom/JSDOMCoreException.h \ @@ -269,7 +269,6 @@ GEN := \ $(intermediates)/dom/JSElement.h \ $(intermediates)/dom/JSEntity.h \ $(intermediates)/dom/JSEntityReference.h \ - $(intermediates)/dom/JSErrorEvent.h \ $(intermediates)/dom/JSEvent.h \ $(intermediates)/dom/JSEventException.h \ $(intermediates)/dom/JSKeyboardEvent.h \ @@ -396,21 +395,19 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/htm GEN := \ $(intermediates)/html/canvas/JSCanvasGradient.h \ $(intermediates)/html/canvas/JSCanvasPixelArray.h \ - $(intermediates)/html/canvas/JSCanvasPattern.h \ $(intermediates)/html/canvas/JSCanvasRenderingContext2D.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)/html/canvas/JS%.h : $(LOCAL_PATH)/html/canvas/%.idl $(js_binding_scripts) - $(transform-generated-source) + $(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. +# # above rules. Specifying this explicitly makes -j2 work. $(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) diff --git a/WebCore/Android.mk b/WebCore/Android.mk index e9b11dd..fc7471c 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -238,6 +238,11 @@ LOCAL_SRC_FILES := \ bindings/js/ScriptCallStack.cpp \ bindings/js/ScriptController.cpp \ bindings/js/ScriptControllerAndroid.cpp \ + bindings/js/ScriptControllerGtk.cpp \ + bindings/js/ScriptControllerHaiku.cpp \ + bindings/js/ScriptControllerQt.cpp \ + bindings/js/ScriptControllerWin.cpp \ + bindings/js/ScriptControllerWx.cpp \ bindings/js/ScriptEventListener.cpp \ bindings/js/ScriptFunctionCall.cpp \ bindings/js/ScriptObject.cpp \ @@ -262,6 +267,8 @@ LOCAL_SRC_FILES := \ bridge/runtime_method.cpp \ bridge/runtime_object.cpp \ bridge/runtime_root.cpp \ + bridge/testbindings.cpp \ + bridge/testqtbindings.cpp \ \ css/CSSBorderImageValue.cpp \ css/CSSCanvasValue.cpp \ @@ -417,6 +424,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/WheelEvent.cpp \ dom/XMLTokenizer.cpp \ dom/XMLTokenizerLibxml2.cpp \ + dom/XMLTokenizerQt.cpp \ dom/XMLTokenizerScope.cpp \ dom/default/PlatformMessagePortChannel.cpp \ \ @@ -454,6 +462,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ editing/SelectionController.cpp \ editing/SetNodeAttributeCommand.cpp \ editing/SmartReplace.cpp \ + editing/SmartReplaceCF.cpp \ editing/SmartReplaceICU.cpp \ editing/SplitElementCommand.cpp \ editing/SplitTextNodeCommand.cpp \ @@ -471,6 +480,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ editing/visible_units.cpp \ \ history/BackForwardList.cpp \ + history/BackForwardListChromium.cpp \ history/CachedFrame.cpp \ history/CachedPage.cpp \ history/HistoryItem.cpp \ @@ -942,6 +952,12 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ rendering/RenderTextControlSingleLine.cpp \ rendering/RenderTextFragment.cpp \ rendering/RenderTheme.cpp \ + rendering/RenderThemeChromiumLinux.cpp \ + rendering/RenderThemeChromiumSkia.cpp \ + rendering/RenderThemeChromiumWin.cpp \ + rendering/RenderThemeSafari.cpp \ + rendering/RenderThemeWin.cpp \ + rendering/RenderThemeWince.cpp \ rendering/RenderTreeAsText.cpp \ rendering/RenderVideo.cpp \ rendering/RenderView.cpp \ diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp index c8e5db6..44a11e4 100644 --- a/WebCore/bindings/js/JSDOMWindowCustom.cpp +++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp @@ -55,6 +55,7 @@ #include "Location.h" #include "MediaPlayer.h" #include "MessagePort.h" +#include "NotificationCenter.h" #include "Page.h" #include "PlatformScreen.h" #include "RegisteredEventListener.h" @@ -67,10 +68,6 @@ #include <runtime/JSObject.h> #include <runtime/PrototypeFunction.h> -#if ENABLE(NOTIFICATIONS) -#include "NotificationCenter.h" -#endif - using namespace JSC; namespace WebCore { diff --git a/WebCore/bindings/js/JSEventCustom.cpp b/WebCore/bindings/js/JSEventCustom.cpp index 804c529..7f9030e 100644 --- a/WebCore/bindings/js/JSEventCustom.cpp +++ b/WebCore/bindings/js/JSEventCustom.cpp @@ -110,7 +110,7 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event) #endif #if ENABLE(TOUCH_EVENTS) // Android else if (event->isTouchEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, TouchEvent, event); + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, TouchEvent, event); #endif else wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, UIEvent, event); |