WebKit merge 41498:41530.
Review URL: http://codereview.chromium.org/41017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11312 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
4
DEPS
4
DEPS
@ -1,7 +1,7 @@
|
||||
vars = {
|
||||
"webkit_trunk":
|
||||
"http://svn.webkit.org/repository/webkit/trunk",
|
||||
"webkit_revision": "41498",
|
||||
"webkit_revision": "41530",
|
||||
}
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ deps = {
|
||||
"http://googletest.googlecode.com/svn/trunk@167",
|
||||
|
||||
"src/third_party/WebKit":
|
||||
"/trunk/deps/third_party/WebKit@11253",
|
||||
"/trunk/deps/third_party/WebKit@11310",
|
||||
|
||||
"src/third_party/icu38":
|
||||
"/trunk/deps/third_party/icu38@10692",
|
||||
|
@ -1 +1 @@
|
||||
http://svn.webkit.org/repository/webkit/trunk@41498
|
||||
http://svn.webkit.org/repository/webkit/trunk@41530
|
@ -684,6 +684,7 @@ input_files = [
|
||||
'$WEBCORE_DIR/rendering/RenderWidget.cpp',
|
||||
'$WEBCORE_DIR/rendering/RenderWordBreak.cpp',
|
||||
'$WEBCORE_DIR/rendering/RootInlineBox.cpp',
|
||||
'$WEBCORE_DIR/rendering/ScrollBehavior.cpp',
|
||||
'$WEBCORE_DIR/rendering/SVGCharacterLayoutInfo.cpp',
|
||||
'$WEBCORE_DIR/rendering/SVGInlineFlowBox.cpp',
|
||||
'$WEBCORE_DIR/rendering/SVGInlineTextBox.cpp',
|
||||
|
@ -3792,6 +3792,14 @@
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGRootInlineBox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\TableLayout.h"
|
||||
>
|
||||
|
@ -23,6 +23,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
|
||||
#include "KeyboardEvent.h"
|
||||
#include "PlatformKeyboardEvent.h"
|
||||
#include "PlatformString.h"
|
||||
#include "RenderObject.h"
|
||||
MSVC_POP_WARNING();
|
||||
|
||||
#include "WebKit.h"
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include "base/compiler_specific.h"
|
||||
|
||||
MSVC_PUSH_WARNING_LEVEL(0);
|
||||
#include "CSSHelper.h"
|
||||
#include "CString.h"
|
||||
#include "Document.h"
|
||||
#include "DocumentLoader.h"
|
||||
@ -296,7 +297,7 @@ WebCore::HTMLInputElement* GetTextElement(
|
||||
} // namespace
|
||||
|
||||
SearchableFormData* SearchableFormData::Create(WebCore::Element* element) {
|
||||
if (!element->isFormControlElement() || !element->isHTMLElement()) {
|
||||
if (!element->isFormControlElement() || !element->isHTMLElement()) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -1218,7 +1218,9 @@ void WebFrameLoaderClient::frameLoadCompleted() {
|
||||
// Note: Can be called multiple times.
|
||||
// Even if already complete, we might have set a previous item on a frame that
|
||||
// didn't do any data loading on the past transaction. Make sure to clear these out.
|
||||
webframe_->frame()->loader()->setPreviousHistoryItem(0);
|
||||
|
||||
// FIXME: setPreviousHistoryItem() no longer exists. http://crbug.com/8566
|
||||
// webframe_->frame()->loader()->setPreviousHistoryItem(0);
|
||||
}
|
||||
|
||||
void WebFrameLoaderClient::saveViewStateToItem(HistoryItem*) {
|
||||
|
@ -132,6 +132,8 @@
|
||||
#include "Settings.h"
|
||||
#include "StyleSheet.h"
|
||||
#include "StyleSheetList.h"
|
||||
#include "SVGColor.h"
|
||||
#include "SVGPaint.h"
|
||||
#include "TextEvent.h"
|
||||
#include "TextMetrics.h"
|
||||
#include "TimeRanges.h"
|
||||
|
@ -124,6 +124,7 @@ DEFER : LayoutTests/fast/repaint/bugzilla-6473.html = PASS FAIL
|
||||
|
||||
// Worker related tests (ENABLE_WORKERS):
|
||||
DEFER SKIP : LayoutTests/fast/workers = TIMEOUT FAIL
|
||||
DEFER SKIP : LayoutTests/http/tests/workers = TIMEOUT FAIL
|
||||
DEFER SKIP : LayoutTests/http/tests/xmlhttprequest/workers = TIMEOUT
|
||||
DEFER: LayoutTests/fast/events/dispatchEvent-crash.html = FAIL
|
||||
|
||||
|
@ -3207,6 +3207,8 @@
|
||||
'../third_party/WebKit/WebCore/rendering/RenderWordBreak.h',
|
||||
'../third_party/WebKit/WebCore/rendering/RootInlineBox.cpp',
|
||||
'../third_party/WebKit/WebCore/rendering/RootInlineBox.h',
|
||||
'../third_party/WebKit/WebCore/rendering/ScrollBehavior.cpp',
|
||||
'../third_party/WebKit/WebCore/rendering/ScrollBehavior.h',
|
||||
'../third_party/WebKit/WebCore/rendering/SVGCharacterLayoutInfo.cpp',
|
||||
'../third_party/WebKit/WebCore/rendering/SVGCharacterLayoutInfo.h',
|
||||
'../third_party/WebKit/WebCore/rendering/SVGInlineFlowBox.cpp',
|
||||
|
Reference in New Issue
Block a user