OSDN Git Service

Merge WebKit at r72805: Cherry-pick WebKit change 72948
authorSteve Block <steveblock@google.com>
Wed, 5 Jan 2011 15:06:26 +0000 (15:06 +0000)
committerSteve Block <steveblock@google.com>
Thu, 6 Jan 2011 14:22:59 +0000 (14:22 +0000)
commit47852ff9ccd90ffa4366e306a8bed1d2dd4eeca9
tree0f53968ef11a74571f2b475a66c07b7384151cd3
parent85d7b260f352d69c53a1274f445dca6fbe33bf4c
Merge WebKit at r72805: Cherry-pick WebKit change 72948

This fixes CodeGeneratorV8.pm

It is a re-commit of 'Merge WebKit at r72274: Fix CodeGeneratorV8.pm',
which was inadvertantly removed as part of the initial merge by Git to
r72805.

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

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: Iaa56a5a503aaaf4d996ebc44d66d557d12838cfa
WebCore/WebCore.pri
WebCore/WebCore.pro
WebCore/bindings/scripts/CodeGeneratorV8.pm
WebCore/bindings/v8/ScriptControllerQt.cpp
WebCore/bindings/v8/V8GCController.cpp
WebCore/inspector/CodeGeneratorInspector.pm
WebCore/loader/ResourceLoadScheduler.cpp
WebCore/loader/cache/MemoryCache.cpp
WebCore/loader/loader.cpp