Title: [161747] trunk/Source/WebCore
- Revision
- 161747
- Author
- [email protected]
- Date
- 2014-01-10 22:53:43 -0800 (Fri, 10 Jan 2014)
Log Message
[iOS] Fix GCController::releaseExecutableMemory
https://bugs.webkit.org/show_bug.cgi?id=126805
Reviewed by Sam Weinig and Mark Lam.
VM::dynamicGlobalObject has since been replaced by VMEntryScope.
Update to check entryScope instead of the dynamicGlobalObject.
Also, make this non-iOS only.
* bindings/js/GCController.h:
* bindings/js/GCController.cpp:
(WebCore::GCController::releaseExecutableMemory):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161746 => 161747)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 06:41:35 UTC (rev 161746)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 06:53:43 UTC (rev 161747)
@@ -1,5 +1,20 @@
2014-01-10 Joseph Pecoraro <[email protected]>
+ [iOS] Fix GCController::releaseExecutableMemory
+ https://bugs.webkit.org/show_bug.cgi?id=126805
+
+ Reviewed by Sam Weinig and Mark Lam.
+
+ VM::dynamicGlobalObject has since been replaced by VMEntryScope.
+ Update to check entryScope instead of the dynamicGlobalObject.
+ Also, make this non-iOS only.
+
+ * bindings/js/GCController.h:
+ * bindings/js/GCController.cpp:
+ (WebCore::GCController::releaseExecutableMemory):
+
+2014-01-10 Joseph Pecoraro <[email protected]>
+
Fix HTMLMediaElement.o for iOS. Unreviewed build fix.
There is now local variable mediaElement. Just call the
Modified: trunk/Source/WebCore/bindings/js/GCController.cpp (161746 => 161747)
--- trunk/Source/WebCore/bindings/js/GCController.cpp 2014-01-11 06:41:35 UTC (rev 161746)
+++ trunk/Source/WebCore/bindings/js/GCController.cpp 2014-01-11 06:53:43 UTC (rev 161747)
@@ -20,7 +20,7 @@
* 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.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
@@ -103,7 +103,6 @@
detachThread(threadID);
}
-#if PLATFORM(IOS)
void GCController::releaseExecutableMemory()
{
JSLockHolder lock(JSDOMWindow::commonVM());
@@ -113,15 +112,14 @@
// We shouldn't have any _javascript_ running on our stack when this function is called. The
// following line asserts that.
- ASSERT(!JSDOMWindow::commonVM()->dynamicGlobalObject);
+ ASSERT(!JSDOMWindow::commonVM()->entryScope);
// But be safe in release builds just in case...
- if (JSDOMWindow::commonVM()->dynamicGlobalObject)
+ if (JSDOMWindow::commonVM()->entryScope)
return;
JSDOMWindow::commonVM()->releaseExecutableMemory();
}
-#endif
void GCController::setJavaScriptGarbageCollectorTimerEnabled(bool enable)
{
Modified: trunk/Source/WebCore/bindings/js/GCController.h (161746 => 161747)
--- trunk/Source/WebCore/bindings/js/GCController.h 2014-01-11 06:41:35 UTC (rev 161746)
+++ trunk/Source/WebCore/bindings/js/GCController.h 2014-01-11 06:53:43 UTC (rev 161747)
@@ -20,7 +20,7 @@
* 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.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef GCController_h
@@ -44,9 +44,7 @@
void garbageCollectNow(); // It's better to call garbageCollectSoon, unless you have a specific reason not to.
void garbageCollectOnAlternateThreadForDebugging(bool waitUntilDone); // Used for stress testing.
-#if PLATFORM(IOS)
void releaseExecutableMemory();
-#endif
void setJavaScriptGarbageCollectorTimerEnabled(bool);
void discardAllCompiledCode();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
