OSDN Git Service

Merge WebKit at r60074: Fix conflicts
[android-x86/external-webkit.git] / WebCore / plugins / PluginView.h
2010-05-27 Steve BlockMerge WebKit at r60074: Fix conflicts
2010-05-27 Steve BlockMerge WebKit at r60074: Initial merge by git
2010-05-25 Kristian MonsenMerge "Merge WebKit at r59636: Initial merge by git"
2010-05-25 Kristian MonsenMerge WebKit at r59636: Initial merge by git
2010-05-25 Grace KlobaMerge "First draft to add a fat point to WebKit hit...
2010-05-24 Steve BlockMerge "Cherry-pick WebKit change 59918 to fix Java...
2010-05-24 Steve BlockMerge "Update Android to reflect upstreamed code to...
2010-05-20 Steve BlockMerge "Update Android to reflect upstreaming of PluginV...
2010-05-20 Steve BlockUpdate Android to reflect upstreaming of PluginView...
2010-05-18 The Android Open... am 5a1f66aa: am ec92ec7c: merge from open-source master
2010-05-18 The Android Open... merge from open-source master
2010-05-17 The Android Open... am b7c854ae: am 18e97e57: merge from open-source master
2010-05-17 The Android Open... merge from open-source master
2010-05-14 Cary ClarkMerge "clean up nav cache debugging"
2010-05-14 Ben MurdochMerge Webkit at r58956: Update plugin code to use C99...
2010-05-14 Ben MurdochMerge Webkit at r58956: Initial merge by Git.
2010-05-11 Nicolas Roardam c1cdea23: am 75238a0c: am 2943c136: Fix the \'wobbli...
2010-05-11 Steve BlockMerge webkit.org at r58033 : Initial merge by git
2010-05-06 Ben Murdocham bf13d116: am ec366141: am 7f034a17: Fix a ref counti...
2010-05-05 Ben Murdocham 4190ab28: am cc7f2722: am da713c02: Fix a crash...
2010-05-03 Derek Sollenbergeram ce99ade6: am 6452300d: am d294ab99: Update plugin...
2010-05-03 Jing YuMerge "Fix a return type bug which is complained by...
2010-04-29 Steve BlockMerge changes Ie9ba4c69,I35363367,I18aaae5f,I2c315360...
2010-04-27 Steve BlockMerge webkit.org at r55033 : Initial merge by git
2010-04-07 Cary ClarkMerge "add portable bzero interface"
2010-04-05 Cary ClarkMerge "Create a method to check to see if the focus...
2010-04-02 The Android Open... merge from open-source master
2010-03-31 Nicolas RoardMerge "Only allows composited layers if not in iframes...
2010-03-31 Ben MurdochMerge "Implement the V8 JNI bindings more completely...
2010-03-30 Grace KlobaMerge "cherry-pick 74f79778892548221468d075f949acb3d406...
2010-03-30 Andrei Popescuam e805cfbf: Fix build by removing PLATFORM macro from...
2010-03-30 Cary Clarkam 300f320e: Merge "enable gifs for large memory device...
2010-03-30 Cary Clarkam 15a662df: Merge "correct rgba order for skia" into...
2010-03-30 Grace Klobacherry-pick 74f79778892548221468d075f949acb3d4064368...
2010-03-30 Andrei Popescuam 4b7d2805: Merge "Ask the plugin how long to wait...
2010-03-30 Grace KlobaMerge "In Android, as we always remap the plugin from...
2010-03-26 Grace KlobaIn Android, as we always remap the plugin from page
2010-03-03 Jean-Baptiste Queruam fa65eb8a: (-s ours) am 9a77bf56: Revert "Use STLPort...
2010-03-03 Jean-Baptiste Queruam 381c572c: (-s ours) am f0073a99: Use STLPort instead...
2010-03-03 Claire Hoam dd77efd5: (-s ours) am 60326ce1: Android ICU4...
2010-03-02 Derek Sollenbergeram 4e409302: am a506357e: Adding logging to android...
2010-02-24 Derek Sollenbergeram 70a336f2: am da8d052d: Merge "adding logging to...
2010-02-24 Patrick Scottam f494d11a: (-s ours) am 48633eb7: Do not merge.
2010-02-24 Derek Sollenbergeram 5bce6668: am 15027de7: Added new logging messages...
2010-02-22 Derek Sollenbergeram 4c76da0e: am 1044e7fd: Fixes error where plugin...
2010-02-16 Ben MurdochMerge "Add toV8 conversion for touch event type."
2010-02-16 Steve BlockMerge webkit.org at r54731 : Fix remaining merge conflicts
2010-02-16 Steve BlockMerge webkit.org at r54731 : Initial merge by git
2010-02-15 Ben MurdochMerge changes Ic6718a7c,Ie4e6f65e,Iff5e29c7
2010-02-15 Mike ReedMerge "checkpoint for refactoring"
2010-02-15 Steve BlockMerge "Fix Mac build"
2010-02-15 Steve BlockUse common version of PluginView::parentFrame
2010-02-05 The Android Open... am 8e03c5a1: am c3e14116: reconcile main tree with...
2010-02-04 Steve BlockMerge webkit.org at r54127 : Fix conflicts due to use...
2010-02-04 Steve BlockMerge webkit.org at r54127 : Initial merge by git
2010-01-25 Andrei PopescuMerge "Prepare ScriptController class for upstreaming."
2010-01-25 Andrei PopescuMerge "Remove Android-specific TODOs as the changes...
2010-01-22 Grace Klobaam 6d849f2b: (-s ours) am b99dd716: DO NOT MERGE
2010-01-21 Grace KlobaMerge commit 'db0b7b50' into merge
2010-01-21 Grace KlobaMerge commit '91d051d3' into tmp
2010-01-21 Steve BlockMerge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7...
2010-01-21 Steve BlockMerge "Cherry-pick WebKit change 53619 to fix style...
2010-01-21 Steve BlockMerge "Cherry-pick WebKit change 53557 to rename jni_ru...
2010-01-20 Grace Klobaresolved conflicts for merge of 9dabd572 to master
2010-01-20 Grace Klobaam 1f15f3a9: Changing plugin setwindow() to use page...
2010-01-20 Grace KlobaChanging plugin setwindow() to use page coordinate
2010-01-19 Grace Klobaam 4b178ce7: (-s ours) am f48712a0: DO NOT MERGE.
2010-01-13 Grace Klobaam 625ef54c: (-s ours) am dbb30613: DO NOT MERGE.
2010-01-12 Steve Blockresolved conflicts for merge of e0286f66 to master
2010-01-11 Grace Klobaam 4ad9c9b7: (-s ours) am 237bd75b: First draft of...
2009-12-17 Steve Blockam 4dd98cc2: am aad6f24e: Merge webkit.org at r51976...
2009-12-17 Steve Blockam b880d713: am 643ca787: Merge webkit.org at r51976...
2009-12-17 Steve Blockam aad6f24e: Merge webkit.org at r51976 : Fix general...
2009-12-17 Steve Blockam 643ca787: Merge webkit.org at r51976 : Initial merge...
2009-12-17 Steve BlockMerge webkit.org at r51976 : Fix general conflicts.
2009-12-17 Steve BlockMerge webkit.org at r51976 : Initial merge by git.
2009-12-15 Android Git AutomergerMerge commit 'goog/eclair-plus-aosp'
2009-12-05 Grace Klobaam daa8318d: (-s ours) DO NOT MERGE. This is cherry...
2009-11-18 Grace Klobaam ffe27b58: Integrate WebKit security fix trac.webkit...
2009-11-15 Jean-Baptiste Querumerge from open-source master
2009-11-15 Jean-Baptiste Querumerge from eclair
2009-11-13 Jean-Baptiste Querueclair snapshot
2009-11-12 Grace Klobaam a5605499: Changing fit column to screen to exclude...
2009-11-10 Steve Blockam 3f60c26c: Merge webkit.org at r50258 : Fix conflicts.
2009-11-10 Steve Blockam cac0f67c: Merge webkit.org at r50258 : Initial merge...
2009-11-10 Steve BlockMerge webkit.org at r50258 : Fix conflicts.
2009-11-10 Steve BlockMerge webkit.org at r50258 : Initial merge by git.
2009-11-10 Steve Blockam f3df4438: (-s ours) Merge change I43c19e84 into...
2009-11-10 Leon Scrogginsam 6f9b8a17: (-s ours) do not merge -- Fix a clicking...
2009-10-30 Steve Blockam b9fca1a7: (-s ours) Fix Geolocation service to use...
2009-10-30 Grace Klobaam 5469794f: Avoid constructing the MutexLocker class...
2009-10-28 Android (Google... Merge change Ia17a9f02 into eclair-mr2
2009-10-28 Android (Google... Merge change I9f515e09 into eclair-mr2
2009-10-27 Android (Google... Merge change Ib24a54e5 into eclair-mr2
2009-10-27 Derek Sollenbergeram c7d90905: changing how plugins gain/lose focus.
2009-10-27 Derek Sollenbergerchanging how plugins gain/lose focus.
2009-10-22 Grace Klobaam 228543b5: Apparently we can\'t use atomic_inc/dec...
2009-10-22 Grace Klobaam 87689f70: Back in 02/08 when we added android_atomic...
2009-10-22 Cary Clarkam e9901563: (-s ours) do not merge: fix copy/paste...
2009-10-20 Steve Blockam 231d4e31: Merge webkit.org at R49305 : Automatic...
next