summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 562a8a46: am 53c84f3c: Do not allow the plugin to show or hide the ↵Derek Sollenberger2010-01-253-7/+22
|\ | | | | | | | | | | | | | | | | keyboard unless it has focus. Merge commit '562a8a469695e0a2dee4eb1946847553f04ca2a2' * commit '562a8a469695e0a2dee4eb1946847553f04ca2a2': Do not allow the plugin to show or hide the keyboard unless it has focus.
| * am 53c84f3c: Do not allow the plugin to show or hide the keyboard unless it ↵Derek Sollenberger2010-01-253-7/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | has focus. Merge commit '53c84f3caf7c84282400134fa9554cd465ec7da8' into eclair-mr2-plus-aosp * commit '53c84f3caf7c84282400134fa9554cd465ec7da8': Do not allow the plugin to show or hide the keyboard unless it has focus.
| | * Do not allow the plugin to show or hide the keyboard unless it has focus.Derek Sollenberger2010-01-253-7/+22
| | |
* | | am 71ce050b: am c45f962c: Merge "Correcting how the plugin\'s bounding ↵Derek Sollenberger2010-01-253-73/+86
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | coordinates are computed." into eclair-mr2 Merge commit '71ce050b9dbf42b1f1f33269021af49371c20a54' * commit '71ce050b9dbf42b1f1f33269021af49371c20a54': Correcting how the plugin's bounding coordinates are computed.
| * | am c45f962c: Merge "Correcting how the plugin\'s bounding coordinates are ↵Derek Sollenberger2010-01-253-73/+86
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | computed." into eclair-mr2 Merge commit 'c45f962cdbdd4a870b7af94ce48f48e36c5b53cb' into eclair-mr2-plus-aosp * commit 'c45f962cdbdd4a870b7af94ce48f48e36c5b53cb': Correcting how the plugin's bounding coordinates are computed.
| | * Merge "Correcting how the plugin's bounding coordinates are computed." into ↵Derek Sollenberger2010-01-253-73/+86
| | |\ | | | | | | | | | | | | eclair-mr2
| | | * Correcting how the plugin's bounding coordinates are computed.Derek Sollenberger2010-01-253-73/+86
| | | |
* | | | resolved conflicts for merge of 98c97471 to masterGrace Kloba2010-01-251-2/+5
|\ \ \ \ | |/ / /
| * | | am f7dbff09: Merge "Rearrange the include headers to enable logging." into ↵Grace Kloba2010-01-251-2/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | eclair-mr2 Merge commit 'f7dbff09c8d416459a317e397e0a46c197dbf862' into eclair-mr2-plus-aosp * commit 'f7dbff09c8d416459a317e397e0a46c197dbf862': Rearrange the include headers to enable logging.
| | * | Merge "Rearrange the include headers to enable logging." into eclair-mr2Grace Kloba2010-01-251-2/+4
| | |\ \ | | | |/ | | |/|
| | | * Rearrange the include headers to enable logging.Grace Kloba2010-01-251-2/+4
| | | |
* | | | Merge "allow text node boundaries to delimit addresses"Cary Clark2010-01-251-1/+3
|\ \ \ \
| * | | | allow text node boundaries to delimit addressesCary Clark2010-01-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current boundary condition for a state without a trailing zip code is a couple of spaces or a non-alphanumeric character, like punctuation. Add allowing the end of the text node as a termination condition. Fixes http://b/2384326
* | | | | Merge changes Ib69ddd4d,Ib28c69a6,I342b9f6bSteve Block2010-01-254-9/+40
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | * changes: Cherry-pick WebKit change 53441 to make changes to Geolocation Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume public Cherry-pick WebKit change 52104 to make changes to Geolocation
| * | | | Cherry-pick WebKit change 53441 to make changes to GeolocationSteve Block2010-01-253-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/53441 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: Ib69ddd4d1b0944c861ac6c35412936ec1209cff0
| * | | | Bring Geolocation up-to-date with WebKit change 53342 to make suspend/resume ↵Steve Block2010-01-252-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | public See http://trac.webkit.org/changeset/53342 Change-Id: Ib28c69a686d72ea4fb17b52b6476bfc5696b1db3
| * | | | Cherry-pick WebKit change 52104 to make changes to GeolocationSteve Block2010-01-253-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/52104 This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code. Change-Id: I342b9f6b6ef5a25fac37dd2187a67a834fb7e270
* | | | | Merge "Merge pinch zoom from Eclair to Master. Including,"Grace Kloba2010-01-252-29/+89
|\ \ \ \ \
| * | | | | Merge pinch zoom from Eclair to Master. Including,Grace Kloba2010-01-232-29/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 237bd75b6ebc1298cbd1c46b43903d19d7dd18b1 commit dbb3061334333f32b6f12c294a551bd2a4a3844c commit f48712a096831a3b85a5e18dabd44a541f6b4712 commit b99dd716b4af0afde074e28b50b7b28ae3c03da7
* | | | | | am 53e1af87: am 2eb76d0b: Add logging for all plugin events and their return ↵Derek Sollenberger2010-01-256-24/+165
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | values. Merge commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0' * commit '53e1af87fa4f19eac50b3d6fb45a3a386d156cd0': Add logging for all plugin events and their return values.
| * | | | am 2eb76d0b: Add logging for all plugin events and their return values.Derek Sollenberger2010-01-256-24/+165
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '2eb76d0bcdf5cdc45cf6188c8bb76a409612235b' into eclair-mr2-plus-aosp * commit '2eb76d0bcdf5cdc45cf6188c8bb76a409612235b': Add logging for all plugin events and their return values.
| | * | | Add logging for all plugin events and their return values.Derek Sollenberger2010-01-256-24/+165
| | | |/ | | |/|
* | | | Fix build byAndrei Popescu2010-01-254-10/+11
| | | | | | | | | | | | | | | | | | | | - adding WebCore/svg to the include path. This should not be guarded by #if ENABLE(SVG) in the makefiles. - calling PluginView::getNPObject from PlatformBridge only when V8 is used.
* | | | Prepare NPV8Object.h/cpp for upstreaming:Andrei Popescu2010-01-254-23/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove #include bindings/npruntime.h from NPV8Object.cpp since that's also included in the NPV8Object.h - add ARRAYSIZE_UNSAFE macro - remove some TODOS This will be checked in after the corresponding webkit bug gets landed. See https://bugs.webkit.org/show_bug.cgi?id=33608
* | | | Merge "Prepare ScriptController class for upstreaming."Andrei Popescu2010-01-255-23/+18
|\ \ \ \
| * | | | Prepare ScriptController class for upstreaming.Andrei Popescu2010-01-225-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the code to obtain the NPObject ptr associated with a PluginView to the PlatformBridge. This change will be submitted as soon as the patch in https://bugs.webkit.org/show_bug.cgi?id=33673 lands upstream.
* | | | | Merge "Remove Android-specific TODOs as the changes have been upstreamed in"Andrei Popescu2010-01-252-12/+0
|\ \ \ \ \
| * | | | | Remove Android-specific TODOs as the changes have been upstreamed inAndrei Popescu2010-01-222-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=33944
* | | | | | Call nextTextfield on the CachedFrame that contains the cursor/focus.Leon Scroggins2010-01-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes http://b/issue?id=2359748
* | | | | | am de7e9124: am ec4b5ee4: As we are sharing the view between embedded and ↵Grace Kloba2010-01-211-11/+10
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full screen, we should make sure to call the correct update when bounds changed. Merge commit 'de7e9124bea659d873d5488809d92a334104cb53' * commit 'de7e9124bea659d873d5488809d92a334104cb53': As we are sharing the view between embedded and full
| * | | | | am ec4b5ee4: As we are sharing the view between embedded and full screen, we ↵Grace Kloba2010-01-211-11/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should make sure to call the correct update when bounds changed. Merge commit 'ec4b5ee43c88d914221e8c9f668421ace6bdd72d' into eclair-mr2-plus-aosp * commit 'ec4b5ee43c88d914221e8c9f668421ace6bdd72d': As we are sharing the view between embedded and full
| | * | | | As we are sharing the view between embedded and fullGrace Kloba2010-01-211-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen, we should make sure to call the correct update when bounds changed. This should fix the crash when changing orientation.
* | | | | | am 6d849f2b: (-s ours) am b99dd716: DO NOT MERGEGrace Kloba2010-01-210-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6d849f2b09b0aa503957a037f2e8a276bd6f8041' * commit '6d849f2b09b0aa503957a037f2e8a276bd6f8041': DO NOT MERGE
| * | | | | am b99dd716: DO NOT MERGEGrace Kloba2010-01-181-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b99dd716b4af0afde074e28b50b7b28ae3c03da7' into eclair-plus-aosp * commit 'b99dd716b4af0afde074e28b50b7b28ae3c03da7': DO NOT MERGE
| | * | | | | DO NOT MERGEGrace Kloba2010-01-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the hit result node has zero width, we can't use it. Try its parents. This happens in the story inside nytimes.com. They use a special <nyt_text> tag. If it is the hit point, it has 0 width and height. Fix http://b/issue?id=2363260
* | | | | | | Merge commit 'db0b7b50' into mergeGrace Kloba2010-01-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e32bb876: Revert https://android-git.corp.google.com/g/37444 as ↵Grace Kloba2010-01-141-5/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/37486 is a better fix for http://b/issue?id=2375232 Merge commit 'e32bb87640c16f2414a3f35cefd3c4146a174091' into eclair-plus-aosp * commit 'e32bb87640c16f2414a3f35cefd3c4146a174091': Revert https://android-git.corp.google.com/g/37444
| | * | | | | Revert https://android-git.corp.google.com/g/37444Grace Kloba2010-01-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | as https://android-git.corp.google.com/g/37486 is a better fix for http://b/issue?id=2375232
* | | | | | | Merge commit '91d051d3' into tmpGrace Kloba2010-01-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9f20cbf5: For mobile site, allow text wrap to screen if scale is not same ↵Grace Kloba2010-01-141-2/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as screen width scale. Merge commit '9f20cbf56188e83d4a3a631aba9607697ebac6c0' into eclair-plus-aosp * commit '9f20cbf56188e83d4a3a631aba9607697ebac6c0': For mobile site, allow text wrap to screen if scale
| | * | | | | For mobile site, allow text wrap to screen if scaleGrace Kloba2010-01-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not same as screen width scale. Fix http://b/issue?id=2375232
* | | | | | | Removing reference to a java object that is no longer used.Derek Sollenberger2010-01-213-66/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native plugin code was creating a java object that was intended to by used by the old Gears code. The java object has been deprecated and is not being used within the native code.
* | | | | | | Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7,I63f3c4edSteve Block2010-01-2120-440/+550
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fixes style in V8 jni_runtime.[cpp|h] Updates V8 version of JavaString to use a private implementation class. Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix style Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix style Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, Instance and Array from Bridge to BridgeJSC
| * | | | | | | Fixes style in V8 jni_runtime.[cpp|h]Steve Block2010-01-212-142/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it far easier to compare these files with WebCore/bridge/jni/Bridge.[cpp|h], with which these files will eventually be merged. Change-Id: I1b4ba9843f61c909568f85c65a0872a36d727fb3
| * | | | | | | Updates V8 version of JavaString to use a private implementation class.Steve Block2010-01-214-32/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit change http://trac.webkit.org/changeset/53449 moved the JSC-specific implementation of JavaString to JavaStringJSC.h. This is the V8 equivalent of that change. This is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33953 Change-Id: I6cadc4f4f941aab900aeaf3251a5cad77d050b9b
| * | | | | | | Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix styleSteve Block2010-01-216-45/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf99c709929ef14551de61e55780b97767575f01
| * | | | | | | Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix styleSteve Block2010-01-217-110/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the V8 equivalent of http://trac.webkit.org/changeset/53412 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33951 Change-Id: Id22d59b7a5e0be72d594d454bb41c58760d824ff
| * | | | | | | Cherry-pick WebKit change 53620 to move bridge interfaces Field, Class, ↵Steve Block2010-01-218-113/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instance and Array from Bridge to BridgeJSC See http://trac.webkit.org/changeset/53620 This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge. Note that changes to WebCore.xcodeproj were not pulled, as they introduced merge conflicts. Change-Id: I63f3c4ed101badaea3207d53784de04aee49c2ab
* | | | | | | | Merge "Refactor style of Android specific touch events code in preparation ↵Ben Murdoch2010-01-215-6/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | for upstreaming to webkit.org."
| * | | | | | | | Refactor style of Android specific touch events code in preparation for ↵Ben Murdoch2010-01-215-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upstreaming to webkit.org. Change-Id: Id34e727145fe94e98e62a36b7fc8256468b4157c
generated by cgit v1.1 at 2025-11-26 19:02:26 +0000