      , m_maskLayer(0)
      , m_contentsClippingMaskLayer(0)
      , m_replicaLayer(0)
-@@ -194,6 +195,12 @@ void GraphicsLayer::setParent(GraphicsLayer* layer)
+@@ -190,6 +191,12 @@ void GraphicsLayer::setParent(GraphicsLayer* layer)
      m_parent = layer;
  }
  

2.10.0.rc0.17.gd63263a


From d1a0ceb3858760d095a0309b09431afa85174056 Mon Sep 17 00:00:00 2001
From: JW Bell <bjwbell@gmail.com>
Date: Tue, 6 Sep 2016 14:09:39 -0400
Subject: [PATCH 26/26] Ironframe - Remove unused LayoutTests files

   gfx::VectorIconId GetVectorIcon() const override;
   base::string16 GetSecureVerboseText() const override;
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index ef9a4cc..adb1671 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -196,14 +196,14 @@ void SSLPolicy::UpdateEntry(NavigationEntryImpl* entry,
 
   InitializeEntryIfNeeded(entry);
 
