git.osdn.net Git - android-x86/external-webkit.git/commit

(root) / android-x86 / external-webkit.git / commit

author	Ben Murdoch <benm@google.com>
	Fri, 20 May 2011 15:48:45 +0000 (16:48 +0100)
committer	Ben Murdoch <benm@google.com>
	Mon, 23 May 2011 17:54:18 +0000 (18:54 +0100)
commit	53733164eb6cabab5a1eddcabb42e4ce27eb0e44
tree	1ba5405cbf0bf31341e2e260a7ed05c9dcce8e4b	tree \| snapshot
parent	9bbecbe38e6249c7b1c0874e80503f6162f13613	commit \| diff

Merge WebKit at r76408: Fix Bridge.h

Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.

Change-Id: I26c91f7940b106db21e26c37507490acd1546cff

41 files changed:

Source/WebCore/bindings/js/JSPluginElementFunctions.cpp		diff \| blob \| history
Source/WebCore/bindings/js/ScriptControllerBrew.cpp		diff \| blob \| history
Source/WebCore/bindings/js/ScriptControllerGtk.cpp		diff \| blob \| history
Source/WebCore/bindings/js/ScriptControllerHaiku.cpp		diff \| blob \| history
Source/WebCore/bindings/js/ScriptControllerMac.mm		diff \| blob \| history
Source/WebCore/bindings/js/ScriptControllerQt.cpp		diff \| blob \| history
Source/WebCore/bindings/js/ScriptControllerWin.cpp		diff \| blob \| history
Source/WebCore/bindings/js/ScriptControllerWx.cpp		diff \| blob \| history
Source/WebCore/bindings/js/ScriptInstance.h		diff \| blob \| history
Source/WebCore/bindings/objc/WebScriptObject.mm		diff \| blob \| history
Source/WebCore/bridge/Bridge.h		diff \| blob \| history
Source/WebCore/bridge/c/c_class.h		diff \| blob \| history
Source/WebCore/bridge/c/c_instance.h		diff \| blob \| history
Source/WebCore/bridge/c/c_runtime.h		diff \| blob \| history
Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h		diff \| blob \| history
Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h		diff \| blob \| history
Source/WebCore/bridge/jsc/BridgeJSC.h		diff \| blob \| history
Source/WebCore/bridge/objc/objc_runtime.h		diff \| blob \| history
Source/WebCore/bridge/qt/qt_class.h		diff \| blob \| history
Source/WebCore/bridge/qt/qt_instance.h		diff \| blob \| history
Source/WebCore/bridge/qt/qt_pixmapruntime.h		diff \| blob \| history
Source/WebCore/bridge/qt/qt_runtime.h		diff \| blob \| history
Source/WebCore/bridge/runtime_array.h		diff \| blob \| history
Source/WebCore/bridge/runtime_method.h		diff \| blob \| history
Source/WebCore/bridge/runtime_object.h		diff \| blob \| history
Source/WebCore/bridge/runtime_root.cpp		diff \| blob \| history
Source/WebCore/bridge/testbindings.cpp		diff \| blob \| history
Source/WebCore/bridge/testbindings.mm		diff \| blob \| history
Source/WebCore/bridge/testqtbindings.cpp		diff \| blob \| history
Source/WebCore/page/win/FrameWin.cpp		diff \| blob \| history
Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp		diff \| blob \| history
Source/WebCore/plugins/PluginView.cpp		diff \| blob \| history
Source/WebCore/plugins/PluginViewNone.cpp		diff \| blob \| history
Source/WebCore/plugins/gtk/PluginViewGtk.cpp		diff \| blob \| history
Source/WebCore/plugins/mac/PluginViewMac.mm		diff \| blob \| history
Source/WebCore/plugins/qt/PluginViewQt.cpp		diff \| blob \| history
Source/WebCore/plugins/symbian/PluginViewSymbian.cpp		diff \| blob \| history
Source/WebCore/plugins/win/PluginViewWin.cpp		diff \| blob \| history
Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h		diff \| blob \| history
Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm		diff \| blob \| history
Source/WebKit/qt/Api/qwebframe.cpp		diff \| blob \| history

external/webkit

RSS Atom

About OSDN

Find Software

Develop Software

Help