<!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>[191759] trunk/Source</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/191759">191759</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-10-29 15:32:04 -0700 (Thu, 29 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CMake build fix.
Source/WebCore:
* editing/mac/EditorMac.mm:
(WebCore::Editor::WebContentReader::readFilenames):
Before <a href="http://trac.webkit.org/projects/webkit/changeset/191553">r191553</a>, text was a local variable and could be changed.
This restores the same behavior and compiles correctly when ATTACHMENT_ELEMENT is disabled.
* platform/mac/CursorMac.mm:
(WebCore::Cursor::Cursor):
(WebCore::Cursor::operator=):
Added preprocessor macros.
Source/WebKit2:
* CMakeLists.txt:
* PlatformMac.cmake:
I mistakenly added some mac-specific files to the shared CMakeLists.txt. This puts them in the right place.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::viewWillStartLiveResize):
(WebKit::WebPageProxy::viewDidLeaveWindow):
(WebKit::WebPageProxy::didEndColorPicker):
Add preprocessor enable checks.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacCursorMacmm">trunk/Source/WebCore/platform/mac/CursorMac.mm</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191758 => 191759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-29 22:08:51 UTC (rev 191758)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 22:32:04 UTC (rev 191759)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ CMake build fix.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::WebContentReader::readFilenames):
+ Before r191553, text was a local variable and could be changed.
+ This restores the same behavior and compiles correctly when ATTACHMENT_ELEMENT is disabled.
+ * platform/mac/CursorMac.mm:
+ (WebCore::Cursor::Cursor):
+ (WebCore::Cursor::operator=):
+ Added preprocessor macros.
+
</ins><span class="cx"> 2015-10-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: deleteObjectStore support.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (191758 => 191759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2015-10-29 22:08:51 UTC (rev 191758)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2015-10-29 22:32:04 UTC (rev 191759)
</span><span class="lines">@@ -529,10 +529,8 @@
</span><span class="cx"> attachment->setFile(File::create([[NSURL fileURLWithPath:text] path]).ptr());
</span><span class="cx"> fragment->appendChild(WTF::move(attachment));
</span><span class="cx"> #else
</span><del>- text = frame.editor().client()->userVisibleString([NSURL fileURLWithPath:text]);
-
</del><span class="cx"> Ref<HTMLElement> paragraph = createDefaultParagraphElement(document);
</span><del>- paragraph->appendChild(document.createTextNode(text));
</del><ins>+ paragraph->appendChild(document.createTextNode(frame.editor().client()->userVisibleString([NSURL fileURLWithPath:text])));
</ins><span class="cx"> fragment->appendChild(WTF::move(paragraph));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacCursorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (191758 => 191759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/CursorMac.mm 2015-10-29 22:08:51 UTC (rev 191758)
+++ trunk/Source/WebCore/platform/mac/CursorMac.mm 2015-10-29 22:32:04 UTC (rev 191759)
</span><span class="lines">@@ -245,7 +245,9 @@
</span><span class="cx"> : m_type(other.m_type)
</span><span class="cx"> , m_image(other.m_image)
</span><span class="cx"> , m_hotSpot(other.m_hotSpot)
</span><ins>+#if ENABLE(MOUSE_CURSOR_SCALE)
</ins><span class="cx"> , m_imageScaleFactor(other.m_imageScaleFactor)
</span><ins>+#endif
</ins><span class="cx"> , m_platformCursor(other.m_platformCursor)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -255,7 +257,9 @@
</span><span class="cx"> m_type = other.m_type;
</span><span class="cx"> m_image = other.m_image;
</span><span class="cx"> m_hotSpot = other.m_hotSpot;
</span><ins>+#if ENABLE(MOUSE_CURSOR_SCALE)
</ins><span class="cx"> m_imageScaleFactor = other.m_imageScaleFactor;
</span><ins>+#endif
</ins><span class="cx"> m_platformCursor = other.m_platformCursor;
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (191758 => 191759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-10-29 22:08:51 UTC (rev 191758)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-10-29 22:32:04 UTC (rev 191759)
</span><span class="lines">@@ -456,51 +456,6 @@
</span><span class="cx"> UIProcess/API/C/WKViewportAttributes.cpp
</span><span class="cx"> UIProcess/API/C/WKWindowFeaturesRef.cpp
</span><span class="cx">
</span><del>- UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
- UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
- UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
- UIProcess/API/Cocoa/LegacyBundleForClass.mm
- UIProcess/API/Cocoa/WKBackForwardList.mm
- UIProcess/API/Cocoa/WKBackForwardListItem.mm
- UIProcess/API/Cocoa/WKBrowsingContextController.mm
- UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
- UIProcess/API/Cocoa/WKConnection.mm
- UIProcess/API/Cocoa/WKError.mm
- UIProcess/API/Cocoa/WKFrameInfo.mm
- UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
- UIProcess/API/Cocoa/WKNavigation.mm
- UIProcess/API/Cocoa/WKNavigationAction.mm
- UIProcess/API/Cocoa/WKNavigationData.mm
- UIProcess/API/Cocoa/WKNavigationResponse.mm
- UIProcess/API/Cocoa/WKPreferences.mm
- UIProcess/API/Cocoa/WKProcessGroup.mm
- UIProcess/API/Cocoa/WKProcessPool.mm
- UIProcess/API/Cocoa/WKScriptMessage.mm
- UIProcess/API/Cocoa/WKSecurityOrigin.mm
- UIProcess/API/Cocoa/WKTypeRefWrapper.mm
- UIProcess/API/Cocoa/WKUserContentController.mm
- UIProcess/API/Cocoa/WKUserScript.mm
- UIProcess/API/Cocoa/WKWebView.mm
- UIProcess/API/Cocoa/WKWebViewConfiguration.mm
- UIProcess/API/Cocoa/WKWebsiteDataRecord.mm
- UIProcess/API/Cocoa/WKWebsiteDataStore.mm
- UIProcess/API/Cocoa/WKWindowFeatures.mm
- UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
- UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
- UIProcess/API/Cocoa/_WKDownload.mm
- UIProcess/API/Cocoa/_WKElementAction.mm
- UIProcess/API/Cocoa/_WKElementInfo.mm
- UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
- UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
- UIProcess/API/Cocoa/_WKSessionState.mm
- UIProcess/API/Cocoa/_WKThumbnailView.mm
- UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
- UIProcess/API/Cocoa/_WKUserContentFilter.mm
- UIProcess/API/Cocoa/_WKUserStyleSheet.mm
- UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm
- UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
- UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
-
</del><span class="cx"> UIProcess/Authentication/AuthenticationChallengeProxy.cpp
</span><span class="cx"> UIProcess/Authentication/AuthenticationDecisionListener.cpp
</span><span class="cx"> UIProcess/Authentication/WebCredential.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191758 => 191759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-29 22:08:51 UTC (rev 191758)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-29 22:32:04 UTC (rev 191759)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-29 Alex Christensen <achristensen@webkit.org>
+
+ CMake build fix.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ I mistakenly added some mac-specific files to the shared CMakeLists.txt. This puts them in the right place.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::viewWillStartLiveResize):
+ (WebKit::WebPageProxy::viewDidLeaveWindow):
+ (WebKit::WebPageProxy::didEndColorPicker):
+ Add preprocessor enable checks.
+
</ins><span class="cx"> 2015-10-29 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKView being inside WKWebView leads to weird API issues
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (191758 => 191759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformMac.cmake 2015-10-29 22:08:51 UTC (rev 191758)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-10-29 22:32:04 UTC (rev 191759)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> UIProcess/API/Cocoa/WKNavigationData.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKNavigationResponse.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKPreferences.mm
</span><ins>+ UIProcess/API/Cocoa/WKProcessGroup.mm
</ins><span class="cx"> UIProcess/API/Cocoa/WKProcessPool.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKScriptMessage.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKSecurityOrigin.mm
</span><span class="lines">@@ -210,8 +211,10 @@
</span><span class="cx"> UIProcess/API/Cocoa/WKWebsiteDataStore.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKWindowFeatures.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
</span><ins>+ UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
</ins><span class="cx"> UIProcess/API/Cocoa/_WKDownload.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKElementAction.mm
</span><ins>+ UIProcess/API/Cocoa/_WKElementInfo.mm
</ins><span class="cx"> UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKSessionState.mm
</span><span class="lines">@@ -219,6 +222,7 @@
</span><span class="cx"> UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKUserContentFilter.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKUserStyleSheet.mm
</span><ins>+ UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm
</ins><span class="cx"> UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191758 => 191759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-29 22:08:51 UTC (rev 191758)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-29 22:32:04 UTC (rev 191759)
</span><span class="lines">@@ -1282,7 +1282,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><del>-#if ENABLE(INPUT_TYPE_COLOR_POPOVER)
</del><ins>+#if ENABLE(INPUT_TYPE_COLOR_POPOVER) && ENABLE(INPUT_TYPE_COLOR)
</ins><span class="cx"> if (m_colorPicker)
</span><span class="cx"> endColorPicker();
</span><span class="cx"> #endif
</span><span class="lines">@@ -1376,7 +1376,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::viewDidLeaveWindow()
</span><span class="cx"> {
</span><del>-#if ENABLE(INPUT_TYPE_COLOR_POPOVER)
</del><ins>+#if ENABLE(INPUT_TYPE_COLOR_POPOVER) && ENABLE(INPUT_TYPE_COLOR)
</ins><span class="cx"> // When leaving the current page, close the popover color well.
</span><span class="cx"> if (m_colorPicker)
</span><span class="cx"> endColorPicker();
</span><span class="lines">@@ -3917,10 +3917,12 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+#if ENABLE(INPUT_TYPE_COLOR)
</ins><span class="cx"> if (m_colorPicker) {
</span><span class="cx"> m_colorPicker->invalidate();
</span><span class="cx"> m_colorPicker = nullptr;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::DidEndColorPicker(), m_pageID);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>