Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Issue 907853004: Revert of Roll src/third_party/WebKit 465217f:d693046 (svn 189778:189793) (Closed)

Created:
5 years, 10 months ago by Ryan Hamilton
Modified:
5 years, 10 months ago
CC:
chromium-reviews, caseq, Dirk Pranke
Base URL:
https://chromium.googlesource.com/chromium/src@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Roll src/third_party/WebKit 465217f:d693046 (svn 189778:189793) (patchset #1 id:1 of https://codereview.chromium.org/912483003/) Reason for revert: Looks like this broke the linux 32 bots: https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29%2832%29/builds/9539 lots of failures like: ASSERTION FAILED: !((reinterpret_cast<uintptr_t>(address) + sizeof(HeapObjectHeader)) & allocationMask) ../../third_party/WebKit/Source/platform/heap/Heap.cpp(875) : void blink::FreeList::addToFreeList(Address, size_t) Original issue's description: > Roll src/third_party/WebKit 465217f:d693046 (svn 189778:189793) > > Summary of changes available at: > https://chromium.googlesource.com/chromium/blink/+log/465217f..d693046 > > TBR=dpranke@chromium.org,caseq@chromium.org > > Committed: https://crrev.com/3a40a6413424402ac41db8184a398ec46934c206 > Cr-Commit-Position: refs/heads/master@{#315299} TBR=caseq@chromium.org,dpranke@chromium.org,blink-deps-roller@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M DEPS View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 5 (2 generated)
Ryan Hamilton
Created Revert of Roll src/third_party/WebKit 465217f:d693046 (svn 189778:189793)
5 years, 10 months ago (2015-02-09 17:58:52 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/907853004/1
5 years, 10 months ago (2015-02-09 17:59:59 UTC) #2
commit-bot: I haz the power
5 years, 10 months ago (2015-02-09 18:00:48 UTC) #4
Failed to apply patch for DEPS:
While running git apply --index -3 -p1;
  error: patch failed: DEPS:34
  Falling back to three-way merge...
  Applied patch to 'DEPS' with conflicts.
  U DEPS

Patch:       DEPS
Index: DEPS
diff --git a/DEPS b/DEPS
index
59f65978d76483e35b6ce27501a3f1cf55e8edf0..855d2c475f3b580b0dd20ea3a1c10253bb2ed9d0
100644
--- a/DEPS
+++ b/DEPS
@@ -34,7 +34,7 @@
   'llvm_url': 'http://src.chromium.org/llvm-project',
   'llvm_git': 'https://llvm.googlesource.com',
   'webkit_trunk': 'http://src.chromium.org/blink/trunk',
-  'webkit_revision': 'd69304689acffac5220ddaa2e9c56c97ac4df090', # from svn
revision 189793
+  'webkit_revision': '465217f5619ae33f836fc30492fa0d8e43e5883e', # from svn
revision 189778
   'chromium_git': 'https://chromium.googlesource.com',
   'chromiumos_git': 'https://chromium.googlesource.com/chromiumos',
   'pdfium_git': 'https://pdfium.googlesource.com',

Powered by Google App Engine
This is Rietveld 408576698