Changeset 265085 in webkit


Ignore:
Timestamp:
Jul 30, 2020 9:31:40 AM (4 years ago)
Author:
Kate Cheney
Message:

REGRESSION (r264925): run-safari --debug no longer works
​https://bugs.webkit.org/show_bug.cgi?id=214947
<rdar://problem/66297850>

Reviewed by Darin Adler.

Removing these APIs in WebKit caused older versions of Safari to
break. We should add back in empty functions to make this work.

No new tests. Manually verified this fix.

  • Shared/API/c/WKRenderLayer.cpp: Added.

(WKRenderLayerGetTypeID):
(WKRenderLayerGetRenderer):
(WKRenderLayerCopyRendererName):
(WKRenderLayerCopyElementTagName):
(WKRenderLayerCopyElementID):
(WKRenderLayerGetElementClassNames):
(WKRenderLayerGetAbsoluteBounds):
(WKRenderLayerIsClipping):
(WKRenderLayerIsClipped):
(WKRenderLayerIsReflection):
(WKRenderLayerGetCompositingLayerType):
(WKRenderLayerGetBackingStoreMemoryEstimate):
(WKRenderLayerGetNegativeZOrderList):
(WKRenderLayerGetNormalFlowList):
(WKRenderLayerGetPositiveZOrderList):
(WKRenderLayerGetFrameContentsLayer):

  • Shared/API/c/WKRenderLayer.h: Added.
  • Shared/API/c/WKRenderObject.cpp: Added.

(WKRenderObjectGetTypeID):
(WKRenderObjectCopyName):
(WKRenderObjectCopyTextSnippet):
(WKRenderObjectGetTextLength):
(WKRenderObjectCopyElementTagName):
(WKRenderObjectCopyElementID):
(WKRenderObjectGetElementClassNames):
(WKRenderObjectGetAbsolutePosition):
(WKRenderObjectGetFrameRect):
(WKRenderObjectGetChildren):

  • Shared/API/c/WKRenderObject.h: Added.
  • Sources.txt:
  • WebKit.xcodeproj/project.pbxproj:
  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:

(WKBundlePageCopyRenderTree):
(WKBundlePageCopyRenderLayerTree):

  • WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
