Permalink
Browse files

Merge webkit.org at r54127 : Fix Makefiles

Note that we update the XCode project file to add the new
GeolocationPositionCache files to allow us to build Android WebKit on Mac.

Change-Id: Iab5f73da50b0457cf6212d0aa1a8f6a413027f50
  • Loading branch information...
Steve Block
Steve Block committed Feb 2, 2010
1 parent 8e01d56 commit b5909d0379f5d5440e8c0596b1c7ddc564284be6
View
@@ -90,6 +90,7 @@ LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebCore \
$(LOCAL_PATH)/WebCore/accessibility \
+ $(LOCAL_PATH)/WebCore/bindings/generic \
$(LOCAL_PATH)/WebCore/css \
$(LOCAL_PATH)/WebCore/dom \
$(LOCAL_PATH)/WebCore/editing \
@@ -129,6 +130,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebCore/svg/animation \
$(LOCAL_PATH)/WebCore/svg/graphics \
$(LOCAL_PATH)/WebCore/svg/graphics/filters \
+ $(LOCAL_PATH)/WebCore/websockets \
$(LOCAL_PATH)/WebCore/workers \
$(LOCAL_PATH)/WebCore/xml
@@ -141,6 +141,7 @@ LOCAL_SRC_FILES := \
runtime/StructureChain.cpp \
runtime/TimeoutChecker.cpp \
runtime/UString.cpp \
+ runtime/UStringImpl.cpp \
\
wrec/CharacterClass.cpp \
wrec/CharacterClassConstructor.cpp \
@@ -110,6 +110,7 @@ GEN := \
$(intermediates)/bindings/V8Notation.h \
$(intermediates)/bindings/V8OverflowEvent.h \
$(intermediates)/bindings/V8PageTransitionEvent.h \
+ $(intermediates)/bindings/V8PopStateEvent.h \
$(intermediates)/bindings/V8ProcessingInstruction.h \
$(intermediates)/bindings/V8ProgressEvent.h \
$(intermediates)/bindings/V8Range.h \
View
@@ -24,6 +24,8 @@
##
LOCAL_SRC_FILES := \
+ bindings/generic/BindingSecurityBase.cpp \
+ \
css/CSSBorderImageValue.cpp \
css/CSSCanvasValue.cpp \
css/CSSCharsetRule.cpp \
@@ -241,6 +243,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
\
html/Blob.cpp \
html/CollectionCache.cpp \
+ html/DateComponents.cpp \
html/File.cpp \
html/FileList.cpp \
html/FormDataList.cpp \
@@ -259,7 +262,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
html/HTMLTokenizer.cpp \
html/HTMLViewSourceDocument.cpp \
html/ImageData.cpp \
- html/ISODateTime.cpp \
html/PreloadScanner.cpp \
html/TimeRanges.cpp \
html/ValidityState.cpp \
@@ -30,6 +30,7 @@ BINDING_C_INCLUDES := \
\
$(LOCAL_PATH)/bindings/v8 \
$(LOCAL_PATH)/bindings/v8/custom \
+ $(LOCAL_PATH)/bindings/v8/specialization \
$(LOCAL_PATH)/bridge \
$(LOCAL_PATH)/bridge/jni \
$(LOCAL_PATH)/bridge/jni/v8 \
@@ -46,6 +47,8 @@ LOCAL_SRC_FILES += \
bindings/v8/DateExtension.cpp \
bindings/v8/DOMData.cpp \
bindings/v8/DOMDataStore.cpp \
+ bindings/v8/DOMWrapperWorld.cpp \
+ bindings/v8/IsolatedWorld.cpp \
bindings/v8/MainThreadDOMData.cpp \
bindings/v8/NPV8Object.cpp \
bindings/v8/RuntimeEnabledFeatures.cpp \
@@ -63,20 +66,22 @@ LOCAL_SRC_FILES += \
bindings/v8/ScriptState.cpp \
bindings/v8/ScriptStringImpl.cpp \
bindings/v8/ScriptValue.cpp \
+ bindings/v8/SerializedScriptValue.cpp \
bindings/v8/StaticDOMDataStore.cpp \
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 \
bindings/v8/V8DataGridDataSource.cpp \
bindings/v8/V8EventListenerList.cpp \
bindings/v8/V8GCController.cpp \
bindings/v8/V8Helpers.cpp \
bindings/v8/V8HiddenPropertyName.cpp \
+ bindings/v8/V8IsolatedContext.cpp \
bindings/v8/V8Index.cpp \
- bindings/v8/V8IsolatedWorld.cpp \
bindings/v8/V8LazyEventListener.cpp \
bindings/v8/V8NPObject.cpp \
bindings/v8/V8NPUtils.cpp \
@@ -94,7 +99,6 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8AttrCustom.cpp \
bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp \
bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp \
- bindings/v8/custom/V8ClientRectListCustom.cpp \
bindings/v8/custom/V8ClipboardCustom.cpp \
bindings/v8/custom/V8ConsoleCustom.cpp \
bindings/v8/custom/V8CoordinatesCustom.cpp \
@@ -117,7 +121,6 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8EventCustom.cpp \
bindings/v8/custom/V8EventSourceConstructor.cpp \
bindings/v8/custom/V8EventSourceCustom.cpp \
- bindings/v8/custom/V8FileListCustom.cpp \
bindings/v8/custom/V8GeolocationCustom.cpp \
bindings/v8/custom/V8HistoryCustom.cpp \
bindings/v8/custom/V8HTMLAllCollectionCustom.cpp \
@@ -135,18 +138,19 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8HTMLOptionElementConstructor.cpp \
bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp \
bindings/v8/custom/V8HTMLPlugInElementCustom.cpp \
- bindings/v8/custom/V8HTMLSelectElementCollectionCustom.cpp \
bindings/v8/custom/V8HTMLSelectElementCustom.cpp \
bindings/v8/custom/V8LocationCustom.cpp \
bindings/v8/custom/V8MessageChannelConstructor.cpp \
bindings/v8/custom/V8MessagePortCustom.cpp \
bindings/v8/custom/V8MessageEventCustom.cpp \
bindings/v8/custom/V8NamedNodeMapCustom.cpp \
bindings/v8/custom/V8NamedNodesCollection.cpp \
+ bindings/v8/custom/V8NavigatorCustom.cpp \
bindings/v8/custom/V8NodeCustom.cpp \
bindings/v8/custom/V8NodeFilterCustom.cpp \
bindings/v8/custom/V8NodeIteratorCustom.cpp \
bindings/v8/custom/V8NodeListCustom.cpp \
+ bindings/v8/custom/V8PopStateEventCustom.cpp \
bindings/v8/custom/V8SQLResultSetRowListCustom.cpp \
bindings/v8/custom/V8SQLTransactionCustom.cpp \
bindings/v8/custom/V8WebSocketCustom.cpp
@@ -169,7 +173,9 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8WorkerCustom.cpp \
bindings/v8/custom/V8XMLHttpRequestConstructor.cpp \
bindings/v8/custom/V8XMLHttpRequestCustom.cpp \
- bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp
+ bindings/v8/custom/V8XMLHttpRequestUploadCustom.cpp \
+ \
+ bindings/v8/specialization/V8BindingState.cpp
LOCAL_SRC_FILES += \
bridge/jni/JNIBridge.cpp \
@@ -1120,6 +1120,8 @@
550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
5913953B110758450083EC55 /* JNIBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 5913953A110758450083EC55 /* JNIBridge.h */; };
5913953D1107584E0083EC55 /* JNIBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5913953C1107584E0083EC55 /* JNIBridge.cpp */; };
+ 599ABBC51119761C0083897F /* GeolocationPositionCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 599ABBC41119761C0083897F /* GeolocationPositionCache.cpp */; };
+ 599ABBC91119762B0083897F /* GeolocationPositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 599ABBC81119762B0083897F /* GeolocationPositionCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
599E759011055A1F00D904FA /* Bridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 599E758F11055A1F00D904FA /* Bridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
59A9E7B01104758800DFB4C1 /* JavaInstanceJSC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */; };
59A9E7B21104759400DFB4C1 /* JavaInstanceJSC.h in Headers */ = {isa = PBXBuildFile; fileRef = 59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */; };
@@ -6501,6 +6503,8 @@
550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
5913953A110758450083EC55 /* JNIBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JNIBridge.h; sourceTree = "<group>"; };
5913953C1107584E0083EC55 /* JNIBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JNIBridge.cpp; sourceTree = "<group>"; };
+ 599ABBC41119761C0083897F /* GeolocationPositionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationPositionCache.cpp; sourceTree = "<group>"; };
+ 599ABBC81119762B0083897F /* GeolocationPositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPositionCache.h; sourceTree = "<group>"; };
599E758F11055A1F00D904FA /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bridge.h; path = bridge/Bridge.h; sourceTree = "<group>"; };
59A9E7AF1104758800DFB4C1 /* JavaInstanceJSC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JavaInstanceJSC.cpp; path = jsc/JavaInstanceJSC.cpp; sourceTree = "<group>"; };
59A9E7B11104759400DFB4C1 /* JavaInstanceJSC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JavaInstanceJSC.h; path = jsc/JavaInstanceJSC.h; sourceTree = "<group>"; };
@@ -11382,6 +11386,8 @@
65BF02180974806300C43196 /* page */ = {
isa = PBXGroup;
children = (
+ 599ABBC81119762B0083897F /* GeolocationPositionCache.h */,
+ 599ABBC41119761C0083897F /* GeolocationPositionCache.cpp */,
316FE1060E6E1D8400BF6088 /* animation */,
93C09A820B064F05005ABD4D /* mac */,
8538F0000AD71770006A81D1 /* AbstractView.idl */,
@@ -18465,6 +18471,7 @@
93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */,
E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
97DD4D870FDF4D6E00ECF9A4 /* XSSAuditor.h in Headers */,
+ 599ABBC91119762B0083897F /* GeolocationPositionCache.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -20639,6 +20646,7 @@
93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */,
E1BE512D0CF6C512002EA959 /* XSLTUnicodeSort.cpp in Sources */,
97DD4D860FDF4D6E00ECF9A4 /* XSSAuditor.cpp in Sources */,
+ 599ABBC51119761C0083897F /* GeolocationPositionCache.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

0 comments on commit b5909d0

Please sign in to comment.