Diff
Modified: trunk/Source/WebKitLegacy/ChangeLog (250564 => 250565)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-10-01 17:36:39 UTC (rev 250565)
@@ -1,3 +1,15 @@
+2019-10-01 Alex Christensen <achristen...@webkit.org>
+
+ Unify more WebKitLegacy sources
+ https://bugs.webkit.org/show_bug.cgi?id=202410
+
+ Reviewed by Tim Horton.
+
+ * SourcesCocoa.txt:
+ * UnifiedSources-output.xcfilelist:
+ * WebKitLegacy.xcodeproj/project.pbxproj:
+ * scripts/generate-unified-sources.sh:
+
2019-09-30 Alex Christensen <achristen...@webkit.org>
Resurrect Mac CMake build
Modified: trunk/Source/WebKitLegacy/SourcesCocoa.txt (250564 => 250565)
--- trunk/Source/WebKitLegacy/SourcesCocoa.txt 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/SourcesCocoa.txt 2019-10-01 17:36:39 UTC (rev 250565)
@@ -58,9 +58,9 @@
mac/DOM/DOMFile.mm
mac/DOM/DOMFileList.mm
mac/DOM/DOMHTML.mm
-mac/DOM/DOMHTMLAnchorElement.mm @no-unify
+mac/DOM/DOMHTMLAnchorElement.mm
mac/DOM/DOMHTMLAppletElement.mm
-mac/DOM/DOMHTMLAreaElement.mm @no-unify
+mac/DOM/DOMHTMLAreaElement.mm
mac/DOM/DOMHTMLBRElement.mm
mac/DOM/DOMHTMLBaseElement.mm
mac/DOM/DOMHTMLBaseFontElement.mm
@@ -118,7 +118,7 @@
mac/DOM/DOMHTMLTitleElement.mm
mac/DOM/DOMHTMLUListElement.mm
mac/DOM/DOMHTMLVideoElement.mm
-mac/DOM/DOMImplementation.mm @no-unify
+mac/DOM/DOMImplementation.mm
mac/DOM/DOMInternal.mm
mac/DOM/DOMKeyboardEvent.mm
mac/DOM/DOMMediaError.mm
@@ -144,7 +144,7 @@
mac/DOM/DOMTokenList.mm
mac/DOM/DOMTreeWalker.mm
mac/DOM/DOMUIEvent.mm
-mac/DOM/DOMUIKitExtensions.mm @no-unify
+mac/DOM/DOMUIKitExtensions.mm
mac/DOM/DOMUtility.mm
mac/DOM/DOMWheelEvent.mm
mac/DOM/DOMXPath.mm
Modified: trunk/Source/WebKitLegacy/UnifiedSources-output.xcfilelist (250564 => 250565)
--- trunk/Source/WebKitLegacy/UnifiedSources-output.xcfilelist 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/UnifiedSources-output.xcfilelist 2019-10-01 17:36:39 UTC (rev 250565)
@@ -14,6 +14,7 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource2-mm.mm
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource2.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource20-mm.mm
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource21-mm.mm
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource3-mm.mm
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource3.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource4-mm.mm
Modified: trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (250564 => 250565)
--- trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj 2019-10-01 17:36:39 UTC (rev 250565)
@@ -172,7 +172,6 @@
598ADA461202275000ABAE4E /* WebDeviceOrientationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 598ADA451202275000ABAE4E /* WebDeviceOrientationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
5C40CD2122D8F9C000E9DAD5 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB82173435C900C5D807 /* PopupMenuMac.mm */; };
5C40CD2222D8F9C300E9DAD5 /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB84173435C900C5D807 /* SearchPopupMenuMac.mm */; };
- 5C5D0F7722D9629A00E841DB /* DOMImplementation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D435451D57ABEE00AB85EA /* DOMImplementation.mm */; };
5C7DCC4922D9632D00CFEB59 /* UnifiedSource4-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7DCC4722D9631100CFEB59 /* UnifiedSource4-mm.mm */; };
5C7DCC4F22D963BD00CFEB59 /* UnifiedSource3-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7DCC4D22D9639B00CFEB59 /* UnifiedSource3-mm.mm */; };
5C7DCC5022D9643A00CFEB59 /* UnifiedSource8-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7E786322D95FE20006A230 /* UnifiedSource8-mm.mm */; };
@@ -195,8 +194,6 @@
5C9D925B22D7E8AD008E9266 /* SourcesCocoa.txt in Resources */ = {isa = PBXBuildFile; fileRef = 5C9D925922D7E8AD008E9266 /* SourcesCocoa.txt */; };
5C9EF2F521F061BE003BDC56 /* PageStorageSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9EF2F421F061BE003BDC56 /* PageStorageSessionProvider.h */; };
5CA46E7821F1451D00CE86B4 /* NetworkStorageSessionMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CA46E7621F1451D00CE86B4 /* NetworkStorageSessionMap.h */; };
- 5CA4B3BD22DCF26E00676415 /* DOMHTMLAreaElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D435681D57ABEE00AB85EA /* DOMHTMLAreaElement.mm */; };
- 5CA4B3BE22DCF27600676415 /* DOMHTMLAnchorElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D435641D57ABEE00AB85EA /* DOMHTMLAnchorElement.mm */; };
5CC19FCC22D7F28D00BBC952 /* UnifiedSource1-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FB822D7F23B00BBC952 /* UnifiedSource1-mm.mm */; };
5CC19FCD22D7F28D00BBC952 /* UnifiedSource1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FBB22D7F23B00BBC952 /* UnifiedSource1.cpp */; };
5CC19FCE22D7F28D00BBC952 /* UnifiedSource2-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FBE22D7F23C00BBC952 /* UnifiedSource2-mm.mm */; };
@@ -205,6 +202,7 @@
5CC19FD122D7F28D00BBC952 /* UnifiedSource5-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FBC22D7F23B00BBC952 /* UnifiedSource5-mm.mm */; };
5CC19FD222D7F28D00BBC952 /* UnifiedSource5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FB922D7F23B00BBC952 /* UnifiedSource5.cpp */; };
5CE44F4A206D70EA003EFD01 /* PingHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE44F49206D70E9003EFD01 /* PingHandle.h */; };
+ 5CEFBA2F2343BE66009C41F8 /* UnifiedSource21-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CEFBA2E2343BE66009C41F8 /* UnifiedSource21-mm.mm */; };
5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D7BF8120C2A1D90008CE06D /* WebInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib */; };
65488DA1084FBCCB00831AD0 /* WebNSDictionaryExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */; };
@@ -935,8 +933,8 @@
5C7E786722D95FE20006A230 /* UnifiedSource7-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource7-mm.mm"; sourceTree = "<group>"; };
5C7E786822D95FE20006A230 /* UnifiedSource12-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource12-mm.mm"; sourceTree = "<group>"; };
5C7E786922D95FE20006A230 /* UnifiedSource11-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource11-mm.mm"; sourceTree = "<group>"; };
- 5C97EF612342C534006020D4 /* UnifiedSource19-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource19-mm.mm"; path = "UnifiedSource19-mm.mm"; sourceTree = "<group>"; };
- 5C97EF622342C534006020D4 /* UnifiedSource20-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource20-mm.mm"; path = "UnifiedSource20-mm.mm"; sourceTree = "<group>"; };
+ 5C97EF612342C534006020D4 /* UnifiedSource19-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource19-mm.mm"; sourceTree = "<group>"; };
+ 5C97EF622342C534006020D4 /* UnifiedSource20-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource20-mm.mm"; sourceTree = "<group>"; };
5C9D925822D7E8AD008E9266 /* Sources.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Sources.txt; sourceTree = "<group>"; };
5C9D925922D7E8AD008E9266 /* SourcesCocoa.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourcesCocoa.txt; sourceTree = "<group>"; };
5C9EF2F421F061BE003BDC56 /* PageStorageSessionProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PageStorageSessionProvider.h; path = WebCoreSupport/PageStorageSessionProvider.h; sourceTree = SOURCE_ROOT; };
@@ -950,6 +948,7 @@
5CC19FBD22D7F23B00BBC952 /* UnifiedSource3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UnifiedSource3.cpp; sourceTree = "<group>"; };
5CC19FBE22D7F23C00BBC952 /* UnifiedSource2-mm.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource2-mm.mm"; sourceTree = "<group>"; };
5CE44F49206D70E9003EFD01 /* PingHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PingHandle.h; path = WebCoreSupport/PingHandle.h; sourceTree = SOURCE_ROOT; };
+ 5CEFBA2E2343BE66009C41F8 /* UnifiedSource21-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource21-mm.mm"; sourceTree = "<group>"; };
5D7BF8120C2A1D90008CE06D /* WebInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspector.h; sourceTree = "<group>"; };
5D7BF8130C2A1D90008CE06D /* WebInspector.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspector.mm; sourceTree = "<group>"; };
5DE83A750D0F7F9400CAD12A /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/WebJavaScriptTextInputPanel.xib; sourceTree = SOURCE_ROOT; };
@@ -1921,6 +1920,7 @@
5C7E785E22D95FE10006A230 /* UnifiedSource18-mm.mm */,
5C97EF612342C534006020D4 /* UnifiedSource19-mm.mm */,
5C97EF622342C534006020D4 /* UnifiedSource20-mm.mm */,
+ 5CEFBA2E2343BE66009C41F8 /* UnifiedSource21-mm.mm */,
);
path = "unified-sources";
sourceTree = "<group>";
@@ -3399,9 +3399,6 @@
1A9119F61DB0470A0087D1FD /* BackForwardList.mm in Sources */,
1A60519117502A5D00BC62F5 /* BinaryPropertyList.cpp in Sources */,
B82958D4132707D0000D0E79 /* CorrectionPanel.mm in Sources */,
- 5CA4B3BE22DCF27600676415 /* DOMHTMLAnchorElement.mm in Sources */,
- 5CA4B3BD22DCF26E00676415 /* DOMHTMLAreaElement.mm in Sources */,
- 5C5D0F7722D9629A00E841DB /* DOMImplementation.mm in Sources */,
5C9A4E5322DE4627007DB353 /* DOMUIKitExtensions.mm in Sources */,
1A60519317502A5D00BC62F5 /* HistoryPropertyList.mm in Sources */,
1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */,
@@ -3446,6 +3443,7 @@
5C7E786B22D95FE20006A230 /* UnifiedSource18-mm.mm in Sources */,
5C97EF632342C534006020D4 /* UnifiedSource19-mm.mm in Sources */,
5C97EF642342C534006020D4 /* UnifiedSource20-mm.mm in Sources */,
+ 5CEFBA2F2343BE66009C41F8 /* UnifiedSource21-mm.mm in Sources */,
CEDA12DB152CBE6800D9E08D /* WebAlternativeTextClient.mm in Sources */,
9398111D0824BF01008DF038 /* WebArchive.mm in Sources */,
939810CF0824BF01008DF038 /* WebAuthenticationPanel.m in Sources */,
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (250564 => 250565)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-10-01 17:36:39 UTC (rev 250565)
@@ -1,5 +1,81 @@
2019-10-01 Alex Christensen <achristen...@webkit.org>
+ Unify more WebKitLegacy sources
+ https://bugs.webkit.org/show_bug.cgi?id=202410
+
+ Reviewed by Tim Horton.
+
+ * DOM/DOMHTML.mm:
+ (-[DOMHTMLElement scrollXOffset]):
+ (-[DOMHTMLElement scrollYOffset]):
+ (-[DOMHTMLElement setScrollXOffset:scrollYOffset:adjustForIOSCaret:]):
+ (-[DOMHTMLElement absolutePosition::::]):
+ (-[DOMHTMLInputElement setValueWithChangeEvent:]):
+ (-[DOMHTMLInputElement setValueAsNumberWithChangeEvent:]):
+ * DOM/DOMHTMLTextAreaElement.mm:
+ (unwrap):
+ (core):
+ (kit):
+ (-[DOMHTMLTextAreaElement autofocus]):
+ (-[DOMHTMLTextAreaElement setAutofocus:]):
+ (-[DOMHTMLTextAreaElement dirName]):
+ (-[DOMHTMLTextAreaElement setDirName:]):
+ (-[DOMHTMLTextAreaElement disabled]):
+ (-[DOMHTMLTextAreaElement setDisabled:]):
+ (-[DOMHTMLTextAreaElement form]):
+ (-[DOMHTMLTextAreaElement maxLength]):
+ (-[DOMHTMLTextAreaElement setMaxLength:]):
+ (-[DOMHTMLTextAreaElement name]):
+ (-[DOMHTMLTextAreaElement setName:]):
+ (-[DOMHTMLTextAreaElement placeholder]):
+ (-[DOMHTMLTextAreaElement setPlaceholder:]):
+ (-[DOMHTMLTextAreaElement readOnly]):
+ (-[DOMHTMLTextAreaElement setReadOnly:]):
+ (-[DOMHTMLTextAreaElement required]):
+ (-[DOMHTMLTextAreaElement setRequired:]):
+ (-[DOMHTMLTextAreaElement rows]):
+ (-[DOMHTMLTextAreaElement setRows:]):
+ (-[DOMHTMLTextAreaElement cols]):
+ (-[DOMHTMLTextAreaElement setCols:]):
+ (-[DOMHTMLTextAreaElement wrap]):
+ (-[DOMHTMLTextAreaElement setWrap:]):
+ (-[DOMHTMLTextAreaElement type]):
+ (-[DOMHTMLTextAreaElement defaultValue]):
+ (-[DOMHTMLTextAreaElement setDefaultValue:]):
+ (-[DOMHTMLTextAreaElement value]):
+ (-[DOMHTMLTextAreaElement setValue:]):
+ (-[DOMHTMLTextAreaElement textLength]):
+ (-[DOMHTMLTextAreaElement willValidate]):
+ (-[DOMHTMLTextAreaElement labels]):
+ (-[DOMHTMLTextAreaElement selectionStart]):
+ (-[DOMHTMLTextAreaElement setSelectionStart:]):
+ (-[DOMHTMLTextAreaElement selectionEnd]):
+ (-[DOMHTMLTextAreaElement setSelectionEnd:]):
+ (-[DOMHTMLTextAreaElement selectionDirection]):
+ (-[DOMHTMLTextAreaElement setSelectionDirection:]):
+ (-[DOMHTMLTextAreaElement accessKey]):
+ (-[DOMHTMLTextAreaElement setAccessKey:]):
+ (-[DOMHTMLTextAreaElement autocomplete]):
+ (-[DOMHTMLTextAreaElement setAutocomplete:]):
+ (-[DOMHTMLTextAreaElement select]):
+ (-[DOMHTMLTextAreaElement setRangeText:]):
+ (-[DOMHTMLTextAreaElement setRangeText:start:end:selectionMode:]):
+ (-[DOMHTMLTextAreaElement setSelectionRange:end:]):
+ * DOM/DOMUIKitExtensions.mm:
+ (-[DOMRange move:inDirection:]):
+ (-[DOMRange extend:inDirection:]):
+ (-[DOMNode borderRadii]):
+ (-[DOMNode isSelectableBlock]):
+ (-[DOMNode findExplodedTextNodeAtPoint:]):
+ (-[DOMHTMLElement structuralComplexityContribution]):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (dataSource):
+ * WebView/WebDataSource.mm:
+ (addTypesFromClass):
+
+2019-10-01 Alex Christensen <achristen...@webkit.org>
+
Fix internal build after r250549
https://bugs.webkit.org/show_bug.cgi?id=202390
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMHTML.mm (250564 => 250565)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMHTML.mm 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMHTML.mm 2019-10-01 17:36:39 UTC (rev 250565)
@@ -24,7 +24,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#import "DOMDocumentFragmentInternal.h"
#import "DOMExtensions.h"
#import "DOMHTMLCollectionInternal.h"
@@ -63,37 +62,35 @@
#if PLATFORM(IOS_FAMILY)
-using namespace WebCore;
-
@implementation DOMHTMLElement (DOMHTMLElementExtensions)
- (int)scrollXOffset
{
- RenderObject *renderer = core(self)->renderer();
+ auto* renderer = core(self)->renderer();
if (!renderer)
return 0;
- if (!is<RenderBlockFlow>(*renderer))
+ if (!is<WebCore::RenderBlockFlow>(*renderer))
renderer = renderer->containingBlock();
- if (!is<RenderBox>(*renderer) || !renderer->hasOverflowClip())
+ if (!is<WebCore::RenderBox>(*renderer) || !renderer->hasOverflowClip())
return 0;
- return downcast<RenderBox>(*renderer).layer()->scrollOffset().x();
+ return downcast<WebCore::RenderBox>(*renderer).layer()->scrollOffset().x();
}
- (int)scrollYOffset
{
- RenderObject* renderer = core(self)->renderer();
+ auto* renderer = core(self)->renderer();
if (!renderer)
return 0;
- if (!is<RenderBlockFlow>(*renderer))
+ if (!is<WebCore::RenderBlockFlow>(*renderer))
renderer = renderer->containingBlock();
- if (!is<RenderBox>(*renderer) || !renderer->hasOverflowClip())
+ if (!is<WebCore::RenderBox>(*renderer) || !renderer->hasOverflowClip())
return 0;
- return downcast<RenderBox>(*renderer).layer()->scrollOffset().y();
+ return downcast<WebCore::RenderBox>(*renderer).layer()->scrollOffset().y();
}
- (void)setScrollXOffset:(int)x scrollYOffset:(int)y
@@ -103,19 +100,19 @@
- (void)setScrollXOffset:(int)x scrollYOffset:(int)y adjustForIOSCaret:(BOOL)adjustForIOSCaret
{
- RenderObject* renderer = core(self)->renderer();
+ auto* renderer = core(self)->renderer();
if (!renderer)
return;
- if (!is<RenderBlockFlow>(*renderer))
+ if (!is<WebCore::RenderBlockFlow>(*renderer))
renderer = renderer->containingBlock();
- if (!renderer->hasOverflowClip() || !is<RenderBox>(*renderer))
+ if (!renderer->hasOverflowClip() || !is<WebCore::RenderBox>(*renderer))
return;
- RenderLayer* layer = downcast<RenderBox>(*renderer).layer();
+ auto* layer = downcast<WebCore::RenderBox>(*renderer).layer();
if (adjustForIOSCaret)
layer->setAdjustForIOSCaretWhenScrolling(true);
- layer->scrollToOffset(ScrollOffset(x, y), ScrollType::Programmatic, ScrollClamping::Unclamped);
+ layer->scrollToOffset(WebCore::ScrollOffset(x, y), WebCore::ScrollType::Programmatic, WebCore::ScrollClamping::Unclamped);
if (adjustForIOSCaret)
layer->setAdjustForIOSCaretWhenScrolling(false);
}
@@ -122,7 +119,7 @@
- (void)absolutePosition:(int *)x :(int *)y :(int *)w :(int *)h
{
- RenderBox *renderer = core(self)->renderBox();
+ auto* renderer = core(self)->renderBox();
if (renderer) {
if (w)
*w = renderer->width();
@@ -129,9 +126,9 @@
if (h)
*h = renderer->width();
if (x && y) {
- FloatPoint floatPoint(*x, *y);
+ WebCore::FloatPoint floatPoint(*x, *y);
renderer->localToAbsolute(floatPoint);
- IntPoint point = roundedIntPoint(floatPoint);
+ WebCore::IntPoint point = roundedIntPoint(floatPoint);
*x = point.x();
*y = point.y();
}
@@ -265,13 +262,13 @@
- (void)setValueWithChangeEvent:(NSString *)newValue
{
WebCore::JSMainThreadNullState state;
- core(self)->setValue(newValue, DispatchInputAndChangeEvent);
+ core(self)->setValue(newValue, WebCore::DispatchInputAndChangeEvent);
}
- (void)setValueAsNumberWithChangeEvent:(double)newValueAsNumber
{
WebCore::JSMainThreadNullState state;
- core(self)->setValueAsNumber(newValueAsNumber, DispatchInputAndChangeEvent);
+ core(self)->setValueAsNumber(newValueAsNumber, WebCore::DispatchInputAndChangeEvent);
}
@end
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm (250564 => 250565)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm 2019-10-01 17:36:39 UTC (rev 250565)
@@ -34,23 +34,21 @@
#import <WebCore/NodeList.h>
#import <WebCore/ThreadCheck.h>
-using namespace WebCore;
-
-static inline HTMLTextAreaElement& unwrap(DOMHTMLTextAreaElement& wrapper)
+static inline WebCore::HTMLTextAreaElement& unwrap(DOMHTMLTextAreaElement& wrapper)
{
ASSERT(wrapper._internal);
- return downcast<HTMLTextAreaElement>(reinterpret_cast<Node&>(*wrapper._internal));
+ return downcast<WebCore::HTMLTextAreaElement>(reinterpret_cast<WebCore::Node&>(*wrapper._internal));
}
-HTMLTextAreaElement* core(DOMHTMLTextAreaElement *wrapper)
+WebCore::HTMLTextAreaElement* core(DOMHTMLTextAreaElement *wrapper)
{
return wrapper ? &unwrap(*wrapper) : nullptr;
}
-DOMHTMLTextAreaElement *kit(HTMLTextAreaElement* value)
+DOMHTMLTextAreaElement *kit(WebCore::HTMLTextAreaElement* value)
{
WebCoreThreadViolationCheckRoundOne();
- return static_cast<DOMHTMLTextAreaElement*>(kit(static_cast<Node*>(value)));
+ return static_cast<DOMHTMLTextAreaElement*>(kit(static_cast<WebCore::Node*>(value)));
}
@implementation DOMHTMLTextAreaElement
@@ -57,271 +55,271 @@
- (BOOL)autofocus
{
- JSMainThreadNullState state;
- return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::autofocusAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::autofocusAttr);
}
- (void)setAutofocus:(BOOL)newAutofocus
{
- JSMainThreadNullState state;
- unwrap(*self).setBooleanAttribute(HTMLNames::autofocusAttr, newAutofocus);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::autofocusAttr, newAutofocus);
}
- (NSString *)dirName
{
- JSMainThreadNullState state;
- return unwrap(*self).getAttribute(HTMLNames::dirnameAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).getAttribute(WebCore::HTMLNames::dirnameAttr);
}
- (void)setDirName:(NSString *)newDirName
{
- JSMainThreadNullState state;
- unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::dirnameAttr, newDirName);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::dirnameAttr, newDirName);
}
- (BOOL)disabled
{
- JSMainThreadNullState state;
- return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::disabledAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::disabledAttr);
}
- (void)setDisabled:(BOOL)newDisabled
{
- JSMainThreadNullState state;
- unwrap(*self).setBooleanAttribute(HTMLNames::disabledAttr, newDisabled);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::disabledAttr, newDisabled);
}
- (DOMHTMLFormElement *)form
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return kit(unwrap(*self).form());
}
- (int)maxLength
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).maxLength();
}
- (void)setMaxLength:(int)newMaxLength
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
raiseOnDOMError(unwrap(*self).setMaxLength(newMaxLength));
}
- (NSString *)name
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).getNameAttribute();
}
- (void)setName:(NSString *)newName
{
- JSMainThreadNullState state;
- unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::nameAttr, newName);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::nameAttr, newName);
}
- (NSString *)placeholder
{
- JSMainThreadNullState state;
- return unwrap(*self).getAttribute(HTMLNames::placeholderAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).getAttribute(WebCore::HTMLNames::placeholderAttr);
}
- (void)setPlaceholder:(NSString *)newPlaceholder
{
- JSMainThreadNullState state;
- unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::placeholderAttr, newPlaceholder);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::placeholderAttr, newPlaceholder);
}
- (BOOL)readOnly
{
- JSMainThreadNullState state;
- return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::readonlyAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::readonlyAttr);
}
- (void)setReadOnly:(BOOL)newReadOnly
{
- JSMainThreadNullState state;
- unwrap(*self).setBooleanAttribute(HTMLNames::readonlyAttr, newReadOnly);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::readonlyAttr, newReadOnly);
}
- (BOOL)required
{
- JSMainThreadNullState state;
- return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::requiredAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::requiredAttr);
}
- (void)setRequired:(BOOL)newRequired
{
- JSMainThreadNullState state;
- unwrap(*self).setBooleanAttribute(HTMLNames::requiredAttr, newRequired);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::requiredAttr, newRequired);
}
- (int)rows
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).rows();
}
- (void)setRows:(int)newRows
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setRows(newRows);
}
- (int)cols
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).cols();
}
- (void)setCols:(int)newCols
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setCols(newCols);
}
- (NSString *)wrap
{
- JSMainThreadNullState state;
- return unwrap(*self).getAttribute(HTMLNames::wrapAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).getAttribute(WebCore::HTMLNames::wrapAttr);
}
- (void)setWrap:(NSString *)newWrap
{
- JSMainThreadNullState state;
- unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::wrapAttr, newWrap);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::wrapAttr, newWrap);
}
- (NSString *)type
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).type();
}
- (NSString *)defaultValue
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).defaultValue();
}
- (void)setDefaultValue:(NSString *)newDefaultValue
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setDefaultValue(newDefaultValue);
}
- (NSString *)value
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).value();
}
- (void)setValue:(NSString *)newValue
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setValue(newValue);
}
- (unsigned)textLength
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).textLength();
}
- (BOOL)willValidate
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).willValidate();
}
- (DOMNodeList *)labels
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return kit(unwrap(*self).labels().get());
}
- (int)selectionStart
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).selectionStart();
}
- (void)setSelectionStart:(int)newSelectionStart
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setSelectionStart(newSelectionStart);
}
- (int)selectionEnd
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).selectionEnd();
}
- (void)setSelectionEnd:(int)newSelectionEnd
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setSelectionEnd(newSelectionEnd);
}
- (NSString *)selectionDirection
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).selectionDirection();
}
- (void)setSelectionDirection:(NSString *)newSelectionDirection
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setSelectionDirection(newSelectionDirection);
}
- (NSString *)accessKey
{
- JSMainThreadNullState state;
- return unwrap(*self).getAttribute(HTMLNames::accesskeyAttr);
+ WebCore::JSMainThreadNullState state;
+ return unwrap(*self).getAttribute(WebCore::HTMLNames::accesskeyAttr);
}
- (void)setAccessKey:(NSString *)newAccessKey
{
- JSMainThreadNullState state;
- unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::accesskeyAttr, newAccessKey);
+ WebCore::JSMainThreadNullState state;
+ unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::accesskeyAttr, newAccessKey);
}
- (NSString *)autocomplete
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
return unwrap(*self).autocomplete();
}
- (void)setAutocomplete:(NSString *)newAutocomplete
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setAutocomplete(newAutocomplete);
}
- (void)select
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).select();
}
- (void)setRangeText:(NSString *)replacement
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
raiseOnDOMError(unwrap(*self).setRangeText(replacement));
}
- (void)setRangeText:(NSString *)replacement start:(unsigned)start end:(unsigned)end selectionMode:(NSString *)selectionMode
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
raiseOnDOMError(unwrap(*self).setRangeText(replacement, start, end, selectionMode));
}
- (void)setSelectionRange:(int)start end:(int)end
{
- JSMainThreadNullState state;
+ WebCore::JSMainThreadNullState state;
unwrap(*self).setSelectionRange(start, end);
}
Modified: trunk/Source/WebKitLegacy/mac/DOM/DOMUIKitExtensions.mm (250564 => 250565)
--- trunk/Source/WebKitLegacy/mac/DOM/DOMUIKitExtensions.mm 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/mac/DOM/DOMUIKitExtensions.mm 2019-10-01 17:36:39 UTC (rev 250565)
@@ -24,7 +24,6 @@
*
*/
-
#if PLATFORM(IOS_FAMILY)
#import "DOMUIKitExtensions.h"
@@ -66,8 +65,6 @@
#import <WebCore/VisibleUnits.h>
#import <WebCore/WAKAppKitStubs.h>
-using namespace WebCore;
-
using WebCore::Node;
using WebCore::Position;
using WebCore::Range;
@@ -82,22 +79,22 @@
- (void)move:(UInt32)amount inDirection:(WebTextAdjustmentDirection)direction
{
Range *range = core(self);
- FrameSelection frameSelection;
+ WebCore::FrameSelection frameSelection;
frameSelection.moveTo(range);
- TextGranularity granularity = CharacterGranularity;
+ WebCore::TextGranularity granularity = WebCore::CharacterGranularity;
// Until WebKit supports vertical layout, "down" is equivalent to "forward by a line" and
// "up" is equivalent to "backward by a line".
if (direction == WebTextAdjustmentDown) {
direction = WebTextAdjustmentForward;
- granularity = LineGranularity;
+ granularity = WebCore::LineGranularity;
} else if (direction == WebTextAdjustmentUp) {
direction = WebTextAdjustmentBackward;
- granularity = LineGranularity;
+ granularity = WebCore::LineGranularity;
}
for (UInt32 i = 0; i < amount; i++)
- frameSelection.modify(FrameSelection::AlterationMove, (SelectionDirection)direction, granularity);
+ frameSelection.modify(WebCore::FrameSelection::AlterationMove, (WebCore::SelectionDirection)direction, granularity);
Position start = frameSelection.selection().start().parentAnchoredEquivalent();
Position end = frameSelection.selection().end().parentAnchoredEquivalent();
@@ -110,11 +107,11 @@
- (void)extend:(UInt32)amount inDirection:(WebTextAdjustmentDirection)direction
{
Range *range = core(self);
- FrameSelection frameSelection;
+ WebCore::FrameSelection frameSelection;
frameSelection.moveTo(range);
for (UInt32 i = 0; i < amount; i++)
- frameSelection.modify(FrameSelection::AlterationExtend, (SelectionDirection)direction, CharacterGranularity);
+ frameSelection.modify(WebCore::FrameSelection::AlterationExtend, (WebCore::SelectionDirection)direction, WebCore::CharacterGranularity);
Position start = frameSelection.selection().start().parentAnchoredEquivalent();
Position end = frameSelection.selection().end().parentAnchoredEquivalent();
@@ -184,11 +181,11 @@
RenderObject* renderer = core(self)->renderer();
if (is<RenderBox>(renderer)) {
- RoundedRect::Radii radii = downcast<RenderBox>(*renderer).borderRadii();
- return @[[NSValue valueWithSize:(FloatSize)radii.topLeft()],
- [NSValue valueWithSize:(FloatSize)radii.topRight()],
- [NSValue valueWithSize:(FloatSize)radii.bottomLeft()],
- [NSValue valueWithSize:(FloatSize)radii.bottomRight()]];
+ WebCore::RoundedRect::Radii radii = downcast<RenderBox>(*renderer).borderRadii();
+ return @[[NSValue valueWithSize:(WebCore::FloatSize)radii.topLeft()],
+ [NSValue valueWithSize:(WebCore::FloatSize)radii.topRight()],
+ [NSValue valueWithSize:(WebCore::FloatSize)radii.bottomLeft()],
+ [NSValue valueWithSize:(WebCore::FloatSize)radii.bottomRight()]];
}
NSValue *emptyValue = [NSValue valueWithSize:CGSizeZero];
return @[emptyValue, emptyValue, emptyValue, emptyValue];
@@ -206,7 +203,7 @@
- (BOOL)isSelectableBlock
{
RenderObject* renderer = core(self)->renderer();
- return renderer && (is<RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation() != nil));
+ return renderer && (is<WebCore::RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation() != nil));
}
- (DOMRange *)rangeOfContainingParagraph
@@ -241,10 +238,10 @@
- (DOMNode *)findExplodedTextNodeAtPoint:(CGPoint)point
{
auto* renderer = core(self)->renderer();
- if (!is<RenderBlockFlow>(renderer))
+ if (!is<WebCore::RenderBlockFlow>(renderer))
return nil;
- auto* renderText = downcast<RenderBlockFlow>(*renderer).findClosestTextAtAbsolutePoint(point);
+ auto* renderText = downcast<WebCore::RenderBlockFlow>(*renderer).findClosestTextAtAbsolutePoint(point);
if (renderText && renderText->textNode())
return kit(renderText->textNode());
@@ -271,7 +268,7 @@
result = INT_MAX;
} else if (!renderer->firstChildSlow()) {
result = 0;
- } else if (is<RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation())) {
+ } else if (is<WebCore::RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation())) {
BOOL noCost = NO;
if (is<RenderBox>(*renderer)) {
RenderBox& asBox = renderer->enclosingBox();
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h (250564 => 250565)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h 2019-10-01 17:36:39 UTC (rev 250565)
@@ -260,3 +260,6 @@
WeakObjCPtr<WebFramePolicyListener> m_policyListener;
};
+
+WebDataSource *dataSource(WebCore::DocumentLoader*);
+void addTypesFromClass(NSMutableDictionary *, Class, NSArray *);
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (250564 => 250565)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2019-10-01 17:36:39 UTC (rev 250565)
@@ -196,7 +196,7 @@
@end
-static inline WebDataSource *dataSource(WebCore::DocumentLoader* loader)
+WebDataSource *dataSource(WebCore::DocumentLoader* loader)
{
return loader ? static_cast<WebDocumentLoaderMac*>(loader)->dataSource() : nil;
}
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm (250564 => 250565)
--- trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm 2019-10-01 17:36:39 UTC (rev 250565)
@@ -127,7 +127,7 @@
toPrivate(_private)->representationFinishedLoading = NO;
}
-static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCClass, NSArray *supportTypes)
+void addTypesFromClass(NSMutableDictionary *allTypes, Class objCClass, NSArray *supportTypes)
{
NSEnumerator *enumerator = [supportTypes objectEnumerator];
ASSERT(enumerator != nil);
Modified: trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh (250564 => 250565)
--- trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh 2019-10-01 17:34:42 UTC (rev 250564)
+++ trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh 2019-10-01 17:36:39 UTC (rev 250565)
@@ -15,7 +15,7 @@
fi
UnifiedSourceCppFileCount=5
-UnifiedSourceMmFileCount=20
+UnifiedSourceMmFileCount=21
if [ $# -eq 0 ]; then
echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
