diff options
| author | Steve Block <steveblock@google.com> | 2011-06-13 23:23:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 03:16:53 +0100 |
| commit | b4d8044b71fecca026f297f220ba85ef67c7e42e (patch) | |
| tree | a1f7e51bf60d5388e2404264395f556d7f8c8a95 | |
| parent | df107b9482a6c8016393ca90bae1e6ecc49e943b (diff) | |
| download | external_webkit-b4d8044b71fecca026f297f220ba85ef67c7e42e.zip external_webkit-b4d8044b71fecca026f297f220ba85ef67c7e42e.tar.gz external_webkit-b4d8044b71fecca026f297f220ba85ef67c7e42e.tar.bz2 | |
Adds WebTiming IDL files to build and sets ENABLE_WEB_TIMING
Bug: 4442995
Change-Id: I9c37d7022946fd66e1ee635328182bf1456b0de7
| -rw-r--r-- | Source/JavaScriptCore/wtf/Platform.h | 1 | ||||
| -rw-r--r-- | Source/WebCore/Android.derived.jscbindings.mk | 5 | ||||
| -rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h index e10dd0e..e92af89 100644 --- a/Source/JavaScriptCore/wtf/Platform.h +++ b/Source/JavaScriptCore/wtf/Platform.h @@ -731,6 +731,7 @@ // Converts ListBoxes to dropdown popup lists. #define ENABLE_NO_LISTBOX_RENDERING 1 #define ENABLE_LINK_PREFETCH 1 +#define ENABLE_WEB_TIMING 1 // Android ENABLE guards not present upstream #define ENABLE_COMPOSITED_FIXED_ELEMENTS 1 // FIXME: Rename to ENABLE_ANDROID_COMPOSITED_FIXED_ELEMENTS diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk index f8b704e..d859b15 100644 --- a/Source/WebCore/Android.derived.jscbindings.mk +++ b/Source/WebCore/Android.derived.jscbindings.mk @@ -50,7 +50,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ bindings/scripts/generate-bindings.pl \ ) -FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1 ENABLE_FILE_READER=1 ENABLE_BLOB=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1 ENABLE_FILE_READER=1 ENABLE_BLOB=1 ENABLE_WEB_TIMING=1 ifeq ($(ENABLE_SVG), true) FEATURE_DEFINES += ENABLE_SVG=1 @@ -378,6 +378,9 @@ GEN := \ $(intermediates)/page/JSNavigatorUserMediaError.h \ $(intermediates)/page/JSNavigatorUserMediaErrorCallback.h \ $(intermediates)/page/JSNavigatorUserMediaSuccessCallback.h \ + $(intermediates)/page/JSPerformance.h \ + $(intermediates)/page/JSPerformanceNavigation.h \ + $(intermediates)/page/JSPerformanceTiming.h \ $(intermediates)/page/JSPositionError.h \ $(intermediates)/page/JSScreen.h \ $(intermediates)/page/JSSpeechInputEvent.h \ diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index 4a81f24..992cc40 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -31,7 +31,7 @@ js_binding_scripts := \ $(LOCAL_PATH)/bindings/scripts/generate-bindings.pl # Add ACCELERATED_COMPOSITING=1 and ENABLE_3D_RENDERING=1 for layers support -FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1 ENABLE_FILE_READER=1 ENABLE_BLOB=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 ENABLE_DEVICE_ORIENTATION=1 ENABLE_FILE_READER=1 ENABLE_BLOB=1 ENABLE_WEB_TIMING=1 # The defines above should be identical to those for JSC. FEATURE_DEFINES += V8_BINDING @@ -364,6 +364,9 @@ GEN := \ $(intermediates)/bindings/V8NavigatorUserMediaError.h \ $(intermediates)/bindings/V8NavigatorUserMediaErrorCallback.h \ $(intermediates)/bindings/V8NavigatorUserMediaSuccessCallback.h \ + $(intermediates)/bindings/V8Performance.h \ + $(intermediates)/bindings/V8PerformanceNavigation.h \ + $(intermediates)/bindings/V8PerformanceTiming.h \ $(intermediates)/bindings/V8PositionError.h \ $(intermediates)/bindings/V8Screen.h \ $(intermediates)/bindings/V8SpeechInputEvent.h \ |