Gentoo Forums :: View topic - Assistance retrofitting a patch into chromium [SOLVED]

Assistance retrofitting a patch into chromium [SOLVED]

View unanswered posts
View posts from last 24 hours

Goto page Previous 1, 2

Gentoo Forums Forum Index

Portage & Programming

View previous topic :: View next topic

Author

Message

eyoung100
Veteran
Veteran

Joined: 23 Jan 2004
Posts: 1428

Posted: Mon Nov 25, 2013 4:30 pm Post subject:

dolohow wrote:

You mean v30 and v31? Because v32 is not stable yet.
I did a merge from this two files provided by OP and that's it.

Oops, sorry yes v31
_________________
The Birth and Growth of Science is the Death and Atrophy of Art -- Unknown
Registerd Linux User #363735
Adopt a Post | Strip Comments| Emerge Wrapper

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Mon Nov 25, 2013 8:32 pm Post subject:

dolohow wrote:

Try with this header file for v31:
http://pastebin.com/nyhDS1j1

Trying now, thanks... how did you preform the merge? Manually?
_________________
Zsh and other configs

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Mon Nov 25, 2013 9:04 pm Post subject:

With the patch on github (latest commit) + the header file posted by dolohow, the compile ended in this error:

Code:

...
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/gtk_key_bindings_handler.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/gtk_plugin_container.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/gtk_plugin_container_manager.o
In file included from content/browser/renderer_host/gtk_im_context_wrapper.cc:17:0:./content/browser/renderer_host/render_widget_host_view_gtk.h:20:50: fatal error: ui/base/animation/animation_delegate.h: No such file or directory
#include "ui/base/animation/animation_delegate.h"
^
compilation terminated.
content/content_browser.target.mk:824: recipe for target 'out/Release/obj.target/content_browser/content/browser/renderer_host/gtk_im_context_wrapper.o' failed
make: *** [out/Release/obj.target/content_browser/content/browser/renderer_host/gtk_im_context_wrapper.o] Error 1
make: *** Waiting for unfinished jobs....

Looks like another missing header... copied over the one from v30 and trying again. Prognosis doesn't look good.

EDIT: actually, the entire ui/base/animation directory is missing from v31...
_________________
Zsh and other configs

dolohow
Tux's lil' helper

Joined: 17 Jan 2010
Posts: 98
Location: Poland

Posted: Mon Nov 25, 2013 9:59 pm Post subject:

Yea, just copy the header ui/base/animation/animation_delegate.h from v30 to v31.

Quote:

EDIT: actually, the entire ui/base/animation directory is missing from v31...

Maybe devs moved it somewhere else. If not, make a copy

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Mon Nov 25, 2013 10:02 pm Post subject:

Code:

% find . -name 'animation_del*'
./ui/gfx/animation/animation_delegate.h
./cc/animation/animation_delegate.h

Seems like the merged file you created will need to be edited....
_________________
Zsh and other configs

dolohow
Tux's lil' helper

Joined: 17 Jan 2010
Posts: 98
Location: Poland

Posted: Mon Nov 25, 2013 10:07 pm Post subject:

Code:

--- v31.txt 2013-11-25 11:13:18.490483672 +0100
+++ v31a.txt 2013-11-25 23:06:52.391767596 +0100
@@ -17,8 +17,8 @@
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/common/content_export.h"
#include "ipc/ipc_sender.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/gtk/gtk_signal_registrar.h"
#include "ui/base/gtk/owned_widget_gtk.h"

Try this one, I'm not sure wheter "#include "ui/gfx/animation/slide_animation.h" also changed

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Mon Nov 25, 2013 10:25 pm Post subject:

Yes, thanks. I did it in vim already as a test... compiling now.

Code:

:%s/ui\/base/ui\/gfx/gc

_________________
Zsh and other configs

Last edited by graysky on Mon Nov 25, 2013 10:46 pm; edited 2 times in total

dolohow
Tux's lil' helper

Joined: 17 Jan 2010
Posts: 98
Location: Poland

Posted: Mon Nov 25, 2013 10:30 pm Post subject:

OK, I think you shouldn't change all occurance of "base" and why you change "ui" to "us"?

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Mon Nov 25, 2013 10:46 pm Post subject:

dolohow wrote:

OK, I think you shouldn't change all occurance of "base" and why you change "ui" to "us"?

That was a typo in the post... I actually had a /gc and only hit the first two.
_________________
Zsh and other configs

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Mon Nov 25, 2013 11:20 pm Post subject:

Still no go:

Code:

