tree bf5878468329482619d1de6cdf557cb53378d416
parent be1919eaffb0acfef40e1e7346dbdf0ce9c965fb
author wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1593624207 +0000
committer wenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1593624207 +0000

Fix the WebKit build after <rdar://problem/64288191>
https://bugs.webkit.org/show_bug.cgi?id=213832

Reviewed by Tim Horton.

Source/WebCore:

Upcoming changes to <UIKit/UIWebDocumentView.h> will cause the WebKit build to break, due to conflicting
declarations of WKObject in both WebCore (WAK) code and the WebKit API. Avoid this by renaming the WAK version
to WAKObject, rather than WKObject.

Additionally, fix some minor style issues along the way.

* platform/ios/wak/WKTypes.h:
* platform/ios/wak/WKUtilities.c:
(WKRetain):
(WKRelease):
(_WAKObjectDealloc):
(WKGetClassInfo):
(_WKObjectDealloc): Deleted.
* platform/ios/wak/WKUtilities.h:
* platform/ios/wak/WKView.h:
* platform/ios/wak/WKView.mm:
(_WKViewDealloc):

Tools:

Additionally, fix a naming conflict that will result from `WebArchivePboardType` being declared in both
`<WebKitLegacy/WebArchive.h>` and DumpRenderTree, by making the latter a local variable instead.

* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::imageCountInGeneralPasteboard const):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263814 268f45cc-cd09-0410-ab3c-d52691b4dbfc