Changeset 250565 in webkit


Ignore:
Timestamp:
Oct 1, 2019 10:36:39 AM (5 years ago)
Author:
achristensen@apple.com
Message:

Unify more WebKitLegacy sources
​https://bugs.webkit.org/show_bug.cgi?id=202410

Reviewed by Tim Horton.

Source/WebKitLegacy:

  • SourcesCocoa.txt:
  • UnifiedSources-output.xcfilelist:
  • WebKitLegacy.xcodeproj/project.pbxproj:
  • scripts/generate-unified-sources.sh:

Source/WebKitLegacy/mac:

  • 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):

Location:
trunk/Source/WebKitLegacy
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKitLegacy/ChangeLog

    r250550 r250565  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unify more WebKitLegacy sources
     4        https://bugs.webkit.org/show_bug.cgi?id=202410
     5
     6        Reviewed by Tim Horton.
     7
     8        * SourcesCocoa.txt:
     9        * UnifiedSources-output.xcfilelist:
     10        * WebKitLegacy.xcodeproj/project.pbxproj:
     11        * scripts/generate-unified-sources.sh:
     12
    1132019-09-30  Alex Christensen  <achristensen@webkit.org>
    214

  • trunk/Source/WebKitLegacy/SourcesCocoa.txt

    r250549 r250565  
    5959mac/DOM/DOMFileList.mm
    6060mac/DOM/DOMHTML.mm
    61 mac/DOM/DOMHTMLAnchorElement.mm @no-unify
     61mac/DOM/DOMHTMLAnchorElement.mm
    6262mac/DOM/DOMHTMLAppletElement.mm
    63 mac/DOM/DOMHTMLAreaElement.mm @no-unify
     63mac/DOM/DOMHTMLAreaElement.mm
    6464mac/DOM/DOMHTMLBRElement.mm
    6565mac/DOM/DOMHTMLBaseElement.mm
    … …  
    119119mac/DOM/DOMHTMLUListElement.mm
    120120mac/DOM/DOMHTMLVideoElement.mm
    121 mac/DOM/DOMImplementation.mm @no-unify
     121mac/DOM/DOMImplementation.mm
    122122mac/DOM/DOMInternal.mm
    123123mac/DOM/DOMKeyboardEvent.mm
    … …  
    145145mac/DOM/DOMTreeWalker.mm
    146146mac/DOM/DOMUIEvent.mm
    147 mac/DOM/DOMUIKitExtensions.mm @no-unify
     147mac/DOM/DOMUIKitExtensions.mm
    148148mac/DOM/DOMUtility.mm
    149149mac/DOM/DOMWheelEvent.mm

  • trunk/Source/WebKitLegacy/UnifiedSources-output.xcfilelist

    r250549 r250565  
    1515$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource2.cpp
    1616$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource20-mm.mm
     17$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource21-mm.mm
    1718$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource3-mm.mm
    1819$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/unified-sources/UnifiedSource3.cpp

  • trunk/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj

    r250549 r250565  
    173173                5C40CD2122D8F9C000E9DAD5 /* PopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB82173435C900C5D807 /* PopupMenuMac.mm */; };
    174174                5C40CD2222D8F9C300E9DAD5 /* SearchPopupMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C01CB84173435C900C5D807 /* SearchPopupMenuMac.mm */; };
    175                 5C5D0F7722D9629A00E841DB /* DOMImplementation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D435451D57ABEE00AB85EA /* DOMImplementation.mm */; };
    176175                5C7DCC4922D9632D00CFEB59 /* UnifiedSource4-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7DCC4722D9631100CFEB59 /* UnifiedSource4-mm.mm */; };
    177176                5C7DCC4F22D963BD00CFEB59 /* UnifiedSource3-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C7DCC4D22D9639B00CFEB59 /* UnifiedSource3-mm.mm */; };
    … …  
    196195                5C9EF2F521F061BE003BDC56 /* PageStorageSessionProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9EF2F421F061BE003BDC56 /* PageStorageSessionProvider.h */; };
    197196                5CA46E7821F1451D00CE86B4 /* NetworkStorageSessionMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CA46E7621F1451D00CE86B4 /* NetworkStorageSessionMap.h */; };
    198                 5CA4B3BD22DCF26E00676415 /* DOMHTMLAreaElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D435681D57ABEE00AB85EA /* DOMHTMLAreaElement.mm */; };
    199                 5CA4B3BE22DCF27600676415 /* DOMHTMLAnchorElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93D435641D57ABEE00AB85EA /* DOMHTMLAnchorElement.mm */; };
    200197                5CC19FCC22D7F28D00BBC952 /* UnifiedSource1-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FB822D7F23B00BBC952 /* UnifiedSource1-mm.mm */; };
    201198                5CC19FCD22D7F28D00BBC952 /* UnifiedSource1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FBB22D7F23B00BBC952 /* UnifiedSource1.cpp */; };
    … …  
    206203                5CC19FD222D7F28D00BBC952 /* UnifiedSource5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CC19FB922D7F23B00BBC952 /* UnifiedSource5.cpp */; };
    207204                5CE44F4A206D70EA003EFD01 /* PingHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE44F49206D70E9003EFD01 /* PingHandle.h */; };
     205                5CEFBA2F2343BE66009C41F8 /* UnifiedSource21-mm.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CEFBA2E2343BE66009C41F8 /* UnifiedSource21-mm.mm */; };
    208206                5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D7BF8120C2A1D90008CE06D /* WebInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
    209207                5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib */; };
    … …  
    936934                5C7E786822D95FE20006A230 /* UnifiedSource12-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource12-mm.mm"; sourceTree = "<group>"; };
    937935                5C7E786922D95FE20006A230 /* UnifiedSource11-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource11-mm.mm"; sourceTree = "<group>"; };
    938                 5C97EF612342C534006020D4 /* UnifiedSource19-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource19-mm.mm"; path = "UnifiedSource19-mm.mm"; sourceTree = "<group>"; };
    939                 5C97EF622342C534006020D4 /* UnifiedSource20-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UnifiedSource20-mm.mm"; path = "UnifiedSource20-mm.mm"; sourceTree = "<group>"; };
     936                5C97EF612342C534006020D4 /* UnifiedSource19-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource19-mm.mm"; sourceTree = "<group>"; };
     937                5C97EF622342C534006020D4 /* UnifiedSource20-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource20-mm.mm"; sourceTree = "<group>"; };
    940938                5C9D925822D7E8AD008E9266 /* Sources.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Sources.txt; sourceTree = "<group>"; };
    941939                5C9D925922D7E8AD008E9266 /* SourcesCocoa.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourcesCocoa.txt; sourceTree = "<group>"; };
    … …  
    951949                5CC19FBE22D7F23C00BBC952 /* UnifiedSource2-mm.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource2-mm.mm"; sourceTree = "<group>"; };
    952950                5CE44F49206D70E9003EFD01 /* PingHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PingHandle.h; path = WebCoreSupport/PingHandle.h; sourceTree = SOURCE_ROOT; };
     951                5CEFBA2E2343BE66009C41F8 /* UnifiedSource21-mm.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UnifiedSource21-mm.mm"; sourceTree = "<group>"; };
    953952                5D7BF8120C2A1D90008CE06D /* WebInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspector.h; sourceTree = "<group>"; };
    954953                5D7BF8130C2A1D90008CE06D /* WebInspector.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspector.mm; sourceTree = "<group>"; };
    … …  
    19221921                                5C97EF612342C534006020D4 /* UnifiedSource19-mm.mm */,
    19231922                                5C97EF622342C534006020D4 /* UnifiedSource20-mm.mm */,
     1923                                5CEFBA2E2343BE66009C41F8 /* UnifiedSource21-mm.mm */,
    19241924                        );
    19251925                        path = "unified-sources";
    … …  
    34003400                                1A60519117502A5D00BC62F5 /* BinaryPropertyList.cpp in Sources */,
    34013401                                B82958D4132707D0000D0E79 /* CorrectionPanel.mm in Sources */,
    3402                                 5CA4B3BE22DCF27600676415 /* DOMHTMLAnchorElement.mm in Sources */,
    3403                                 5CA4B3BD22DCF26E00676415 /* DOMHTMLAreaElement.mm in Sources */,
    3404                                 5C5D0F7722D9629A00E841DB /* DOMImplementation.mm in Sources */,
    34053402                                5C9A4E5322DE4627007DB353 /* DOMUIKitExtensions.mm in Sources */,
    34063403                                1A60519317502A5D00BC62F5 /* HistoryPropertyList.mm in Sources */,
    … …  
    34473444                                5C97EF632342C534006020D4 /* UnifiedSource19-mm.mm in Sources */,
    34483445                                5C97EF642342C534006020D4 /* UnifiedSource20-mm.mm in Sources */,
     3446                                5CEFBA2F2343BE66009C41F8 /* UnifiedSource21-mm.mm in Sources */,
    34493447                                CEDA12DB152CBE6800D9E08D /* WebAlternativeTextClient.mm in Sources */,
    34503448                                9398111D0824BF01008DF038 /* WebArchive.mm in Sources */,

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r250556 r250565  
     12019-10-01  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unify more WebKitLegacy sources
     4        https://bugs.webkit.org/show_bug.cgi?id=202410
     5
     6        Reviewed by Tim Horton.
     7
     8        * DOM/DOMHTML.mm:
     9        (-[DOMHTMLElement scrollXOffset]):
     10        (-[DOMHTMLElement scrollYOffset]):
     11        (-[DOMHTMLElement setScrollXOffset:scrollYOffset:adjustForIOSCaret:]):
     12        (-[DOMHTMLElement absolutePosition::::]):
     13        (-[DOMHTMLInputElement setValueWithChangeEvent:]):
     14        (-[DOMHTMLInputElement setValueAsNumberWithChangeEvent:]):
     15        * DOM/DOMHTMLTextAreaElement.mm:
     16        (unwrap):
     17        (core):
     18        (kit):
     19        (-[DOMHTMLTextAreaElement autofocus]):
     20        (-[DOMHTMLTextAreaElement setAutofocus:]):
     21        (-[DOMHTMLTextAreaElement dirName]):
     22        (-[DOMHTMLTextAreaElement setDirName:]):
     23        (-[DOMHTMLTextAreaElement disabled]):
     24        (-[DOMHTMLTextAreaElement setDisabled:]):
     25        (-[DOMHTMLTextAreaElement form]):
     26        (-[DOMHTMLTextAreaElement maxLength]):
     27        (-[DOMHTMLTextAreaElement setMaxLength:]):
     28        (-[DOMHTMLTextAreaElement name]):
     29        (-[DOMHTMLTextAreaElement setName:]):
     30        (-[DOMHTMLTextAreaElement placeholder]):
     31        (-[DOMHTMLTextAreaElement setPlaceholder:]):
     32        (-[DOMHTMLTextAreaElement readOnly]):
     33        (-[DOMHTMLTextAreaElement setReadOnly:]):
     34        (-[DOMHTMLTextAreaElement required]):
     35        (-[DOMHTMLTextAreaElement setRequired:]):
     36        (-[DOMHTMLTextAreaElement rows]):
     37        (-[DOMHTMLTextAreaElement setRows:]):
     38        (-[DOMHTMLTextAreaElement cols]):
     39        (-[DOMHTMLTextAreaElement setCols:]):
     40        (-[DOMHTMLTextAreaElement wrap]):
     41        (-[DOMHTMLTextAreaElement setWrap:]):
     42        (-[DOMHTMLTextAreaElement type]):
     43        (-[DOMHTMLTextAreaElement defaultValue]):
     44        (-[DOMHTMLTextAreaElement setDefaultValue:]):
     45        (-[DOMHTMLTextAreaElement value]):
     46        (-[DOMHTMLTextAreaElement setValue:]):
     47        (-[DOMHTMLTextAreaElement textLength]):
     48        (-[DOMHTMLTextAreaElement willValidate]):
     49        (-[DOMHTMLTextAreaElement labels]):
     50        (-[DOMHTMLTextAreaElement selectionStart]):
     51        (-[DOMHTMLTextAreaElement setSelectionStart:]):
     52        (-[DOMHTMLTextAreaElement selectionEnd]):
     53        (-[DOMHTMLTextAreaElement setSelectionEnd:]):
     54        (-[DOMHTMLTextAreaElement selectionDirection]):
     55        (-[DOMHTMLTextAreaElement setSelectionDirection:]):
     56        (-[DOMHTMLTextAreaElement accessKey]):
     57        (-[DOMHTMLTextAreaElement setAccessKey:]):
     58        (-[DOMHTMLTextAreaElement autocomplete]):
     59        (-[DOMHTMLTextAreaElement setAutocomplete:]):
     60        (-[DOMHTMLTextAreaElement select]):
     61        (-[DOMHTMLTextAreaElement setRangeText:]):
     62        (-[DOMHTMLTextAreaElement setRangeText:start:end:selectionMode:]):
     63        (-[DOMHTMLTextAreaElement setSelectionRange:end:]):
     64        * DOM/DOMUIKitExtensions.mm:
     65        (-[DOMRange move:inDirection:]):
     66        (-[DOMRange extend:inDirection:]):
     67        (-[DOMNode borderRadii]):
     68        (-[DOMNode isSelectableBlock]):
     69        (-[DOMNode findExplodedTextNodeAtPoint:]):
     70        (-[DOMHTMLElement structuralComplexityContribution]):
     71        * WebCoreSupport/WebFrameLoaderClient.h:
     72        * WebCoreSupport/WebFrameLoaderClient.mm:
     73        (dataSource):
     74        * WebView/WebDataSource.mm:
     75        (addTypesFromClass):
     76
    1772019-10-01  Alex Christensen  <achristensen@webkit.org>
    278

  • trunk/Source/WebKitLegacy/mac/DOM/DOMHTML.mm

    r243919 r250565  
    2525 */
    2626
    27 
    2827#import "DOMDocumentFragmentInternal.h"
    2928#import "DOMExtensions.h"
    … …  
    6463#if PLATFORM(IOS_FAMILY)
    6564
    66 using namespace WebCore;
    67 
    6865@implementation DOMHTMLElement (DOMHTMLElementExtensions)
    6966
    7067- (int)scrollXOffset
    7168{
    72     RenderObject *renderer = core(self)->renderer();
     69    auto* renderer = core(self)->renderer();
    7370    if (!renderer)
    7471        return 0;
    7572
    76     if (!is<RenderBlockFlow>(*renderer))
     73    if (!is<WebCore::RenderBlockFlow>(*renderer))
    7774        renderer = renderer->containingBlock();
    7875
    79     if (!is<RenderBox>(*renderer) || !renderer->hasOverflowClip())
    80         return 0;
    81 
    82     return downcast<RenderBox>(*renderer).layer()->scrollOffset().x();
     76    if (!is<WebCore::RenderBox>(*renderer) || !renderer->hasOverflowClip())
     77        return 0;
     78
     79    return downcast<WebCore::RenderBox>(*renderer).layer()->scrollOffset().x();
    8380}
    8481
    8582- (int)scrollYOffset
    8683{
    87     RenderObject* renderer = core(self)->renderer();
     84    auto* renderer = core(self)->renderer();
    8885    if (!renderer)
    8986        return 0;
    9087
    91     if (!is<RenderBlockFlow>(*renderer))
     88    if (!is<WebCore::RenderBlockFlow>(*renderer))
    9289        renderer = renderer->containingBlock();
    93     if (!is<RenderBox>(*renderer) || !renderer->hasOverflowClip())
    94         return 0;
    95 
    96     return downcast<RenderBox>(*renderer).layer()->scrollOffset().y();
     90    if (!is<WebCore::RenderBox>(*renderer) || !renderer->hasOverflowClip())
     91        return 0;
     92
     93    return downcast<WebCore::RenderBox>(*renderer).layer()->scrollOffset().y();
    9794}
    9895
    … …  
    104101- (void)setScrollXOffset:(int)x scrollYOffset:(int)y adjustForIOSCaret:(BOOL)adjustForIOSCaret
    105102{
    106     RenderObject* renderer = core(self)->renderer();
     103    auto* renderer = core(self)->renderer();
    107104    if (!renderer)
    108105        return;
    109106
    110     if (!is<RenderBlockFlow>(*renderer))
     107    if (!is<WebCore::RenderBlockFlow>(*renderer))
    111108        renderer = renderer->containingBlock();
    112     if (!renderer->hasOverflowClip() || !is<RenderBox>(*renderer))
     109    if (!renderer->hasOverflowClip() || !is<WebCore::RenderBox>(*renderer))
    113110        return;
    114111
    115     RenderLayer* layer = downcast<RenderBox>(*renderer).layer();
     112    auto* layer = downcast<WebCore::RenderBox>(*renderer).layer();
    116113    if (adjustForIOSCaret)
    117114        layer->setAdjustForIOSCaretWhenScrolling(true);
    118     layer->scrollToOffset(ScrollOffset(x, y), ScrollType::Programmatic, ScrollClamping::Unclamped);
     115    layer->scrollToOffset(WebCore::ScrollOffset(x, y), WebCore::ScrollType::Programmatic, WebCore::ScrollClamping::Unclamped);
    119116    if (adjustForIOSCaret)
    120117        layer->setAdjustForIOSCaretWhenScrolling(false);
    … …  
    123120- (void)absolutePosition:(int *)x :(int *)y :(int *)w :(int *)h
    124121{
    125     RenderBox *renderer = core(self)->renderBox();
     122    auto* renderer = core(self)->renderBox();
    126123    if (renderer) {
    127124        if (w)
    … …  
    130127            *h = renderer->width();
    131128        if (x && y) {
    132             FloatPoint floatPoint(*x, *y);
     129            WebCore::FloatPoint floatPoint(*x, *y);
    133130            renderer->localToAbsolute(floatPoint);
    134             IntPoint point = roundedIntPoint(floatPoint);
     131            WebCore::IntPoint point = roundedIntPoint(floatPoint);
    135132            *x = point.x();
    136133            *y = point.y();
    … …  
    266263{
    267264    WebCore::JSMainThreadNullState state;
    268     core(self)->setValue(newValue, DispatchInputAndChangeEvent);
     265    core(self)->setValue(newValue, WebCore::DispatchInputAndChangeEvent);
    269266}
    270267
    … …  
    272269{
    273270    WebCore::JSMainThreadNullState state;
    274     core(self)->setValueAsNumber(newValueAsNumber, DispatchInputAndChangeEvent);
     271    core(self)->setValueAsNumber(newValueAsNumber, WebCore::DispatchInputAndChangeEvent);
    275272}
    276273

  • trunk/Source/WebKitLegacy/mac/DOM/DOMHTMLTextAreaElement.mm

    r234586 r250565  
    3535#import <WebCore/ThreadCheck.h>
    3636
    37 using namespace WebCore;
    38 
    39 static inline HTMLTextAreaElement& unwrap(DOMHTMLTextAreaElement& wrapper)
     37static inline WebCore::HTMLTextAreaElement& unwrap(DOMHTMLTextAreaElement& wrapper)
    4038{
    4139    ASSERT(wrapper._internal);
    42     return downcast<HTMLTextAreaElement>(reinterpret_cast<Node&>(*wrapper._internal));
    43 }
    44 
    45 HTMLTextAreaElement* core(DOMHTMLTextAreaElement *wrapper)
     40    return downcast<WebCore::HTMLTextAreaElement>(reinterpret_cast<WebCore::Node&>(*wrapper._internal));
     41}
     42
     43WebCore::HTMLTextAreaElement* core(DOMHTMLTextAreaElement *wrapper)
    4644{
    4745    return wrapper ? &unwrap(*wrapper) : nullptr;
    4846}
    4947
    50 DOMHTMLTextAreaElement *kit(HTMLTextAreaElement* value)
     48DOMHTMLTextAreaElement *kit(WebCore::HTMLTextAreaElement* value)
    5149{
    5250    WebCoreThreadViolationCheckRoundOne();
    53     return static_cast<DOMHTMLTextAreaElement*>(kit(static_cast<Node*>(value)));
     51    return static_cast<DOMHTMLTextAreaElement*>(kit(static_cast<WebCore::Node*>(value)));
    5452}
    5553
    … …  
    5856- (BOOL)autofocus
    5957{
    60     JSMainThreadNullState state;
    61     return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::autofocusAttr);
     58    WebCore::JSMainThreadNullState state;
     59    return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::autofocusAttr);
    6260}
    6361
    6462- (void)setAutofocus:(BOOL)newAutofocus
    6563{
    66     JSMainThreadNullState state;
    67     unwrap(*self).setBooleanAttribute(HTMLNames::autofocusAttr, newAutofocus);
     64    WebCore::JSMainThreadNullState state;
     65    unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::autofocusAttr, newAutofocus);
    6866}
    6967
    7068- (NSString *)dirName
    7169{
    72     JSMainThreadNullState state;
    73     return unwrap(*self).getAttribute(HTMLNames::dirnameAttr);
     70    WebCore::JSMainThreadNullState state;
     71    return unwrap(*self).getAttribute(WebCore::HTMLNames::dirnameAttr);
    7472}
    7573
    7674- (void)setDirName:(NSString *)newDirName
    7775{
    78     JSMainThreadNullState state;
    79     unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::dirnameAttr, newDirName);
     76    WebCore::JSMainThreadNullState state;
     77    unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::dirnameAttr, newDirName);
    8078}
    8179
    8280- (BOOL)disabled
    8381{
    84     JSMainThreadNullState state;
    85     return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::disabledAttr);
     82    WebCore::JSMainThreadNullState state;
     83    return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::disabledAttr);
    8684}
    8785
    8886- (void)setDisabled:(BOOL)newDisabled
    8987{
    90     JSMainThreadNullState state;
    91     unwrap(*self).setBooleanAttribute(HTMLNames::disabledAttr, newDisabled);
     88    WebCore::JSMainThreadNullState state;
     89    unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::disabledAttr, newDisabled);
    9290}
    9391
    9492- (DOMHTMLFormElement *)form
    9593{
    96     JSMainThreadNullState state;
     94    WebCore::JSMainThreadNullState state;
    9795    return kit(unwrap(*self).form());
    9896}
    … …  
    10098- (int)maxLength
    10199{
    102     JSMainThreadNullState state;
     100    WebCore::JSMainThreadNullState state;
    103101    return unwrap(*self).maxLength();
    104102}
    … …  
    106104- (void)setMaxLength:(int)newMaxLength
    107105{
    108     JSMainThreadNullState state;
     106    WebCore::JSMainThreadNullState state;
    109107    raiseOnDOMError(unwrap(*self).setMaxLength(newMaxLength));
    110108}
    … …  
    112110- (NSString *)name
    113111{
    114     JSMainThreadNullState state;
     112    WebCore::JSMainThreadNullState state;
    115113    return unwrap(*self).getNameAttribute();
    116114}
    … …  
    118116- (void)setName:(NSString *)newName
    119117{
    120     JSMainThreadNullState state;
    121     unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::nameAttr, newName);
     118    WebCore::JSMainThreadNullState state;
     119    unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::nameAttr, newName);
    122120}
    123121
    124122- (NSString *)placeholder
    125123{
    126     JSMainThreadNullState state;
    127     return unwrap(*self).getAttribute(HTMLNames::placeholderAttr);
     124    WebCore::JSMainThreadNullState state;
     125    return unwrap(*self).getAttribute(WebCore::HTMLNames::placeholderAttr);
    128126}
    129127
    130128- (void)setPlaceholder:(NSString *)newPlaceholder
    131129{
    132     JSMainThreadNullState state;
    133     unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::placeholderAttr, newPlaceholder);
     130    WebCore::JSMainThreadNullState state;
     131    unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::placeholderAttr, newPlaceholder);
    134132}
    135133
    136134- (BOOL)readOnly
    137135{
    138     JSMainThreadNullState state;
    139     return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::readonlyAttr);
     136    WebCore::JSMainThreadNullState state;
     137    return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::readonlyAttr);
    140138}
    141139
    142140- (void)setReadOnly:(BOOL)newReadOnly
    143141{
    144     JSMainThreadNullState state;
    145     unwrap(*self).setBooleanAttribute(HTMLNames::readonlyAttr, newReadOnly);
     142    WebCore::JSMainThreadNullState state;
     143    unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::readonlyAttr, newReadOnly);
    146144}
    147145
    148146- (BOOL)required
    149147{
    150     JSMainThreadNullState state;
    151     return unwrap(*self).hasAttributeWithoutSynchronization(HTMLNames::requiredAttr);
     148    WebCore::JSMainThreadNullState state;
     149    return unwrap(*self).hasAttributeWithoutSynchronization(WebCore::HTMLNames::requiredAttr);
    152150}
    153151
    154152- (void)setRequired:(BOOL)newRequired
    155153{
    156     JSMainThreadNullState state;
    157     unwrap(*self).setBooleanAttribute(HTMLNames::requiredAttr, newRequired);
     154    WebCore::JSMainThreadNullState state;
     155    unwrap(*self).setBooleanAttribute(WebCore::HTMLNames::requiredAttr, newRequired);
    158156}
    159157
    160158- (int)rows
    161159{
    162     JSMainThreadNullState state;
     160    WebCore::JSMainThreadNullState state;
    163161    return unwrap(*self).rows();
    164162}
    … …  
    166164- (void)setRows:(int)newRows
    167165{
    168     JSMainThreadNullState state;
     166    WebCore::JSMainThreadNullState state;
    169167    unwrap(*self).setRows(newRows);
    170168}
    … …  
    172170- (int)cols
    173171{
    174     JSMainThreadNullState state;
     172    WebCore::JSMainThreadNullState state;
    175173    return unwrap(*self).cols();
    176174}
    … …  
    178176- (void)setCols:(int)newCols
    179177{
    180     JSMainThreadNullState state;
     178    WebCore::JSMainThreadNullState state;
    181179    unwrap(*self).setCols(newCols);
    182180}
    … …  
    184182- (NSString *)wrap
    185183{
    186     JSMainThreadNullState state;
    187     return unwrap(*self).getAttribute(HTMLNames::wrapAttr);
     184    WebCore::JSMainThreadNullState state;
     185    return unwrap(*self).getAttribute(WebCore::HTMLNames::wrapAttr);
    188186}
    189187
    190188- (void)setWrap:(NSString *)newWrap
    191189{
    192     JSMainThreadNullState state;
    193     unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::wrapAttr, newWrap);
     190    WebCore::JSMainThreadNullState state;
     191    unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::wrapAttr, newWrap);
    194192}
    195193
    196194- (NSString *)type
    197195{
    198     JSMainThreadNullState state;
     196    WebCore::JSMainThreadNullState state;
    199197    return unwrap(*self).type();
    200198}
    … …  
    202200- (NSString *)defaultValue
    203201{
    204     JSMainThreadNullState state;
     202    WebCore::JSMainThreadNullState state;
    205203    return unwrap(*self).defaultValue();
    206204}
    … …  
    208206- (void)setDefaultValue:(NSString *)newDefaultValue
    209207{
    210     JSMainThreadNullState state;
     208    WebCore::JSMainThreadNullState state;
    211209    unwrap(*self).setDefaultValue(newDefaultValue);
    212210}
    … …  
    214212- (NSString *)value
    215213{
    216     JSMainThreadNullState state;
     214    WebCore::JSMainThreadNullState state;
    217215    return unwrap(*self).value();
    218216}
    … …  
    220218- (void)setValue:(NSString *)newValue
    221219{
    222     JSMainThreadNullState state;
     220    WebCore::JSMainThreadNullState state;
    223221    unwrap(*self).setValue(newValue);
    224222}
    … …  
    226224- (unsigned)textLength
    227225{
    228     JSMainThreadNullState state;
     226    WebCore::JSMainThreadNullState state;
    229227    return unwrap(*self).textLength();
    230228}
    … …  
    232230- (BOOL)willValidate
    233231{
    234     JSMainThreadNullState state;
     232    WebCore::JSMainThreadNullState state;
    235233    return unwrap(*self).willValidate();
    236234}
    … …  
    238236- (DOMNodeList *)labels
    239237{
    240     JSMainThreadNullState state;
     238    WebCore::JSMainThreadNullState state;
    241239    return kit(unwrap(*self).labels().get());
    242240}
    … …  
    244242- (int)selectionStart
    245243{
    246     JSMainThreadNullState state;
     244    WebCore::JSMainThreadNullState state;
    247245    return unwrap(*self).selectionStart();
    248246}
    … …  
    250248- (void)setSelectionStart:(int)newSelectionStart
    251249{
    252     JSMainThreadNullState state;
     250    WebCore::JSMainThreadNullState state;
    253251    unwrap(*self).setSelectionStart(newSelectionStart);
    254252}
    … …  
    256254- (int)selectionEnd
    257255{
    258     JSMainThreadNullState state;
     256    WebCore::JSMainThreadNullState state;
    259257    return unwrap(*self).selectionEnd();
    260258}
    … …  
    262260- (void)setSelectionEnd:(int)newSelectionEnd
    263261{
    264     JSMainThreadNullState state;
     262    WebCore::JSMainThreadNullState state;
    265263    unwrap(*self).setSelectionEnd(newSelectionEnd);
    266264}
    … …  
    268266- (NSString *)selectionDirection
    269267{
    270     JSMainThreadNullState state;
     268    WebCore::JSMainThreadNullState state;
    271269    return unwrap(*self).selectionDirection();
    272270}
    … …  
    274272- (void)setSelectionDirection:(NSString *)newSelectionDirection
    275273{
    276     JSMainThreadNullState state;
     274    WebCore::JSMainThreadNullState state;
    277275    unwrap(*self).setSelectionDirection(newSelectionDirection);
    278276}
    … …  
    280278- (NSString *)accessKey
    281279{
    282     JSMainThreadNullState state;
    283     return unwrap(*self).getAttribute(HTMLNames::accesskeyAttr);
     280    WebCore::JSMainThreadNullState state;
     281    return unwrap(*self).getAttribute(WebCore::HTMLNames::accesskeyAttr);
    284282}
    285283
    286284- (void)setAccessKey:(NSString *)newAccessKey
    287285{
    288     JSMainThreadNullState state;
    289     unwrap(*self).setAttributeWithoutSynchronization(HTMLNames::accesskeyAttr, newAccessKey);
     286    WebCore::JSMainThreadNullState state;
     287    unwrap(*self).setAttributeWithoutSynchronization(WebCore::HTMLNames::accesskeyAttr, newAccessKey);
    290288}
    291289
    292290- (NSString *)autocomplete
    293291{
    294     JSMainThreadNullState state;
     292    WebCore::JSMainThreadNullState state;
    295293    return unwrap(*self).autocomplete();
    296294}
    … …  
    298296- (void)setAutocomplete:(NSString *)newAutocomplete
    299297{
    300     JSMainThreadNullState state;
     298    WebCore::JSMainThreadNullState state;
    301299    unwrap(*self).setAutocomplete(newAutocomplete);
    302300}
    … …  
    304302- (void)select
    305303{
    306     JSMainThreadNullState state;
     304    WebCore::JSMainThreadNullState state;
    307305    unwrap(*self).select();
    308306}
    … …  
    310308- (void)setRangeText:(NSString *)replacement
    311309{
    312     JSMainThreadNullState state;
     310    WebCore::JSMainThreadNullState state;
    313311    raiseOnDOMError(unwrap(*self).setRangeText(replacement));
    314312}
    … …  
    316314- (void)setRangeText:(NSString *)replacement start:(unsigned)start end:(unsigned)end selectionMode:(NSString *)selectionMode
    317315{
    318     JSMainThreadNullState state;
     316    WebCore::JSMainThreadNullState state;
    319317    raiseOnDOMError(unwrap(*self).setRangeText(replacement, start, end, selectionMode));
    320318}
    … …  
    322320- (void)setSelectionRange:(int)start end:(int)end
    323321{
    324     JSMainThreadNullState state;
     322    WebCore::JSMainThreadNullState state;
    325323    unwrap(*self).setSelectionRange(start, end);
    326324}

  • trunk/Source/WebKitLegacy/mac/DOM/DOMUIKitExtensions.mm

    r237266 r250565  
    2424 *
    2525 */
    26 
    2726
    2827#if PLATFORM(IOS_FAMILY)
    … …  
    6766#import <WebCore/WAKAppKitStubs.h>
    6867
    69 using namespace WebCore;
    70 
    7168using WebCore::Node;
    7269using WebCore::Position;
    … …  
    8380{
    8481    Range *range = core(self);
    85     FrameSelection frameSelection;
     82    WebCore::FrameSelection frameSelection;
    8683    frameSelection.moveTo(range);
    8784   
    88     TextGranularity granularity = CharacterGranularity;
     85    WebCore::TextGranularity granularity = WebCore::CharacterGranularity;
    8986    // Until WebKit supports vertical layout, "down" is equivalent to "forward by a line" and
    9087    // "up" is equivalent to "backward by a line".
    9188    if (direction == WebTextAdjustmentDown) {
    9289        direction = WebTextAdjustmentForward;
    93         granularity = LineGranularity;
     90        granularity = WebCore::LineGranularity;
    9491    } else if (direction == WebTextAdjustmentUp) {
    9592        direction = WebTextAdjustmentBackward;
    96         granularity = LineGranularity;
     93        granularity = WebCore::LineGranularity;
    9794    }
    9895   
    9996    for (UInt32 i = 0; i < amount; i++)
    100         frameSelection.modify(FrameSelection::AlterationMove, (SelectionDirection)direction, granularity);
     97        frameSelection.modify(WebCore::FrameSelection::AlterationMove, (WebCore::SelectionDirection)direction, granularity);
    10198   
    10299    Position start = frameSelection.selection().start().parentAnchoredEquivalent();
    … …  
    111108{
    112109    Range *range = core(self);
    113     FrameSelection frameSelection;
     110    WebCore::FrameSelection frameSelection;
    114111    frameSelection.moveTo(range);
    115112   
    116113    for (UInt32 i = 0; i < amount; i++)
    117         frameSelection.modify(FrameSelection::AlterationExtend, (SelectionDirection)direction, CharacterGranularity);   
     114        frameSelection.modify(WebCore::FrameSelection::AlterationExtend, (WebCore::SelectionDirection)direction, WebCore::CharacterGranularity);
    118115   
    119116    Position start = frameSelection.selection().start().parentAnchoredEquivalent();
    … …  
    185182   
    186183    if (is<RenderBox>(renderer)) {
    187         RoundedRect::Radii radii = downcast<RenderBox>(*renderer).borderRadii();
    188         return @[[NSValue valueWithSize:(FloatSize)radii.topLeft()],
    189                  [NSValue valueWithSize:(FloatSize)radii.topRight()],
    190                  [NSValue valueWithSize:(FloatSize)radii.bottomLeft()],
    191                  [NSValue valueWithSize:(FloatSize)radii.bottomRight()]];
     184        WebCore::RoundedRect::Radii radii = downcast<RenderBox>(*renderer).borderRadii();
     185        return @[[NSValue valueWithSize:(WebCore::FloatSize)radii.topLeft()],
     186            [NSValue valueWithSize:(WebCore::FloatSize)radii.topRight()],
     187            [NSValue valueWithSize:(WebCore::FloatSize)radii.bottomLeft()],
     188            [NSValue valueWithSize:(WebCore::FloatSize)radii.bottomRight()]];
    192189    }
    193190    NSValue *emptyValue = [NSValue valueWithSize:CGSizeZero];
    … …  
    207204{
    208205    RenderObject* renderer = core(self)->renderer();
    209     return renderer && (is<RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation() != nil));
     206    return renderer && (is<WebCore::RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation() != nil));
    210207}
    211208
    … …  
    242239{
    243240    auto* renderer = core(self)->renderer();
    244     if (!is<RenderBlockFlow>(renderer))
     241    if (!is<WebCore::RenderBlockFlow>(renderer))
    245242        return nil;
    246243
    247     auto* renderText = downcast<RenderBlockFlow>(*renderer).findClosestTextAtAbsolutePoint(point);
     244    auto* renderText = downcast<WebCore::RenderBlockFlow>(*renderer).findClosestTextAtAbsolutePoint(point);
    248245    if (renderText && renderText->textNode())
    249246        return kit(renderText->textNode());
    … …  
    272269        } else if (!renderer->firstChildSlow()) {
    273270            result = 0;
    274         } else if (is<RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation())) {
     271        } else if (is<WebCore::RenderBlockFlow>(*renderer) || (is<RenderBlock>(*renderer) && downcast<RenderBlock>(*renderer).inlineContinuation())) {
    275272            BOOL noCost = NO;
    276273            if (is<RenderBox>(*renderer)) {

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h

    r250196 r250565  
    261261    WeakObjCPtr<WebFramePolicyListener> m_policyListener;
    262262};
     263
     264WebDataSource *dataSource(WebCore::DocumentLoader*);
     265void addTypesFromClass(NSMutableDictionary *, Class, NSArray *);

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r250549 r250565  
    197197@end
    198198
    199 static inline WebDataSource *dataSource(WebCore::DocumentLoader* loader)
     199WebDataSource *dataSource(WebCore::DocumentLoader* loader)
    200200{
    201201    return loader ? static_cast<WebDocumentLoaderMac*>(loader)->dataSource() : nil;

  • trunk/Source/WebKitLegacy/mac/WebView/WebDataSource.mm

    r250549 r250565  
    128128}
    129129
    130 static inline void addTypesFromClass(NSMutableDictionary *allTypes, Class objCClass, NSArray *supportTypes)
     130void addTypesFromClass(NSMutableDictionary *allTypes, Class objCClass, NSArray *supportTypes)
    131131{
    132132    NSEnumerator *enumerator = [supportTypes objectEnumerator];

  • trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh

    r250549 r250565  
    1616
    1717UnifiedSourceCppFileCount=5
    18 UnifiedSourceMmFileCount=20
     18UnifiedSourceMmFileCount=21
    1919
    2020if [ $# -eq 0 ]; then
Note: See TracChangeset for help on using the changeset viewer.