<!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>[160388] 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/160388">160388</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-10 14:11:28 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>UserData should handle geometry types
https://bugs.webkit.org/show_bug.cgi?id=125542
Reviewed by Andreas Kling.
Rename WebGeometry.h to APIGeometry.h in preparation for moving the classes into the API namespace.
Add encode/decode functions to geometry classes. Use them in UserData::encode and UserData::decode.
* Shared/API/c/WKGeometry.cpp:
* Shared/APIGeometry.cpp: Added.
* Shared/APIGeometry.h: Renamed from Source/WebKit2/Shared/WebGeometry.h.
(WebKit::UserData::encode):
(WebKit::UserData::decode):
* Shared/UserMessageCoders.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebPage.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKGeometrycpp">trunk/Source/WebKit2/Shared/API/c/WKGeometry.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebGeometryh">trunk/Source/WebKit2/Shared/WebGeometry.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160387 => 160388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-10 21:51:36 UTC (rev 160387)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 22:11:28 UTC (rev 160388)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-10 Anders Carlsson <andersca@apple.com>
+
+ UserData should handle geometry types
+ https://bugs.webkit.org/show_bug.cgi?id=125542
+
+ Reviewed by Andreas Kling.
+
+ Rename WebGeometry.h to APIGeometry.h in preparation for moving the classes into the API namespace.
+ Add encode/decode functions to geometry classes. Use them in UserData::encode and UserData::decode.
+
+ * Shared/API/c/WKGeometry.cpp:
+ * Shared/APIGeometry.cpp: Added.
+ * Shared/APIGeometry.h: Renamed from Source/WebKit2/Shared/WebGeometry.h.
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ * Shared/UserMessageCoders.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/WebPage.cpp:
+
</ins><span class="cx"> 2013-12-10 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125533
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKGeometrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKGeometry.cpp (160387 => 160388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKGeometry.cpp 2013-12-10 21:51:36 UTC (rev 160387)
+++ trunk/Source/WebKit2/Shared/API/c/WKGeometry.cpp 2013-12-10 22:11:28 UTC (rev 160388)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKGeometry.h"
</span><span class="cx">
</span><ins>+#include "APIGeometry.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><del>-#include "WebGeometry.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160387 => 160388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 21:51:36 UTC (rev 160387)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 22:11:28 UTC (rev 160388)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIFrameHandle.h"
</span><ins>+#include "APIGeometry.h"
</ins><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "MutableDictionary.h"
</span><span class="lines">@@ -137,12 +138,30 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case API::Object::Type::Point: {
+ auto& point = static_cast<const WebPoint&>(object);
+ point.encode(encoder);
+ break;
+ }
+
+ case API::Object::Type::Rect: {
+ auto& rect = static_cast<const WebRect&>(object);
+ rect.encode(encoder);
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::SerializedScriptValue: {
</span><span class="cx"> auto& serializedScriptValue = static_cast<const WebSerializedScriptValue&>(object);
</span><span class="cx"> encoder << serializedScriptValue.dataReference();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case API::Object::Type::Size: {
+ auto& size = static_cast<const WebSize&>(object);
+ size.encode(encoder);
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::String: {
</span><span class="cx"> auto& string = static_cast<const WebString&>(object);
</span><span class="cx"> encoder << string.string();
</span><span class="lines">@@ -235,7 +254,17 @@
</span><span class="cx"> case API::Object::Type::Null:
</span><span class="cx"> result = nullptr;
</span><span class="cx"> break;
</span><ins>+
+ case API::Object::Type::Point:
+ if (!WebPoint::decode(decoder, result))
+ return false;
+ break;
</ins><span class="cx">
</span><ins>+ case API::Object::Type::Rect:
+ if (!WebRect::decode(decoder, result))
+ return false;
+ break;
+
</ins><span class="cx"> case API::Object::Type::SerializedScriptValue: {
</span><span class="cx"> CoreIPC::DataReference dataReference;
</span><span class="cx"> if (!decoder.decode(dataReference))
</span><span class="lines">@@ -246,6 +275,11 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case API::Object::Type::Size:
+ if (!WebSize::decode(decoder, result))
+ return false;
+ break;
+
</ins><span class="cx"> case API::Object::Type::String: {
</span><span class="cx"> String string;
</span><span class="cx"> if (!decoder.decode(string))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160387 => 160388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-10 21:51:36 UTC (rev 160387)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-10 22:11:28 UTC (rev 160388)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define UserMessageCoders_h
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIGeometry.h"
</ins><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="lines">@@ -36,7 +37,6 @@
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebData.h"
</span><span class="cx"> #include "WebError.h"
</span><del>-#include "WebGeometry.h"
</del><span class="cx"> #include "WebImage.h"
</span><span class="cx"> #include "WebNumber.h"
</span><span class="cx"> #include "WebRenderLayer.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebGeometryh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebGeometry.h (160387 => 160388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebGeometry.h 2013-12-10 21:51:36 UTC (rev 160387)
+++ trunk/Source/WebKit2/Shared/WebGeometry.h 2013-12-10 22:11:28 UTC (rev 160388)
</span><span class="lines">@@ -1,94 +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 WebGeometry_h
-#define WebGeometry_h
-
-#include "APIObject.h"
-#include "WKGeometry.h"
-#include <WebCore/FloatRect.h>
-#include <wtf/PassRefPtr.h>
-
-namespace CoreIPC {
- class ArgumentDecoder;
- class ArgumentEncoder;
-}
-
-namespace WebKit {
-
-class WebSize : public API::ObjectImpl<API::Object::Type::Size> {
-public:
- static PassRefPtr<WebSize> create(const WKSize& size)
- {
- return adoptRef(new WebSize(size));
- }
-
- const WKSize& size() const { return m_size; }
-
-private:
- explicit WebSize(const WKSize& size)
- : m_size(size)
- { }
-
- WKSize m_size;
-};
-
-class WebPoint : public API::ObjectImpl<API::Object::Type::Point> {
-public:
- static PassRefPtr<WebPoint> create(const WKPoint& point)
- {
- return adoptRef(new WebPoint(point));
- }
-
- const WKPoint& point() const { return m_point; }
-
-private:
- explicit WebPoint(const WKPoint& point)
- : m_point(point)
- { }
-
- WKPoint m_point;
-};
-
-class WebRect : public API::ObjectImpl<API::Object::Type::Rect> {
-public:
- static PassRefPtr<WebRect> create(const WKRect& rect)
- {
- return adoptRef(new WebRect(rect));
- }
-
- const WKRect& rect() const { return m_rect; }
-
-private:
- explicit WebRect(const WKRect& rect)
- : m_rect(rect)
- { }
-
- WKRect m_rect;
-};
-
-} // namespace WebKit
-
-#endif // WebGeometry_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160387 => 160388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-10 21:51:36 UTC (rev 160387)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-10 22:11:28 UTC (rev 160388)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> /* End PBXAggregateTarget section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXBuildFile section */
</span><del>- 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F174AA2142A4CB60039250F /* WebGeometry.h */; };
</del><ins>+ 0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F174AA2142A4CB60039250F /* APIGeometry.h */; };
</ins><span class="cx"> 0F174AA7142AAC610039250F /* WKGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F174AA6142AAC610039250F /* WKGeometry.cpp */; };
</span><span class="cx"> 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; };
</span><span class="cx"> 1A043976124D034800FFBFB5 /* PluginProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043974124D034800FFBFB5 /* PluginProcess.h */; };
</span><span class="lines">@@ -269,6 +269,7 @@
</span><span class="cx"> 1AC1336E18565D2B00F3EC05 /* APIPageHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */; };
</span><span class="cx"> 1AC1337118566C7C00F3EC05 /* APIFrameHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */; };
</span><span class="cx"> 1AC1337218566C7C00F3EC05 /* APIFrameHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */; };
</span><ins>+ 1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */; };
</ins><span class="cx"> 1AC25FC212A48F6000BD2671 /* PluginProcessShim.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */; };
</span><span class="cx"> 1AC4C82916B876A90069DCCD /* MessageFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC4C82816B876A90069DCCD /* MessageFlags.h */; };
</span><span class="cx"> 1AC5FFC2174BFD1B0001483D /* PluginProcessAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC5FFC1174BFD1B0001483D /* PluginProcessAttributes.h */; };
</span><span class="lines">@@ -1550,7 +1551,7 @@
</span><span class="cx"> /* Begin PBXFileReference section */
</span><span class="cx"> 0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
</span><span class="cx"> 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
</span><del>- 0F174AA2142A4CB60039250F /* WebGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebGeometry.h; sourceTree = "<group>"; };
</del><ins>+ 0F174AA2142A4CB60039250F /* APIGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIGeometry.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0F174AA6142AAC610039250F /* WKGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKGeometry.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
</span><span class="lines">@@ -1800,6 +1801,7 @@
</span><span class="cx"> 1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIPageHandle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIFrameHandle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFrameHandle.h; sourceTree = "<group>"; };
</span><ins>+ 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIGeometry.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 1AC25F8912A48E0300BD2671 /* PluginProcessShim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessShim.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessShim.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = PluginProcessShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -3427,6 +3429,8 @@
</span><span class="cx"> 1A3DD205125E5A2F004515E6 /* APIClient.h */,
</span><span class="cx"> 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */,
</span><span class="cx"> 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */,
</span><ins>+ 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */,
+ 0F174AA2142A4CB60039250F /* APIGeometry.h */,
</ins><span class="cx"> B63403F814910D57001070B5 /* APIObject.cpp */,
</span><span class="cx"> BCF04C8C11FF9B7D00F86A58 /* APIObject.h */,
</span><span class="cx"> 1AC1336D18565D2B00F3EC05 /* APIPageHandle.cpp */,
</span><span class="lines">@@ -3524,7 +3528,6 @@
</span><span class="cx"> 1A90C1ED1264FD50003E44D4 /* WebFindOptions.h */,
</span><span class="cx"> BC0E607212D6BC200012A72A /* WebGeolocationPosition.cpp */,
</span><span class="cx"> BC0E607112D6BC200012A72A /* WebGeolocationPosition.h */,
</span><del>- 0F174AA2142A4CB60039250F /* WebGeometry.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">@@ -5945,7 +5948,7 @@
</span><span class="cx"> BC0E618312D6CB1D0012A72A /* WebGeolocationManagerProxyMessages.h in Headers */,
</span><span class="cx"> BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */,
</span><span class="cx"> BC1BE1F212D54DBD0004A228 /* WebGeolocationProvider.h in Headers */,
</span><del>- 0F174AA3142A4CB70039250F /* WebGeometry.h in Headers */,
</del><ins>+ 0F174AA3142A4CB70039250F /* APIGeometry.h in Headers */,
</ins><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">@@ -7218,6 +7221,7 @@
</span><span class="cx"> C5E1AFEE16B21025006CC1F2 /* WebArchiveResource.cpp in Sources */,
</span><span class="cx"> BC72BA1D11E64907001EB4EA /* WebBackForwardList.cpp in Sources */,
</span><span class="cx"> 51B3005012529D0E000B5CA0 /* WebBackForwardListCF.cpp in Sources */,
</span><ins>+ 1AC133741857C21E00F3EC05 /* APIGeometry.cpp in Sources */,
</ins><span class="cx"> 518D2CAD12D5153B003BB93B /* WebBackForwardListItem.cpp in Sources */,
</span><span class="cx"> BC72B9FA11E6476B001EB4EA /* WebBackForwardListProxy.cpp in Sources */,
</span><span class="cx"> BC111A5A112F4FBB00337BAB /* WebChromeClient.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160387 => 160388)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-10 21:51:36 UTC (rev 160387)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-10 22:11:28 UTC (rev 160388)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> #include "WebFullScreenManager.h"
</span><span class="cx"> #include "WebFullScreenManagerMessages.h"
</span><span class="cx"> #include "WebGeolocationClient.h"
</span><del>-#include "WebGeometry.h"
</del><span class="cx"> #include "WebImage.h"
</span><span class="cx"> #include "WebInspector.h"
</span><span class="cx"> #include "WebInspectorClient.h"
</span></span></pre>
</div>
</div>
</body>
</html>