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/page/PageSerializer.h | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'Source/WebCore/page/PageSerializer.h')

diff --git a/Source/WebCore/page/PageSerializer.h b/Source/WebCore/page/PageSerializer.h
index f25488f7f..d5743bc4f 100644
--- a/Source/WebCore/page/PageSerializer.h
+++ b/Source/WebCore/page/PageSerializer.h
@@ -28,10 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PageSerializer_h
-#define PageSerializer_h
+#pragma once
 
-#include "URL.h"
 #include "URLHash.h"
 #include "SharedBuffer.h"
 #include <wtf/HashMap.h>
@@ -57,20 +55,20 @@ public:
         URL url;
         String mimeType;
         RefPtr<SharedBuffer> data;
-        Resource();
-        Resource(const URL&, const String& mimeType, PassRefPtr<SharedBuffer> data);
     };
 
-    explicit PageSerializer(Vector<Resource>*);
+    explicit PageSerializer(Vector<Resource>&);
 
     // Initiates the serialization of the frame's page. All serialized content and retrieved
     // resources are added to the Vector passed to the constructor. The first resource in that
     // vector is the top frame serialized content.
-    void serialize(Page*);
+    void serialize(Page&);
+
+private:
+    class SerializerMarkupAccumulator;
 
     URL urlForBlankFrame(Frame*);
 
-private:
     void serializeFrame(Frame*);
 
     // Serializes the stylesheet back to text and adds it to the resources if URL is not-empty.
@@ -79,14 +77,12 @@ private:
 
     void addImageToResources(CachedImage*, RenderElement*, const URL&);
     void retrieveResourcesForProperties(const StyleProperties*, Document*);
-    void retrieveResourcesForRule(StyleRule*, Document*);
+    void retrieveResourcesForRule(StyleRule&, Document*);
 
-    Vector<Resource>* m_resources;
+    Vector<Resource>& m_resources;
     ListHashSet<URL> m_resourceURLs;
     HashMap<Frame*, URL> m_blankFrameURLs;
-    unsigned m_blankFrameCounter;
+    unsigned m_blankFrameCounter { 0 };
 };
 
-}
-
-#endif
+} // namespace WebCore
-- 
cgit v1.2.1