Bug 43767 – [EFL]REGRESSION(65021) need to fix build break

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit EFL

[Ryuan Choi]

we need to fix build break

[Ryuan Choi]

Created attachment 63973 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 63973 [details]
Patch

Rejecting patch 63973 from commit-queue.

Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Gavin Barraclough', u'--force']" exit_code: 1
Parsed 3 diffs from patch file(s).
patching file WebKit/efl/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebKit/efl/ewk/ewk_frame.cpp
Hunk #1 FAILED at 1946.
1 out of 1 hunk FAILED -- saving rejects to file WebKit/efl/ewk/ewk_frame.cpp.rej
patching file WebKit/efl/ewk/ewk_view.cpp
Hunk #2 succeeded at 1350 with fuzz 2.
Hunk #3 FAILED at 2528.
1 out of 3 hunks FAILED -- saving rejects to file WebKit/efl/ewk/ewk_view.cpp.rej

Full output: http://queues.webkit.org/results/3714011

[Ryuan Choi]

Created attachment 63977 [details]
Patch

[Ryuan Choi]

Created attachment 63978 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 63978 [details]
Patch

WebKit/efl/ewk/ewk_frame.cpp:1949
 +  WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
We generally use WebCore::String instead of WTF::String directly.  I guess it doesn't matter much.

[Ryuan Choi]

(In reply to comment #5)
> (From update of attachment 63978 [details])
> WebKit/efl/ewk/ewk_frame.cpp:1949
>  +  WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
> We generally use WebCore::String instead of WTF::String directly.  I guess it doesn't matter much.

I believe r65021 changes WebCore::String.

below is a part of r65021

Index: WebKit/efl/ewk/ewk_settings.cpp
===================================================================
--- WebKit/efl/ewk/ewk_settings.cpp	(revision 65020)
+++ WebKit/efl/ewk/ewk_settings.cpp	(working copy)
@@ -67,7 +67,7 @@ uint64_t ewk_settings_web_database_defau
 void ewk_settings_web_database_path_set(const char *path)
 {
 #if ENABLE(DATABASE)
-    WebCore::String corePath = WebCore::String::fromUTF8(path);
+    WTF::String corePath = WTF::String::fromUTF8(path);
     WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(corePath);
 #endif
 }

[WebKit Commit Bot]

Comment on attachment 63978 [details]
Patch

Rejecting patch 63978 from commit-queue.

Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--force']" exit_code: 1
Parsed 3 diffs from patch file(s).
patching file WebKit/efl/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebKit/efl/ewk/ewk_frame.cpp
Hunk #1 FAILED at 1946.
1 out of 1 hunk FAILED -- saving rejects to file WebKit/efl/ewk/ewk_frame.cpp.rej
patching file WebKit/efl/ewk/ewk_view.cpp
Hunk #2 succeeded at 1350 with fuzz 2.
Hunk #3 FAILED at 2528.
1 out of 3 hunks FAILED -- saving rejects to file WebKit/efl/ewk/ewk_view.cpp.rej

Full output: http://queues.webkit.org/results/3771023

[Gyuyoung Kim]

Hello Ryuan,

Please use "check-webkit-style" script before uploading your patch.
The script is located in WebKitTools/Scripts.

You should test your patch using the script before uploading your patch.

[Eric Seidel (no email)]

webkit-patch upload also runs check-webkit-style for you when uploading a patch. :)

[Ryuan Choi]

(In reply to comment #8)
> Hello Ryuan,
> 
> Please use "check-webkit-style" script before uploading your patch.
> The script is located in WebKitTools/Scripts.
> 
> You should test your patch using the script before uploading your patch.

I use webkit-patch which include check-webkit-style.
so I checked that script.
I don't know why It was failed :(

[Ryuan Choi]

(In reply to comment #9)
> webkit-patch upload also runs check-webkit-style for you when uploading a patch. :)

hello eric, what do I need to know for this patch to land?
I can't know why it was failed.
It was no problem in my environment although getting latest.

[Eric Seidel (no email)]

It failed because it failed to apply.  I think you need to upload a new patch which applies to top of tree.

[Ryuan Choi]

(In reply to comment #12)
> It failed because it failed to apply.  I think you need to upload a new patch which applies to top of tree.

Ok, I'll create patch from scratch after getting latest.

[Ryuan Choi]

Created attachment 64067 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 64067 [details]
Patch

Clearing flags on attachment: 64067

Committed r65122: <http://trac.webkit.org/changeset/65122>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.