View previous topic :: View next topic |
Author |
Message |
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Mon Nov 18, 2013 9:03 pm Post subject: |
|
|
eyoung100 wrote: | Can you post the dif from when you try to integrate the patch See GNOME Bug 692666. Comment that the patch you've retrofitted is no longer working. |
I did take a stab at it; see the unstable branch of the github link I posted. It applies but does not compile. _________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
Posted: Mon Nov 18, 2013 9:09 pm Post subject: |
|
|
graysky wrote: | eyoung100 wrote: | Can you post the dif from when you try to integrate the patch See GNOME Bug 692666. Comment that the patch you've retrofitted is no longer working. |
I did take a stab at it; see the unstable branch of the github link I posted. It applies but does not compile. |
Remove lines 59 - 89 _________________ 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 |
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Mon Nov 18, 2013 10:15 pm Post subject: |
|
|
eyoung100 wrote: | Remove lines 59 - 89 |
OK... git commit. Thanks for the time and attention. I am attempting to build now... will post back in 20 min or so. _________________ Zsh and other configs
Last edited by graysky on Mon Nov 18, 2013 11:36 pm; edited 1 time in total |
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Mon Nov 18, 2013 10:37 pm Post subject: |
|
|
Ack... build aborted.
Code: | ...
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_base.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_guest.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/synthetic_gesture_calculator.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/synthetic_gesture_controller.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/socket_stream_dispatcher_host.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/socket_stream_host.o
content/browser/renderer_host/render_widget_host_view_gtk.cc: In static member function 'static float content::RenderWidgetHostViewGtkWidget::GetScrollPixelsPerTick()':
content/browser/renderer_host/render_widget_host_view_gtk.cc:459:23: error: 'kDefaultScrollPixelsPerTick' was not declared in this scope
scroll_pixels = kDefaultScrollPixelsPerTick;
^
CXX(target) out/Release/obj.target/content_browser/content/browser/resolve_proxy_msg_helper.o
content/content_browser.target.mk:824: recipe for target 'out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o' failed
make: *** [out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o] Error 1
make: *** Waiting for unfinished jobs.... |
_________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Tue Nov 19, 2013 1:51 am Post subject: |
|
|
OK... git commit 2.
Aborted again:
Code: |
...
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_base.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_guest.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/synthetic_gesture_calculator.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/synthetic_gesture_controller.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/socket_stream_dispatcher_host.o
content/browser/renderer_host/render_widget_host_view_gtk.cc:477:16: error: 'static float content::RenderWidgetHostViewGtkWidget::GetScrollPixelsPerTick()' cannot be overloaded
static float GetScrollPixelsPerTick() {
^
content/browser/renderer_host/render_widget_host_view_gtk.cc:455:16: error: with 'static float content::RenderWidgetHostViewGtkWidget::GetScrollPixelsPerTick()'
static float GetScrollPixelsPerTick() {
^
content/browser/renderer_host/render_widget_host_view_gtk.cc: In static member function 'static float content::RenderWidgetHostViewGtkWidget::GetScrollPixelsPerTick()':
content/browser/renderer_host/render_widget_host_view_gtk.cc:459:23: error: 'kDefaultScrollPixelsPerTick' was not declared in this scope
scroll_pixels = kDefaultScrollPixelsPerTick;
^
content/browser/renderer_host/render_widget_host_view_gtk.cc: In static member function 'static float content::RenderWidgetHostViewGtkWidget::GetScrollPixelsPerTick()':
content/browser/renderer_host/render_widget_host_view_gtk.cc:481:23: error: 'kDefaultScrollPixelsPerTick' was not declared in this scope
scroll_pixels = kDefaultScrollPixelsPerTick;
^
content/content_browser.target.mk:824: recipe for target 'out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o' failed
make: *** [out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o] Error 1
make: *** Waiting for unfinished jobs....
|
_________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Tue Nov 19, 2013 3:42 pm Post subject: |
|
|
OK... git commit 3.
I read though the link you posted, but most of it was lost on me having no C programming experience; I barely qualify as a shell scripter for that matter Any suggestions or pull requests are welcomed.
Aborted again:
Code: |
...
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_base.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_guest.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/synthetic_gesture_calculator.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/synthetic_gesture_controller.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/socket_stream_dispatcher_host.o
CXX(target) out/Release/obj.target/content_browser/content/browser/renderer_host/socket_stream_host.o
CXX(target) out/Release/obj.target/content_browser/content/browser/resolve_proxy_msg_helper.o
content/browser/renderer_host/render_widget_host_view_gtk.cc: In static member function 'static float content::RenderWidgetHostViewGtkWidget::GetScrollPixelsPerTick()':
content/browser/renderer_host/render_widget_host_view_gtk.cc:459:23: error: 'kDefaultScrollPixelsPerTick' was not declared in this scope
scroll_pixels = kDefaultScrollPixelsPerTick;
^
content/content_browser.target.mk:824: recipe for target 'out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o' failed
make: *** [out/Release/obj.target/content_browser/content/browser/renderer_host/render_widget_host_view_gtk.o] Error 1
make: *** Waiting for unfinished jobs....
|
_________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Tue Nov 19, 2013 4:01 pm Post subject: |
|
|
eyoung100 wrote: | Do you have OO experience in any language |
None. To date, retrofitting the patch was as simple as diffing the original files. It more more difficult when the code moved into other files, but grepping for it is how I assembled the various patches. With v31, I hit the roadblock in my first post. _________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
Posted: Tue Nov 19, 2013 4:57 pm Post subject: |
|
|
The reason it's gone now is because upstream removed the function definition for the function you patch back in from the class header file. You need to put it back in the header file... _________________ 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 |
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Tue Nov 19, 2013 6:52 pm Post subject: |
|
|
eyoung100 wrote: | The reason it's gone now is because upstream removed the function definition for the function you patch back in from the class header file. You need to put it back in the header file... |
Well, if the function is "kDefaultScrollPixelsPerTick", the only file from the v30 source that contains that text (from grepping for it) is: content/browser/renderer_host/render_widget_host_view_gtk.cc.
Code: | % pagrep kDefaultScrollPixelsPerTick
./content/browser/renderer_host/render_widget_host_view_gtk.cc:75:const float kDefaultScrollPixelsPerTick = 160.0f / 3.0f;
./content/browser/renderer_host/render_widget_host_view_gtk.cc:503: return num_clicks * kDefaultScrollPixelsPerTick;
./content/browser/renderer_host/render_widget_host_view_gtk.cc:527: web_event.deltaY = kDefaultScrollPixelsPerTick;
./content/browser/renderer_host/render_widget_host_view_gtk.cc:529: web_event.deltaY = -kDefaultScrollPixelsPerTick;
./content/browser/renderer_host/render_widget_host_view_gtk.cc:533: web_event.deltaX = kDefaultScrollPixelsPerTick;
./content/browser/renderer_host/render_widget_host_view_gtk.cc:535: web_event.deltaX = -kDefaultScrollPixelsPerTick |
When I look at what I believe to be the header file -- the one that ends in .h -- if I diff the two version, here is what results, but I think this is beyond my abilities to fix.
Code: | % diff -u chromium-30.0.1599.114/content/browser/renderer_host/render_widget_host_view_gtk.h chromium-31.0.1650.57/content/browser/renderer_host/render_widget_host_view_gtk.h
--- chromium-30.0.1599.114/content/browser/renderer_host/render_widget_host_view_gtk.h 2013-10-24 03:11:27.000000000 -0400
+++ chromium-31.0.1650.57/content/browser/renderer_host/render_widget_host_view_gtk.h 2013-11-15 19:17:37.000000000 -0500
@@ -17,8 +17,6 @@
#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/base/gtk/gtk_signal.h"
#include "ui/base/gtk/gtk_signal_registrar.h"
#include "ui/base/gtk/owned_widget_gtk.h"
@@ -83,8 +81,8 @@
virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
virtual void SetIsLoading(bool is_loading) OVERRIDE;
virtual void TextInputTypeChanged(ui::TextInputType type,
- bool can_compose_inline,
- ui::TextInputMode input_mode) OVERRIDE;
+ ui::TextInputMode input_mode,
+ bool can_compose_inline) OVERRIDE;
virtual void ImeCancelComposition() OVERRIDE;
virtual void DidUpdateBackingStore(
const gfx::Rect& scroll_rect,
@@ -98,7 +96,7 @@
virtual void SetTooltipText(const string16& tooltip_text) OVERRIDE;
virtual void SelectionChanged(const string16& text,
size_t offset,
- const ui::Range& range) OVERRIDE;
+ const gfx::Range& range) OVERRIDE;
virtual void SelectionBoundsChanged(
const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
virtual void ScrollOffsetChanged() OVERRIDE;
@@ -131,8 +129,8 @@
virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
virtual bool LockMouse() OVERRIDE;
virtual void UnlockMouse() OVERRIDE;
- virtual void OnAccessibilityNotifications(
- const std::vector<AccessibilityHostMsg_NotificationParams>& params)
+ virtual void OnAccessibilityEvents(
+ const std::vector<AccessibilityHostMsg_EventParams>& params)
OVERRIDE;
// ActiveWindowWatcherXObserver implementation. |
_________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Tue Nov 19, 2013 7:45 pm Post subject: |
|
|
eyoung100 wrote: | Thats the file but don't diff but merge 31 into 32 |
Sorry, I don't understand merge in this context. What do you mean? _________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
Posted: Tue Nov 19, 2013 8:01 pm Post subject: |
|
|
A diff adds and subtracts from a file. If snippet a exists in file a, its looked for in file b, if it exists it's subtracted out, if it doesnt its added in file b. You need to merge only compare file a and file b and add file a and b together _________________ 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
Last edited by eyoung100 on Tue Nov 19, 2013 8:11 pm; edited 1 time in total |
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Tue Nov 19, 2013 8:08 pm Post subject: |
|
|
I'm not sure how to accomplish this... basically you want me to add the two files together, not accounting for the differences? Wouldn't that double some lines?
v30 file: http://pastebin.com/FT3x2gD3
v31 file: http://pastebin.com/2v0JBS3S
Can you create the merged file so I can see what it should look like? _________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
Posted: Tue Nov 19, 2013 8:17 pm Post subject: |
|
|
Start with a blank file
If a line exists in File A, copy it into Empty. If the same line exists in File B, leave it out
If a line exists in File B that's not in A, copy it to Empty.
or Copy A and B to Empty, doubling the lines, and when the file is finished remove the doubles, leaving a single. _________________ 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 |
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Tue Nov 19, 2013 8:25 pm Post subject: |
|
|
eyoung100 wrote: | Start with a blank file
Copy A and B to Empty, doubling the lines, and when the file is finished remove the doubles, leaving a single. |
I'm not sure how to do this short of inspecting all 340+ lines. Catting them together will satisfy the first part, but I have no idea how to remove the dups when the resulting files isn't sorted. _________________ Zsh and other configs |
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
Posted: Tue Nov 19, 2013 9:21 pm Post subject: |
|
|
There is no shortcut, open each file and the empty file in your preferred text editor, copy each line one at a time from each file in the order they are written in order to create a file like so:
Code: | Line 1 from A
Line 1 from B
Line 2 From A
Line 2 From B |
for all 340 lines. Save the file once they are all pasted in order, then reopen it. Now if Line X from File A = Line X From File B, remove one of the lines. This ensures no doubles will exist when a Line Exists in A that's not in B and a line that Exists in B that's not in A. When you Finish the files will be merged. We have to do it this way since you have no idea how to write a Header File in C++ _________________ 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
Last edited by eyoung100 on Mon Nov 25, 2013 3:25 pm; edited 1 time in total |
|
Back to top |
|
|
graysky Tux's lil' helper
Joined: 25 Nov 2006 Posts: 118 Location: above the flames and the ashes
|
Posted: Wed Nov 20, 2013 7:53 pm Post subject: |
|
|
EDIT: I was mistaken. _________________ Zsh and other configs |
|
Back to top |
|
|
dolohow Tux's lil' helper
Joined: 17 Jan 2010 Posts: 98 Location: Poland
|
|
Back to top |
|
|
eyoung100 Veteran
Joined: 23 Jan 2004 Posts: 1428
|
Posted: Mon Nov 25, 2013 3:33 pm Post subject: |
|
|
Ill advised: If something was added in v32 that isn't in v31 we need v32's version. A line by line copy will achieve the desired result. The difference here is the header file info was taken out for this patch because the patch the OP is maintaining was "cleaned out" because upstream isn't using the option anymore. _________________ 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 |
|
Back to top |
|
|
dolohow Tux's lil' helper
Joined: 17 Jan 2010 Posts: 98 Location: Poland
|
Posted: Mon Nov 25, 2013 3:53 pm Post subject: |
|
|
eyoung100 wrote: | Ill advised: If something was added in v32 that isn't in v31 we need v32's version. |
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. |
|
Back to top |
|
|
|