Commit f18aae37 authored by weinig's avatar weinig

JavaScriptCore:

        Reviewed by Darin.

        - patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=10176
          Make WebCore compile with -Wundef

          * Adds -Wundef flag to Xcode project
          * Converts #ifs to #ifdef and #ifndefs where needed.
          * Added #define YYMAXDEPTH 10000 in kjs/grammar.y
            to fix a warning from within Bison.

        * JavaScriptCore.xcodeproj/project.pbxproj:
        * bindings/jni/jni_jsobject.cpp:
        (JavaJSObject::getSlot):
        (JavaJSObject::setSlot):
        * bindings/npapi.h:
        * bindings/objc/objc_class.mm:
        (KJS::Bindings::ObjcClass::methodsNamed):
        (KJS::Bindings::ObjcClass::fieldNamed):
        * bindings/objc/objc_instance.mm:
        (ObjcInstance::invokeMethod):
        * bindings/objc/objc_runtime.mm:
        (ObjcMethod::getMethodSignature):
        (ObjcField::name):
        (ObjcField::type):
        * kjs/grammar.y:
        * kjs/identifier.h:

JavaScriptGlue:

        Reviewed by Darin.

        - patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=10176
          Make WebCore compile with -Wundef

          * Adds -Wundef flag to Xcode project

        * JavaScriptGlue.xcodeproj/project.pbxproj:

