diff options
| author | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 22:23:04 +0000 |
|---|---|---|
| committer | pamg@google.com <pamg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 22:23:04 +0000 |
| commit | 997c8ca739b3f79ff76adbbf421c7056af8ccdcb (patch) | |
| tree | ae86a33c34904a2ec59c794f9e139461d6e7c415 /webkit/build | |
| parent | 7ef735ae2811757a4883f1664fd5f8ab9773b477 (diff) | |
| download | chromium_src-997c8ca739b3f79ff76adbbf421c7056af8ccdcb.zip chromium_src-997c8ca739b3f79ff76adbbf421c7056af8ccdcb.tar.gz chromium_src-997c8ca739b3f79ff76adbbf421c7056af8ccdcb.tar.bz2 | |
Chromium side of merge 39453:39501.
Includes new baselines for fast/transforms/identity-matrix-expected.html, which
was edited slightly, and fast/backgrounds/opacity-on-document-element.html,
which is new and looks correct.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/17010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 28 |
4 files changed, 36 insertions, 0 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 9fd54a6..ae371c5 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -154,6 +154,7 @@ wtf_inputs = [ '$WTF_DIR/RandomNumber.cpp', '$WTF_DIR/RefCountedLeakCounter.cpp', '$WTF_DIR/TCSystemAlloc.cpp', + '$WTF_DIR/Threading.cpp', '$WTF_DIR/unicode/UTF8.cpp', '$WTF_DIR/unicode/icu/CollatorICU.cpp', ] diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index 5a5d7c3..ec8b39f 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -314,6 +314,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Threading.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Threading.h" > </File> diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 09cc470..6c7bacf 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -421,6 +421,7 @@ input_files = [ '$WEBCORE_DIR/platform/ScrollbarThemeComposite.cpp', '$WEBCORE_DIR/platform/ScrollView.cpp', '$WEBCORE_DIR/platform/SharedBuffer.cpp', + '$WEBCORE_DIR/platform/ThreadGlobalData.cpp', '$WEBCORE_DIR/platform/Timer.cpp', '$WEBCORE_DIR/platform/Widget.cpp', @@ -638,6 +639,8 @@ input_files = [ '$WEBCORE_DIR/rendering/RenderTableSection.cpp', '$WEBCORE_DIR/rendering/RenderText.cpp', '$WEBCORE_DIR/rendering/RenderTextControl.cpp', + '$WEBCORE_DIR/rendering/RenderTextControlMultiLine.cpp', + '$WEBCORE_DIR/rendering/RenderTextControlSingleLine.cpp', '$WEBCORE_DIR/rendering/RenderTextFragment.cpp', '$WEBCORE_DIR/rendering/RenderTheme.cpp', '$WEBCORE_DIR/rendering/RenderTreeAsText.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 8a37fd6..3e0a043 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1226,6 +1226,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadGlobalData.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThreadGlobalData.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Threading.h" > </File> @@ -3470,6 +3478,22 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlMultiLine.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlMultiLine.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlSingleLine.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextControlSingleLine.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderTextFragment.cpp" > </File> @@ -4322,6 +4346,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\KeyboardEvent.cpp" > </File> |