Commit Graph

47 Commits (a174a4ff3db22a40fe0259dab260321b20108fb7)

Author SHA1 Message Date
Tofu Linden 7498504c92 EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux
Maybe also: EXT-4495 flash content crashes Webkit on Linux
2010-03-04 17:22:22 +00:00
Tofu Linden 496e6e1948 Add #if'd code that can deal with the newer QPixmap-based LLQtWebkits.
Disabled for now.
2010-03-04 14:30:57 +00:00
Tofu Linden 15513ff6d7 trivial cleanup. 2010-02-22 16:20:57 +00:00
Tofu Linden df43c0e18b Wire the linux volume catcher into the webkit plugin. 2010-02-22 14:08:15 +00:00
Tofu Linden 6d08400145 EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
This change lets Linux pass keys through to Flash.
2010-02-09 18:19:35 +00:00
Tofu Linden c920a71240 merge 2010-02-09 15:08:10 +00:00
Tofu Linden b0791c3001 Backed out changeset 0664cf2c9edf 2010-02-09 15:07:45 +00:00
Tofu Linden c66e9199a5 Backed out changeset b1c241040751 2010-02-09 14:52:13 +00:00
Tofu Linden 5abb6dece7 HACK HACK HACK to unbreak linux build while I wait for access to the new llqtwebkit code.
only affects linux.  may harm webkit functionality temporarily.  to be backed-out.
2010-02-09 14:00:33 +00:00
Monroe Linden 3699be5c45 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-05 18:38:16 -08:00
Monroe Linden 8b0ae67e73 Changed LLWindowWin32::getNativeKeyData() to use platform-specific names in the key data.
Changed MediaPluginWebkit::deserializeKeyboardData() to use platform-specific names when extracting the key data.  Also fixed a mac-specific issue where the arguments were reversed, which was causing flash apps to get bad keycode data.

