diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 18:43:47 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 18:43:47 +0000 |
| commit | b0381b3e193519c009ec812686c9366ecd684f9f (patch) | |
| tree | 706ebd5881ec588be0eddd9eed3b7dc3c6cd62c6 | |
| parent | a6e8bc495bcdb6c1484ea88bb2f8aa03f6603765 (diff) | |
| download | chromium_src-b0381b3e193519c009ec812686c9366ecd684f9f.zip chromium_src-b0381b3e193519c009ec812686c9366ecd684f9f.tar.gz chromium_src-b0381b3e193519c009ec812686c9366ecd684f9f.tar.bz2 | |
Reverting 9394.
Relanding merge for the third time. Darin will fix mac build.
Review URL: http://codereview.chromium.org/20183
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9395 0039d316-1c4b-4281-b951-d872f2087c98
23 files changed, 70 insertions, 50 deletions
@@ -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@9391", "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/SConscript b/webkit/SConscript index cda5fb7..92de4bf 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -128,6 +128,7 @@ env.Prepend( '$JAVASCRIPTCORE_DIR', '$JAVASCRIPTCORE_DIR/wtf', + '$JAVASCRIPTCORE_DIR/wtf/chromium', # Directories in third_party/WebKit/Webcore that we pull headers # from. We don't have to list directories that are listed in the @@ -155,6 +156,7 @@ env.Prepend( '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/opentype', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/graphics/transforms', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/image-decoders/skia', + '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/image-encoders/skia', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/network', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/network/chromium', '$CHROME_SRC_DIR/third_party/WebKit/WebCore/platform/sql', diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index f0db07a..d0d0540 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -156,6 +156,7 @@ wtf_inputs = [ '$WTF_DIR/RandomNumber.cpp', '$WTF_DIR/RefCountedLeakCounter.cpp', '$WTF_DIR/TCSystemAlloc.cpp', + '$WTF_DIR/chromium/MainThreadChromium.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 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..4302b4d 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', @@ -542,6 +541,8 @@ input_files = [ '$WEBCORE_DIR/platform/image-decoders/skia/PNGImageDecoder.cpp', '$WEBCORE_DIR/platform/image-decoders/skia/XBMImageDecoder.cpp', + '$WEBCORE_DIR/platform/image-encoders/skia/PNGImageEncoder.cpp', + '$WEBCORE_DIR/platform/network/AuthenticationChallengeBase.cpp', '$WEBCORE_DIR/platform/network/Credential.cpp', '$WEBCORE_DIR/platform/network/FormData.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=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";$(SolutionDir)..\webkit\pending;$(SolutionDir)..\webkit\port\bridge;"$(ProjectDir)";$(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;"$(SolutionDir)..\third_party\WebKit\WebCore\os-win32";$(SolutionDir)..\third_party\WebKit\WebCore\wtf;$(SolutionDir)..\third_party\WebKit\JavaScriptCore;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\wtf;"$(SolutionDir)..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";$(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=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";$(SolutionDir)..\webkit\pending;$(SolutionDir)..\webkit\port\bridge;"$(ProjectDir)";$(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;"$(SolutionDir)..\third_party\WebKit\WebCore\os-win32";$(SolutionDir)..\third_party\WebKit\WebCore\wtf;$(SolutionDir)..\third_party\WebKit\JavaScriptCore;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\wtf;"$(SolutionDir)..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";$(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..9c86018 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -1762,5 +1762,11 @@ LINUX : LayoutTests/svg/text/text-path-01-b.svg = FAIL // jshin@chromium.org did several font related changes in this merge. LINUX WIN : LayoutTests/fast/css/text-overflow-ellipsis.html = FAIL +// 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..8bcea8e 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -38,6 +38,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 07390253EA4F1C8D86C78CCD /* PNGImageEncoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */; }; 25B9F25199984DFE5E4A59AE /* V8WebKitCSSMatrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */; }; 31BF82F52CDAED9621AC244E /* CrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E9CDA0420F5FBB839D45544 /* CrossThreadCopier.cpp */; }; 3C9197C6A7DABB989CBDBF81 /* Playback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C1174C9D4E12AB30D653019A /* Playback.cpp */; }; @@ -98,6 +99,7 @@ 89F4A0D50F200D5B000A326A /* V8CanvasPixelArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89F4A0D30F200D59000A326A /* V8CanvasPixelArray.cpp */; }; 89F4A2090F2106EF000A326A /* V8CanvasPixelArrayCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 89F4A1FC0F2101F8000A326A /* V8CanvasPixelArrayCustom.cpp */; }; 8EFD7D527676BF3B3C92361E /* ThreadTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A9898388068C93C5A7C011C /* ThreadTimers.cpp */; }; + 926BA16FA5646FDB1353DBD1 /* MainThreadChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FF1567A8464BD6DC36B47CD /* MainThreadChromium.cpp */; }; 934CC0040EBFE0E000A658F2 /* chromium_bridge_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 934CC0030EBFE0E000A658F2 /* chromium_bridge_impl.cc */; }; 938180500EF3394A00993F02 /* back_forward_list_client_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9381804E0EF3394A00993F02 /* back_forward_list_client_impl.cc */; }; 938444080F16B0570075F4C5 /* AccessibilityImageMapLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DB7F1E80E9BAE2900C66CE0 /* AccessibilityImageMapLink.cpp */; }; @@ -275,7 +277,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 */; }; @@ -1493,6 +1494,7 @@ 0F9CD02EE3AE2D8974EDFE58 /* RenderBoxModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderBoxModelObject.h; sourceTree = "<group>"; }; 1DF458E80DD265C670E05B03 /* RenderSelectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSelectionInfo.h; sourceTree = "<group>"; }; 20EF92D9CD4E55999674A63E /* CurrentTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentTime.h; sourceTree = "<group>"; }; + 31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PNGImageEncoder.cpp; path = "../third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp"; sourceTree = SOURCE_ROOT; }; 35DEC96C125DC674B5C9FA27 /* Interval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Interval.cpp; path = port/bindings/v8/extensions/Interval.cpp; sourceTree = SOURCE_ROOT; }; 3CBAF5EB0EFC892100E752CB /* Animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Animation.cpp; sourceTree = "<group>"; }; 3CBAF5EC0EFC892100E752CB /* Animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Animation.h; sourceTree = "<group>"; }; @@ -2633,7 +2635,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>"; }; @@ -3903,6 +3904,7 @@ 7BF891E70E7311B1000BAF8A /* ucptable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucptable.cpp; sourceTree = "<group>"; }; 7BF891FD0E731414000BAF8A /* chartables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chartables.c; sourceTree = "<group>"; }; 7BFD8E660DAFE7630084BC4B /* libjsbindings.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjsbindings.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 7FF1567A8464BD6DC36B47CD /* MainThreadChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MainThreadChromium.cpp; path = ../third_party/WebKit/JavaScriptCore/wtf/chromium/MainThreadChromium.cpp; sourceTree = SOURCE_ROOT; }; 820A61930DE7592C00871E2D /* WebCoreURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreURLResponse.h; sourceTree = "<group>"; }; 820A61940DE7592C00871E2D /* WebCoreURLResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponse.mm; sourceTree = "<group>"; }; 823E8F320F1CF88B00CD2F6C /* plugin_lib.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = plugin_lib.cc; sourceTree = "<group>"; }; @@ -4728,6 +4730,8 @@ 35DEC96C125DC674B5C9FA27 /* Interval.cpp */, C1174C9D4E12AB30D653019A /* Playback.cpp */, 4CDA86D8A0B62BD0EBF07D78 /* AnimationControllerPrivate.h */, + 7FF1567A8464BD6DC36B47CD /* MainThreadChromium.cpp */, + 31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */, ); sourceTree = "<group>"; }; @@ -5072,7 +5076,6 @@ 7B5E8A020D7F3A7C001ECF42 /* EventNames.h */, 7B5E8A030D7F3A7C001ECF42 /* EventTarget.cpp */, 7B5E8A040D7F3A7C001ECF42 /* EventTarget.h */, - 7B5E8A060D7F3A7C001ECF42 /* EventTargetNode.cpp */, 7B5E8A070D7F3A7C001ECF42 /* EventTargetNode.h */, 7B5E8A080D7F3A7C001ECF42 /* ExceptionBase.cpp */, 7B5E8A090D7F3A7C001ECF42 /* ExceptionBase.h */, @@ -8250,6 +8253,7 @@ 7B5E862C0D7F2B56001ECF42 /* FastMalloc.cpp in Sources */, 7B5E85F40D7F28F5001ECF42 /* HashTable.cpp in Sources */, 4DB7F5290E9BD3FB00C66CE0 /* MainThread.cpp in Sources */, + 926BA16FA5646FDB1353DBD1 /* MainThreadChromium.cpp in Sources */, 4DB7F5420E9BD50600C66CE0 /* MainThreadMac.mm in Sources */, 4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */, E40054A70E9BC4C20055B38E /* RefCountedLeakCounter.cpp in Sources */, @@ -8766,7 +8770,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 */, @@ -9034,6 +9037,7 @@ 938445BA0F16B0570075F4C5 /* PluginDataChromium.cpp in Sources */, 938445BB0F16B0570075F4C5 /* PluginDocument.cpp in Sources */, 93EF1C0F0F214F260070601B /* PNGImageDecoder.cpp in Sources */, + 07390253EA4F1C8D86C78CCD /* PNGImageEncoder.cpp in Sources */, 938445BD0F16B0570075F4C5 /* PointerEventsHitRules.cpp in Sources */, 938445BE0F16B0570075F4C5 /* PopupMenuChromium.cpp in Sources */, 938445BF0F16B0570075F4C5 /* Position.cpp in Sources */, |