Changeset 66968 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

Timestamp:

Sep 8, 2010, 4:08:08 AM (15 years ago)

Author:

[email protected]

Message:

2010-08-30 Maciej Stachowiak <​[email protected]>

Reviewed by Darin Adler.

Handle MediaQueryExp memory management exclusively with smart pointers
​https://bugs.webkit.org/show_bug.cgi?id=44874

Implemented a non-copying sort function to make it possible to sort a Vector
of OwnPtrs (which cannot be copied). This is required for the above.

• wtf/NonCopyingSort.h: Added. (WTF::nonCopyingSort): It's secretly heapsort. (WTF::heapSort): heapsort implementation. (WTF::siftDown): Helper function for heapsort. (WTF::heapify): ditto

Adjust build systems.

• GNUmakefile.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/WTF/WTF.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:

2010-08-30 Maciej Stachowiak <​[email protected]>

Reviewed by Darin Adler.

Handle MediaQueryExp memory management exclusively with smart pointers
​https://bugs.webkit.org/show_bug.cgi?id=44874

Gace MediaQueryExp a create function, made the constructor private, and followed
the implications. The one tricky bit was using a non-copying sort to sort
the Vector<OwnPtr<MediaQueryExp> > in the MediaQuery constructor.

• ForwardingHeaders/wtf/NonCopyingSort.h: Added.
• css/CSSGrammar.y:
• css/CSSParser.cpp: (WebCore::CSSParser::~CSSParser): (WebCore::CSSParser::createFloatingMediaQueryExp): (WebCore::CSSParser::createFloatingMediaQueryExpList): (WebCore::CSSParser::sinkFloatingMediaQueryExpList): (WebCore::CSSParser::createFloatingMediaQuery):
• css/CSSParser.h:
• css/MediaList.cpp:
• css/MediaQuery.cpp: (WebCore::expressionCompare): (WebCore::MediaQuery::MediaQuery): (WebCore::MediaQuery::~MediaQuery):
• css/MediaQuery.h: (WebCore::MediaQuery::expressions):
• css/MediaQueryEvaluator.cpp: (WebCore::MediaQueryEvaluator::eval):
• css/MediaQueryExp.h: (WebCore::MediaQueryExp::create):

File:

• trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -189 +189 @@
                 655EB29B10CE2581001A990E /* NodesCodegen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 655EB29A10CE2581001A990E /* NodesCodegen.cpp */; };
                 65DFC93308EA173A00F7300B /* HashTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65DFC92D08EA173A00F7300B /* HashTable.cpp */; };
+                65E1A3DF122B894500B26097 /* NonCopyingSort.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1A2F4122B880D00B26097 /* NonCopyingSort.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 65FDE49C0BDD1D4A00E80111 /* Assertions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65E217B808E7EECC0023E5F6 /* Assertions.cpp */; settings = {COMPILER_FLAGS = "-Wno-missing-format-attribute"; }; };
                 7E4EE7090EBB7963005934AA /* StructureChain.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E4EE7080EBB7963005934AA /* StructureChain.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -776 +777 @@
                 65DFC92E08EA173A00F7300B /* HashTable.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashTable.h; sourceTree = "<group>"; tabWidth = 8; };
                 65DFC92F08EA173A00F7300B /* HashTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashTraits.h; sourceTree = "<group>"; tabWidth = 8; };
+                65E1A2F4122B880D00B26097 /* NonCopyingSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NonCopyingSort.h; sourceTree = "<group>"; };
                 65E217B708E7EECC0023E5F6 /* Assertions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Assertions.h; sourceTree = "<group>"; tabWidth = 8; };
                 65E217B808E7EECC0023E5F6 /* Assertions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Assertions.cpp; sourceTree = "<group>"; tabWidth = 8; };
@@ -1493 +1495 @@
                                 511FC4CA117EE2A800425272 /* MD5.h */,
                                 E1EE798B0D6CA53D00FEA3BA /* MessageQueue.h */,
+                                65E1A2F4122B880D00B26097 /* NonCopyingSort.h */,
                                 9303F5690991190000AD71B8 /* Noncopyable.h */,
                                 C0A2723F0E509F1E00E96E15 /* NotFound.h */,
@@ -2167 +2170 @@
                                 7EFF00640EC05A9A00AA7C93 /* NodeInfo.h in Headers */,
                                 BC18C43F0E16F5CD00B34460 /* Nodes.h in Headers */,
+                                65E1A3DF122B894500B26097 /* NonCopyingSort.h in Headers */,
                                 BC18C4400E16F5CD00B34460 /* Noncopyable.h in Headers */,
                                 C0A272630E50A06300E96E15 /* NotFound.h in Headers */,