Bug 136494

Summary: [iOS] Make iOS build when ENABLE_TOUCH_EVENT and ENABLE_IOS_TOUCH_EVENTS disabled
Product: WebKit Reporter: Daniel Bates <dbates>
Component: Tools / TestsAssignee: Daniel Bates <dbates>
Status: RESOLVED FIXED    
Severity: Normal CC: aestes, cmarcelo, commit-queue, ddkilzer, esprehn+autocc, glenn, jamesr, kondapallykalyan, luiz, simon.fraser, tonikitoo
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: iPhone / iPad   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch aestes: review+

Daniel Bates
Reported 2014-09-03 12:59:37 PDT
Make iOS WebKit build when ENABLE_TOUCH_EVENT and ENABLE_IOS_TOUCH_EVENTS are disabled.
Attachments
Patch (14.17 KB, patch)
2014-09-03 13:06 PDT, Daniel Bates 		no flags
DetailsFormatted DiffDiff
Patch (14.44 KB, patch)
2014-09-03 13:14 PDT, Daniel Bates 		aestes: review+
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Daniel Bates
Comment 1 2014-09-03 13:06:29 PDT
Created attachment 237573 [details] Patch
Daniel Bates
Comment 2 2014-09-03 13:14:34 PDT
Created attachment 237576 [details] Patch Export symbol EventHandler::handleTouchEvent when building with ENABLE(TOUCH_EVENTS).
Andy Estes
Comment 3 2014-09-03 18:04:54 PDT
Comment on attachment 237576 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237576&action=review > Source/WebCore/bindings/js/JSDocumentCustom.cpp:38 > +#if ENABLE(TOUCH_EVENTS) > #include "JSTouch.h" > #include "JSTouchList.h" > +#endif We usually separate the conditional includes from the unconditional ones. > Source/WebCore/platform/ios/ScrollAnimatorIOS.mm:33 > +#if ENABLE(TOUCH_EVENTS) > #include "PlatformTouchEventIOS.h" > +#endif Ditto. > Source/WebCore/rendering/RenderLayer.cpp:183 > +#endif > +#if ENABLE(IOS_TOUCH_EVENTS) > , m_registeredAsTouchEventListenerForScrolling(false) > +#endif > +#if PLATFORM(IOS) I would just nest the ENABLE(IOS_TOUCH_EVENTS) inside the PLATFORM(IOS) block, which would make this simpler. > Source/WebKit/mac/MigrateHeaders.make:239 > +ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(FEATURE_DEFINES)), ENABLE_IOS_TOUCH_EVENTS) > +all : \ > + $(PRIVATE_HEADERS_DIR)/WebEventRegion.h > +endif > + You should remove line 219.
Daniel Bates
Comment 4 2014-09-04 08:39:40 PDT
Comment on attachment 237576 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237576&action=review >> Source/WebCore/bindings/js/JSDocumentCustom.cpp:38 >> +#endif > > We usually separate the conditional includes from the unconditional ones. Will move conditional includes for ENABLE(TOUCH_EVENTS) and ENABLE(WEBGL) after the list of unconditional includes. >> Source/WebCore/platform/ios/ScrollAnimatorIOS.mm:33 >> +#endif > > Ditto. Will move this conditional include after the list of unconditional includes. >> Source/WebCore/rendering/RenderLayer.cpp:183 >> +#if PLATFORM(IOS) > > I would just nest the ENABLE(IOS_TOUCH_EVENTS) inside the PLATFORM(IOS) block, which would make this simpler. Will nest ENABLE(IOS_TOUCH_EVENTS) inside the PLATFORM(IOS) block here and in file RenderLayer.h. >> Source/WebKit/mac/MigrateHeaders.make:239 >> + > > You should remove line 219. Oops! Will remove.
Daniel Bates
Comment 5 2014-09-04 08:43:13 PDT
Committed r173258: <http://trac.webkit.org/changeset/173258>
Daniel Bates
Comment 6 2014-09-04 17:10:04 PDT
Committed iOS build fix in <http://trac.webkit.org/changeset/173292>.
Note You need to log in before you can comment on or make changes to this bug.