Bug #: 4234
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 31 Jul 2005 19:51:24 +0000 (19:51 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 31 Jul 2005 19:51:24 +0000 (19:51 +0000)
Submitted by: eseidel
Reviewed by: hyatt
        * WebCore-svg.exp: Added.
        * WebCore.xcodeproj/project.pbxproj: Uses WebCore+SVG.exp
        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
        (KCanvasFEFloodQuartz::getCIFilter): Fixed longjmp warning.
        * kdom/css/impl/CSSStyleSelector.cpp:
        (CSSStyleSelector::applyRule): Fixed "un-initialized" warning.
        * kdom/ecma/DOMLookup.h: Removed <iostream>
        * ksvg2/impl/svgpathparser.cpp: Removed <iostream>
        Several fixes required to make Deployment style builds
        compile correctly.  Also WebCore-svg.exp symbols were added
        both when generating WebCore-combined.exp as well as for
        generating a new WebCore+SVG.exp export file for the Deployment
        style builds, allowing DrawTest to link properly.
        A few other small warnings were caught and fixed.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=4234

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9982 268f45cc-cd09-0410-ab3c-d52691b4dbfc

SVGSupport/kdom/css/CSSStyleSelector.cpp
SVGSupport/kdom/ecma/DOMLookup.h
WebCore/ChangeLog-2005-08-23
WebCore/WebCore-svg.exp [new file with mode: 0644]
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
WebCore/ksvg2/svg/svgpathparser.cpp

index 9a02bb69cd268de3bd505182ce8c710bb3e69a80..708b9a644fa6d85a8c7638849ac8aa322c65850c 100644 (file)
@@ -3652,7 +3652,7 @@ void CSSStyleSelector::applyRule(int id, CSSValueImpl *value)
                                style->setContent(val->getCounterValue(), i != 0);
                        else if(val->primitiveType() == CSS_IDENT)
                        {
-                               EQuoteContent quote;
+                               EQuoteContent quote = QC_NO_QUOTE;
                                switch (val->getIdent())
                                {
                                        case CSS_VAL_OPEN_QUOTE:
index f73013189919072c9fbdd5c545a1c2434f285f4d..f3fa71c9cee79ea9d9f27d68bcc97564a7450a03 100644 (file)
@@ -23,7 +23,9 @@
 #ifndef KDOM_DOMLookup_H
 #define KDOM_DOMLookup_H
 
+#ifndef APPLE_CHANGES
 #include <iostream>
+#endif
 #include <kjs/value.h>
 #include <kjs/object.h>
 #include <kjs/lookup.h>
index 3d42a17051f7cf70e23f9a91718dc0980c61ee3b..606e81b5ec974c6338f5e629d7206de7aaa72e8e 100644 (file)
@@ -1,3 +1,23 @@
+2005-07-31  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by hyatt.
+
+        * WebCore-svg.exp: Added.
+        * WebCore.xcodeproj/project.pbxproj: Uses WebCore+SVG.exp
+        * kcanvas/device/quartz/KCanvasFilterQuartz.mm: 
+        (KCanvasFEFloodQuartz::getCIFilter): Fixed longjmp warning.
+        * kdom/css/impl/CSSStyleSelector.cpp:
+        (CSSStyleSelector::applyRule): Fixed "un-initialized" warning.
+        * kdom/ecma/DOMLookup.h: Removed <iostream>
+        * ksvg2/impl/svgpathparser.cpp: Removed <iostream>
+        Several fixes required to make Deployment style builds
+        compile correctly.  Also WebCore-svg.exp symbols were added
+        both when generating WebCore-combined.exp as well as for
+        generating a new WebCore+SVG.exp export file for the Deployment
+        style builds, allowing DrawTest to link properly.
+        A few other small warnings were caught and fixed.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=4234
+
 2005-07-29  David Hyatt  <hyatt@apple.com>
 
        This patch makes simulated clicks actually go into active state briefly.  Spacebar
diff --git a/WebCore/WebCore-svg.exp b/WebCore/WebCore-svg.exp
new file mode 100644 (file)
index 0000000..975c26e
--- /dev/null
@@ -0,0 +1,2 @@
+.objc_class_name_DrawDocument
+.objc_class_name_DrawView
index 0ee02ddad9ac026e2e3af0145ed7fd8e1ea9fc76..98dfe96240dc6b4289cbd50a453f6ac1dff24e09 100644 (file)
                                "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h",
                                "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).cpp",
                        );
-                       script = "[ \"$INPUT_FILE_BASE\" = \"parser\" ] && export PREFIX_BASE=\"css\" && echo \"success! css\"\n[ \"$INPUT_FILE_BASE\" = \"kdomparsercss\" ] && export PREFIX_BASE=\"$INPUT_FILE_BASE\"  && echo \"success! $INPUT_FILE_BASE\"\n[ \"$INPUT_FILE_BASE\" = \"xpath\" ] && export PREFIX_BASE=\"$INPUT_FILE_BASE\"  && echo \"success! $INPUT_FILE_BASE\"\n[ -z \"$PREFIX_BASE\" ] && echo \"Unhandled yacc filename \\\"$INPUT_FILE_BASE\\\", edit build rule.\" && exit 1\nexport YY=\"yy\"\n\nbison -d -p \"$PREFIX_BASE$YY\" \"$INPUT_FILE_PATH\" -o \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.cpp\"\ncat \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.cpp.h\" \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.hpp\" > \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.h\" 2> /dev/null || echo -n";
+                       script = "[ \"$INPUT_FILE_BASE\" = \"parser\" ] && export PREFIX_BASE=\"css\" && echo \"success! css\"\n[ \"$INPUT_FILE_BASE\" = \"kdomparsercss\" ] && export PREFIX_BASE=\"$INPUT_FILE_BASE\"  && echo \"success! $INPUT_FILE_BASE\"\n[ \"$INPUT_FILE_BASE\" = \"xpath\" ] && export PREFIX_BASE=\"$INPUT_FILE_BASE\"  && echo \"success! $INPUT_FILE_BASE\"\n[ -z \"$PREFIX_BASE\" ] && echo \"Unhandled yacc filename \\\"$INPUT_FILE_BASE\\\", edit build rule.\" && exit 1\nexport YY=\"yy\"\n\nbison -d -p \"$PREFIX_BASE$YY\" \"$INPUT_FILE_PATH\" -o \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.cpp\"\nrm \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.h\"\ncat \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.cpp.h\" \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.hpp\" > \"$DERIVED_FILE_DIR/$INPUT_FILE_BASE.h\" 2> /dev/null || echo -n";
                };
 /* End PBXBuildRule section */
 
                                A8212A8008794A2300677359 /* libxml2-WebCore */,
                                A8212A8108794A2300677359 /* tokenizer.cpp */,
                                A8212A8208794A2300677359 /* WebCore-combined.exp */,
+                               A8AA619B089CDABF00666825 /* WebCore+SVG.exp */,
                                A8212A8308794A2300677359 /* xmlhttprequest.lut.h */,
                                A8212A8408794A2300677359 /* xmlserializer.lut.h */,
                                A8212A8508794A2300677359 /* domparser.lut.h */,
                        );
                        inputPaths = (
                                WebCore.exp,
+                               "WebCore-svg.exp",
                                "WebCore-tests.exp",
                        );
                        name = "WebCore-combined.exp";
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "if gcc -dumpversion | grep -q '^3\\.'\nthen\n    cat WebCore.exp WebCore-tests.exp | grep -v '^__ZTI' > \"$DERIVED_FILE_DIR/WebCore-combined.exp\"\nelse\n    cat WebCore.exp WebCore-tests.exp > \"$DERIVED_FILE_DIR/WebCore-combined.exp\"\nfi";
+                       shellScript = "if gcc -dumpversion | grep -q '^3\\.'\nthen\n    cat WebCore.exp WebCore-tests.exp WebCore-svg.exp | grep -v '^__ZTI' > \"$DERIVED_FILE_DIR/WebCore-combined.exp\"\n    cat WebCore.exp WebCore-svg.exp | grep -v '^__ZTI' > \"$DERIVED_FILE_DIR/WebCore+SVG.exp\"\nelse\n    cat WebCore.exp WebCore-tests.exp WebCore-svg.exp > \"$DERIVED_FILE_DIR/WebCore-combined.exp\"\n    cat WebCore.exp WebCore-svg.exp > \"$DERIVED_FILE_DIR/WebCore+SVG.exp\"\nfi";
                };
                A8212A8308794A2300677359 /* xmlhttprequest.lut.h */ = {
                        isa = PBXShellScriptBuildPhase;
                        shellPath = /bin/sh;
                        shellScript = "cat ksvg2/css/impl/cssvalues.in > \"$DERIVED_FILE_DIR/ksvgcssvalues.in\"\ncd \"$DERIVED_FILE_DIR\"\n\"$SRCROOT/kdom/scripts/cssmakevalues\" -n KSVG -f ksvgcssvalues.in";
                };
