Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (101912 => 101913)
--- trunk/Source/_javascript_Core/ChangeLog 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,3 +1,17 @@
+2011-12-02 David Levin <[email protected]>
+
+ Rename WTF class from TemporarilyChange to TemporaryChange.
+ https://bugs.webkit.org/show_bug.cgi?id=73479
+
+ Reviewed by Eric Seidel.
+
+ * _javascript_Core.gypi:
+ * _javascript_Core.vcproj/WTF/WTF.vcproj:
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * wtf/TemporaryChange.h: Renamed from Source/_javascript_Core/wtf/TemporarilyChange.h.
+ (WTF::TemporaryChange::TemporaryChange):
+ (WTF::TemporaryChange::~TemporaryChange):
+
2011-12-02 Mark Hahnenberg <[email protected]>
REGRESSION (r99754): All layout tests crash on Windows
Modified: trunk/Source/_javascript_Core/_javascript_Core.gypi (101912 => 101913)
--- trunk/Source/_javascript_Core/_javascript_Core.gypi 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/_javascript_Core/_javascript_Core.gypi 2011-12-03 07:06:54 UTC (rev 101913)
@@ -207,7 +207,7 @@
'wtf/StdLibExtras.h',
'wtf/StringExtras.h',
'wtf/StringHasher.h',
- 'wtf/TemporarilyChange.h',
+ 'wtf/TemporaryChange.h',
'wtf/ThreadSafeRefCounted.h',
'wtf/ThreadSpecific.h',
'wtf/ThreadRestrictionVerifier.h',
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/WTF/WTF.vcproj (101912 => 101913)
--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/WTF/WTF.vcproj 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/WTF/WTF.vcproj 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1153,7 +1153,7 @@
>
</File>
<File
- RelativePath="..\..\wtf\TemporarilyChange.h"
+ RelativePath="..\..\wtf\TemporaryChange.h"
>
</File>
<File
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (101912 => 101913)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2011-12-03 07:06:54 UTC (rev 101913)
@@ -46,7 +46,7 @@
0B330C270F38C62300692DE3 /* TypeTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0B330C260F38C62300692DE3 /* TypeTraits.cpp */; };
0B4D7E630F319AC800AD7E58 /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
0BAC94A01338728400CF135B /* ThreadRestrictionVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BAC949E1338728400CF135B /* ThreadRestrictionVerifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 0BCD83571485845200EA2003 /* TemporarilyChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCD83541485841200EA2003 /* TemporarilyChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 0BCD83571485845200EA2003 /* TemporaryChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCD83541485841200EA2003 /* TemporaryChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
0BDFFAE10FC6193100D69EF4 /* OwnFastMallocPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BDFFAD10FC616EC00D69EF4 /* OwnFastMallocPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
0BF28A2911A33DC300638F84 /* SizeLimits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF28A2811A33DC300638F84 /* SizeLimits.cpp */; };
0F16D726142C39C000CF784A /* BitVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F16D724142C39A200CF784A /* BitVector.cpp */; };
@@ -823,7 +823,7 @@
0B330C260F38C62300692DE3 /* TypeTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TypeTraits.cpp; sourceTree = "<group>"; };
0B4D7E620F319AC800AD7E58 /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };
0BAC949E1338728400CF135B /* ThreadRestrictionVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadRestrictionVerifier.h; sourceTree = "<group>"; };
- 0BCD83541485841200EA2003 /* TemporarilyChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemporarilyChange.h; sourceTree = "<group>"; };
+ 0BCD83541485841200EA2003 /* TemporaryChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemporaryChange.h; sourceTree = "<group>"; };
0BDFFAD10FC616EC00D69EF4 /* OwnFastMallocPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnFastMallocPtr.h; sourceTree = "<group>"; };
0BF28A2811A33DC300638F84 /* SizeLimits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SizeLimits.cpp; sourceTree = "<group>"; };
0F16D724142C39A200CF784A /* BitVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitVector.cpp; sourceTree = "<group>"; };
@@ -2028,7 +2028,7 @@
6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */,
6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */,
6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */,
- 0BCD83541485841200EA2003 /* TemporarilyChange.h */,
+ 0BCD83541485841200EA2003 /* TemporaryChange.h */,
8656573E115BE35200291F40 /* text */,
18BAB52710DADFCD000D945B /* ThreadIdentifierDataPthreads.cpp */,
18BAB52810DADFCD000D945B /* ThreadIdentifierDataPthreads.h */,
@@ -2875,7 +2875,7 @@
BC18C46C0E16F5CD00B34460 /* TCPackedCache.h in Headers */,
BC18C46D0E16F5CD00B34460 /* TCPageMap.h in Headers */,
BC18C46F0E16F5CD00B34460 /* TCSystemAlloc.h in Headers */,
- 0BCD83571485845200EA2003 /* TemporarilyChange.h in Headers */,
+ 0BCD83571485845200EA2003 /* TemporaryChange.h in Headers */,
971EDEA61169E0D3005E4262 /* Terminator.h in Headers */,
F3BD31ED126735770065467F /* TextPosition.h in Headers */,
18BAB55410DAE066000D945B /* ThreadIdentifierDataPthreads.h in Headers */,
Deleted: trunk/Source/_javascript_Core/wtf/TemporarilyChange.h (101912 => 101913)
--- trunk/Source/_javascript_Core/wtf/TemporarilyChange.h 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/_javascript_Core/wtf/TemporarilyChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2011 Google 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 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 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 TemporarilyChange_h
-#define TemporarilyChange_h
-
-#include "Noncopyable.h"
-
-namespace WTF {
-
-// TemporarilyChange<> is useful for setting a variable to a new value only within a
-// particular scope. An TemporarilyChange<> object changes a variable to its original
-// value upon destruction, making it an alternative to writing "var = false;"
-// or "var = oldVal;" at all of a block's exit points.
-//
-// This should be obvious, but note that an TemporarilyChange<> instance should have a
-// shorter lifetime than its scopedVariable, to prevent invalid memory writes
-// when the TemporarilyChange<> object is destroyed.
-
-template<typename T>
-class TemporarilyChange {
- WTF_MAKE_NONCOPYABLE(TemporarilyChange);
-public:
- TemporarilyChange(T& scopedVariable, T newValue)
- : m_scopedVariable(scopedVariable)
- , m_originalValue(scopedVariable)
- {
- m_scopedVariable = newValue;
- }
-
- ~TemporarilyChange()
- {
- m_scopedVariable = m_originalValue;
- }
-
-
-private:
- T& m_scopedVariable;
- T m_originalValue;
-};
-
-}
-
-using WTF::TemporarilyChange;
-
-#endif
Copied: trunk/Source/_javascript_Core/wtf/TemporaryChange.h (from rev 101912, trunk/Source/_javascript_Core/wtf/TemporarilyChange.h) (0 => 101913)
--- trunk/Source/_javascript_Core/wtf/TemporaryChange.h (rev 0)
+++ trunk/Source/_javascript_Core/wtf/TemporaryChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011 Google 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 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 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 TemporaryChange_h
+#define TemporaryChange_h
+
+#include "Noncopyable.h"
+
+namespace WTF {
+
+// TemporaryChange<> is useful for setting a variable to a new value only within a
+// particular scope. An TemporaryChange<> object changes a variable to its original
+// value upon destruction, making it an alternative to writing "var = false;"
+// or "var = oldVal;" at all of a block's exit points.
+//
+// This should be obvious, but note that an TemporaryChange<> instance should have a
+// shorter lifetime than its scopedVariable, to prevent invalid memory writes
+// when the TemporaryChange<> object is destroyed.
+
+template<typename T>
+class TemporaryChange {
+ WTF_MAKE_NONCOPYABLE(TemporaryChange);
+public:
+ TemporaryChange(T& scopedVariable, T newValue)
+ : m_scopedVariable(scopedVariable)
+ , m_originalValue(scopedVariable)
+ {
+ m_scopedVariable = newValue;
+ }
+
+ ~TemporaryChange()
+ {
+ m_scopedVariable = m_originalValue;
+ }
+
+
+private:
+ T& m_scopedVariable;
+ T m_originalValue;
+};
+
+}
+
+using WTF::TemporaryChange;
+
+#endif
Modified: trunk/Source/_javascript_Glue/ChangeLog (101912 => 101913)
--- trunk/Source/_javascript_Glue/ChangeLog 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/_javascript_Glue/ChangeLog 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,3 +1,13 @@
+2011-12-02 David Levin <[email protected]>
+
+ Rename WTF class from TemporarilyChange to TemporaryChange.
+ https://bugs.webkit.org/show_bug.cgi?id=73479
+
+ Reviewed by Eric Seidel.
+
+ * ForwardingHeaders/wtf/TemporarilyChange.h: Removed.
+ * ForwardingHeaders/wtf/TemporaryChange.h: Added.
+
2011-12-02 Hajime Morrita <[email protected]>
Unreviewed, rolling out r101751 and r101775.
Deleted: trunk/Source/_javascript_Glue/ForwardingHeaders/wtf/TemporarilyChange.h (101912 => 101913)
--- trunk/Source/_javascript_Glue/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/_javascript_Glue/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1 +0,0 @@
-#include <_javascript_Core/TemporarilyChange.h>
Added: trunk/Source/_javascript_Glue/ForwardingHeaders/wtf/TemporaryChange.h (0 => 101913)
--- trunk/Source/_javascript_Glue/ForwardingHeaders/wtf/TemporaryChange.h (rev 0)
+++ trunk/Source/_javascript_Glue/ForwardingHeaders/wtf/TemporaryChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -0,0 +1 @@
+#include <_javascript_Core/TemporaryChange.h>
Modified: trunk/Source/WebCore/ChangeLog (101912 => 101913)
--- trunk/Source/WebCore/ChangeLog 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/WebCore/ChangeLog 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,3 +1,18 @@
+2011-12-02 David Levin <[email protected]>
+
+ Rename WTF class from TemporarilyChange to TemporaryChange.
+ https://bugs.webkit.org/show_bug.cgi?id=73479
+
+ Reviewed by Eric Seidel.
+
+ * ForwardingHeaders/wtf/TemporarilyChange.h: Removed.
+ * ForwardingHeaders/wtf/TemporaryChange.h: Added.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::forceLayoutParentViewIfNeeded):
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::setScrollPosition):
+ (WebCore::FrameView::autoSizeIfEnabled):
+
2011-12-02 Armand Navabi <[email protected]>
ASSERT fails in updateState ACTION_DRAW case
Deleted: trunk/Source/WebCore/ForwardingHeaders/wtf/TemporarilyChange.h (101912 => 101913)
--- trunk/Source/WebCore/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/WebCore/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_TemporarilyChange_h
-#define WebCore_FWD_TemporarilyChange_h
-#include <_javascript_Core/TemporarilyChange.h>
-#endif
Added: trunk/Source/WebCore/ForwardingHeaders/wtf/TemporaryChange.h (0 => 101913)
--- trunk/Source/WebCore/ForwardingHeaders/wtf/TemporaryChange.h (rev 0)
+++ trunk/Source/WebCore/ForwardingHeaders/wtf/TemporaryChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_TemporaryChange_h
+#define WebCore_FWD_TemporaryChange_h
+#include <_javascript_Core/TemporaryChange.h>
+#endif
Modified: trunk/Source/WebCore/page/FrameView.cpp (101912 => 101913)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-12-03 07:06:54 UTC (rev 101913)
@@ -65,7 +65,7 @@
#include "TextResourceDecoder.h"
#include <wtf/CurrentTime.h>
-#include <wtf/TemporarilyChange.h>
+#include <wtf/TemporaryChange.h>
#if USE(ACCELERATED_COMPOSITING)
#include "RenderLayerCompositor.h"
@@ -902,7 +902,7 @@
return;
ASSERT(!m_inLayoutParentView);
- TemporarilyChange<bool> resetInLayoutParentView(m_inLayoutParentView, true);
+ TemporaryChange<bool> resetInLayoutParentView(m_inLayoutParentView, true);
// Clear needs-size-negotiation flag in RenderSVGRoot, so the next call to our
// layout() method won't fire the size negotiation logic again.
@@ -977,7 +977,7 @@
RenderObject* root;
{
- TemporarilyChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
+ TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
if (!m_nestedLayoutCount && !m_inSynchronousPostLayout && m_hasPendingPostLayoutTasks && !inSubframeLayoutWithFrameFlattening) {
// This is a new top-level layout. If there are any remaining tasks from the previous
@@ -1016,7 +1016,7 @@
FontCachePurgePreventer fontCachePurgePreventer;
RenderLayer* layer;
{
- TemporarilyChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
+ TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
m_nestedLayoutCount++;
@@ -1688,7 +1688,7 @@
void FrameView::setScrollPosition(const IntPoint& scrollPoint)
{
- TemporarilyChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, true);
+ TemporaryChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, true);
m_maintainScrollPositionAnchor = 0;
ScrollView::setScrollPosition(scrollPoint);
}
@@ -2312,7 +2312,7 @@
if (m_inAutoSize)
return;
- TemporarilyChange<bool> changeInAutoSize(m_inAutoSize, true);
+ TemporaryChange<bool> changeInAutoSize(m_inAutoSize, true);
Document* document = frame()->document();
if (!document)
Modified: trunk/Source/WebKit/mac/ChangeLog (101912 => 101913)
--- trunk/Source/WebKit/mac/ChangeLog 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,3 +1,13 @@
+2011-12-02 David Levin <[email protected]>
+
+ Rename WTF class from TemporarilyChange to TemporaryChange.
+ https://bugs.webkit.org/show_bug.cgi?id=73479
+
+ Reviewed by Eric Seidel.
+
+ * ForwardingHeaders/wtf/TemporarilyChange.h: Removed.
+ * ForwardingHeaders/wtf/TemporaryChange.h: Added.
+
2011-12-02 Simon Fraser <[email protected]>
<rdar://problem/10423627> Layers are flipped in WebKit1 views
Deleted: trunk/Source/WebKit/mac/ForwardingHeaders/wtf/TemporarilyChange.h (101912 => 101913)
--- trunk/Source/WebKit/mac/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Source/WebKit/mac/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1 +0,0 @@
-#include <_javascript_Core/TemporarilyChange.h>
Added: trunk/Source/WebKit/mac/ForwardingHeaders/wtf/TemporaryChange.h (0 => 101913)
--- trunk/Source/WebKit/mac/ForwardingHeaders/wtf/TemporaryChange.h (rev 0)
+++ trunk/Source/WebKit/mac/ForwardingHeaders/wtf/TemporaryChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -0,0 +1 @@
+#include <_javascript_Core/TemporaryChange.h>
Modified: trunk/Tools/ChangeLog (101912 => 101913)
--- trunk/Tools/ChangeLog 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Tools/ChangeLog 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,3 +1,18 @@
+2011-12-02 David Levin <[email protected]>
+
+ Rename WTF class from TemporarilyChange to TemporaryChange.
+ https://bugs.webkit.org/show_bug.cgi?id=73479
+
+ Reviewed by Eric Seidel.
+
+ * DumpRenderTree/ForwardingHeaders/wtf/TemporarilyChange.h: Removed.
+ * DumpRenderTree/ForwardingHeaders/wtf/TemporaryChange.h: Added.
+ * TestWebKitAPI/TestWebKitAPI.gypi:
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WTF/TemporaryChange.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/TemporarilyChange.cpp.
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/win/TestWebKitAPI.vcproj:
+
2011-12-02 Tony Chang <[email protected]>
[NRWT] reftest asserts intermittently on the Qt-WK2 bot
Deleted: trunk/Tools/DumpRenderTree/ForwardingHeaders/wtf/TemporarilyChange.h (101912 => 101913)
--- trunk/Tools/DumpRenderTree/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Tools/DumpRenderTree/ForwardingHeaders/wtf/TemporarilyChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1 +0,0 @@
-#include <_javascript_Core/TemporarilyChange.h>
Added: trunk/Tools/DumpRenderTree/ForwardingHeaders/wtf/TemporaryChange.h (0 => 101913)
--- trunk/Tools/DumpRenderTree/ForwardingHeaders/wtf/TemporaryChange.h (rev 0)
+++ trunk/Tools/DumpRenderTree/ForwardingHeaders/wtf/TemporaryChange.h 2011-12-03 07:06:54 UTC (rev 101913)
@@ -0,0 +1 @@
+#include <_javascript_Core/TemporaryChange.h>
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi (101912 => 101913)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gypi 2011-12-03 07:06:54 UTC (rev 101913)
@@ -35,7 +35,7 @@
'Tests/WTF/RedBlackTree.cpp',
'Tests/WTF/StringBuilder.cpp',
'Tests/WTF/StringOperators.cpp',
- 'Tests/WTF/TemporarilyChange.cpp',
+ 'Tests/WTF/TemporaryChange.cpp',
'Tests/WTF/VectorBasic.cpp',
'Tests/WTF/VectorReverse.cpp',
],
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (101912 => 101913)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2011-12-03 07:06:54 UTC (rev 101913)
@@ -7,7 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
- 0BCD856A1485C98B00EA2003 /* TemporarilyChange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BCD85691485C98B00EA2003 /* TemporarilyChange.cpp */; };
+ 0BCD856A1485C98B00EA2003 /* TemporaryChange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BCD85691485C98B00EA2003 /* TemporaryChange.cpp */; };
0FC6C4CC141027E0005B7F0C /* RedBlackTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */; };
0FC6C4CF141034AD005B7F0C /* MetaAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC6C4CE141034AD005B7F0C /* MetaAllocator.cpp */; };
1A02C84F125D4A8400E3F4BD /* Find.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A02C84E125D4A8400E3F4BD /* Find.cpp */; };
@@ -146,7 +146,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 0BCD85691485C98B00EA2003 /* TemporarilyChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TemporarilyChange.cpp; path = WTF/TemporarilyChange.cpp; sourceTree = "<group>"; };
+ 0BCD85691485C98B00EA2003 /* TemporaryChange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TemporaryChange.cpp; path = WTF/TemporaryChange.cpp; sourceTree = "<group>"; };
0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RedBlackTree.cpp; path = WTF/RedBlackTree.cpp; sourceTree = "<group>"; };
0FC6C4CE141034AD005B7F0C /* MetaAllocator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MetaAllocator.cpp; path = WTF/MetaAllocator.cpp; sourceTree = "<group>"; };
1A02C84B125D4A5E00E3F4BD /* find.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = find.html; sourceTree = "<group>"; };
@@ -418,7 +418,7 @@
A7A966DA140ECCC8005EF9B4 /* CheckedArithmeticOperations.cpp */,
81B50192140F232300D9EB58 /* StringBuilder.cpp */,
C01363C713C3997300EF3964 /* StringOperators.cpp */,
- 0BCD85691485C98B00EA2003 /* TemporarilyChange.cpp */,
+ 0BCD85691485C98B00EA2003 /* TemporaryChange.cpp */,
BC90964B125561BF00083756 /* VectorBasic.cpp */,
37200B9113A16230007A4FAD /* VectorReverse.cpp */,
);
@@ -663,7 +663,7 @@
BC3C4C7F14587AA60025FB62 /* WKBrowsingContextGroupTest.mm in Sources */,
C0C5D3BE14598B6F00A802A6 /* GetBackingScaleFactor.mm in Sources */,
3722C8691461E03E00C45D00 /* RenderedImageFromDOMRange.mm in Sources */,
- 0BCD856A1485C98B00EA2003 /* TemporarilyChange.cpp in Sources */,
+ 0BCD856A1485C98B00EA2003 /* TemporaryChange.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Deleted: trunk/Tools/TestWebKitAPI/Tests/WTF/TemporarilyChange.cpp (101912 => 101913)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/TemporarilyChange.cpp 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/TemporarilyChange.cpp 2011-12-03 07:06:54 UTC (rev 101913)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2011 Google 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.
- */
-
-#include "config.h"
-
-#include <wtf/TemporarilyChange.h>
-
-namespace TestWebKitAPI {
-
-TEST(WTF, TemporarilyChangeNested)
-{
- bool originallyFalse = false;
- {
- TemporarilyChange<bool> change1OriginallyFalse(originallyFalse, true);
- EXPECT_TRUE(originallyFalse);
- {
- TemporarilyChange<bool> change2OriginallyFalse(originallyFalse, false);
- EXPECT_FALSE(originallyFalse);
- }
- EXPECT_TRUE(originallyFalse);
- }
- EXPECT_FALSE(originallyFalse);
-}
-
-} // namespace TestWebKitAPI
Copied: trunk/Tools/TestWebKitAPI/Tests/WTF/TemporaryChange.cpp (from rev 101912, trunk/Tools/TestWebKitAPI/Tests/WTF/TemporarilyChange.cpp) (0 => 101913)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/TemporaryChange.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/TemporaryChange.cpp 2011-12-03 07:06:54 UTC (rev 101913)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011 Google 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.
+ */
+
+#include "config.h"
+
+#include <wtf/TemporaryChange.h>
+
+namespace TestWebKitAPI {
+
+TEST(WTF, TemporaryChangeNested)
+{
+ bool originallyFalse = false;
+ {
+ TemporaryChange<bool> change1OriginallyFalse(originallyFalse, true);
+ EXPECT_TRUE(originallyFalse);
+ {
+ TemporaryChange<bool> change2OriginallyFalse(originallyFalse, false);
+ EXPECT_FALSE(originallyFalse);
+ }
+ EXPECT_TRUE(originallyFalse);
+ }
+ EXPECT_FALSE(originallyFalse);
+}
+
+} // namespace TestWebKitAPI
Modified: trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj (101912 => 101913)
--- trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj 2011-12-03 06:56:09 UTC (rev 101912)
+++ trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj 2011-12-03 07:06:54 UTC (rev 101913)
@@ -640,7 +640,7 @@
>
</File>
<File
- RelativePath="..\Tests\WTF\TemporarilyChange.cpp"
+ RelativePath="..\Tests\WTF\TemporaryChange.cpp"
>
</File>
<File
