<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169909] trunk/Source/WebKit/win</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169909">169909</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-12 13:34:28 -0700 (Thu, 12 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Avoid crashes in code that converted CFDictionaries to HashMap
https://bugs.webkit.org/show_bug.cgi?id=133813
<rdar://problem/17291647>
Reviewed by Tim Horton.
* WebHistory.cpp: Add empty string checks to avoid crashes in
hash function.
(WebHistory::removeItem):
(WebHistory::addItem):
(WebHistory::visitedURL):
(WebHistory::itemForURL):
(WebHistory::removeItemForURLString):
(WebHistory::itemForURLString):
* WebPreferences.cpp: Ditto.
(WebPreferences::getInstanceForIdentifier):
(WebPreferences::setInstance):
(WebPreferences::removeReferenceForIdentifier):
* WebView.cpp: Ditto. Also convert OwnPtr uses in this file
to std::unique_ptr.
(WebView::close):
(WebView::handleMouseEvent):
(WebView::registerEmbeddedViewMIMEType):
(WebView::shouldUseEmbeddedView):
(WebView::enterFullscreenForNode):
(WebView::fullScreenController):
* WebView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebHistorycpp">trunk/Source/WebKit/win/WebHistory.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewh">trunk/Source/WebKit/win/WebView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (169908 => 169909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-06-12 20:23:25 UTC (rev 169908)
+++ trunk/Source/WebKit/win/ChangeLog 2014-06-12 20:34:28 UTC (rev 169909)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-06-12 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Avoid crashes in code that converted CFDictionaries to HashMap
+ https://bugs.webkit.org/show_bug.cgi?id=133813
+ <rdar://problem/17291647>
+
+ Reviewed by Tim Horton.
+
+ * WebHistory.cpp: Add empty string checks to avoid crashes in
+ hash function.
+ (WebHistory::removeItem):
+ (WebHistory::addItem):
+ (WebHistory::visitedURL):
+ (WebHistory::itemForURL):
+ (WebHistory::removeItemForURLString):
+ (WebHistory::itemForURLString):
+ * WebPreferences.cpp: Ditto.
+ (WebPreferences::getInstanceForIdentifier):
+ (WebPreferences::setInstance):
+ (WebPreferences::removeReferenceForIdentifier):
+ * WebView.cpp: Ditto. Also convert OwnPtr uses in this file
+ to std::unique_ptr.
+ (WebView::close):
+ (WebView::handleMouseEvent):
+ (WebView::registerEmbeddedViewMIMEType):
+ (WebView::shouldUseEmbeddedView):
+ (WebView::enterFullscreenForNode):
+ (WebView::fullScreenController):
+ * WebView.h:
+
</ins><span class="cx"> 2014-05-07 Hyowon Kim <hw1008.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> GraphicsLayer::client() should return a reference.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistory.cpp (169908 => 169909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistory.cpp 2014-06-12 20:23:25 UTC (rev 169908)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2014-06-12 20:34:28 UTC (rev 169909)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -425,6 +425,8 @@
</span><span class="cx"> return hr;
</span><span class="cx">
</span><span class="cx"> String urlString(urlBStr, SysStringLen(urlBStr));
</span><ins>+ if (urlString.isEmpty())
+ return E_FAIL;
</ins><span class="cx">
</span><span class="cx"> auto it = m_entriesByURL.find(urlString);
</span><span class="cx"> if (it == m_entriesByURL.end())
</span><span class="lines">@@ -460,6 +462,8 @@
</span><span class="cx"> return hr;
</span><span class="cx">
</span><span class="cx"> String urlString(urlBStr, SysStringLen(urlBStr));
</span><ins>+ if (urlString.isEmpty())
+ return E_FAIL;
</ins><span class="cx">
</span><span class="cx"> COMPtr<IWebHistoryItem> oldEntry(m_entriesByURL.get(urlString));
</span><span class="cx">
</span><span class="lines">@@ -496,7 +500,11 @@
</span><span class="cx">
</span><span class="cx"> void WebHistory::visitedURL(const URL& url, const String& title, const String& httpMethod, bool wasFailure, bool increaseVisitCount)
</span><span class="cx"> {
</span><del>- IWebHistoryItem* entry = m_entriesByURL.get(url.string()).get();
</del><ins>+ const String& urlString = url.string();
+ if (urlString.isEmpty())
+ return;
+
+ IWebHistoryItem* entry = m_entriesByURL.get(urlString).get();
</ins><span class="cx"> if (!entry) {
</span><span class="cx"> COMPtr<WebHistoryItem> item(AdoptCOM, WebHistoryItem::createInstance());
</span><span class="cx"> if (!item)
</span><span class="lines">@@ -510,10 +518,10 @@
</span><span class="cx"> if (!SystemTimeToVariantTime(&currentTime, &lastVisited))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (FAILED(entry->initWithURLString(BString(url.string()), BString(title), lastVisited)))
</del><ins>+ if (FAILED(entry->initWithURLString(BString(urlString), BString(title), lastVisited)))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_entriesByURL.set(url.string(), entry);
</del><ins>+ m_entriesByURL.set(urlString, entry);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebHistoryItemPrivate> entryPrivate(Query, entry);
</span><span class="lines">@@ -530,13 +538,17 @@
</span><span class="cx"> postNotification(kWebHistoryItemsAddedNotification, userInfo.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT WebHistory::itemForURL(BSTR url, IWebHistoryItem** item)
</del><ins>+HRESULT WebHistory::itemForURL(BSTR urlBStr, IWebHistoryItem** item)
</ins><span class="cx"> {
</span><span class="cx"> if (!item)
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> *item = 0;
</span><span class="cx">
</span><del>- auto it = m_entriesByURL.find(url);
</del><ins>+ String urlString(urlBStr, SysStringLen(urlBStr));
+ if (urlString.isEmpty())
+ return E_FAIL;
+
+ auto it = m_entriesByURL.find(urlString);
</ins><span class="cx"> if (it == m_entriesByURL.end())
</span><span class="cx"> return E_FAIL;
</span><span class="cx">
</span><span class="lines">@@ -546,6 +558,9 @@
</span><span class="cx">
</span><span class="cx"> HRESULT WebHistory::removeItemForURLString(const WTF::String& urlString)
</span><span class="cx"> {
</span><ins>+ if (urlString.isEmpty())
+ return E_FAIL;
+
</ins><span class="cx"> auto it = m_entriesByURL.find(urlString);
</span><span class="cx"> if (it == m_entriesByURL.end())
</span><span class="cx"> return E_FAIL;
</span><span class="lines">@@ -558,8 +573,8 @@
</span><span class="cx">
</span><span class="cx"> COMPtr<IWebHistoryItem> WebHistory::itemForURLString(const String& urlString) const
</span><span class="cx"> {
</span><del>- if (!urlString)
- return 0;
</del><ins>+ if (urlString.isEmpty())
+ return nullptr;
</ins><span class="cx"> return m_entriesByURL.get(urlString);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (169908 => 169909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp 2014-06-12 20:23:25 UTC (rev 169908)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2014-06-12 20:34:28 UTC (rev 169909)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -154,6 +154,9 @@
</span><span class="cx"> return sharedStandardPreferences();
</span><span class="cx">
</span><span class="cx"> WTF::String identifierString(identifier, SysStringLen(identifier));
</span><ins>+ if (identifierString.isEmpty())
+ return sharedStandardPreferences();
+
</ins><span class="cx"> return webPreferencesInstances.get(identifierString).get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,6 +165,8 @@
</span><span class="cx"> if (!identifier || !instance)
</span><span class="cx"> return;
</span><span class="cx"> WTF::String identifierString(identifier, SysStringLen(identifier));
</span><ins>+ if (identifierString.isEmpty())
+ return;
</ins><span class="cx"> webPreferencesInstances.add(identifierString, instance);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -171,6 +176,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WTF::String identifierString(identifier, SysStringLen(identifier));
</span><ins>+ if (identifierString.isEmpty())
+ return;
</ins><span class="cx"> WebPreferences* webPreference = webPreferencesInstances.get(identifierString).get();
</span><span class="cx"> if (webPreference && webPreference->m_refCount == 1)
</span><span class="cx"> webPreferencesInstances.remove(identifierString);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (169908 => 169909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-06-12 20:23:25 UTC (rev 169908)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-06-12 20:34:28 UTC (rev 169909)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> #include <WebCore/FrameTree.h>
</span><span class="cx"> #include <WebCore/FrameView.h>
</span><span class="cx"> #include <WebCore/FrameWin.h>
</span><ins>+#include <WebCore/FullScreenController.h>
</ins><span class="cx"> #include <WebCore/GDIObjectCounter.h>
</span><span class="cx"> #include <WebCore/GeolocationController.h>
</span><span class="cx"> #include <WebCore/GeolocationError.h>
</span><span class="lines">@@ -717,7 +718,7 @@
</span><span class="cx"> if (m_mouseOutTracker) {
</span><span class="cx"> m_mouseOutTracker->dwFlags = TME_CANCEL;
</span><span class="cx"> ::TrackMouseEvent(m_mouseOutTracker.get());
</span><del>- m_mouseOutTracker.clear();
</del><ins>+ m_mouseOutTracker.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> revokeDragDrop();
</span><span class="lines">@@ -1539,7 +1540,7 @@
</span><span class="cx"> } else if (message == WM_MOUSELEAVE && m_mouseOutTracker) {
</span><span class="cx"> // Once WM_MOUSELEAVE is fired windows clears this tracker
</span><span class="cx"> // so there is no need to disable it ourselves.
</span><del>- m_mouseOutTracker.clear();
</del><ins>+ m_mouseOutTracker.reset();
</ins><span class="cx"> m_page->mainFrame().eventHandler().mouseMoved(mouseEvent);
</span><span class="cx"> handled = true;
</span><span class="cx"> } else if (message == WM_MOUSEMOVE) {
</span><span class="lines">@@ -1548,7 +1549,7 @@
</span><span class="cx"> mouseEvent.setClickCount(globalClickCount);
</span><span class="cx"> handled = m_page->mainFrame().eventHandler().mouseMoved(mouseEvent);
</span><span class="cx"> if (!m_mouseOutTracker) {
</span><del>- m_mouseOutTracker = adoptPtr(new TRACKMOUSEEVENT);
</del><ins>+ m_mouseOutTracker = std::make_unique<TRACKMOUSEEVENT>();
</ins><span class="cx"> m_mouseOutTracker->cbSize = sizeof(TRACKMOUSEEVENT);
</span><span class="cx"> m_mouseOutTracker->dwFlags = TME_LEAVE;
</span><span class="cx"> m_mouseOutTracker->hwndTrack = m_viewWindow;
</span><span class="lines">@@ -6195,13 +6196,13 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebView::registerEmbeddedViewMIMEType(BSTR mimeType)
</del><ins>+HRESULT WebView::registerEmbeddedViewMIMEType(BSTR mimeType)
</ins><span class="cx"> {
</span><span class="cx"> if (!mimeType)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> if (!m_embeddedViewMIMETypes)
</span><del>- m_embeddedViewMIMETypes = adoptPtr(new HashSet<String>);
</del><ins>+ m_embeddedViewMIMETypes = std::make_unique<HashSet<String>>();
</ins><span class="cx">
</span><span class="cx"> m_embeddedViewMIMETypes->add(toString(mimeType));
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -6212,6 +6213,9 @@
</span><span class="cx"> if (!m_embeddedViewMIMETypes)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (mimeType.isEmpty())
+ return false;
+
</ins><span class="cx"> return m_embeddedViewMIMETypes->contains(mimeType);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6299,7 +6303,7 @@
</span><span class="cx"> ASSERT(!m_fullScreenVideoController);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_fullScreenVideoController = adoptPtr(new FullscreenVideoController);
</del><ins>+ m_fullScreenVideoController = std::make_unique<FullscreenVideoController>();
</ins><span class="cx"> m_fullScreenVideoController->setMediaElement(videoElement);
</span><span class="cx"> m_fullScreenVideoController->enterFullscreen();
</span><span class="cx"> #endif
</span><span class="lines">@@ -6902,7 +6906,7 @@
</span><span class="cx"> FullScreenController* WebView::fullScreenController()
</span><span class="cx"> {
</span><span class="cx"> if (!m_fullscreenController)
</span><del>- m_fullscreenController = adoptPtr(new FullScreenController(this));
</del><ins>+ m_fullscreenController = std::unique_ptr<FullScreenController>(new FullScreenController(this));
</ins><span class="cx"> return m_fullscreenController.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.h (169908 => 169909)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.h 2014-06-12 20:23:25 UTC (rev 169908)
+++ trunk/Source/WebKit/win/WebView.h 2014-06-12 20:34:28 UTC (rev 169909)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2009, 2010, 2011 Appcelerator, Inc. All rights reserved.
</span><span class="cx"> * Copyright (C) 2011 Brent Fulgham. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> #include <WebCore/SuspendableTimer.h>
</span><span class="cx"> #include <WebCore/WindowMessageListener.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="lines">@@ -1126,11 +1125,11 @@
</span><span class="cx"> static bool s_allowSiteSpecificHacks;
</span><span class="cx">
</span><span class="cx"> WebCore::SuspendableTimer* m_closeWindowTimer;
</span><del>- OwnPtr<TRACKMOUSEEVENT> m_mouseOutTracker;
</del><ins>+ std::unique_ptr<TRACKMOUSEEVENT> m_mouseOutTracker;
</ins><span class="cx">
</span><span class="cx"> HWND m_topLevelParent;
</span><span class="cx">
</span><del>- OwnPtr<HashSet<WTF::String> > m_embeddedViewMIMETypes;
</del><ins>+ std::unique_ptr<HashSet<WTF::String>> m_embeddedViewMIMETypes;
</ins><span class="cx">
</span><span class="cx"> //Variables needed to store gesture information
</span><span class="cx"> RefPtr<WebCore::Node> m_gestureTargetNode;
</span><span class="lines">@@ -1140,7 +1139,7 @@
</span><span class="cx"> long m_yOverpan;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- OwnPtr<FullscreenVideoController> m_fullScreenVideoController;
</del><ins>+ std::unique_ptr<FullscreenVideoController> m_fullScreenVideoController;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isAcceleratedCompositing() const { return m_isAcceleratedCompositing; }
</span><span class="lines">@@ -1161,7 +1160,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> RefPtr<WebCore::Element> m_fullScreenElement;
</span><del>- OwnPtr<WebCore::FullScreenController> m_fullscreenController;
</del><ins>+ std::unique_ptr<WebCore::FullScreenController> m_fullscreenController;
</ins><span class="cx"> WebCore::IntPoint m_scrollPosition;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>