+               A8AA619B089CDABF00666825 /* WebCore+SVG.exp */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                               WebCore.exp,
+                               "WebCore-svg.exp",
+                       );
+                       name = "WebCore+SVG.exp";
+                       outputPaths = (
+                               "$(DERIVED_FILE_DIR)/WebCore+SVG.exp",
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "if gcc -dumpversion | grep -q '^3\\.'\nthen\n    cat WebCore.exp WebCore-svg.exp | grep -v '^__ZTI' > \"$DERIVED_FILE_DIR/WebCore+SVG.exp\"\nelse\n    cat WebCore.exp WebCore-svg.exp > \"$DERIVED_FILE_DIR/WebCore+SVG.exp\"\nfi";
+               };
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
                                DEBUG_DEFINES = NDEBUG;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
-                               EXPORTED_SYMBOLS_FILE = WebCore.exp;
+                               EXPORTED_SYMBOLS_FILE = "$(DERIVED_FILES_DIR)/WebCore+SVG.exp";
                                FRAMEWORK_SEARCH_PATHS = /System/Library/Frameworks/WebKit.framework/Frameworks;
                                GCC_ENABLE_CPP_EXCEPTIONS = YES;
                                GCC_ENABLE_CPP_RTTI = YES;
index aa9a768204079cfae8828440f0297318e41267b4..19490bf2ee25171d787140d912951d8f86a4257c 100644 (file)
@@ -481,8 +481,9 @@ CIFilter *KCanvasFECompositeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilte
 
 CIFilter *KCanvasFEFloodQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
 {
-       CIFilter *filter = [CIFilter filterWithName:@"CIConstantColorGenerator"];
+       CIFilter *filter = nil;
        KWQ_BLOCK_EXCEPTIONS
+       filter = [CIFilter filterWithName:@"CIConstantColorGenerator"];
        [filter setDefaults];
        CGColorRef color = cgColor(floodColor());
        CGColorRef withAlpha = CGColorCreateCopyWithAlpha(color,CGColorGetAlpha(color) * floodOpacity());
index 71188fd5d5ce07308cfbb43fbed7053aee1b50a0..98bcb093ace3f6304cb3e591a7d3f4b876c446ad 100644 (file)
@@ -21,7 +21,9 @@
 #include <qstring.h>
 #include <math.h>
 
+#ifndef APPLE_CHANGES
 #include <iostream>
+#endif
 
 using namespace KSVG;