<!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>[159229] 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/159229">159229</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-13 13:26:33 -0800 (Wed, 13 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Fix build after <a href="http://trac.webkit.org/projects/webkit/changeset/159222">r159222</a>
https://bugs.webkit.org/show_bug.cgi?id=124305

Patch by Nick Diego Yamane &lt;nick.yamane@openbossa.org&gt; on 2013-11-13
Reviewed by Tim Horton.

WebGraphicsContext and its API has been removed.

* CMakeLists.txt:
* GNUmakefile.list.am:
* Shared/API/c/gtk/WKGraphicsContextGtk.cpp: Removed.
* Shared/API/c/gtk/WKGraphicsContextGtk.h: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2GNUmakefilelistam">trunk/Source/WebKit2/GNUmakefile.list.am</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIcgtkWKGraphicsContextGtkcpp">trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcgtkWKGraphicsContextGtkh">trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159228 => 159229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/ChangeLog        2013-11-13 21:26:33 UTC (rev 159229)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-11-13  Nick Diego Yamane  &lt;nick.yamane@openbossa.org&gt;
+
+        [GTK] Fix build after r159222
+        https://bugs.webkit.org/show_bug.cgi?id=124305
+
+        Reviewed by Tim Horton.
+
+        WebGraphicsContext and its API has been removed.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Shared/API/c/gtk/WKGraphicsContextGtk.cpp: Removed.
+        * Shared/API/c/gtk/WKGraphicsContextGtk.h: Removed.
+
</ins><span class="cx"> 2013-11-13  Tim Horton  &lt;timothy_horton@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove redundant return after r159173
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.list.am (159228 => 159229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.list.am        2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/GNUmakefile.list.am        2013-11-13 21:26:33 UTC (rev 159229)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><span class="cx"> webkit2_h_api += \
</span><span class="cx">         $(WebKit2)/Shared/API/c/gtk/WKBaseGtk.h \
</span><del>-        $(WebKit2)/Shared/API/c/gtk/WKGraphicsContextGtk.h \
</del><span class="cx">         $(WebKit2)/Shared/API/c/soup/WKBaseSoup.h \
</span><span class="cx">         $(WebKit2)/Shared/API/c/WKArray.h \
</span><span class="cx">         $(WebKit2)/Shared/API/c/WKBase.h \
</span><span class="lines">@@ -15,7 +14,6 @@
</span><span class="cx">         $(WebKit2)/Shared/API/c/WKEvent.h \
</span><span class="cx">         $(WebKit2)/Shared/API/c/WKFindOptions.h \
</span><span class="cx">         $(WebKit2)/Shared/API/c/WKGeometry.h \
</span><del>-        $(WebKit2)/Shared/API/c/WKGraphicsContext.h \
</del><span class="cx">         $(WebKit2)/Shared/API/c/WKImage.h \
</span><span class="cx">         $(WebKit2)/Shared/API/c/WKMutableArray.h \
</span><span class="cx">         $(WebKit2)/Shared/API/c/WKMutableDictionary.h \
</span><span class="lines">@@ -330,8 +328,6 @@
</span><span class="cx">         Source/WebKit2/Shared/API/c/cairo/WKImageCairo.cpp \
</span><span class="cx">         Source/WebKit2/Shared/API/c/cairo/WKImageCairo.h \
</span><span class="cx">         Source/WebKit2/Shared/API/c/gtk/WKBaseGtk.h \
</span><del>-        Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h \
-        Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp \
</del><span class="cx">         Source/WebKit2/Shared/API/c/soup/WKBaseSoup.h \
</span><span class="cx">         Source/WebKit2/Shared/API/c/WKArray.cpp \
</span><span class="cx">         Source/WebKit2/Shared/API/c/WKArray.h \
</span><span class="lines">@@ -355,8 +351,6 @@
</span><span class="cx">         Source/WebKit2/Shared/API/c/WKFindOptions.h \
</span><span class="cx">         Source/WebKit2/Shared/API/c/WKGeometry.h \
</span><span class="cx">         Source/WebKit2/Shared/API/c/WKGeometry.cpp \
</span><del>-        Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp \
-        Source/WebKit2/Shared/API/c/WKGraphicsContext.h \
</del><span class="cx">         Source/WebKit2/Shared/API/c/WKImage.cpp \
</span><span class="cx">         Source/WebKit2/Shared/API/c/WKImage.h \
</span><span class="cx">         Source/WebKit2/Shared/API/c/WKMutableArray.cpp \
</span><span class="lines">@@ -523,8 +517,6 @@
</span><span class="cx">         Source/WebKit2/Shared/WebGeolocationPosition.cpp \
</span><span class="cx">         Source/WebKit2/Shared/WebGeolocationPosition.h \
</span><span class="cx">         Source/WebKit2/Shared/WebGeometry.h \
</span><del>-        Source/WebKit2/Shared/WebGraphicsContext.cpp \
-        Source/WebKit2/Shared/WebGraphicsContext.h \
</del><span class="cx">         Source/WebKit2/Shared/WebHitTestResult.cpp \
</span><span class="cx">         Source/WebKit2/Shared/WebHitTestResult.h \
</span><span class="cx">         Source/WebKit2/Shared/WebImage.cpp \
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcgtkWKGraphicsContextGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp (159228 => 159229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp        2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp        2013-11-13 21:26:33 UTC (rev 159229)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Igalia SL All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#include &quot;config.h&quot;
-#include &quot;WKGraphicsContextGtk.h&quot;
-
-#include &quot;WKSharedAPICast.h&quot;
-#include &quot;WebGraphicsContext.h&quot;
-
-using namespace WebKit;
-
-cairo_t* WKGraphicsContextGetGtkContext(WKGraphicsContextRef graphicsContextRef)
-{
-    return toImpl(graphicsContextRef)-&gt;platformContext();
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcgtkWKGraphicsContextGtkh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h (159228 => 159229)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h        2013-11-13 21:22:04 UTC (rev 159228)
+++ trunk/Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h        2013-11-13 21:26:33 UTC (rev 159229)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Igalia SL All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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 PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKGraphicsContextGtk_h
-#define WKGraphicsContextGtk_h
-
-#include &lt;WebKit2/WKBase.h&gt;
-
-#include &lt;cairo.h&gt;
-
-#ifdef __cplusplus
-extern &quot;C&quot; {
-#endif
-
-WK_EXPORT cairo_t* WKGraphicsContextGetGtkContext(WKGraphicsContextRef);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKGraphicsContextGtk_h */
</del></span></pre>
</div>
</div>

</body>
</html>