From 12dcf6dbbef0382b9b208bd6d9e6c21ce6c3a4d6 Mon Sep 17 00:00:00 2001 From: "mark%moxienet.com" Date: Sun, 20 Nov 2005 19:51:13 +0000 Subject: [PATCH] Bug 317077, Enable HTML support in Camino. Camino-only, npotdb. r=smfr git-svn-id: svn://10.0.0.236/trunk@185015 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/Camino.xcode/project.pbxproj | 55 +++++++++++++++++++ mozilla/camino/config/mozconfig | 4 +- .../embedding/config/basebrowser-mac-macho | 1 + 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/mozilla/camino/Camino.xcode/project.pbxproj b/mozilla/camino/Camino.xcode/project.pbxproj index a540d9cd42d..0faf8da34cd 100644 --- a/mozilla/camino/Camino.xcode/project.pbxproj +++ b/mozilla/camino/Camino.xcode/project.pbxproj @@ -1501,6 +1501,7 @@ F6BD639601B3131201A962F7, F6BD63A201B3131201A962F7, F6BD639701B3131201A962F7, + F6BD639701B3131201A962F8, F6BD639801B3131201A962F7, F6BD639901B3131201A962F7, F6BD639A01B3131201A962F7, @@ -5252,6 +5253,7 @@ 3F44ACD705BDFB9F00CB4B08, 3F44ACD905BDFB9F00CB4B08, 3F44ACDA05BDFB9F00CB4B08, + 3F44ACDA05BDFB9F00CB4B09, 3F44ACDB05BDFB9F00CB4B08, 3F44ACDC05BDFB9F00CB4B08, 3F44ACDD05BDFB9F00CB4B08, @@ -5356,6 +5358,12 @@ settings = { }; }; + 3F44ACDA05BDFB9F00CB4B09 = { + fileRef = F6BD639701B3131201A962F8; + isa = PBXBuildFile; + settings = { + }; + }; 3F44ACDB05BDFB9F00CB4B08 = { fileRef = F6BD639801B3131201A962F7; isa = PBXBuildFile; @@ -9146,6 +9154,7 @@ 3F44AF0E05BDFBA000CB4B08, 3F44AF0F05BDFBA000CB4B08, 3F44AF1005BDFBA000CB4B08, + 3F44AF1005BDFBA000CB4B09, 3F44AF1105BDFBA000CB4B08, 3F44AF1205BDFBA000CB4B08, 3F44AF1305BDFBA000CB4B08, @@ -9222,6 +9231,12 @@ settings = { }; }; + 3F44AF1005BDFBA000CB4B09 = { + fileRef = F6BD639701B3131201A962F8; + isa = PBXBuildFile; + settings = { + }; + }; 3F44AF1105BDFBA000CB4B08 = { fileRef = F6BD639801B3131201A962F7; isa = PBXBuildFile; @@ -10093,6 +10108,8 @@ 4DC41D400869D7A400947044, 4DC41D3F0869D7A400947044, 4DC41D410869D7A400947044, + 4DC41D410869D7A400947045, + 4DC41D410869D7A400947046, 3F44AFBB05BDFBA000CB4B08, 3F44AFBC05BDFBA000CB4B08, 3F44AFBD05BDFBA000CB4B08, @@ -12444,6 +12461,22 @@ refType = 2; sourceTree = SOURCE_ROOT; }; + 4DC41D3E0869D7A400947045 = { + isa = PBXFileReference; + lastKnownFileType = archive.ar; + name = libmozpng.a; + path = ../dist/lib/libmozcairo.a; + refType = 2; + sourceTree = SOURCE_ROOT; + }; + 4DC41D3E0869D7A400947046 = { + isa = PBXFileReference; + lastKnownFileType = archive.ar; + name = libmozpng.a; + path = ../dist/lib/libmozlibpixman.a; + refType = 2; + sourceTree = SOURCE_ROOT; + }; 4DC41D3F0869D7A400947044 = { fileRef = 4DC41D3C0869D7A400947044; isa = PBXBuildFile; @@ -12462,6 +12495,18 @@ settings = { }; }; + 4DC41D410869D7A400947045 = { + fileRef = 4DC41D3E0869D7A400947045; + isa = PBXBuildFile; + settings = { + }; + }; + 4DC41D410869D7A400947046 = { + fileRef = 4DC41D3E0869D7A400947046; + isa = PBXBuildFile; + settings = { + }; + }; //4D0 //4D1 //4D2 @@ -15549,6 +15594,8 @@ 4DC41D3D0869D7A400947044, 4DC41D3C0869D7A400947044, 4DC41D3E0869D7A400947044, + 4DC41D3E0869D7A400947045, + 4DC41D3E0869D7A400947046, ); isa = PBXGroup; name = "Gecko Static Components"; @@ -17001,6 +17048,14 @@ refType = 2; sourceTree = SOURCE_ROOT; }; + F6BD639701B3131201A962F8 = { + isa = PBXFileReference; + lastKnownFileType = file; + name = dom_core.xpt; + path = ../dist/Embed/components/dom_canvas.xpt; + refType = 2; + sourceTree = SOURCE_ROOT; + }; F6BD639801B3131201A962F7 = { isa = PBXFileReference; lastKnownFileType = file; diff --git a/mozilla/camino/config/mozconfig b/mozilla/camino/config/mozconfig index 7f2a4e62f6d..87884f99373 100644 --- a/mozilla/camino/config/mozconfig +++ b/mozilla/camino/config/mozconfig @@ -2,13 +2,11 @@ mk_add_options MOZ_CO_PROJECT=macbrowser ac_add_options --enable-application=macbrowser ac_add_options --enable-default-toolkit=cocoa ac_add_options --disable-tests -ac_add_options --disable-mailnews -ac_add_options --disable-ldap ac_add_options --disable-accessibility ac_add_options --disable-jsd ac_add_options --disable-mathml -ac_add_options --without-system-zlib ac_add_options --enable-single-profile +ac_add_options --enable-canvas # Pick the right SDK depending on the CPU. This doesn't even pretend to be # cross-friendly, but neither do other parts of the Camino build, and it's diff --git a/mozilla/embedding/config/basebrowser-mac-macho b/mozilla/embedding/config/basebrowser-mac-macho index b78ab27769b..4a4e6ed96a4 100644 --- a/mozilla/embedding/config/basebrowser-mac-macho +++ b/mozilla/embedding/config/basebrowser-mac-macho @@ -61,6 +61,7 @@ components/docshell.xpt ; dom components/dom.xpt components/dom_base.xpt +components/dom_canvas.xpt components/dom_core.xpt components/dom_css.xpt components/dom_events.xpt