* WebCore.pbproj/project.pbxproj: Add back the main_thread_malloc files,...

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 9d1cd4e7e0c58ecd76015c0623a3f9fddb339459..7811971540388b342dc44925a303f8457fc972f3 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2005-04-28  Darin Adler  <darin@apple.com>
+
+        * WebCore.pbproj/project.pbxproj: Add back the main_thread_malloc files, rolled out by accident.
+
+2005-04-25  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adele.
+
+        - fixed security for new frameElement feature (fix for 4091082 below)
+
+        * khtml/ecma/kjs_window.cpp:
+        (frameElement): Refactored into separate function; added isSafeScript check.
+        (Window::get): Call the new frameElement function.
+
 2005-04-27 Adele Peterson  <adele@apple.com>
 
         Rolling out fix for <rdar://problem/4097849> because the following layout tests were failing:

diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index d87e35340c2cfabdbc12193b48f198261e85b480..0eeadd9371b8b98ad71c5ee6684d753b5ba9fdb1 100644 (file)
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -540,6 +540,7 @@
                                BEA5E01E075CEDAC0098A432,
                                9378D9FC07640A46004B97BF,
                                EDA4AC98076FB89100DD23EC,
+                               65FD9D2E081D727F00636F54,
                        );
                        isa = PBXHeadersBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -828,6 +829,7 @@
                                BEA5DBDB075CEDA00098A432,
                                9378D9FB07640A46004B97BF,
                                51111AC107BD812C00B7162C,
+                               65FD9D2D081D727F00636F54,
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -1287,6 +1289,34 @@
                        settings = {
                        };
                };
+               65FD9D2B081D727F00636F54 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = main_thread_malloc.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               65FD9D2C081D727F00636F54 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = main_thread_malloc.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               65FD9D2D081D727F00636F54 = {
+                       fileRef = 65FD9D2B081D727F00636F54;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               65FD9D2E081D727F00636F54 = {
+                       fileRef = 65FD9D2C081D727F00636F54;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
 //650
 //651
 //652
@@ -6049,6 +6079,8 @@
                                F523D28402DE43D7018635CA,
                                F523D28502DE43D7018635CA,
                                F523D28602DE43D7018635CA,
+                               65FD9D2B081D727F00636F54,
+                               65FD9D2C081D727F00636F54,
                                F523D28802DE43D7018635CA,
                                BC433ACF05D3046F003A5A14,
                                F523D28902DE43D7018635CA,