...
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/input/buffered_input_router.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/input/gesture_event_filter.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/input/immediate_input_router.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/input/input_queue.o
In file included from content/browser/renderer_host/gtk_im_context_wrapper.cc:17:0:
./content/browser/renderer_host/render_widget_host_view_gtk.h:101:39: error: 'Range' in namespace 'ui' does not name a type
const ui::Range& range,
^
./content/browser/renderer_host/render_widget_host_view_gtk.h:101:50: error: ISO C++ forbids declaration of 'range' with no type [-fpermissive]
const ui::Range& range,
^
./content/browser/renderer_host/render_widget_host_view_gtk.h:102:51: error: conflicting declaration 'const gfx::Range& range'
const gfx::Range& range) OVERRIDE;
^
./content/browser/renderer_host/render_widget_host_view_gtk.h:101:50: error: 'range' has a previous declaration as 'const int& range'
const ui::Range& range,
^
./content/browser/renderer_host/render_widget_host_view_gtk.h:136:25: error: 'AccessibilityHostMsg_NotificationParams' was not declared in this scope
const std::vector<AccessibilityHostMsg_NotificationParams>& params)
^
./content/browser/renderer_host/render_widget_host_view_gtk.h:136:64: error: template argument 1 is invalid
const std::vector<AccessibilityHostMsg_NotificationParams>& params)
^
./content/browser/renderer_host/render_widget_host_view_gtk.h:136:64: error: template argument 2 is invalid
content/content_browser.target.mk:824: recipe for target 'out/Release/obj.target/content_browser/content/browser/renderer_host/gtk_im_context_wrapper.o' failed
make: *** [out/Release/obj.target/content_browser/content/browser/renderer_host/gtk_im_context_wrapper.o] Error 1
make: *** Waiting for unfinished jobs....

Again, I used the patch from my unstable branch and modified your merged file with the two changes you posted.
_________________
Zsh and other configs

dolohow
Tux's lil' helper

Joined: 17 Jan 2010
Posts: 98
Location: Poland

Posted: Mon Nov 25, 2013 11:27 pm Post subject:

Code:

--- v31o.txt 2013-11-25 23:19:43.069804894 +0100
+++ v31a.txt 2013-11-26 00:26:11.409997919 +0100
@@ -17,6 +17,8 @@
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/common/content_export.h"
#include "ipc/ipc_sender.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/gtk/gtk_signal_registrar.h"
#include "ui/base/gtk/owned_widget_gtk.h"
@@ -96,6 +98,7 @@
virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;
virtual void SelectionChanged(const string16& text,
size_t offset,
+ //const ui::Range& range,
const gfx::Range& range) OVERRIDE;
virtual void SelectionBoundsChanged(
const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
@@ -129,6 +132,9 @@
virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
virtual bool LockMouse() OVERRIDE;
virtual void UnlockMouse() OVERRIDE;
+ virtual void OnAccessibilityNotifications(
+ const std::vector<AccessibilityHostMsg_NotificationParams>& params)
+ OVERRIDE;
virtual void OnAccessibilityEvents(
const std::vector<AccessibilityHostMsg_EventParams>& params)
OVERRIDE;

Apply on clean v31

Yea, I've made declaration of the same variable twice

EDIT:
It won't work I see there is another mistake in code. Looks like not easy task. Gotta find some time and dig into code.

EDIT:
In previous error you have undeclared variable you can fix this with:

Code:

const float kDefaultScrollPixelsPerTick = 160.0f / 3.0f;

I'll find some time in friday and I'll try to create the complete patch

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Tue Nov 26, 2013 7:04 pm Post subject:

dolohow wrote:

I'll find some time in friday and I'll try to create the complete patch

Thanks but I think maintaining this patchset long-term would be nightmarish since I have no OO experience and would need to rely on someone else to do the porting.
_________________
Zsh and other configs

dolohow
Tux's lil' helper

Joined: 17 Jan 2010
Posts: 98
Location: Poland

Posted: Tue Nov 26, 2013 10:41 pm Post subject:

http://pastebin.kde.org/py3asemuu OK, try this one on the clean source

graysky
Tux's lil' helper

Joined: 25 Nov 2006
Posts: 118
Location: above the flames and the ashes

Posted: Wed Nov 27, 2013 11:44 pm Post subject:

OK, dolohow solved it. Code on my github repo linked in previous posts. Thanks dolohow! _________________ Zsh and other configs

eyoung100
Veteran
Veteran

Joined: 23 Jan 2004
Posts: 1428

Posted: Sun Dec 01, 2013 5:11 am Post subject:

graysky wrote:

OK, dolohow solved it. Code on my github repo linked in previous posts. Thanks dolohow!

In order to maintain compatibility with future versions, you will need to merge dhows header files with all future header files from upstream. I suggest you do some research on what a header is...
_________________
The Birth and Growth of Science is the Death and Atrophy of Art -- Unknown
Registerd Linux User #363735
Adopt a Post | Strip Comments| Emerge Wrapper

dolohow
Tux's lil' helper

Joined: 17 Jan 2010
Posts: 98
Location: Poland

Posted: Sun Dec 01, 2013 4:48 pm Post subject:

Well there was no need to modify the header. First take a look on source code and then post.

Display posts from previous:

	Gentoo Forums Forum Index Portage & Programming	All times are GMT Goto page Previous 1, 2
Page 2 of 2

Jump to:

You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum

Copyright 2001-2024 Gentoo Foundation, Inc. Designed by Kyle Manna © 2003; Style derived from original subSilver theme. | Hosting by Gossamer Threads Inc. © | Powered by phpBB 2.0.23-gentoo-p11 © 2001, 2002 phpBB Group
Privacy Policy