Just pass 0 for the "native modifiers" param on windows, since it doesn't seem to actually have a native notion of a "modifier keys mask".  The Qt (non-native) modifiers should be good enough.
2010-02-05 18:23:16 -08:00
Tofu Linden f9f6f1958d EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
This should be a lot better now.  But still not good overall.  Performance is now just bad instead of intolerable.
2010-02-05 09:01:58 +00:00
Callum Prentice 259fa5fd0b Merge with tip 2010-02-04 17:03:41 -08:00
Callum Prentice 80139d95ad added code to grab raw key codes from Win32 WPARAM and LPARAM and send to plugin
factored out keyboard message deserialization for media_plugin_webkit
new version of llqtwebkit with Girish's changes to keyboard and cursor handling code
2010-02-04 16:30:21 -08:00
Tofu Linden c0422e1c6c CID-284
Checker: UNINIT_CTOR
Function: MediaPluginWebKit::MediaPluginWebKit(void (*)(const char *, void **), void *)
File: /indra/media_plugins/webkit/media_plugin_webkit.cpp
2010-02-03 19:06:06 +00:00
Monroe Linden a4aed31ad9 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-01-29 14:49:18 -08:00
Monroe Linden 572b8fc518 Changes to llqtwebkit keyboard event api.
Reference to new mac build of llqtwebkit (from revision 5e61bf24915f in https://hg.lindenlab.com/monroe/llqtwebkit-4.6).
2010-01-19 21:55:51 -08:00
Monroe Linden c3b8a84d3c Workaround for "Stop on Debugger()/DebugStr()" Xcode setting causing the webkit plugin to crash. 2010-01-19 14:31:27 -08:00
Monroe Linden fae9c8fe86 Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.
Added an LLSD argument to LLPluginClassMedia::keyEvent() and LLPluginClassMedia::textInput() which contains the native key data.
Made LLViewerMediaImpl retrieve the native key data and pass it to keyEvent and textInput.
Added a native_key_data parameter to the text_event and key_event messages.
Made the webkit plugin extract the native_key_data parameter and pass it to the internal keyEvent() and unicodeInput() functions.
Fixed LLMediaPluginTest to match function signature change to LLPluginClassMedia::keyEvent().
2010-01-18 17:58:12 -08:00
Lynx Linden 507ccd52a9 EXT-3624: Support "_blank" href target types.
Support href links in web views that have a target attribute set to
"_blank". This will open the link in the user's preferred browser
(internal or external, as defined in Prefs). This change relies on the
new llqtwebkit package that has just been pushed.

Also updated the hardcoded Qt version number in the About floater.
2010-01-14 11:57:03 +00:00
Monroe Linden 3b2697cb93 Fix for black/grey look at login screen and backspace going back in search/help windows. This should address EXT-4097.
Added a notion of "background color" to LLViewerMediaImpl and LLPluginClassMedia.
Added background color parameters to the size_change message.
Webkit plugin now sets the background color of the instance from the supplied background color, and navigates to a data: url with that background color instead of about:blank as its initial navigate.
Webkit plugin now no longer waits for the first onPageChanged event
LLViewerMediaImpl now clears the texture to the background color when initializing it.
Made LLMediaCtrl fill with its opaque background color when the media impl isn't set up yet.
Removed the initial data URL from the search and help floaters, since what it was doing is now handled internally by the new background color code.

Reviewed by callum and rick.
2010-01-11 17:54:05 -08:00
Monroe Linden f119a86461 Fix for EXT-3069 (Media Browser lets you click on Back button on first page).
Fix was to have the webkit plugin clear the llqtwebkit history on the first real navigateComplete event.
2010-01-05 15:23:52 -08:00
skolb d5b53eb483 Merge viewer 2 into media 2009-12-18 10:54:16 -08:00
Tofu Linden d8a574ce57 DEV-43898 Enable Flash-on-a-prim on Linux. Yowza! 2009-12-17 17:43:31 -08:00
Tofu Linden b7ddd2e4fe Fix a code comment now that we enable NSAPI plugins under Darwin. 2009-12-17 17:05:04 -08:00
Monroe Linden 0084d969ae Added setInitState() function to use as a logging point. 2009-12-16 18:06:23 -08:00
callum 6cb3d25942 Merge with tip 2009-12-16 13:10:03 -08:00
callum b7747a815f Merge with tip before push 2009-12-15 17:53:03 -08:00
callum f923f896bc client changes to work with new version of Qt (4.6) and to do some cleanup at plugin exit so that cookies more betterer than what they did before. 2009-12-15 17:50:16 -08:00
Monroe Linden bf9609294f Enable plugins in the Mac build of the webkit plugin. 2009-12-11 10:43:23 -08:00
Tofu Linden 05e0d9d24a Re-disable a very spewy debug spew in the webkit plugin. Mea culpa. 2009-12-09 14:36:45 -08:00
Tofu Linden 197de032e1 DEV-43948 viewer2 is writing session data into the 'read-only' installation tree (mostly media stuff)
propagate the parent app's OSUserAppDir (i.e. ~/.secondlife/) all the way down to plugins, if they need persistant user data/settings (like the webkit plugin needs a place to put its cache).
2009-12-09 12:57:10 -08:00
Monroe Linden 1db0d32133 Partial fix for EXT-2904/DEV-43584 (Space bar and Enter/Return key don't work as input for checkboxes or buttons on MoaP).
This change forces space characters to go through the keyEvent() path instead of the unicodeInput() path, which makes the space bar work for setting checkboxes.  I still need to figure out what's going on with the enter key.
2009-12-01 18:27:09 -08:00
bea@american.lindenlab.com 8e3276ebf9 doxygen: exclude licensing comments 2009-11-30 14:53:31 -08:00
Monroe Linden d19d581b48 Fix a logic error in the code to hide the initial about:blank navigate that caused DEV-42093 to recur. 2009-11-16 13:48:50 -08:00
Monroe Linden 5890c850f8 Prevent the about:blank url from the initial navigate from leaking out of the webkit plugin. This should fix DEV-42766. 2009-11-13 13:05:16 -08:00
callum a99493e8d0 Fix for - DEV-41731 (HTTP AUTH issues).
Reintroduces "white-flash" but this is less important than fix for now.
Also cleaned up a code typo.
2009-10-29 11:46:32 -07:00
Monroe Linden c114b6a7d9 Fix for DEV-41544 (focus issues when signing into google docs on MoaP).
Made the webkit plugin code post a tab key event into llqtwebkit on initial focus.  This seems to do the right thing in all cases I tested.
2009-10-27 17:49:13 -07:00
Monroe Linden 376deff7a3 Changes to match new version of llqtwebkit -- passing modifier keys through to most user events and using new scroll wheel event. 2009-10-23 14:28:21 -07:00
callum 318e4784d2 No Jira - added some new bookmarks to include Flash based sites
for testing purposes.
2009-10-22 18:09:38 -07:00
callum 4347096803 https://jira.lindenlab.com/jira/browse/DEV-40711
Implement name fetching capabilities for Webkit and Quicktime plugins
Adds support for new PluginAPI message (MEDIA_EVENT_NAME_CHANGED) that updates the "title" of the media. In WebKit plugin this is the contents of the <title> tag. In The QuickTime plugin it is the "display name" from the movie meta data
2009-10-15 11:26:52 -07:00
Mark Palange (Mani) 4d53e235c2 merge of latest viewer/viewer-20 2009-10-02 10:35:42 -07:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
Mark Palange (Mani) 65d8a5a11b Changed win32 generation of initial 'component_path' for webkit plugin.
DllMain() captures module handle.
Call to GetModuleFilePathA() gets the dll filepath, Filename is trimmed off.
2009-09-28 17:57:51 -07:00
Adam Moss 158946668a svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
Monroe Williams 558897b4b9 svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5
In the webkit plugin, don't try to load web browser plugins except on Windows.  The flash plugin on the Mac crashes the webkit plugin when running under xcode.
2009-08-29 01:08:36 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00