<!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>[170989] trunk/Source/WebKit2</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/170989">170989</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-10 20:50:15 -0700 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/170970">r170970</a>) REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/170974">r170974</a>): [GTK] Build broken.
https://bugs.webkit.org/show_bug.cgi?id=134825
Unreviewed GTK build fix.
Patch by Carlos Alberto Lopez Perez <clopez@igalia.com> on 2014-07-10
* Shared/SessionState.h: Put ifdefs for ViewSnapshot on Mac port.
* Shared/WebBackForwardListItem.h: Idem.
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformDefaultOpenGLCacheDirectory): Implement skeleton.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionStateh">trunk/Source/WebKit2/Shared/SessionState.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebBackForwardListItemh">trunk/Source/WebKit2/Shared/WebBackForwardListItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170988 => 170989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-11 02:29:33 UTC (rev 170988)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-11 03:50:15 UTC (rev 170989)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-07-10 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ REGRESSION(r170970) REGRESSION(r170974): [GTK] Build broken.
+ https://bugs.webkit.org/show_bug.cgi?id=134825
+
+ Unreviewed GTK build fix.
+
+ * Shared/SessionState.h: Put ifdefs for ViewSnapshot on Mac port.
+ * Shared/WebBackForwardListItem.h: Idem.
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformDefaultOpenGLCacheDirectory): Implement skeleton.
+
</ins><span class="cx"> 2014-07-10 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS][WK2] It should be safe to call WKContentViewInteraction's cleanupInteraction multiple times
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionState.h (170988 => 170989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionState.h 2014-07-11 02:29:33 UTC (rev 170988)
+++ trunk/Source/WebKit2/Shared/SessionState.h 2014-07-11 03:50:15 UTC (rev 170989)
</span><span class="lines">@@ -26,7 +26,10 @@
</span><span class="cx"> #ifndef SessionState_h
</span><span class="cx"> #define SessionState_h
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #include "ViewSnapshotStore.h"
</span><ins>+#endif
+
</ins><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="lines">@@ -121,7 +124,10 @@
</span><span class="cx"> uint64_t identifier;
</span><span class="cx">
</span><span class="cx"> PageState pageState;
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> RefPtr<ViewSnapshot> snapshot;
</span><ins>+#endif
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct BackForwardListState {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (170988 => 170989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-11 02:29:33 UTC (rev 170988)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-11 03:50:15 UTC (rev 170989)
</span><span class="lines">@@ -57,8 +57,10 @@
</span><span class="cx"> const String& url() const { return m_itemState.pageState.mainFrameState.urlString; }
</span><span class="cx"> const String& title() const { return m_itemState.pageState.title; }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> ViewSnapshot* snapshot() const { return m_itemState.snapshot.get(); }
</span><span class="cx"> void setSnapshot(PassRefPtr<ViewSnapshot> snapshot) { m_itemState.snapshot = snapshot; }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static uint64_t highedUsedItemID();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (170988 => 170989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-07-11 02:29:33 UTC (rev 170988)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-07-11 03:50:15 UTC (rev 170989)
</span><span class="lines">@@ -148,6 +148,12 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebContext::platformDefaultOpenGLCacheDirectory() const
+{
+ notImplemented();
+ return String();
+}
+
</ins><span class="cx"> void WebContext::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><span class="cx"> m_ignoreTLSErrors = ignoreTLSErrors;
</span></span></pre>
</div>
</div>
</body>
</html>