OSDN Git Service

Merge webkit.org at r54127 : mainWorldScriptState is now a global function.
authorSteve Block <steveblock@google.com>
Tue, 2 Feb 2010 18:46:44 +0000 (18:46 +0000)
committerSteve Block <steveblock@google.com>
Thu, 4 Feb 2010 22:46:59 +0000 (22:46 +0000)
commitc2b81cdbb474946907dbf44328a37c8882112f77
treef2c63a1e3ca8eeec0ea81fac5a5249c6ddf2a5e9
parent9c4df4389f9d998ce8b59b1665a018b69a2eb865
Merge webkit.org at r54127 : mainWorldScriptState is now a global function.

See http://trac.webkit.org/changeset/54051

Change-Id: I1f904a812dab1acf3eafd4c287571df245d4fa0d
WebKit/android/jni/WebCoreFrameBridge.cpp