summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS4
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--webkit/build/JavaScriptCore/WTF.vcproj12
-rw-r--r--webkit/build/V8Bindings/SConscript1
-rw-r--r--webkit/build/V8Bindings/V8Bindings.vcproj8
-rw-r--r--webkit/build/WebCore/SConscript1
-rw-r--r--webkit/build/WebCore/WebCore.vcproj24
-rw-r--r--webkit/build/port/SConscript1
-rw-r--r--webkit/build/webkit_common_includes.vsprops2
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc5
-rw-r--r--webkit/glue/webframeloaderclient_impl.h1
-rw-r--r--webkit/port/DerivedSources.make1
-rw-r--r--webkit/port/bindings/scripts/CodeGeneratorV8.pm4
-rw-r--r--webkit/port/bindings/v8/v8_custom.cpp23
-rw-r--r--webkit/port/bindings/v8/v8_custom.h4
-rw-r--r--webkit/port/bindings/v8/v8_index.cpp1
-rw-r--r--webkit/port/bindings/v8/v8_index.h1
-rw-r--r--webkit/port/bindings/v8/v8_proxy.cpp1
-rw-r--r--webkit/port/bindings/v8/v8_proxy.h1
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt10
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj4
21 files changed, 61 insertions, 50 deletions
diff --git a/DEPS b/DEPS
index e26d097..025fb69 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "40668",
+ "webkit_revision": "40722",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@9357",
+ "/trunk/deps/third_party/WebKit@9379",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@9252",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index f6acee8..c47a677 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@40668 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@40722 \ No newline at end of file
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index b669304..9bed692 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -346,6 +346,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.h"
>
</File>
@@ -381,6 +385,14 @@
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\VectorTraits.h"
>
</File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\ChromiumThreading.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\MainThreadChromium.cpp"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index fa71964..4c40582 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -86,7 +86,6 @@ inputs = [
'$DERIVED_DIR/V8EntityReference.cpp',
'$DERIVED_DIR/V8Event.cpp',
'$DERIVED_DIR/V8EventException.cpp',
- '$DERIVED_DIR/V8EventTargetNode.cpp',
'$DERIVED_DIR/V8File.cpp',
'$DERIVED_DIR/V8FileList.cpp',
'$DERIVED_DIR/V8History.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index 2dcd350..e476d4d 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -520,14 +520,6 @@
>
</File>
<File
- RelativePath="$(IntDir)\DerivedSources\V8EventTargetNode.cpp"
- >
- </File>
- <File
- RelativePath="$(IntDir)\DerivedSources\V8EventTargetNode.h"
- >
- </File>
- <File
RelativePath="$(IntDir)\DerivedSources\V8File.cpp"
>
</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index ceea840..d0b49d7 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -128,7 +128,6 @@ input_files = [
'$WEBCORE_DIR/dom/Event.cpp',
'$WEBCORE_DIR/dom/EventNames.cpp',
'$WEBCORE_DIR/dom/EventTarget.cpp',
- '$WEBCORE_DIR/dom/EventTargetNode.cpp',
'$WEBCORE_DIR/dom/ExceptionBase.cpp',
'$WEBCORE_DIR/dom/ExceptionCode.cpp',
'$WEBCORE_DIR/dom/FormControlElementWithState.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 5b31d6d..45a64da 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -2395,6 +2395,22 @@
Name="skia"
>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-encoders\skia\PNGImageEncoder.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-encoders\skia\PNGImageEncoder.h"
+ >
+ </File>
+ </Filter>
+ </Filter>
+ <Filter
+ Name="image-decoders"
+ >
+ <Filter
+ Name="skia"
+ >
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\image-decoders\skia\BMPImageDecoder.cpp"
>
</File>
@@ -4441,14 +4457,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\EventTargetNode.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\dom\EventTargetNode.h"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ExceptionBase.cpp"
>
</File>
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 1a86174..895afc6 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -197,7 +197,6 @@ idl_files = [
'dom/EventException.idl',
'dom/EventListener.idl',
'dom/EventTarget.idl',
- 'dom/EventTargetNode.idl',
'dom/KeyboardEvent.idl',
'dom/MessageChannel.idl',
'dom/MessageEvent.idl',
diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops
index 23b5cf3..92136e9 100644
--- a/webkit/build/webkit_common_includes.vsprops
+++ b/webkit/build/webkit_common_includes.vsprops
@@ -6,6 +6,6 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;$(SolutionDir)..\webkit\pending;$(SolutionDir)..\webkit\port\bridge;&quot;$(ProjectDir)&quot;;$(SolutionDir)..\third_party\WebKit\WebCore;$(SolutionDir)..\third_party\WebKit\WebCore\bindings\v8;$(SolutionDir)..\third_party\WebKit\WebCore\bridge;$(SolutionDir)..\third_party\WebKit\WebCore\bridge\c;$(SolutionDir)..\third_party\WebKit\WebCore\css;$(SolutionDir)..\third_party\WebKit\WebCore\dom;$(SolutionDir)..\third_party\WebKit\WebCore\editing;$(SolutionDir)..\third_party\WebKit\WebCore\history;$(SolutionDir)..\third_party\WebKit\WebCore\html;$(SolutionDir)..\third_party\WebKit\WebCore\loader;$(SolutionDir)..\third_party\WebKit\WebCore\loader\appcache;$(SolutionDir)..\third_party\WebKit\WebCore\loader\archive;$(SolutionDir)..\third_party\WebKit\WebCore\loader\icon;$(SolutionDir)..\third_party\WebKit\WebCore\page;$(SolutionDir)..\third_party\WebKit\WebCore\page\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform;$(SolutionDir)..\third_party\WebKit\WebCore\platform\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\image-decoders\skia;$(SolutionDir)..\third_party\WebKit\WebCore\page\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\text;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\opentype;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\transforms;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\skia;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\sql;$(SolutionDir)..\third_party\WebKit\WebCore\rendering;$(SolutionDir)..\third_party\WebKit\WebCore\rendering\style;$(SolutionDir)..\third_party\WebKit\WebCore\storage;$(SolutionDir)..\third_party\WebKit\WebCore\xml;&quot;$(SolutionDir)..\third_party\WebKit\WebCore\os-win32&quot;;$(SolutionDir)..\third_party\WebKit\WebCore\wtf;$(SolutionDir)..\third_party\WebKit\JavaScriptCore;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\wtf;&quot;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;$(SolutionDir)..\third_party\WebKit\WebCore\svg;$(SolutionDir)..\third_party\WebKit\WebCore\svg\animation;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics\filters;$(SolutionDir)..\third_party\WebKit\WebCore\plugins;$(SolutionDir)..\third_party\WebKit\WebCore\inspector;$(SolutionDir)..\third_party\sqlite\preprocessed"
+AdditionalIncludeDirectories="&quot;$(OutDir)\obj\WebCore&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders&quot;;&quot;$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore&quot;;$(SolutionDir)..\webkit\pending;$(SolutionDir)..\webkit\port\bridge;&quot;$(ProjectDir)&quot;;$(SolutionDir)..\third_party\WebKit\WebCore;$(SolutionDir)..\third_party\WebKit\WebCore\bindings\v8;$(SolutionDir)..\third_party\WebKit\WebCore\bridge;$(SolutionDir)..\third_party\WebKit\WebCore\bridge\c;$(SolutionDir)..\third_party\WebKit\WebCore\css;$(SolutionDir)..\third_party\WebKit\WebCore\dom;$(SolutionDir)..\third_party\WebKit\WebCore\editing;$(SolutionDir)..\third_party\WebKit\WebCore\history;$(SolutionDir)..\third_party\WebKit\WebCore\html;$(SolutionDir)..\third_party\WebKit\WebCore\loader;$(SolutionDir)..\third_party\WebKit\WebCore\loader\appcache;$(SolutionDir)..\third_party\WebKit\WebCore\loader\archive;$(SolutionDir)..\third_party\WebKit\WebCore\loader\icon;$(SolutionDir)..\third_party\WebKit\WebCore\page;$(SolutionDir)..\third_party\WebKit\WebCore\page\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform;$(SolutionDir)..\third_party\WebKit\WebCore\platform\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\image-decoders\skia;$(SolutionDir)..\third_party\WebKit\WebCore\platform\image-encoders\skia;$(SolutionDir)..\third_party\WebKit\WebCore\page\animation;$(SolutionDir)..\third_party\WebKit\WebCore\platform\text;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\opentype;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\transforms;$(SolutionDir)..\third_party\WebKit\WebCore\platform\graphics\skia;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network;$(SolutionDir)..\third_party\WebKit\WebCore\platform\network\chromium;$(SolutionDir)..\third_party\WebKit\WebCore\platform\sql;$(SolutionDir)..\third_party\WebKit\WebCore\rendering;$(SolutionDir)..\third_party\WebKit\WebCore\rendering\style;$(SolutionDir)..\third_party\WebKit\WebCore\storage;$(SolutionDir)..\third_party\WebKit\WebCore\xml;&quot;$(SolutionDir)..\third_party\WebKit\WebCore\os-win32&quot;;$(SolutionDir)..\third_party\WebKit\WebCore\wtf;$(SolutionDir)..\third_party\WebKit\JavaScriptCore;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\wtf;&quot;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\os-win32&quot;;..\..\build;&quot;$(SDKIncludes)&quot;;&quot;$(IntDir)\..\WebCore\DerivedSources&quot;;$(SolutionDir)..\third_party\WebKit\WebCore\svg;$(SolutionDir)..\third_party\WebKit\WebCore\svg\animation;$(SolutionDir)..\third_party\WebKit\WebCore\svg\graphics\filters;$(SolutionDir)..\third_party\WebKit\WebCore\plugins;$(SolutionDir)..\third_party\WebKit\WebCore\inspector;$(SolutionDir)..\third_party\sqlite\preprocessed"
/>
</VisualStudioPropertySheet>
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index f01e32e..d68bea5 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -100,6 +100,11 @@ void WebFrameLoaderClient::windowObjectCleared() {
d->WindowObjectCleared(webframe_);
}
+void WebFrameLoaderClient::documentElementAvailable() {
+ // TODO(aa): Implement.
+ notImplemented();
+}
+
void WebFrameLoaderClient::didPerformFirstNavigation() const {
}
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index 7ffad8c..68b6d05 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -43,6 +43,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
// giving it a chance to bind native objects to the window before script
// parsing begins.
virtual void windowObjectCleared();
+ virtual void documentElementAvailable();
virtual bool hasWebView() const; // mainly for assertions
virtual bool hasFrameView() const; // ditto
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make
index f1cf49d..75d28ef 100644
--- a/webkit/port/DerivedSources.make
+++ b/webkit/port/DerivedSources.make
@@ -659,7 +659,6 @@ all : \
V8EntityReference.h \
V8Event.h \
V8EventException.h \
- V8EventTargetNode.h \
V8File.h \
V8FileList.h \
V8HTMLAnchorElement.h \
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index f9000a2..dc37a04 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -1644,7 +1644,7 @@ sub GetNativeType
return "SVGPaint::SVGPaintType" if $type eq "SVGPaintType";
return "DOMTimeStamp" if $type eq "DOMTimeStamp";
return "unsigned" if $type eq "RGBColor";
- return "EventTargetNode*" if $type eq "EventTarget" and $isParameter;
+ return "Node*" if $type eq "EventTarget" and $isParameter;
return "String" if $type eq "DOMUserData"; # temporary hack, TODO
@@ -1763,7 +1763,7 @@ sub JSValueToNative
$implIncludes{"V8Node.h"} = 1;
# EventTarget is not in DOM hierarchy, but all Nodes are EventTarget.
- return "V8Node::HasInstance($value) ? V8Proxy::DOMWrapperToNode<EventTargetNode>($value) : 0";
+ return "V8Node::HasInstance($value) ? V8Proxy::DOMWrapperToNode<Node>($value) : 0";
}
AddIncludesForType($type);
diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index 0e58572..914ebaf 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -62,7 +62,6 @@
#include "Event.h"
#include "EventListener.h"
#include "EventTarget.h"
-#include "EventTargetNode.h"
#include "ExceptionCode.h"
#include "FloatRect.h"
#include "Frame.h"
@@ -2888,12 +2887,11 @@ CALLBACK_FUNC_DECL(DOMWindowNOP)
}
-// EventTargetNode -------------------------------------------------------------
+// Node -------------------------------------------------------------
-CALLBACK_FUNC_DECL(EventTargetNodeAddEventListener) {
- INC_STATS("DOM.EventTargetNode.addEventListener()");
- EventTargetNode* node =
- V8Proxy::DOMWrapperToNode<EventTargetNode>(args.Holder());
+CALLBACK_FUNC_DECL(NodeAddEventListener) {
+ INC_STATS("DOM.Node.addEventListener()");
+ Node* node = V8Proxy::DOMWrapperToNode<Node>(args.Holder());
V8Proxy* proxy = V8Proxy::retrieve(node->document()->frame());
if (!proxy)
@@ -2909,10 +2907,9 @@ CALLBACK_FUNC_DECL(EventTargetNodeAddEventListener) {
return v8::Undefined();
}
-CALLBACK_FUNC_DECL(EventTargetNodeRemoveEventListener) {
- INC_STATS("DOM.EventTargetNode.removeEventListener()");
- EventTargetNode* node =
- V8Proxy::DOMWrapperToNode<EventTargetNode>(args.Holder());
+CALLBACK_FUNC_DECL(NodeRemoveEventListener) {
+ INC_STATS("DOM.Node.removeEventListener()");
+ Node* node = V8Proxy::DOMWrapperToNode<Node>(args.Holder());
V8Proxy* proxy = V8Proxy::retrieve(node->document()->frame());
// It is possbile that the owner document of the node is detached
@@ -3192,8 +3189,7 @@ ACCESSOR_GETTER(DOMWindowEventHandler) {
ACCESSOR_SETTER(ElementEventHandler) {
- EventTargetNode* node =
- V8Proxy::DOMWrapperToNode<EventTargetNode>(info.Holder());
+ Node* node = V8Proxy::DOMWrapperToNode<Node>(info.Holder());
// Name starts with 'on', remove them.
String key = ToWebCoreString(name);
@@ -3223,8 +3219,7 @@ ACCESSOR_SETTER(ElementEventHandler) {
ACCESSOR_GETTER(ElementEventHandler) {
- EventTargetNode* node =
- V8Proxy::DOMWrapperToNode<EventTargetNode>(info.Holder());
+ Node* node = V8Proxy::DOMWrapperToNode<Node>(info.Holder());
// Name starts with 'on', remove them.
String key = ToWebCoreString(name);
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index 99eeca3..72f9979 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -309,8 +309,8 @@ DECLARE_CALLBACK(LocationValueOf)
// Implementation of EventTarget::addEventListener
// and EventTarget::removeEventListener
-DECLARE_CALLBACK(EventTargetNodeAddEventListener)
-DECLARE_CALLBACK(EventTargetNodeRemoveEventListener)
+DECLARE_CALLBACK(NodeAddEventListener)
+DECLARE_CALLBACK(NodeRemoveEventListener)
// Custom implementation is Navigator properties.
// We actually only need this because WebKit has
diff --git a/webkit/port/bindings/v8/v8_index.cpp b/webkit/port/bindings/v8/v8_index.cpp
index 5eb1f81..9f93a93 100644
--- a/webkit/port/bindings/v8/v8_index.cpp
+++ b/webkit/port/bindings/v8/v8_index.cpp
@@ -153,7 +153,6 @@
#include "V8DOMWindow.h"
#include "V8Event.h"
#include "V8EventException.h"
-#include "V8EventTargetNode.h"
#include "V8KeyboardEvent.h"
#include "V8MouseEvent.h"
#include "V8WebKitAnimationEvent.h"
diff --git a/webkit/port/bindings/v8/v8_index.h b/webkit/port/bindings/v8/v8_index.h
index 0f6fc1f..d388116 100644
--- a/webkit/port/bindings/v8/v8_index.h
+++ b/webkit/port/bindings/v8/v8_index.h
@@ -45,7 +45,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)();
V(ELEMENT, Element) \
V(ENTITY, Entity) \
V(ENTITYREFERENCE, EntityReference) \
- V(EVENTTARGETNODE, EventTargetNode) \
V(HTMLDOCUMENT, HTMLDocument) \
V(NODE, Node) \
V(NOTATION, Notation) \
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 3bbbe21..4a76163 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -79,7 +79,6 @@
#include "DOMWindow.h"
#include "Entity.h"
#include "EventListener.h"
-#include "EventTargetNode.h"
#include "EventTarget.h"
#include "Event.h"
#include "EventException.h"
diff --git a/webkit/port/bindings/v8/v8_proxy.h b/webkit/port/bindings/v8/v8_proxy.h
index 31bdc40..772489f 100644
--- a/webkit/port/bindings/v8/v8_proxy.h
+++ b/webkit/port/bindings/v8/v8_proxy.h
@@ -56,7 +56,6 @@ class MimeType;
class MimeTypeArray;
class Plugin;
class PluginArray;
-class EventTargetNode;
class StyleSheetList;
class CSSValue;
class CSSRule;
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 2a60a1f..13ff6f6 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1760,7 +1760,17 @@ LINUX : LayoutTests/svg/text/text-path-01-b.svg = FAIL
// like it is using a different font to render now than it
// did before and that may be a bug. It looks like
// jshin@chromium.org did several font related changes in this merge.
+LayoutTests/fast/css/text-overflow-ellipsis.html = FAIL
+
LINUX WIN : LayoutTests/fast/css/text-overflow-ellipsis.html = FAIL
+// Regressions from webkit merge 40668:40722
+LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
+// This is related to merging EventTargetNode into Node, but I don't understand
+// this well enough to know if this just needs a rebase. One of the V8 folk
+// should take a look at this. The upstream expected results changed as well,
+// but differently than ours did.
+LayoutTests/fast/dom/prototype-chain.html = FAIL
+
// Started failing with webkit merge 40539:40668
MAC DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 554b5ab..ac7fee7 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -275,7 +275,6 @@
938444B70F16B0570075F4C5 /* EventHandlerChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A3624C0F003B3000778012 /* EventHandlerChromium.cpp */; };
938444B80F16B0570075F4C5 /* EventNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8A010D7F3A7C001ECF42 /* EventNames.cpp */; };
938444B90F16B0570075F4C5 /* EventTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8A030D7F3A7C001ECF42 /* EventTarget.cpp */; };
- 938444BA0F16B0570075F4C5 /* EventTargetNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8A060D7F3A7C001ECF42 /* EventTargetNode.cpp */; };
938444BB0F16B0570075F4C5 /* ExceptionBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8A080D7F3A7C001ECF42 /* ExceptionBase.cpp */; };
938444BC0F16B0570075F4C5 /* ExceptionCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8A0A0D7F3A7C001ECF42 /* ExceptionCode.cpp */; };
938444BD0F16B0570075F4C5 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F04D0E9BA86A00C66CE0 /* File.cpp */; };
@@ -2633,7 +2632,6 @@
7B5E8A020D7F3A7C001ECF42 /* EventNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventNames.h; sourceTree = "<group>"; };
7B5E8A030D7F3A7C001ECF42 /* EventTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTarget.cpp; sourceTree = "<group>"; };
7B5E8A040D7F3A7C001ECF42 /* EventTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTarget.h; sourceTree = "<group>"; };
- 7B5E8A060D7F3A7C001ECF42 /* EventTargetNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTargetNode.cpp; sourceTree = "<group>"; };
7B5E8A070D7F3A7C001ECF42 /* EventTargetNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTargetNode.h; sourceTree = "<group>"; };
7B5E8A080D7F3A7C001ECF42 /* ExceptionBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionBase.cpp; sourceTree = "<group>"; };
7B5E8A090D7F3A7C001ECF42 /* ExceptionBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionBase.h; sourceTree = "<group>"; };
@@ -5072,7 +5070,6 @@
7B5E8A020D7F3A7C001ECF42 /* EventNames.h */,
7B5E8A030D7F3A7C001ECF42 /* EventTarget.cpp */,
7B5E8A040D7F3A7C001ECF42 /* EventTarget.h */,
- 7B5E8A060D7F3A7C001ECF42 /* EventTargetNode.cpp */,
7B5E8A070D7F3A7C001ECF42 /* EventTargetNode.h */,
7B5E8A080D7F3A7C001ECF42 /* ExceptionBase.cpp */,
7B5E8A090D7F3A7C001ECF42 /* ExceptionBase.h */,
@@ -8766,7 +8763,6 @@
938444B70F16B0570075F4C5 /* EventHandlerChromium.cpp in Sources */,
938444B80F16B0570075F4C5 /* EventNames.cpp in Sources */,
938444B90F16B0570075F4C5 /* EventTarget.cpp in Sources */,
- 938444BA0F16B0570075F4C5 /* EventTargetNode.cpp in Sources */,
938444BB0F16B0570075F4C5 /* ExceptionBase.cpp in Sources */,
938444BC0F16B0570075F4C5 /* ExceptionCode.cpp in Sources */,
938444BD0F16B0570075F4C5 /* File.cpp in Sources */,
generated by cgit v1.1 at 2024-12-27 11:32:17 +0000