Location:
trunk/Source/WebKit
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r265084 r265085  
     12020-07-30  Kate Cheney  <katherine_cheney@apple.com>
     2
     3        REGRESSION (r264925): run-safari --debug no longer works
     4        https://bugs.webkit.org/show_bug.cgi?id=214947
     5        <rdar://problem/66297850>
     6
     7        Reviewed by Darin Adler.
     8
     9        Removing these APIs in WebKit caused older versions of Safari to
     10        break. We should add back in empty functions to make this work.
     11
     12        No new tests. Manually verified this fix.
     13
     14        * Shared/API/c/WKRenderLayer.cpp: Added.
     15        (WKRenderLayerGetTypeID):
     16        (WKRenderLayerGetRenderer):
     17        (WKRenderLayerCopyRendererName):
     18        (WKRenderLayerCopyElementTagName):
     19        (WKRenderLayerCopyElementID):
     20        (WKRenderLayerGetElementClassNames):
     21        (WKRenderLayerGetAbsoluteBounds):
     22        (WKRenderLayerIsClipping):
     23        (WKRenderLayerIsClipped):
     24        (WKRenderLayerIsReflection):
     25        (WKRenderLayerGetCompositingLayerType):
     26        (WKRenderLayerGetBackingStoreMemoryEstimate):
     27        (WKRenderLayerGetNegativeZOrderList):
     28        (WKRenderLayerGetNormalFlowList):
     29        (WKRenderLayerGetPositiveZOrderList):
     30        (WKRenderLayerGetFrameContentsLayer):
     31        * Shared/API/c/WKRenderLayer.h: Added.
     32        * Shared/API/c/WKRenderObject.cpp: Added.
     33        (WKRenderObjectGetTypeID):
     34        (WKRenderObjectCopyName):
     35        (WKRenderObjectCopyTextSnippet):
     36        (WKRenderObjectGetTextLength):
     37        (WKRenderObjectCopyElementTagName):
     38        (WKRenderObjectCopyElementID):
     39        (WKRenderObjectGetElementClassNames):
     40        (WKRenderObjectGetAbsolutePosition):
     41        (WKRenderObjectGetFrameRect):
     42        (WKRenderObjectGetChildren):
     43        * Shared/API/c/WKRenderObject.h: Added.
     44        * Sources.txt:
     45        * WebKit.xcodeproj/project.pbxproj:
     46        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
     47        (WKBundlePageCopyRenderTree):
     48        (WKBundlePageCopyRenderLayerTree):
     49        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
     50
    1512020-07-30  Darin Adler  <darin@apple.com>
    252

  • trunk/Source/WebKit/Sources.txt

    r264925 r265085  
    207207Shared/WebPreferencesStore.cpp
    208208Shared/WebProcessCreationParameters.cpp
     209Shared/API/c/WKRenderLayer.cpp
     210Shared/API/c/WKRenderObject.cpp
    209211Shared/WebTouchEvent.cpp @no-unify
    210212Shared/WebUserContentControllerDataTypes.cpp

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

    r265063 r265085  
    961961                4960A3BD23C52AFD00961842 /* WebViewCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 4960A3BC23C5286400961842 /* WebViewCategory.h */; };
    962962                4973DF482422941F00E4C26A /* NavigatingToAppBoundDomain.h in Headers */ = {isa = PBXBuildFile; fileRef = 4973DF472422941F00E4C26A /* NavigatingToAppBoundDomain.h */; };
     963                4990002124D2429C00049CB4 /* WKRenderLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4990001F24D2429C00049CB4 /* WKRenderLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
     964                4990002424D24C2900049CB4 /* WKRenderObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4990002324D24C1C00049CB4 /* WKRenderObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
    963965                49BCA19223A177660028A836 /* APIResourceLoadStatisticsFirstParty.h in Headers */ = {isa = PBXBuildFile; fileRef = 49BCA19123A177660028A836 /* APIResourceLoadStatisticsFirstParty.h */; };
    964966                49BCA19523A18CFD0028A836 /* _WKResourceLoadStatisticsFirstPartyInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 49BCA19023A175490028A836 /* _WKResourceLoadStatisticsFirstPartyInternal.h */; };
    … …  
    35853587                4960A3BC23C5286400961842 /* WebViewCategory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebViewCategory.h; sourceTree = "<group>"; };
    35863588                4973DF472422941F00E4C26A /* NavigatingToAppBoundDomain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NavigatingToAppBoundDomain.h; sourceTree = "<group>"; };
     3589                4990001E24D2429C00049CB4 /* WKRenderLayer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WKRenderLayer.cpp; sourceTree = "<group>"; };
     3590                4990001F24D2429C00049CB4 /* WKRenderLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKRenderLayer.h; sourceTree = "<group>"; };
     3591                4990002224D24C1C00049CB4 /* WKRenderObject.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WKRenderObject.cpp; sourceTree = "<group>"; };
     3592                4990002324D24C1C00049CB4 /* WKRenderObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKRenderObject.h; sourceTree = "<group>"; };
    35873593                49BCA19023A175490028A836 /* _WKResourceLoadStatisticsFirstPartyInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKResourceLoadStatisticsFirstPartyInternal.h; sourceTree = "<group>"; };
    35883594                49BCA19123A177660028A836 /* APIResourceLoadStatisticsFirstParty.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = APIResourceLoadStatisticsFirstParty.h; sourceTree = "<group>"; };
    … …  
    99569962                                7C135AA6173B0BCA00586AE2 /* WKPluginInformation.cpp */,
    99579963                                7C135AA7173B0BCA00586AE2 /* WKPluginInformation.h */,
     9964                                4990001E24D2429C00049CB4 /* WKRenderLayer.cpp */,
     9965                                4990001F24D2429C00049CB4 /* WKRenderLayer.h */,
     9966                                4990002224D24C1C00049CB4 /* WKRenderObject.cpp */,
     9967                                4990002324D24C1C00049CB4 /* WKRenderObject.h */,
    99589968                                51CD1C591B3493A900142CA5 /* WKSecurityOriginRef.cpp */,
    99599969                                51CD1C5A1B3493A900142CA5 /* WKSecurityOriginRef.h */,
    … …  
    1173511745                                1A9E329B1822E1CC00F5D04C /* WKRemoteObject.h in Headers */,
    1173611746                                1A9E329F1822FEDD00F5D04C /* WKRemoteObjectCoder.h in Headers */,
     11747                                4990002124D2429C00049CB4 /* WKRenderLayer.h in Headers */,
     11748                                4990002424D24C2900049CB4 /* WKRenderObject.h in Headers */,
    1173711749                                3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */,
    1173811750                                BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */,

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r264925 r265085  
    577577}
    578578
     579// This function should be kept around for compatibility with SafariForWebKitDevelopment.
     580void WKBundlePageCopyRenderTree(WKBundlePageRef pageRef)
     581{
     582}
     583
     584// This function should be kept around for compatibility with SafariForWebKitDevelopment.
     585void WKBundlePageCopyRenderLayerTree(WKBundlePageRef pageRef)
     586{
     587}
     588
    579589void WKBundlePageSetPaintedObjectsCounterThreshold(WKBundlePageRef, uint64_t)
    580590{

  • trunk/Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h

    r264925 r265085  
    7272
    7373WK_EXPORT uint64_t WKBundlePageGetRenderTreeSize(WKBundlePageRef page);
     74WK_EXPORT void WKBundlePageCopyRenderTree(WKBundlePageRef page);
     75WK_EXPORT void WKBundlePageCopyRenderLayerTree(WKBundlePageRef page);
    7476
    7577// FIXME: This function is only still here to keep open source Mac builds building. It doesn't do anything anymore!
Note: See TracChangeset for help on using the changeset viewer.