- Revision
- 191759
- Author
- achristen...@apple.com
- Date
- 2015-10-29 15:32:04 -0700 (Thu, 29 Oct 2015)
Log Message
CMake build fix.
Source/WebCore:
* 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.
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (191758 => 191759)
--- 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)
@@ -1,3 +1,16 @@
+2015-10-29 Alex Christensen <achristen...@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.
+
2015-10-29 Brady Eidson <beid...@apple.com>
Modern IDB: deleteObjectStore support.
Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (191758 => 191759)
--- 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)
@@ -529,10 +529,8 @@
attachment->setFile(File::create([[NSURL fileURLWithPath:text] path]).ptr());
fragment->appendChild(WTF::move(attachment));
#else
- text = frame.editor().client()->userVisibleString([NSURL fileURLWithPath:text]);
-
Ref<HTMLElement> paragraph = createDefaultParagraphElement(document);
- paragraph->appendChild(document.createTextNode(text));
+ paragraph->appendChild(document.createTextNode(frame.editor().client()->userVisibleString([NSURL fileURLWithPath:text])));
fragment->appendChild(WTF::move(paragraph));
#endif
}
Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (191758 => 191759)
--- 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)
@@ -245,7 +245,9 @@
: m_type(other.m_type)
, m_image(other.m_image)
, m_hotSpot(other.m_hotSpot)
+#if ENABLE(MOUSE_CURSOR_SCALE)
, m_imageScaleFactor(other.m_imageScaleFactor)
+#endif
, m_platformCursor(other.m_platformCursor)
{
}
@@ -255,7 +257,9 @@
m_type = other.m_type;
m_image = other.m_image;
m_hotSpot = other.m_hotSpot;
+#if ENABLE(MOUSE_CURSOR_SCALE)
m_imageScaleFactor = other.m_imageScaleFactor;
+#endif
m_platformCursor = other.m_platformCursor;
return *this;
}
Modified: trunk/Source/WebKit2/CMakeLists.txt (191758 => 191759)
--- 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)
@@ -456,51 +456,6 @@
UIProcess/API/C/WKViewportAttributes.cpp
UIProcess/API/C/WKWindowFeaturesRef.cpp
- 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
-
UIProcess/Authentication/AuthenticationChallengeProxy.cpp
UIProcess/Authentication/AuthenticationDecisionListener.cpp
UIProcess/Authentication/WebCredential.cpp
Modified: trunk/Source/WebKit2/ChangeLog (191758 => 191759)
--- 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)
@@ -1,3 +1,16 @@
+2015-10-29 Alex Christensen <achristen...@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.
+
2015-10-29 Tim Horton <timothy_hor...@apple.com>
WKView being inside WKWebView leads to weird API issues
Modified: trunk/Source/WebKit2/PlatformMac.cmake (191758 => 191759)
--- 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)
@@ -198,6 +198,7 @@
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
@@ -210,8 +211,10 @@
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
@@ -219,6 +222,7 @@
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
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191758 => 191759)
--- 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)
@@ -1282,7 +1282,7 @@
{
if (!isValid())
return;
-#if ENABLE(INPUT_TYPE_COLOR_POPOVER)
+#if ENABLE(INPUT_TYPE_COLOR_POPOVER) && ENABLE(INPUT_TYPE_COLOR)
if (m_colorPicker)
endColorPicker();
#endif
@@ -1376,7 +1376,7 @@
void WebPageProxy::viewDidLeaveWindow()
{
-#if ENABLE(INPUT_TYPE_COLOR_POPOVER)
+#if ENABLE(INPUT_TYPE_COLOR_POPOVER) && ENABLE(INPUT_TYPE_COLOR)
// When leaving the current page, close the popover color well.
if (m_colorPicker)
endColorPicker();
@@ -3917,10 +3917,12 @@
if (!isValid())
return;
+#if ENABLE(INPUT_TYPE_COLOR)
if (m_colorPicker) {
m_colorPicker->invalidate();
m_colorPicker = nullptr;
}
+#endif
m_process->send(Messages::WebPage::DidEndColorPicker(), m_pageID);
}
