Title: [207857] trunk/Source/WebKit2
- Revision
- 207857
- Author
- achristen...@apple.com
- Date
- 2016-10-25 16:59:32 -0700 (Tue, 25 Oct 2016)
Log Message
CMake build fix.
* PlatformMac.cmake:
* Shared/WebHitTestResultData.cpp:
(WebKit::WebHitTestResultData::WebHitTestResultData):
Explicitly call AtomicString::string to make the String constructor no longer ambiguous.
It couldn't decide whether to use operator const String& or operator NSString*.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (207856 => 207857)
--- trunk/Source/WebKit2/ChangeLog 2016-10-25 23:42:43 UTC (rev 207856)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-25 23:59:32 UTC (rev 207857)
@@ -1,3 +1,13 @@
+2016-10-25 Alex Christensen <achristen...@webkit.org>
+
+ CMake build fix.
+
+ * PlatformMac.cmake:
+ * Shared/WebHitTestResultData.cpp:
+ (WebKit::WebHitTestResultData::WebHitTestResultData):
+ Explicitly call AtomicString::string to make the String constructor no longer ambiguous.
+ It couldn't decide whether to use operator const String& or operator NSString*.
+
2016-10-25 Carlos Garcia Campos <cgar...@igalia.com>
[SOUP] Network process assertion in NetworkDataTask::continueHTTPRedirection
Modified: trunk/Source/WebKit2/PlatformMac.cmake (207856 => 207857)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-10-25 23:42:43 UTC (rev 207856)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-10-25 23:59:32 UTC (rev 207857)
@@ -154,6 +154,7 @@
Shared/mac/WebHitTestResultData.mm
Shared/mac/WebMemorySampler.mac.mm
+ UIProcess/WebContextMenuListenerProxy.cpp
UIProcess/WebResourceLoadStatisticsStore.cpp
UIProcess/Automation/WebAutomationSession.cpp
Modified: trunk/Source/WebKit2/Shared/WebHitTestResultData.cpp (207856 => 207857)
--- trunk/Source/WebKit2/Shared/WebHitTestResultData.cpp 2016-10-25 23:42:43 UTC (rev 207856)
+++ trunk/Source/WebKit2/Shared/WebHitTestResultData.cpp 2016-10-25 23:59:32 UTC (rev 207857)
@@ -46,7 +46,7 @@
, absoluteMediaURL(hitTestResult.absoluteMediaURL().string())
, linkLabel(hitTestResult.textContent())
, linkTitle(hitTestResult.titleDisplayString())
- , linkSuggestedFilename(hitTestResult.URLElementDownloadAttribute())
+ , linkSuggestedFilename(hitTestResult.URLElementDownloadAttribute().string())
, isContentEditable(hitTestResult.isContentEditable())
, elementBoundingBox(elementBoundingBoxInWindowCoordinates(hitTestResult))
, isScrollbar(hitTestResult.scrollbar())
@@ -66,7 +66,7 @@
, absoluteMediaURL(hitTestResult.absoluteMediaURL().string())
, linkLabel(hitTestResult.textContent())
, linkTitle(hitTestResult.titleDisplayString())
- , linkSuggestedFilename(hitTestResult.URLElementDownloadAttribute())
+ , linkSuggestedFilename(hitTestResult.URLElementDownloadAttribute().string())
, isContentEditable(hitTestResult.isContentEditable())
, elementBoundingBox(elementBoundingBoxInWindowCoordinates(hitTestResult))
, isScrollbar(hitTestResult.scrollbar())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
