Bug 125119 - Merging some more iOS WebKit2 stuff
Summary: Merging some more iOS WebKit2 stuff
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit2 (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Enrica Casucci
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-02 16:23 PST by Enrica Casucci
Modified: 2013-12-02 17:10 PST (History)
1 user (show)

See Also:


Attachments
patch (16.42 KB, patch)
2013-12-02 16:25 PST, Enrica Casucci
thorton: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Enrica Casucci 2013-12-02 16:23:04 PST
Something was missed or moved incorrectly during the first upstream effort.
Comment 1 Enrica Casucci 2013-12-02 16:25:48 PST
Created attachment 218232 [details]
patch
Comment 2 WebKit Commit Bot 2013-12-02 16:28:29 PST
Attachment 218232 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/Shared/EditorState.h', u'Source/WebKit2/Shared/NativeWebKeyboardEvent.h', u'Source/WebKit2/Shared/NativeWebMouseEvent.h', u'Source/WebKit2/Shared/NativeWebTouchEvent.h', u'Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h', u'Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm', u'Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm', u'Source/WebKit2/UIProcess/PageClient.h', u'Source/WebKit2/UIProcess/ios/TiledCoreAnimationDrawingAreaProxyIOS.mm', u'Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm', u'Source/WebKit2/UIProcess/mac/SecItemShimProxy.messages.in', u'Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp', u'Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm', u'Source/WebKit2/WebProcess/WebPage/WebPage.cpp', u'Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h', u'Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm']" exit_code: 1
ERROR: Source/WebKit2/UIProcess/PageClient.h:236:  The parameter name "color" adds no information, so it should be removed.  [readability/parameter_name] [5]
ERROR: Source/WebKit2/UIProcess/PageClient.h:238:  The parameter name "viewportArguments" adds no information, so it should be removed.  [readability/parameter_name] [5]
Total errors found: 2 in 16 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 3 Tim Horton 2013-12-02 16:29:55 PST
Comment on attachment 218232 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=218232&action=review

> Source/WebKit2/Shared/NativeWebTouchEvent.h:33
> +#ifdef __OBJC__

should this use OBJC_CLASS instead of all this madness?

it should be separated from the #if PLATFORM(EFL) section below.

> Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm:30
> +#import <QuartzCore/CALayer.h>

I think we usually include the whole framework, no? QuartzCore/QuartzCore.h?
Comment 4 Enrica Casucci 2013-12-02 16:50:46 PST
(In reply to comment #3)
> (From update of attachment 218232 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=218232&action=review
> 
> > Source/WebKit2/Shared/NativeWebTouchEvent.h:33
> > +#ifdef __OBJC__
> 
> should this use OBJC_CLASS instead of all this madness?
> 
> it should be separated from the #if PLATFORM(EFL) section below.

Done.
> 
> > Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm:30
> > +#import <QuartzCore/CALayer.h>
> 
> I think we usually include the whole framework, no? QuartzCore/QuartzCore.h?

Not sure. I'll leave it as is.
Thanks for the review.
Comment 5 Enrica Casucci 2013-12-02 17:10:19 PST
Committed revision 159985.