Attachment 348631 Details for Bug 189189 – Patch v1

[patch] Patch v1

bug-189189-20180831040509.patch (text/plain), 6.08 KB, created by David Kilzer (:ddkilzer) on 2018-08-31 04:05:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-08-31 04:05:10 PDT

Size: 6.08 KB

patch

obsolete

>Subversion Revision: 235546
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index d3e261f3275be1860045e0b05c4183ee1e13081c..05d6e063fe43b22d111e2f07850390409f2d4653 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-31  David Kilzer  <ddkilzer@apple.com>
>+
>+        REGRESSION (r226407): Remove unused BlockStack.h
>+        <https://webkit.org/b/189189>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WTF.xcodeproj/project.pbxproj: Remove references to BlockStack.h.
>+        * wtf/BlockStack.h: Remove.
>+        * wtf/CMakeLists.txt: Remove references to BlockStack.h.
>+
> 2018-08-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Replace AVFoundationSupport.py using CMake
>diff --git a/Source/WTF/WTF.xcodeproj/project.pbxproj b/Source/WTF/WTF.xcodeproj/project.pbxproj
>index a19a6cce7c17ca091e7d1727b02dd71e98f8ccff..c511ed22751b550a7dfd33fb91bc4c5961a13dd8 100644
>--- a/Source/WTF/WTF.xcodeproj/project.pbxproj
>+++ b/Source/WTF/WTF.xcodeproj/project.pbxproj
>@@ -445,7 +445,6 @@
> 		A8A4725F151A825A004123FF /* Bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Bitmap.h; sourceTree = "<group>"; };
> 		A8A47260151A825A004123FF /* BitVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitVector.cpp; sourceTree = "<group>"; };
> 		A8A47261151A825A004123FF /* BitVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitVector.h; sourceTree = "<group>"; };
>-		A8A47264151A825A004123FF /* BlockStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockStack.h; sourceTree = "<group>"; };
> 		A8A47265151A825A004123FF /* BloomFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BloomFilter.h; sourceTree = "<group>"; };
> 		A8A47267151A825A004123FF /* BumpPointerAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BumpPointerAllocator.h; sourceTree = "<group>"; };
> 		A8A4726A151A825A004123FF /* CheckedArithmetic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CheckedArithmetic.h; sourceTree = "<group>"; };
>@@ -827,7 +826,6 @@
> 				DCEE21FC1CEA7551000C2396 /* BlockObjCExceptions.h */,
> 				DCEE21FD1CEA7551000C2396 /* BlockObjCExceptions.mm */,
> 				1A944F461C3D8814005BD28C /* BlockPtr.h */,
>-				A8A47264151A825A004123FF /* BlockStack.h */,
> 				A8A47265151A825A004123FF /* BloomFilter.h */,
> 				0FB399B820AF5A580017E213 /* BooleanLattice.h */,
> 				0F93274A1C17F4B700CF6564 /* Box.h */,
>diff --git a/Source/WTF/wtf/BlockStack.h b/Source/WTF/wtf/BlockStack.h
>deleted file mode 100644
>index 61e108db3b2e4b0a98d243185c4e836e7314ed16..0000000000000000000000000000000000000000
>--- a/Source/WTF/wtf/BlockStack.h
>+++ /dev/null
>@@ -1,96 +0,0 @@
>-/*
>- * Copyright (C) 2011 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#ifndef BlockStack_h
>-#define BlockStack_h
>-
>-#include <wtf/Assertions.h>
>-#include <wtf/FastMalloc.h>
>-#include <wtf/Vector.h>
>-
>-namespace WTF {
>-
>-template <typename T> class BlockStack {
>-public:
>-    static const size_t blockSize = 4096;
>-    static const size_t blockLength = blockSize / sizeof(T);
>-
>-    BlockStack();
>-    ~BlockStack();
>-
>-    T* grow();
>-    void shrink(T*);
>-
>-    const Vector<T*>& blocks();
>-
>-private:
>-    Vector<T*> m_blocks;
>-    T* m_spareBlock; // Used to avoid thrash at block boundaries.
>-};
>-
>-template <typename T> BlockStack<T>::BlockStack()
>-    : m_spareBlock(0)
>-{
>-}
>-
>-template <typename T> BlockStack<T>::~BlockStack()
>-{
>-    if (m_spareBlock)
>-        fastFree(m_spareBlock);
>-    for (size_t i = 0; i < m_blocks.size(); ++i)
>-        fastFree(m_blocks[i]);
>-}
>-
>-template <typename T> inline const Vector<T*>& BlockStack<T>::blocks()
>-{
>-    return m_blocks;
>-}
>-
>-template <typename T> T* BlockStack<T>::grow()
>-{
>-    T* block = m_spareBlock ? m_spareBlock : static_cast<T*>(fastMalloc(blockSize));
>-    m_spareBlock = 0;
>-
>-    m_blocks.append(block);
>-    return block;
>-}
>-
>-template <typename T> void BlockStack<T>::shrink(T* newEnd)
>-{
>-    ASSERT(newEnd != m_blocks.last() + blockLength);
>-    m_spareBlock = m_blocks.last();
>-    m_blocks.removeLast();
>-
>-    while (m_blocks.last() + blockLength != newEnd) {
>-        fastFree(m_blocks.last());
>-        m_blocks.removeLast();
>-    }
>-}
>-
>-}
>-
>-using WTF::BlockStack;
>-
>-#endif
>diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
>index 9adb55543d013fea9af5a7aae49432f95f3240f2..50e62a311d201213756aff521aa4962c0592a878 100644
>--- a/Source/WTF/wtf/CMakeLists.txt
>+++ b/Source/WTF/wtf/CMakeLists.txt
>@@ -12,7 +12,6 @@ set(WTF_PUBLIC_HEADERS
>     Bitmap.h
>     BlockObjCExceptions.h
>     BlockPtr.h
>-    BlockStack.h
>     BloomFilter.h
>     BooleanLattice.h
>     Box.h

Actions: View | Formatted Diff | Diff

Attachments on bug 189189: 348631