<!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>[159222] 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/159222">159222</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-11-13 12:29:37 -0800 (Wed, 13 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove WebGraphicsContext
https://bugs.webkit.org/show_bug.cgi?id=124302

Reviewed by Dan Bernstein.

WebGraphicsContext and its API &quot;object&quot;, WKGraphicsContextRef was only used
for the overhang paint callback which has been removed.

* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKGraphicsContextGetCGContext):
* Shared/API/c/WKGraphicsContext.cpp: Removed.
* Shared/API/c/WKGraphicsContext.h: Removed.
* Shared/API/c/cg/WKGraphicsContextCG.cpp: Removed.
* Shared/API/c/cg/WKGraphicsContextCG.h: Removed.
* Shared/APIObject.h:
* Shared/WebGraphicsContext.cpp: Removed.
* Shared/WebGraphicsContext.h: Removed.
* UIProcess/API/C/WebKit2_C.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIObjecth">trunk/Source/WebKit2/Shared/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWebKit2_Ch">trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIcWKGraphicsContextcpp">trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKGraphicsContexth">trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccgWKGraphicsContextCGcpp">trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccgWKGraphicsContextCGh">trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebGraphicsContextcpp">trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebGraphicsContexth">trunk/Source/WebKit2/Shared/WebGraphicsContext.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/ChangeLog        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2013-11-13  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Remove WebGraphicsContext
+        https://bugs.webkit.org/show_bug.cgi?id=124302
+
+        Reviewed by Dan Bernstein.
+
+        WebGraphicsContext and its API &quot;object&quot;, WKGraphicsContextRef was only used
+        for the overhang paint callback which has been removed.
+
+        * Shared/API/c/WKDeprecatedFunctions.cpp:
+        (WKGraphicsContextGetCGContext):
+        * Shared/API/c/WKGraphicsContext.cpp: Removed.
+        * Shared/API/c/WKGraphicsContext.h: Removed.
+        * Shared/API/c/cg/WKGraphicsContextCG.cpp: Removed.
+        * Shared/API/c/cg/WKGraphicsContextCG.h: Removed.
+        * Shared/APIObject.h:
+        * Shared/WebGraphicsContext.cpp: Removed.
+        * Shared/WebGraphicsContext.h: Removed.
+        * UIProcess/API/C/WebKit2_C.h:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
+
+2013-11-13  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         WKArrayIsMutable should not be mangled
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=124299
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -31,9 +31,20 @@
</span><span class="cx"> 
</span><span class="cx"> extern &quot;C&quot; {
</span><span class="cx"> WK_EXPORT bool WKArrayIsMutable(WKArrayRef array);
</span><ins>+
+#if PLATFORM(MAC)
+WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool WKArrayIsMutable(WKArrayRef array)
</span><span class="cx"> {
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><ins>+
+#if PLATFORM(MAC)
+CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
+{
+    return nullptr;
+}
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKGraphicsContextcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.cpp        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. 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;WKGraphicsContext.h&quot;
-
-#include &quot;WKSharedAPICast.h&quot;
-#include &quot;WebGraphicsContext.h&quot;
-
-using namespace WebKit;
-
-WKTypeID WKGraphicsContextGetTypeID()
-{
-    return toAPI(WebGraphicsContext::APIType);
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKGraphicsContexth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.h (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.h        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/WKGraphicsContext.h        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. 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 WKGraphicsContext_h
-#define WKGraphicsContext_h
-
-#include &lt;WebKit2/WKBase.h&gt;
-
-#ifdef __cplusplus
-extern &quot;C&quot; {
-#endif
-
-WK_EXPORT WKTypeID WKGraphicsContextGetTypeID();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKGraphicsContext_h */
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccgWKGraphicsContextCGcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.cpp (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.cpp        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.cpp        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. 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;WKGraphicsContextCG.h&quot;
-
-#include &quot;WKSharedAPICast.h&quot;
-#include &quot;WebGraphicsContext.h&quot;
-
-using namespace WebKit;
-
-CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContextRef)
-{
-    return toImpl(graphicsContextRef)-&gt;platformContext();
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccgWKGraphicsContextCGh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.h (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.h        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/API/c/cg/WKGraphicsContextCG.h        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. 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 WKGraphicsContextCG_h
-#define WKGraphicsContextCG_h
-
-#include &lt;CoreGraphics/CGContext.h&gt;
-#include &lt;WebKit2/WKBase.h&gt;
-
-#ifdef __cplusplus
-extern &quot;C&quot; {
-#endif
-
-WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKGraphicsContextCG_h */
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIObject.h (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIObject.h        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/APIObject.h        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx">         Data,
</span><span class="cx">         Dictionary,
</span><span class="cx">         Error,
</span><del>-        GraphicsContext,
</del><span class="cx">         Image,
</span><span class="cx">         ProtectionSpace,
</span><span class="cx">         RenderLayer,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebGraphicsContextcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/WebGraphicsContext.cpp        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. 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;WebGraphicsContext.h&quot;
-
-#if USE(CAIRO)
-#include &lt;WebCore/PlatformContextCairo.h&gt;
-#endif
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebGraphicsContext::WebGraphicsContext(GraphicsContext* graphicsContext)
-#if USE(CG)
-    : m_platformContext(graphicsContext-&gt;platformContext())
-#elif USE(CAIRO)
-    : m_platformContext(graphicsContext-&gt;platformContext()-&gt;cr())
-#endif
-{
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebGraphicsContexth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebGraphicsContext.h (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebGraphicsContext.h        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/Shared/WebGraphicsContext.h        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. 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 WebGraphicsContext_h
-#define WebGraphicsContext_h
-
-#include &quot;APIObject.h&quot;
-#include &lt;WebCore/GraphicsContext.h&gt;
-#include &lt;wtf/PassRefPtr.h&gt;
-
-#if USE(CG)
-#include &lt;wtf/RetainPtr.h&gt;
-#elif USE(CAIRO)
-#include &lt;WebCore/RefPtrCairo.h&gt;
-#endif
-
-namespace WebKit {
-
-class WebGraphicsContext : public API::TypedObject&lt;API::Object::Type::GraphicsContext&gt; {
-public:
-    static PassRefPtr&lt;WebGraphicsContext&gt; create(WebCore::GraphicsContext* graphicsContext)
-    {
-        return adoptRef(new WebGraphicsContext(graphicsContext));
-    }
-
-#if USE(CG)
-    CGContextRef platformContext() { return m_platformContext.get(); }
-#elif USE(CAIRO)
-    cairo_t* platformContext() { return m_platformContext.get(); }
-#endif
-
-
-private:
-    explicit WebGraphicsContext(WebCore::GraphicsContext*);
-
-#if USE(CG)
-    RetainPtr&lt;CGContextRef&gt; m_platformContext;
-#elif USE(CAIRO)
-    RefPtr&lt;cairo_t&gt; m_platformContext;
-#endif
-};
-
-} // namespace WebKit
-
-#endif // WebGraphicsContext_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWebKit2_Ch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/UIProcess/API/C/WebKit2_C.h        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include &lt;WebKit2/WKGeolocationManager.h&gt;
</span><span class="cx"> #include &lt;WebKit2/WKGeolocationPermissionRequest.h&gt;
</span><span class="cx"> #include &lt;WebKit2/WKGeolocationPosition.h&gt;
</span><del>-#include &lt;WebKit2/WKGraphicsContext.h&gt;
</del><span class="cx"> #include &lt;WebKit2/WKHitTestResult.h&gt;
</span><span class="cx"> #include &lt;WebKit2/WKMutableArray.h&gt;
</span><span class="cx"> #include &lt;WebKit2/WKMutableDictionary.h&gt;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -1007,12 +1007,6 @@
</span><span class="cx">                 BCA0EFA012332642007D3CFB /* WebEditCommandProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */; };
</span><span class="cx">                 BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA284D41492F2C7001F9042 /* WKConnection.mm */; };
</span><span class="cx">                 BCA284D71492F2C7001F9042 /* WKConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA284D51492F2C7001F9042 /* WKConnection.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><del>-                BCA56A1C12F9028E00C566C7 /* WebGraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA56A1A12F9028E00C566C7 /* WebGraphicsContext.h */; };
-                BCA56A1D12F9028E00C566C7 /* WebGraphicsContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */; };
-                BCA56A6512F9C8F900C566C7 /* WKGraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                BCA56A6612F9C8F900C566C7 /* WKGraphicsContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA56A6412F9C8F900C566C7 /* WKGraphicsContext.cpp */; };
-                BCA56A6912F9C9AD00C566C7 /* WKGraphicsContextCG.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA56A6712F9C9AD00C566C7 /* WKGraphicsContextCG.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                BCA56A6A12F9C9AD00C566C7 /* WKGraphicsContextCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA56A6812F9C9AD00C566C7 /* WKGraphicsContextCG.cpp */; };
</del><span class="cx">                 BCA8C6A811E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6A611E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp */; };
</span><span class="cx">                 BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */; };
</span><span class="cx">                 BCA8C6AF11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */; };
</span><span class="lines">@@ -2561,12 +2555,6 @@
</span><span class="cx">                 BCA0EF9E12332642007D3CFB /* WebEditCommandProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebEditCommandProxy.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BCA284D41492F2C7001F9042 /* WKConnection.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKConnection.mm; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BCA284D51492F2C7001F9042 /* WKConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKConnection.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                BCA56A1A12F9028E00C566C7 /* WebGraphicsContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGraphicsContext.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebGraphicsContext.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKGraphicsContext.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                BCA56A6412F9C8F900C566C7 /* WKGraphicsContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGraphicsContext.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
-                BCA56A6712F9C9AD00C566C7 /* WKGraphicsContextCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKGraphicsContextCG.h; sourceTree = &quot;&lt;group&gt;&quot;; };
-                BCA56A6812F9C9AD00C566C7 /* WKGraphicsContextCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGraphicsContextCG.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 BCA8C6A611E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageLoaderClient.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BCA8C6A711E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageLoaderClient.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 BCA8C6AD11E3C08700812FB7 /* InjectedBundlePageUIClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageUIClient.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -3423,8 +3411,6 @@
</span><span class="cx">                                 BC0E607212D6BC200012A72A /* WebGeolocationPosition.cpp */,
</span><span class="cx">                                 BC0E607112D6BC200012A72A /* WebGeolocationPosition.h */,
</span><span class="cx">                                 0F174AA2142A4CB60039250F /* WebGeometry.h */,
</span><del>-                                BCA56A1B12F9028E00C566C7 /* WebGraphicsContext.cpp */,
-                                BCA56A1A12F9028E00C566C7 /* WebGraphicsContext.h */,
</del><span class="cx">                                 7801C095142290C400FAF9AF /* WebHitTestResult.cpp */,
</span><span class="cx">                                 7801C096142290C400FAF9AF /* WebHitTestResult.h */,
</span><span class="cx">                                 BCCF6ABA12C91EF9008F9C35 /* WebImage.cpp */,
</span><span class="lines">@@ -5135,8 +5121,6 @@
</span><span class="cx">                 BCCF6AC412C91F3B008F9C35 /* cg */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><del>-                                BCA56A6812F9C9AD00C566C7 /* WKGraphicsContextCG.cpp */,
-                                BCA56A6712F9C9AD00C566C7 /* WKGraphicsContextCG.h */,
</del><span class="cx">                                 BCCF6AC712C91F59008F9C35 /* WKImageCG.cpp */,
</span><span class="cx">                                 BCCF6AC812C91F59008F9C35 /* WKImageCG.h */,
</span><span class="cx">                         );
</span><span class="lines">@@ -5180,8 +5164,6 @@
</span><span class="cx">                                 37F623B712A57B6200E3FDF6 /* WKFindOptions.h */,
</span><span class="cx">                                 0F174AA6142AAC610039250F /* WKGeometry.cpp */,
</span><span class="cx">                                 BCC8B373125FB69000DE46A4 /* WKGeometry.h */,
</span><del>-                                BCA56A6412F9C8F900C566C7 /* WKGraphicsContext.cpp */,
-                                BCA56A6312F9C8F900C566C7 /* WKGraphicsContext.h */,
</del><span class="cx">                                 BCCF6AC012C91F34008F9C35 /* WKImage.cpp */,
</span><span class="cx">                                 BCCF6AC112C91F34008F9C35 /* WKImage.h */,
</span><span class="cx">                                 BC4075E1124FF0270068F20A /* WKMutableArray.cpp */,
</span><span class="lines">@@ -5786,7 +5768,6 @@
</span><span class="cx">                                 BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */,
</span><span class="cx">                                 BC1BE1F212D54DBD0004A228 /* WebGeolocationProvider.h in Headers */,
</span><span class="cx">                                 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */,
</span><del>-                                BCA56A1C12F9028E00C566C7 /* WebGraphicsContext.h in Headers */,
</del><span class="cx">                                 BCF69F871176CD6F00471A52 /* WebHistoryClient.h in Headers */,
</span><span class="cx">                                 7801C09A142290C400FAF9AF /* WebHitTestResult.h in Headers */,
</span><span class="cx">                                 511B24AB132E097200065A0C /* WebIconDatabase.h in Headers */,
</span><span class="lines">@@ -5966,8 +5947,6 @@
</span><span class="cx">                                 BC06F44E12DBDF3F002D78DE /* WKGeolocationPermissionRequest.h in Headers */,
</span><span class="cx">                                 BC0E619812D6CD120012A72A /* WKGeolocationPosition.h in Headers */,
</span><span class="cx">                                 BCC8B374125FB69000DE46A4 /* WKGeometry.h in Headers */,
</span><del>-                                BCA56A6512F9C8F900C566C7 /* WKGraphicsContext.h in Headers */,
-                                BCA56A6912F9C9AD00C566C7 /* WKGraphicsContextCG.h in Headers */,
</del><span class="cx">                                 B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */,
</span><span class="cx">                                 5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */,
</span><span class="cx">                                 5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */,
</span><span class="lines">@@ -7117,7 +7096,6 @@
</span><span class="cx">                                 BC0E618212D6CB1D0012A72A /* WebGeolocationManagerProxyMessageReceiver.cpp in Sources */,
</span><span class="cx">                                 BC0E607412D6BC200012A72A /* WebGeolocationPosition.cpp in Sources */,
</span><span class="cx">                                 BC1BE1F312D54DBD0004A228 /* WebGeolocationProvider.cpp in Sources */,
</span><del>-                                BCA56A1D12F9028E00C566C7 /* WebGraphicsContext.cpp in Sources */,
</del><span class="cx">                                 BCF69F861176CD6F00471A52 /* WebHistoryClient.cpp in Sources */,
</span><span class="cx">                                 7801C099142290C400FAF9AF /* WebHitTestResult.cpp in Sources */,
</span><span class="cx">                                 511B24AA132E097200065A0C /* WebIconDatabase.cpp in Sources */,
</span><span class="lines">@@ -7280,8 +7258,6 @@
</span><span class="cx">                                 BC06F44F12DBDF3F002D78DE /* WKGeolocationPermissionRequest.cpp in Sources */,
</span><span class="cx">                                 BC0E619912D6CD120012A72A /* WKGeolocationPosition.cpp in Sources */,
</span><span class="cx">                                 0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */,
</span><del>-                                BCA56A6612F9C8F900C566C7 /* WKGraphicsContext.cpp in Sources */,
-                                BCA56A6A12F9C9AD00C566C7 /* WKGraphicsContextCG.cpp in Sources */,
</del><span class="cx">                                 B62E7310143047A60069EC35 /* WKHitTestResult.cpp in Sources */,
</span><span class="cx">                                 5110AE0C133C16CB0072717A /* WKIconDatabase.cpp in Sources */,
</span><span class="cx">                                 5123CF1B133D260A0056F800 /* WKIconDatabaseCG.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp (159221 => 159222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp        2013-11-13 20:29:15 UTC (rev 159221)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp        2013-11-13 20:29:37 UTC (rev 159222)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include &quot;InjectedBundleHitTestResult.h&quot;
</span><span class="cx"> #include &quot;WKAPICast.h&quot;
</span><span class="cx"> #include &quot;WKBundleAPICast.h&quot;
</span><del>-#include &quot;WebGraphicsContext.h&quot;
</del><span class="cx"> #include &quot;WebSecurityOrigin.h&quot;
</span><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>