OSDN Git Service

Merge webkit.org at r50258 : Fix conflicts.
authorSteve Block <steveblock@google.com>
Thu, 5 Nov 2009 18:34:51 +0000 (18:34 +0000)
committerSteve Block <steveblock@google.com>
Tue, 10 Nov 2009 22:41:13 +0000 (22:41 +0000)
commit3f60c26c3fa9dc89d57ef4db083a4f13ef86c103
tree81c16accd4c9b2b2e4e29ec18b9e5fa7eb37ed93
parentcac0f67c402d107cdb10971b95719e2ff9c7c76b
Merge webkit.org at r50258 : Fix conflicts.

Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor.
See http://trac.webkit.org/changeset/49608

Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
24 files changed:
JavaScriptCore/wtf/ThreadingPthreads.cpp
WebCore/bindings/js/ScriptController.h
WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
WebCore/bindings/v8/ScriptController.h
WebCore/bindings/v8/V8Index.cpp
WebCore/bindings/v8/V8Index.h
WebCore/bindings/v8/V8Proxy.cpp
WebCore/bindings/v8/V8WorkerContextEventListener.cpp
WebCore/bindings/v8/WorkerContextExecutionProxy.cpp
WebCore/bridge/c/c_instance.cpp
WebCore/dom/Document.cpp
WebCore/loader/FrameLoader.cpp
WebCore/loader/FrameLoader.h
WebCore/page/Console.cpp
WebCore/page/FrameView.cpp
WebCore/page/Geolocation.cpp
WebCore/page/Geolocation.h
WebCore/platform/android/ClipboardAndroid.h
WebCore/platform/android/FileChooserAndroid.cpp
WebCore/platform/network/ResourceRequestBase.cpp
WebCore/plugins/PluginView.cpp
WebCore/plugins/PluginView.h
WebCore/rendering/style/RenderStyle.h
WebCore/workers/WorkerContext.cpp