These assert should be moved forward. they do not work here.

These assert should be moved forward. they do not work here.

R=junov@chromium.org
BUG=

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=175452

[Justin Novosad, 2014-05-29 14:52:36]

On 2014/05/29 07:46:24, penghu wrote:

lgtm

[penghu, 2014-05-30 01:56:02]

The CQ bit was checked by penghu@tencent.com

[commit-bot: I haz the power, 2014-05-30 01:57:12]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/penghu@tencent.com/301133002/1

[commit-bot: I haz the power, 2014-05-30 01:57:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-30 01:57:22]

Failed to apply patch for Source/platform/graphics/Canvas2DLayerBridge.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/platform/graphics/Canvas2DLayerBridge.cpp
  Hunk #1 FAILED at 414.
  1 out of 1 hunk FAILED -- saving rejects to file
Source/platform/graphics/Canvas2DLayerBridge.cpp.rej

Patch:       Source/platform/graphics/Canvas2DLayerBridge.cpp
Index: Source/platform/graphics/Canvas2DLayerBridge.cpp
diff --git a/Source/platform/graphics/Canvas2DLayerBridge.cpp
b/Source/platform/graphics/Canvas2DLayerBridge.cpp
index
a188a2644acbaba7f9a5bd1ee2acf6b27bfc6ebc..b6f40d4e0dcd27f763565d8b27084dece92c522c
100644
--- a/Source/platform/graphics/Canvas2DLayerBridge.cpp
+++ b/Source/platform/graphics/Canvas2DLayerBridge.cpp
@@ -414,15 +414,15 @@ bool
Canvas2DLayerBridge::prepareMailbox(blink::WebExternalTextureMailbox* outMa
     mailboxInfo->m_status = MailboxInUse;
     mailboxInfo->m_image = image;
 
+    ASSERT(mailboxInfo->m_mailbox.syncPoint == 0);
+    ASSERT(mailboxInfo->m_image.get());
+    ASSERT(mailboxInfo->m_image->getTexture());
+
     // Because of texture sharing with the compositor, we must invalidate
     // the state cached in skia so that the deferred copy on write
     // in SkSurface_Gpu does not make any false assumptions.
     mailboxInfo->m_image->getTexture()->invalidateCachedState();
 
-    ASSERT(mailboxInfo->m_mailbox.syncPoint == 0);
-    ASSERT(mailboxInfo->m_image.get());
-    ASSERT(mailboxInfo->m_image->getTexture());
-
     webContext->bindTexture(GL_TEXTURE_2D,
mailboxInfo->m_image->getTexture()->getTextureHandle());
     webContext->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     webContext->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

[penghu, 2014-05-30 01:58:50]

The CQ bit was unchecked by penghu@tencent.com

[James Wei, 2014-06-04 02:00:26]

The CQ bit was checked by wistoch@chromium.org

[commit-bot: I haz the power, 2014-06-04 02:00:56]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/penghu@tencent.com/301133002/20001

[commit-bot: I haz the power, 2014-06-04 04:21:49]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/10521)
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[commit-bot: I haz the power, 2014-06-04 04:22:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-04 04:22:18]

Try jobs failed on following builders:
  win_gpu_triggered_tests on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu_triggered...)

[penghu, 2014-06-04 08:07:27]

The CQ bit was checked by penghu@tencent.com

[commit-bot: I haz the power, 2014-06-04 08:08:15]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/penghu@tencent.com/301133002/20001

[commit-bot: I haz the power, 2014-06-04 08:08:58]

Change committed as 175452