WebCore:

        Reviewed by Darin.

        - patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=10176
          Make WebCore compile with -Wundef

          * Adds -Wundef flag to Xcode project
          * Converts #ifs to #ifdef and #ifndefs where needed.
          * Replaces #ifdef WIN32 with #if PLATFORM(WIN_OS) or PLATFORM(WIN)
            (and in one instance in config.h with #if !COMPILER(MSVC))
          * Added #define YYMAXDEPTH 10000 in XPathGrammar.y and CSSGrammar.y
            to fix a warning from within Bison.
          * Cleaned up style a little in surrounding code.

        * WebCore.xcodeproj/project.pbxproj:
        * bridge/mac/WebCoreAXObject.mm:
        (-[WebCoreAXObject doAXTextMarkerRangeForUnorderedTextMarkers:]):
        * config.h:
        * css/CSSGrammar.y:
        * css/MediaFeatureNames.cpp:
        * css/MediaFeatureNames.h:
        * css/cssparser.cpp:
        * dom/ContainerNode.cpp:
        (WebCore::ContainerNode::setActive):
        * dom/Element.cpp:
        (WebCore::Element::attach):
        * dom/Element.h:
        * dom/EventNames.cpp:
        * dom/EventNames.h:
        * dom/NamedAttrMap.h:
        * dom/Position.cpp:
        * dom/QualifiedName.cpp:
        * dom/QualifiedName.h:
        * dom/Range.h:
        * dom/XMLTokenizer.cpp:
        (WebCore::XMLTokenizer::error):
        * html/HTMLTokenizer.cpp:
        (WebCore::HTMLTokenizer::scriptHandler):
        (WebCore::HTMLTokenizer::scriptExecution):
        (WebCore::HTMLTokenizer::parseTag):
        (WebCore::HTMLTokenizer::continueProcessing):
        (WebCore::HTMLTokenizer::write):
        (WebCore::HTMLTokenizer::timerFired):
        (WebCore::HTMLTokenizer::notifyFinished):
        * kcanvas/device/quartz/KCanvasFilterQuartz.h:
        * kcanvas/device/quartz/KRenderingDeviceQuartz.h:
        * ksvg2/css/SVGRenderStyle.h:
        * ksvg2/css/SVGRenderStyleDefs.h:
        * ksvg2/scripts/make_names.pl:
        * loader/CachedResource.h:
        * loader/LoaderFunctions.h:
        * loader/loader.h:
        * page/Frame.cpp:
        * page/FrameTree.cpp:
        * page/FrameView.cpp:
        (WebCore::FrameView::clear):
        (WebCore::FrameView::layout):
        (WebCore::FrameView::layoutTimerFired):
        (WebCore::FrameView::scheduleRelayout):
        (WebCore::FrameView::unscheduleRelayout):
        * platform/AtomicString.cpp:
        * platform/AtomicString.h:
        * platform/Cursor.h:
        * platform/DeprecatedArray.h:
        * platform/DeprecatedString.cpp:
        (WebCore::allocateHandle):
        (WebCore::initializeHandleNodeBlock):
        (WebCore::freeHandle):
        * platform/FloatPoint.h:
        * platform/FloatRect.h:
        * platform/FloatSize.h:
        * platform/GraphicsContext.h:
        * platform/Image.h:
        * platform/IntPoint.h:
        * platform/IntRect.h:
        (WebCore::IntRect::inflateX):
        (WebCore::IntRect::inflateY):
        * platform/IntSize.h:
        * platform/PlatformKeyboardEvent.h:
        * platform/PlatformMouseEvent.h:
        * platform/PlatformString.h:
        * platform/ResourceLoader.h:
        * platform/ResourceLoaderInternal.h:
        (WebCore::ResourceLoaderInternal::ResourceLoaderInternal):
        * platform/ScrollView.h:
        * platform/StaticConstructors.h:
        * platform/StreamingTextDecoderICU.cpp:
        (WebCore::StreamingTextDecoderICU::convert):
        * platform/StringImpl.h:
        * platform/Widget.h:
        * platform/mac/BlockExceptions.mm:
        * platform/mac/ColorMac.mm:
        (+[WebCoreControlTintObserver WebCore]):
        * platform/mac/FloatPointMac.mm:
        * platform/mac/FloatRectMac.mm:
        * platform/mac/FloatSizeMac.mm:
        * platform/mac/FontMac.mm:
        * platform/mac/GraphicsContextMac.mm:
        (WebCore::GraphicsContext::drawFocusRing):
        * platform/mac/IntPointMac.mm:
        * platform/mac/IntRectMac.mm:
        * platform/mac/IntSizeMac.mm:
        * platform/mac/WebCoreSystemInterface.h:
        * rendering/RenderBlock.h:
        * rendering/RenderTableCell.h:
        * rendering/bidi.cpp:
        (WebCore::appendRun):
        (WebCore::RenderBlock::layoutInlineChildren):
        * xml/XSLTProcessor.cpp:
        (WebCore::parseErrorFunc):
        * xpath/impl/XPathGrammar.y:

WebKit:

        Reviewed by Darin.

        - patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=10176
          Make WebCore compile with -Wundef

          * Adds -Wundef flag to Xcode project
          * Converts #ifs to #ifdef and #ifndefs where needed.

        * Carbon/CarbonUtils.m:
        * Carbon/CarbonWindowAdapter.m:
        * Carbon/HIViewAdapter.m:
        (+[NSView bindHIViewToNSView:nsView:]):
        * Carbon/HIWebView.m:
        (HIWebViewEventHandler):
        * Misc/WebFileDatabase.m:
        (UniqueFilePathForKey):
        * Misc/WebNSWindowExtras.m:
        (swizzleInstanceMethod):
        * Misc/WebTypesInternal.h:
        * Plugins/WebNetscapeDeprecatedFunctions.c:
        * Plugins/WebNetscapeDeprecatedFunctions.h:
        * Plugins/WebNetscapePluginPackage.h:
        * Plugins/WebNetscapePluginPackage.m:
        (-[WebNetscapePluginPackage unloadWithoutShutdown]):
        (-[WebNetscapePluginPackage load]):
        * WebKit.xcodeproj/project.pbxproj:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15781 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5a226ca4
2006-08-03 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Darin.
- patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=10176
Make WebCore compile with -Wundef
* Adds -Wundef flag to Xcode project
* Converts #ifs to #ifdef and #ifndefs where needed.
* Added #define YYMAXDEPTH 10000 in kjs/grammar.y
to fix a warning from within Bison.
* JavaScriptCore.xcodeproj/project.pbxproj:
* bindings/jni/jni_jsobject.cpp:
(JavaJSObject::getSlot):
(JavaJSObject::setSlot):
* bindings/npapi.h:
* bindings/objc/objc_class.mm:
(KJS::Bindings::ObjcClass::methodsNamed):
(KJS::Bindings::ObjcClass::fieldNamed):
* bindings/objc/objc_instance.mm:
(ObjcInstance::invokeMethod):
* bindings/objc/objc_runtime.mm:
(ObjcMethod::getMethodSignature):
(ObjcField::name):
(ObjcField::type):
* kjs/grammar.y:
* kjs/identifier.h:
2006-08-03 Anders Carlsson <acarlsson@apple.com>
Reviewed by John Sullivan.
......
......@@ -1583,6 +1583,7 @@
"-Wwrite-strings",
"-Wno-format-y2k",
"-Wno-long-double",
"-Wundef",
);
};
name = Debug;
......@@ -1623,6 +1624,7 @@
"-Wwrite-strings",
"-Wno-format-y2k",
"-Wno-long-double",
"-Wundef",
);
};
name = Release;
......@@ -1669,6 +1671,7 @@
"-Wwrite-strings",
"-Wno-format-y2k",
"-Wno-long-double",
"-Wundef",
);
};
name = Production;
......@@ -1763,6 +1766,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Debug;
......@@ -1801,6 +1805,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Release;
......@@ -1836,6 +1841,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Production;
......
......@@ -244,7 +244,7 @@ void JavaJSObject::removeMember(jstring memberName) const
jobject JavaJSObject::getSlot(jint index) const
{
#if __LP64__
#ifdef __LP64__
JS_LOG ("index = %d\n", index);
#else
JS_LOG ("index = %ld\n", index);
......@@ -261,7 +261,7 @@ jobject JavaJSObject::getSlot(jint index) const
void JavaJSObject::setSlot(jint index, jobject value) const
{
#if __LP64__
#ifdef __LP64__
JS_LOG ("index = %d, value = %p\n", index, value);
#else
JS_LOG ("index = %ld, value = %p\n", index, value);
......
......@@ -115,7 +115,7 @@ typedef unsigned short uint16;
#ifndef _UINT32
#define _UINT32
#if __LP64__
#ifdef __LP64__
typedef unsigned int uint32;
#else /* __LP64__ */
typedef unsigned long uint32;
......@@ -129,7 +129,7 @@ typedef short int16;
#ifndef _INT32
#define _INT32
#if __LP64__
#ifdef __LP64__
typedef int int32;
#else /* __LP64__ */
typedef long int32;
......
......@@ -93,7 +93,7 @@ MethodList ObjcClass::methodsNamed(const char* JSName, Instance*) const
ClassStructPtr thisClass = _isa;
while (thisClass && methodList.length() < 1) {
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
unsigned numMethodsInClass = 0;
MethodStructPtr* objcMethodList = class_copyMethodList(thisClass, &numMethodsInClass);
#else
......@@ -103,7 +103,7 @@ MethodList ObjcClass::methodsNamed(const char* JSName, Instance*) const
unsigned numMethodsInClass = objcMethodList->method_count;
#endif
for (unsigned i = 0; i < numMethodsInClass; i++) {
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
MethodStructPtr objcMethod = objcMethodList[i];
SEL objcMethodSelector = method_getName(objcMethod);
const char* objcMethodSelectorName = sel_getName(objcMethodSelector);
......@@ -132,7 +132,7 @@ MethodList ObjcClass::methodsNamed(const char* JSName, Instance*) const
break;
}
}
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
thisClass = class_getSuperclass(thisClass);
free(objcMethodList);
#else
......@@ -191,7 +191,7 @@ Field* ObjcClass::fieldNamed(const char* name, Instance* instance) const
// introspection.
while (thisClass) {
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
unsigned numFieldsInClass = 0;
IvarStructPtr* ivarsInClass = class_copyIvarList(thisClass, &numFieldsInClass);
#else
......@@ -200,7 +200,7 @@ Field* ObjcClass::fieldNamed(const char* name, Instance* instance) const
unsigned numFieldsInClass = fieldsInClass->ivar_count;
#endif
for (unsigned i = 0; i < numFieldsInClass; i++) {
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
IvarStructPtr objcIVar = ivarsInClass[i];
const char* objcIvarName = ivar_getName(objcIVar);
#else
......@@ -226,7 +226,7 @@ Field* ObjcClass::fieldNamed(const char* name, Instance* instance) const
break;
}
}
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
thisClass = class_getSuperclass(thisClass);
free(ivarsInClass);
#else
......
......@@ -124,7 +124,7 @@ JSValue* ObjcInstance::invokeMethod(ExecState* exec, const MethodList &methodLis
method = static_cast<ObjcMethod*>(methodList.methodAt(0));
NSMethodSignature* signature = method->getMethodSignature();
NSInvocation* invocation = [NSInvocation invocationWithMethodSignature:signature];
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
[invocation setSelector:sel_registerName(method->name())];
#else
[invocation setSelector:(SEL)method->name()];
......
......@@ -57,7 +57,7 @@ int ObjcMethod::numParameters() const
NSMethodSignature* ObjcMethod::getMethodSignature() const
{
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
return [_objcClass instanceMethodSignatureForSelector:sel_registerName(_selector)];
#else
return [_objcClass instanceMethodSignatureForSelector:(SEL)_selector];
......@@ -89,7 +89,7 @@ ObjcField::ObjcField(CFStringRef name)
const char* ObjcField::name() const
{
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
if (_ivar)
return ivar_getName(_ivar);
#else
......@@ -101,7 +101,7 @@ const char* ObjcField::name() const
RuntimeType ObjcField::type() const
{
#if OBJC_API_VERSION >= 2
#if defined(OBJC_API_VERSION) && OBJC_API_VERSION >= 2
if (_ivar)
return ivar_getTypeEncoding(_ivar);
#else
......
......@@ -36,6 +36,8 @@
// Not sure why, but yacc doesn't add this define along with the others.
#define yylloc kjsyylloc
#define YYMAXDEPTH 10000
/* default values for bison */
#define YYDEBUG 0
#if !PLATFORM(DARWIN)
......
......@@ -82,7 +82,7 @@ namespace KJS {
static PassRefPtr<UString::Rep> add(UString::Rep *);
};
#if !KJS_IDENTIFIER_HIDE_GLOBALS
#ifndef KJS_IDENTIFIER_HIDE_GLOBALS
extern const Identifier nullIdentifier;
inline const Identifier &Identifier::null()
......@@ -117,7 +117,7 @@ namespace KJS {
macro(valueOf)
// Define external global variables for all property names above (and one more).
#if !KJS_IDENTIFIER_HIDE_GLOBALS
#ifndef KJS_IDENTIFIER_HIDE_GLOBALS
extern const Identifier specialPrototypePropertyName;
#define KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL(name) extern const Identifier name ## PropertyName;
......@@ -125,6 +125,6 @@ namespace KJS {
#undef KJS_IDENTIFIER_DECLARE_PROPERTY_NAME_GLOBAL
#endif
}
} // namespace KJS
#endif
#endif // KJS_IDENTIFIER_H
2006-08-03 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Darin.
- patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=10176
Make WebCore compile with -Wundef
* Adds -Wundef flag to Xcode project
* JavaScriptGlue.xcodeproj/project.pbxproj:
2006-07-29 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Darin.
......
......@@ -65,7 +65,7 @@
0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; indentWidth = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
1422E86709DE3BCE00749B87 /* testjsglue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = testjsglue.cpp; sourceTree = "<group>"; };
1422E87709DE3BE800749B87 /* testjsglue */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testjsglue; sourceTree = BUILT_PRODUCTS_DIR; };
1422E87709DE3BE800749B87 /* testjsglue */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = testjsglue; sourceTree = BUILT_PRODUCTS_DIR; };
DD66F3D508F73ED700C75FD7 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
DD66F3D608F73ED700C75FD7 /* JavaScriptGlue.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptGlue.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DD66F3F508F7401B00C75FD7 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -442,6 +442,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Debug;
......@@ -479,6 +480,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Release;
......@@ -512,6 +514,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Production;
......
2006-08-03 Sam Weinig <sam.weinig@gmail.com>
Reviewed by Darin.
- patch for http://bugzilla.opendarwin.org/show_bug.cgi?id=10176
Make WebCore compile with -Wundef
* Adds -Wundef flag to Xcode project
* Converts #ifs to #ifdef and #ifndefs where needed.
* Replaces #ifdef WIN32 with #if PLATFORM(WIN_OS) or PLATFORM(WIN)
(and in one instance in config.h with #if !COMPILER(MSVC))
* Added #define YYMAXDEPTH 10000 in XPathGrammar.y and CSSGrammar.y
to fix a warning from within Bison.
* Cleaned up style a little in surrounding code.
* WebCore.xcodeproj/project.pbxproj:
* bridge/mac/WebCoreAXObject.mm:
(-[WebCoreAXObject doAXTextMarkerRangeForUnorderedTextMarkers:]):
* config.h:
* css/CSSGrammar.y:
* css/MediaFeatureNames.cpp:
* css/MediaFeatureNames.h:
* css/cssparser.cpp:
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::setActive):
* dom/Element.cpp:
(WebCore::Element::attach):
* dom/Element.h:
* dom/EventNames.cpp:
* dom/EventNames.h:
* dom/NamedAttrMap.h:
* dom/Position.cpp:
* dom/QualifiedName.cpp:
* dom/QualifiedName.h:
* dom/Range.h:
* dom/XMLTokenizer.cpp:
(WebCore::XMLTokenizer::error):
* html/HTMLTokenizer.cpp:
(WebCore::HTMLTokenizer::scriptHandler):
(WebCore::HTMLTokenizer::scriptExecution):
(WebCore::HTMLTokenizer::parseTag):
(WebCore::HTMLTokenizer::continueProcessing):
(WebCore::HTMLTokenizer::write):
(WebCore::HTMLTokenizer::timerFired):
(WebCore::HTMLTokenizer::notifyFinished):
* kcanvas/device/quartz/KCanvasFilterQuartz.h:
* kcanvas/device/quartz/KRenderingDeviceQuartz.h:
* ksvg2/css/SVGRenderStyle.h:
* ksvg2/css/SVGRenderStyleDefs.h:
* ksvg2/scripts/make_names.pl:
* loader/CachedResource.h:
* loader/LoaderFunctions.h:
* loader/loader.h:
* page/Frame.cpp:
* page/FrameTree.cpp:
* page/FrameView.cpp:
(WebCore::FrameView::clear):
(WebCore::FrameView::layout):
(WebCore::FrameView::layoutTimerFired):
(WebCore::FrameView::scheduleRelayout):
(WebCore::FrameView::unscheduleRelayout):
* platform/AtomicString.cpp:
* platform/AtomicString.h:
* platform/Cursor.h:
* platform/DeprecatedArray.h:
* platform/DeprecatedString.cpp:
(WebCore::allocateHandle):
(WebCore::initializeHandleNodeBlock):
(WebCore::freeHandle):
* platform/FloatPoint.h:
* platform/FloatRect.h:
* platform/FloatSize.h:
* platform/GraphicsContext.h:
* platform/Image.h:
* platform/IntPoint.h:
* platform/IntRect.h:
(WebCore::IntRect::inflateX):
(WebCore::IntRect::inflateY):
* platform/IntSize.h:
* platform/PlatformKeyboardEvent.h:
* platform/PlatformMouseEvent.h:
* platform/PlatformString.h:
* platform/ResourceLoader.h:
* platform/ResourceLoaderInternal.h:
(WebCore::ResourceLoaderInternal::ResourceLoaderInternal):
* platform/ScrollView.h:
* platform/StaticConstructors.h:
* platform/StreamingTextDecoderICU.cpp:
(WebCore::StreamingTextDecoderICU::convert):
* platform/StringImpl.h:
* platform/Widget.h:
* platform/mac/BlockExceptions.mm:
* platform/mac/ColorMac.mm:
(+[WebCoreControlTintObserver WebCore]):
* platform/mac/FloatPointMac.mm:
* platform/mac/FloatRectMac.mm:
* platform/mac/FloatSizeMac.mm:
* platform/mac/FontMac.mm:
* platform/mac/GraphicsContextMac.mm:
(WebCore::GraphicsContext::drawFocusRing):
* platform/mac/IntPointMac.mm:
* platform/mac/IntRectMac.mm:
* platform/mac/IntSizeMac.mm:
* platform/mac/WebCoreSystemInterface.h:
* rendering/RenderBlock.h:
* rendering/RenderTableCell.h:
* rendering/bidi.cpp:
(WebCore::appendRun):
(WebCore::RenderBlock::layoutInlineChildren):
* xml/XSLTProcessor.cpp:
(WebCore::parseErrorFunc):
* xpath/impl/XPathGrammar.y:
2006-08-03 Adam Roben <aroben@apple.com>
Reviewed by Maciej and Beth.
......
......@@ -3982,6 +3982,8 @@
935C475E09AC4CAE00A6AAB4 /* HistoryMac.mm */,
F58784FF02DE375901EA4122 /* JavaAppletWidget.mm */,
93E47C5B09BE2BBB0019C5C1 /* PageMac.mm */,
55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */,
55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */,
F5B2A4FC02E2220F018635CB /* WebCoreCache.h */,
F5B2A4FD02E2220F018635CB /* WebCoreCache.mm */,
BEF7EEA005FF8F0D009717EE /* WebCoreEditCommand.h */,
......@@ -4015,8 +4017,6 @@
F587855502DE375901EA4122 /* WebCoreViewFactory.m */,
5150C2A10702629000AF642C /* WebDashboardRegion.h */,
5150C2A50702629800AF642C /* WebDashboardRegion.m */,
55998A5A052B59CC0017A6C1 /* WebCoreAXObject.h */,
55998A5B052B59CC0017A6C1 /* WebCoreAXObject.mm */,
);
path = mac;
sourceTree = "<group>";
......@@ -5187,6 +5187,10 @@
F587868202DE3B8601EA4122 /* PopUpButton.h */,
F587852B02DE375901EA4122 /* RegularExpression.cpp */,
F58786B302DE3B8601EA4122 /* RegularExpression.h */,
6545F66C09B82FED0013006F /* ResourceLoader.cpp */,
6545F66D09B82FED0013006F /* ResourceLoader.h */,
6545F66E09B82FED0013006F /* ResourceLoaderClient.h */,
6545F66F09B82FED0013006F /* ResourceLoaderInternal.h */,
9385F761098D9C3100D90D24 /* Screen.h */,
BC7B2AF80450824100A8000F /* ScrollBar.h */,
9353673E09AED79200D35CD6 /* ScrollBarMode.h */,
......@@ -5219,10 +5223,6 @@
F58786BF02DE3B8601EA4122 /* TextStream.h */,
93309EA1099EB78C0056E581 /* Timer.cpp */,
9305B24C098F1B6B00C28855 /* Timer.h */,
6545F66C09B82FED0013006F /* ResourceLoader.cpp */,
6545F66D09B82FED0013006F /* ResourceLoader.h */,
6545F66E09B82FED0013006F /* ResourceLoaderClient.h */,
6545F66F09B82FED0013006F /* ResourceLoaderInternal.h */,
9380F47109A11AB4001FDB34 /* Widget.cpp */,
9380F47209A11AB4001FDB34 /* Widget.h */,
93B780C909B3B7FE00690162 /* WidgetClient.h */,
......@@ -7436,6 +7436,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Debug;
......@@ -7473,6 +7474,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Release;
......@@ -7507,6 +7509,7 @@
"-Wno-format-y2k",
"-Wno-unused-parameter",
"-Wno-long-double",
"-Wundef",
);
};
name = Production;
......
......@@ -1362,7 +1362,7 @@ static void AXAttributedStringAppendReplaced (NSMutableAttributedString *attrStr
- (id)doAXTextMarkerRangeForUnorderedTextMarkers: (NSArray *) markers
{
#if MARKERARRAY_SELF_TEST
#if defined(MARKERARRAY_SELF_TEST) && MARKERARRAY_SELF_TEST
WebCoreTextMarkerRange *tmr = [self getSelectedTextMarkerRange];
WebCoreTextMarker *tm1 = AXTextMarkerRangeCopyEndMarker(tmr);
WebCoreTextMarker *tm2 = AXTextMarkerRangeCopyStartMarker(tmr);
......
......@@ -23,11 +23,12 @@
#define KHTML_NO_XBL 1
#define KHTML_XSLT 1
#if __APPLE__
#define HAVE_FUNC_USLEEP 1
#ifndef CGFLOAT_DEFINED
#if __LP64__
#ifdef __LP64__
typedef double CGFloat;
#else
typedef float CGFloat;
......@@ -35,9 +36,10 @@ typedef float CGFloat;
#define CGFLOAT_DEFINED 1
#endif
#endif
#endif /* __APPLE__ */
#if WIN32
#if PLATFORM(WIN_OS)
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0500
......@@ -54,10 +56,10 @@ typedef float CGFloat;
// FIXME: Should probably just dump this eventually, but it's needed for now.
// We get this from some system place on OS X; probably better not to use it
// in WebCore code.
#include <assert.h>
#endif
#endif /* PLATFORM(WIN_OS) */
#ifdef __cplusplus
......@@ -69,6 +71,6 @@ typedef float CGFloat;
#endif
#if !defined(WIN32) // can't get this to compile on Visual C++ yet
#if !COMPILER(MSVC) // can't get this to compile on Visual C++ yet
#define AVOID_STATIC_CONSTRUCTORS 1
#endif
......@@ -117,6 +117,7 @@ static inline int getValueID(const char* tagStr, int len)
return val->id;
}
#define YYMAXDEPTH 10000
#define YYDEBUG 0
#define YYPARSE_PARAM parser
......
......@@ -22,14 +22,15 @@
#include "config.h"
#if AVOID_STATIC_CONSTRUCTORS
#ifdef AVOID_STATIC_CONSTRUCTORS
#define CSS_MEDIAQUERY_NAMES_HIDE_GLOBALS 1
#endif
#include "MediaFeatureNames.h"
#include "StaticConstructors.h"
namespace WebCore { namespace MediaFeatureNames {
namespace WebCore {
namespace MediaFeatureNames {
#define DEFINE_MEDIAFEATURE_GLOBAL(name, str) \
DEFINE_GLOBAL(AtomicString, name##MediaFeature, str)
......@@ -50,4 +51,5 @@ void init()
}
}
} }
} // namespace MediaFeatureNames
} // namespace WebCore
......@@ -24,7 +24,8 @@
#include "AtomicString.h"
namespace WebCore { namespace MediaFeatureNames {
namespace WebCore {
namespace MediaFeatureNames {
#define CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(macro) \
macro(color, "color") \
......@@ -54,15 +55,15 @@ namespace WebCore { namespace MediaFeatureNames {
macro(min_width, "min-width") \
// end of macro
#if !CSS_MEDIAQUERY_NAMES_HIDE_GLOBALS
#ifndef CSS_MEDIAQUERY_NAMES_HIDE_GLOBALS
#define CSS_MEDIAQUERY_NAMES_DECLARE(name, str) extern const AtomicString name##MediaFeature;
CSS_MEDIAQUERY_NAMES_FOR_EACH_MEDIAFEATURE(CSS_MEDIAQUERY_NAMES_DECLARE)
#undef CSS_MEDIAQUERY_NAMES_DECLARE
#endif
void init();
} }
#endif
void init();
} // namespace MediaFeatureNames
} // namespace WebCore
#endif // MEDIAFEATURENAMES_H
......@@ -2669,7 +2669,7 @@ bool CSSParser::parseBorderImage(int propId, bool important)
return context.failed();
}
#if CSS_DEBUG
#ifdef CSS_DEBUG
static inline int yyerror(const char *str)
{
......
......@@ -783,7 +783,7 @@ void ContainerNode::setActive(bool down, bool pause)
// to repaint the "down" state of the control is about the same time as it would take to repaint the
// "up" state. Once you assume this, you can just delay for 100ms - that time (assuming that after you
// leave this method, it will be about that long before the flush of the up state happens again).
#if HAVE_FUNC_USLEEP
#ifdef HAVE_FUNC_USLEEP
double startTime = currentTime();
#endif
......@@ -792,7 +792,7 @@ void ContainerNode::setActive(bool down, bool pause)
// FIXME: Find a substitute for usleep for Win32.
// Better yet, come up with a way of doing this that doesn't use this sort of thing at all.
#if HAVE_FUNC_USLEEP
#ifdef HAVE_FUNC_USLEEP
// Now pause for a small amount of time (1/10th of a second from before we repainted in the pressed state)
double remainingTime = 0.1 - (currentTime() - startTime);
if (remainingTime > 0)
......
......@@ -540,7 +540,7 @@ void Element::removedFromDocument()
void Element::attach()