OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge "Do not merge: fix dns prefetch, multiply range" into gingerbread
[android-x86/external-webkit.git]
/
Android.mk
2010-08-24
Jean-Baptiste Queru
merge -s ours from froyo-release so that upgrading...
blob
|
commitdiff
2010-08-07
Steve Block
am a4279478: Cherry-pick WebKit change 61921 to fix...
blob
|
commitdiff
2010-08-07
Steve Block
am 2b6ea029: Cherry-pick WebKit change 60984 to fix...
blob
|
commitdiff
2010-07-15
Joe Onorato
Merge "The ICU data is no longer compiled directly...
blob
|
commitdiff
2010-07-14
Joe Onorato
The ICU data is no longer compiled directly into the...
blob
|
commitdiff
2010-05-18
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-05-17
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-04-02
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-03-11
Ben Murdoch
Merge "Prepare touch key modifiers for upstreaming."
blob
|
commitdiff
|
diff to current
2010-03-11
Steve Block
Merge "Marks remaining Android-specific changes to...
blob
|
commitdiff
|
diff to current
2010-03-11
Steve Block
Merge "Update Android to reflect final version submitte...
blob
|
commitdiff
|
diff to current
2010-03-10
Leon Scroggins
Merge "Use a paint with 80% alpha instead of saveLayer...
blob
|
commitdiff
|
diff to current
2010-03-10
Bart Sears
Merge "Switch default build to use V8 on Passion and...
blob
|
commitdiff
|
diff to current
2010-03-10
Andrei Popescu
Switch default build to use V8 on Passion and Sholes.
blob
|
commitdiff
|
diff to current
2010-03-03
Jean-Baptiste Queru
am fa65eb8a: (-s ours) am 9a77bf56: Revert "Use STLPort...
blob
|
commitdiff
|
diff to current
2010-03-03
Jean-Baptiste Queru
am 9a77bf56: Revert "Use STLPort instead of our strippe...
blob
|
commitdiff
|
diff to current
2010-03-03
Jean-Baptiste Queru
Revert "Use STLPort instead of our stripped version...
blob
|
commitdiff
|
diff to current
2010-03-03
Jean-Baptiste Queru
am 381c572c: (-s ours) am f0073a99: Use STLPort instead...
blob
|
commitdiff
|
diff to current
2010-03-03
Claire Ho
am dd77efd5: (-s ours) am 60326ce1: Android ICU4...
blob
|
commitdiff
|
diff to current
2010-03-03
Jean-Baptiste Queru
am f0073a99: Use STLPort instead of our stripped versio...
blob
|
commitdiff
|
diff to current
2010-03-03
Jean-Baptiste Queru
Use STLPort instead of our stripped version. DO NOT...
blob
|
commitdiff
|
diff to current
2010-03-03
Steve Block
Merge "Adds Android-specific expected results for some...
blob
|
commitdiff
|
diff to current
2010-03-03
Andrei Popescu
Merge "Fix V8 build when instrumentation is on"
blob
|
commitdiff
|
diff to current
2010-03-03
Steve Block
Merge "Fixes a crash in WeakJavaInstance"
blob
|
commitdiff
|
diff to current
2010-03-03
Mike Reed
bump up our image cache etc. when we're on larger devic...
blob
|
commitdiff
|
diff to current
2010-03-02
Derek Sollenberger
am 4e409302: am a506357e: Adding logging to android...
blob
|
commitdiff
|
diff to current
2010-03-01
Steve Block
Merge "Adds Android-specific result for a Geolocation...
blob
|
commitdiff
|
diff to current
2010-02-26
Leon Clarke
Merge " Don't crash when throwing javascript excepti...
blob
|
commitdiff
|
diff to current
2010-02-26
Steve Block
Merge "Adds layout tests for HTML5 features"
blob
|
commitdiff
|
diff to current
2010-02-26
Ben Murdoch
Merge "Only set the DatabaseTracker path if it has...
blob
|
commitdiff
|
diff to current
2010-02-26
Shimeng (Simon)...
Merge "Prevent unsafe upper casting by checking Element...
blob
|
commitdiff
|
diff to current
2010-02-25
Andrei Popescu
Merge "Temporarily disable debugger support on V8 due...
blob
|
commitdiff
|
diff to current
2010-02-25
Cary Clark
Merge "refactor drawing to support layers"
blob
|
commitdiff
|
diff to current
2010-02-25
Shimeng (Simon)...
Merge "Use reference instead of vector copying when...
blob
|
commitdiff
|
diff to current
2010-02-24
Cary Clark
refactor drawing to support layers
blob
|
commitdiff
|
diff to current
2010-02-24
Derek Sollenberger
am 70a336f2: am da8d052d: Merge "adding logging to...
blob
|
commitdiff
|
diff to current
2010-02-24
Patrick Scott
am f494d11a: (-s ours) am 48633eb7: Do not merge.
blob
|
commitdiff
|
diff to current
2010-02-24
Derek Sollenberger
am 5bce6668: am 15027de7: Added new logging messages...
blob
|
commitdiff
|
diff to current
2010-02-23
Steve Block
Merge "Fixes a bug with showing the Geolocation permiss...
blob
|
commitdiff
|
diff to current
2010-02-23
Huahui Wu
While upstreaming the JSC JIT patch to the open source...
blob
|
commitdiff
|
diff to current
2010-02-23
Ben Murdoch
Merge "Co-ordinates of a TouchEvent object should be...
blob
|
commitdiff
|
diff to current
2010-02-23
Steve Block
Merge "Updates Android to final version of Geolocation...
blob
|
commitdiff
|
diff to current
2010-02-23
Steve Block
Merge "Cherry-pick WebKit change 55136 to add a means...
blob
|
commitdiff
|
diff to current
2010-02-23
Mike Reed
add optional build flag to trigger enabling layers
blob
|
commitdiff
|
diff to current
2010-02-22
Derek Sollenberger
am 4c76da0e: am 1044e7fd: Fixes error where plugin...
blob
|
commitdiff
|
diff to current
2010-02-17
Cary Clark
Merge "Add UI considerations to layers"
blob
|
commitdiff
|
diff to current
2010-02-17
Steve Block
Merge "Updates Android to reflect upstreaming of CHROMI...
blob
|
commitdiff
|
diff to current
2010-02-17
Steve Block
Merge "Updates Android to reflect upstreaming of guards...
blob
|
commitdiff
|
diff to current
2010-02-16
Patrick Scott
Use the new stlport build configuration.
blob
|
commitdiff
|
diff to current
2010-02-12
Mike Reed
Merge "move children into SkLayer make SkLayer inherit...
blob
|
commitdiff
|
diff to current
2010-02-12
Huahui Wu
Add code that enables SquirrelFish Extreme (a.k.a JSCX...
blob
|
commitdiff
|
diff to current
2010-02-12
Steve Block
Merge "Cherry-pick recent WebKit changes to JavaClassJS...
blob
|
commitdiff
|
diff to current
2010-02-11
Mathias Agopian
split libsurfaceflinger_client and libcamera_client...
blob
|
commitdiff
|
diff to current
2010-02-05
The Android Open...
am 8e03c5a1: am c3e14116: reconcile main tree with...
blob
|
commitdiff
|
diff to current
2010-02-04
Steve Block
Merge webkit.org at r54127 : GIFImageDecoder now requir...
blob
|
commitdiff
|
diff to current
2010-02-04
Steve Block
Merge webkit.org at r54127 : Fix Makefiles
blob
|
commitdiff
|
diff to current
2010-02-04
Steve Block
Merge webkit.org at r54127 : Keep ours for Makefiles.
blob
|
commitdiff
|
diff to current
2010-02-04
Steve Block
Merge webkit.org at r54127 : Initial merge by git
blob
|
commitdiff
|
diff to current
2010-02-03
Ben Murdoch
resolved conflicts for merge of a82364c2 to master
blob
|
commitdiff
|
diff to current
2010-01-29
Ben Murdoch
Merge "Cherry pick the diff after going through review...
blob
|
commitdiff
|
diff to current
2010-01-27
Shimeng (Simon)...
Merge "No text wrapping in FitToScreen mode when text...
blob
|
commitdiff
|
diff to current
2010-01-27
Steve Block
V8 can now use WebCore/bridge/jni/JNIBridge.cpp
blob
|
commitdiff
|
diff to current
2010-01-27
Steve Block
V8 can now use WebCore/bridge/jni/JNIBridge.h
blob
|
commitdiff
|
diff to current
2010-01-25
Derek Sollenberger
am 562a8a46: am 53c84f3c: Do not allow the plugin to...
blob
|
commitdiff
|
diff to current
2010-01-25
Derek Sollenberger
am 71ce050b: am c45f962c: Merge "Correcting how the...
blob
|
commitdiff
|
diff to current
2010-01-25
Grace Kloba
resolved conflicts for merge of 98c97471 to master
blob
|
commitdiff
|
diff to current
2010-01-25
Grace Kloba
Merge "Merge pinch zoom from Eclair to Master. Including,"
blob
|
commitdiff
|
diff to current
2010-01-25
Derek Sollenberger
am 53e1af87: am 2eb76d0b: Add logging for all plugin...
blob
|
commitdiff
|
diff to current
2010-01-25
Andrei Popescu
Fix build by
blob
|
commitdiff
|
diff to current
2010-01-25
Andrei Popescu
Merge "Prepare ScriptController class for upstreaming."
blob
|
commitdiff
|
diff to current
2010-01-25
Andrei Popescu
Merge "Remove Android-specific TODOs as the changes...
blob
|
commitdiff
|
diff to current
2010-01-22
Grace Kloba
am de7e9124: am ec4b5ee4: As we are sharing the view...
blob
|
commitdiff
|
diff to current
2010-01-22
Grace Kloba
am 6d849f2b: (-s ours) am b99dd716: DO NOT MERGE
blob
|
commitdiff
|
diff to current
2010-01-21
Grace Kloba
Merge commit 'db0b7b50' into merge
blob
|
commitdiff
|
diff to current
2010-01-21
Grace Kloba
Merge commit '91d051d3' into tmp
blob
|
commitdiff
|
diff to current
2010-01-21
Steve Block
Merge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7...
blob
|
commitdiff
|
diff to current
2010-01-21
Steve Block
Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8...
blob
|
commitdiff
|
diff to current
2010-01-21
Steve Block
Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8...
blob
|
commitdiff
|
diff to current
2010-01-21
Grace Kloba
am bfcc13fc: (-s ours) am 0a3f01ac: Merge "DO NOT MERGE...
blob
|
commitdiff
|
diff to current
2010-01-21
Grace Kloba
am 67c90537: am 72acb46d: Fix the crash of exiting...
blob
|
commitdiff
|
diff to current
2010-01-20
Grace Kloba
resolved conflicts for merge of 9dabd572 to master
blob
|
commitdiff
|
diff to current
2010-01-20
Steve Block
Move V8 jni_class to bridge/jni/v8/JavaClassV8 and...
blob
|
commitdiff
|
diff to current
2010-01-20
Steve Block
am d9b562d6: am 032a9065: Merge "Cherry-pick WebKit...
blob
|
commitdiff
|
diff to current
2010-01-20
Steve Block
am 0cfc2e19: am 315ee382: Merge "Cherry-pick WebKit...
blob
|
commitdiff
|
diff to current
2010-01-20
Steve Block
resolved conflicts for merge of 3f4b1969 to master
blob
|
commitdiff
|
diff to current
2010-01-19
Grace Kloba
am 2ba2794f: am 4d667d7f: Exit the fullscreen mode...
blob
|
commitdiff
|
diff to current
2010-01-19
Steve Block
am f83060e8: am be164dbc: Cherry-pick WebKit change...
blob
|
commitdiff
|
diff to current
2010-01-19
Steve Block
resolved conflicts for merge of acf4a21d to master
blob
|
commitdiff
|
diff to current
2010-01-19
Steve Block
resolved conflicts for merge of df644d06 to master
blob
|
commitdiff
|
diff to current
2010-01-19
Steve Block
Merge "Cherry-pick WebKit change 53412 to move jni_inst...
blob
|
commitdiff
|
diff to current
2010-01-19
Grace Kloba
am 9611825c: am 6a5a35ed: Merge "Should check the enabl...
blob
|
commitdiff
|
diff to current
2010-01-19
Grace Kloba
am 1a318d00: am 336f436c: Don\'t call setNPWindowRect...
blob
|
commitdiff
|
diff to current
2010-01-19
Grace Kloba
am 4b178ce7: (-s ours) am f48712a0: DO NOT MERGE.
blob
|
commitdiff
|
diff to current
2010-01-15
Grace Kloba
am 8a2903f5: am b8a54826: Don\'t use static jclass...
blob
|
commitdiff
|
diff to current
2010-01-14
Nicolas Roard
am 93f808ab: am 388e461f: Add proper support for fixed...
blob
|
commitdiff
|
diff to current
2010-01-14
Nicolas Roard
am 459f6c34: am 29b325cb: Fix \'disappearing layers...
blob
|
commitdiff
|
diff to current
2010-01-14
Steve Block
am 594a3479: am 44364d80: Merge "Update jni_runtime...
blob
|
commitdiff
|
diff to current
2010-01-14
Steve Block
resolved conflicts for merge of a08c8a5f to master
blob
|
commitdiff
|
diff to current
2010-01-14
Steve Block
am a48cb1ea: Merge "Move general includes before bindin...
blob
|
commitdiff
|
diff to current
2010-01-14
Steve Block
Merge "Move general includes before bindings includes...
blob
|
commitdiff
|
diff to current
next