From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Tue, 27 Jun 2017 06:07:23 +0000
Subject: webkitgtk-2.16.5

---
 Source/WebCore/rendering/RenderBoxRegionInfo.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'Source/WebCore/rendering/RenderBoxRegionInfo.h')

diff --git a/Source/WebCore/rendering/RenderBoxRegionInfo.h b/Source/WebCore/rendering/RenderBoxRegionInfo.h
index bfe0dccc3..a0710e5f3 100644
--- a/Source/WebCore/rendering/RenderBoxRegionInfo.h
+++ b/Source/WebCore/rendering/RenderBoxRegionInfo.h
@@ -13,7 +13,7 @@
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,12 +23,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
-#ifndef RenderBoxRegionInfo_h
-#define RenderBoxRegionInfo_h
+#pragma once
 
 #include "RenderOverflow.h"
-#include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
@@ -54,7 +51,7 @@ public:
     void clearOverflow()
     {
         if (m_overflow)
-            m_overflow.clear();
+            m_overflow = nullptr;
     }
 
 private:
@@ -65,5 +62,3 @@ private:
 };
 
 } // namespace WebCore
-
-#endif // RenderBoxRegionInfo_h
-- 
cgit v1.2.1