forked from WebKit/WebKit-http
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a way to revert a variable to its previous value after leaving a …
…scope. https://bugs.webkit.org/show_bug.cgi?id=73371 Reviewed by Adam Barth. Source/JavaScriptCore: In case anyone from Chromium sees this, it is nearly identical to AutoReset but if the same name were used, it causes unnecessary ambiguity. * JavaScriptCore.xcodeproj/project.pbxproj: * wtf/TemporarilyChange.h: Added. (WTF::TemporarilyChange::TemporarilyChange): (WTF::TemporarilyChange::~TemporarilyChange): Source/JavaScriptGlue: * ForwardingHeaders/wtf/TemporarilyChange.h: Added. Source/WebCore: * ForwardingHeaders/wtf/TemporarilyChange.h: Added. Source/WebKit/mac: * ForwardingHeaders/wtf/TemporarilyChange.h: Added. Tools: * DumpRenderTree/ForwardingHeaders/wtf/TemporarilyChange.h: Added. * TestWebKitAPI/TestWebKitAPI.gypi: Added test file to the build. * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Ditto. * TestWebKitAPI/win/TestWebKitAPI.vcproj: Ditto. * TestWebKitAPI/Tests/WTF/TemporarilyChange.cpp: Added. (TestWebKitAPI::TEST): Added a test for TemporarilyChange. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@101446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
- Loading branch information
David Levin
committed
Nov 30, 2011
1 parent
075a228
commit f4ec26d
Showing
17 changed files
with
196 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
Source/JavaScriptGlue/ForwardingHeaders/wtf/TemporarilyChange.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include <JavaScriptCore/TemporarilyChange.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #ifndef WebCore_FWD_TemporarilyChange_h | ||
| #define WebCore_FWD_TemporarilyChange_h | ||
| #include <JavaScriptCore/TemporarilyChange.h> | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include <JavaScriptCore/TemporarilyChange.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include <JavaScriptCore/TemporarilyChange.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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/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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters