From 4b5e2e0432b36a22b916caa957962d624265a7e6 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@digia.com>
Date: Tue, 21 Jan 2014 14:32:43 +0100
Subject: [PATCH] RELEASE_ASSERT tweak.
Update the snapshot and add the patch that disables it.
Change-Id: Ide67ab476d2fdc7afa0b361848a1ebe881235115
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
...ous-RELEASE_ASSERT_WITH_SECURITY_IMP.patch | 35 +++++++++++++++++++
patches/patch-chromium.sh | 1 +
src/3rdparty | 2 +-
3 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 patches/0001-Remove-the-infamous-RELEASE_ASSERT_WITH_SECURITY_IMP.patch
diff --git a/patches/0001-Remove-the-infamous-RELEASE_ASSERT_WITH_SECURITY_IMP.patch b/patches/0001-Remove-the-infamous-RELEASE_ASSERT_WITH_SECURITY_IMP.patch
new file mode 100644
index 000000000..ddd11396b
--- /dev/null
+++ b/patches/0001-Remove-the-infamous-RELEASE_ASSERT_WITH_SECURITY_IMP.patch
@@ -0,0 +1,35 @@
+From 3e834e97bf8c6f20ca7d9c7d0cc79094108e8965 Mon Sep 17 00:00:00 2001
+From: Pierre Rossi <pierre.rossi@digia.com>
+Date: Mon, 20 Jan 2014 15:14:41 +0100
+Subject: Remove the infamous RELEASE_ASSERT_WITH_SECURITY_IMPLICATION
+
+The security implication doesn't matter that much for us at this point
+(tech preview material, not production quality). But having the render
+process apparently crashing does not look good.
+
+Change-Id: I72d494cfa8b7d5babb30572cedd6520f3dc44d16
+Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
+---
+ Source/bindings/scripts/code_generator_v8.pm | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Source/bindings/scripts/code_generator_v8.pm b/Source/bindings/scripts/code_generator_v8.pm
+index 4fe56e5..280a73e 100644
+--- a/Source/bindings/scripts/code_generator_v8.pm
++++ b/Source/bindings/scripts/code_generator_v8.pm
+@@ -4766,12 +4766,6 @@ v8::Handle<v8::Object> ${v8ClassName}::createWrapper(${createWrapperArgumentType
+ {
+ ASSERT(impl.get());
+ ASSERT(!DOMDataStore::containsWrapper<${v8ClassName}>(impl.get(), isolate));
+- if (ScriptWrappable::wrapperCanBeStoredInObject(impl.get())) {
+- const WrapperTypeInfo* actualInfo = ScriptWrappable::getTypeInfoFromObject(impl.get());
+- // Might be a XXXConstructor::info instead of an XXX::info. These will both have
+- // the same object de-ref functions, though, so use that as the basis of the check.
+- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(actualInfo->derefObjectFunction == info.derefObjectFunction);
+- }
+
+ END
+
+--
+1.8.5.2
+
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index a048d2e7d..0a2db8dfe 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -74,6 +74,7 @@ cd $CHROMIUM_SRC_DIR/third_party/WebKit
echo "Entering $PWD"
git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch
+git am $PATCH_DIR/0001-Remove-the-infamous-RELEASE_ASSERT_WITH_SECURITY_IMP.patch
cd $CHROMIUM_SRC_DIR/third_party/libjingle/source/talk
echo "Entering $PWD"
diff --git a/src/3rdparty b/src/3rdparty
index e4d96858a..3e834e97b 160000
--- a/src/3rdparty
+++ b/src/3rdparty
@@ -1 +1 @@
-Subproject commit e4d96858acc5c6c1bfa47fe4a6a3b8bbf986e60c
+Subproject commit 3e834e97bf8c6f20ca7d9c7d0cc79094108e8965
--
GitLab