diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 21:08:19 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 21:08:19 +0000 |
| commit | e354bc49d8c836cd5869a70afdac1ac836adbec4 (patch) | |
| tree | 6f5a30ffb6e2fbe5ae500f3662ab8800a8f88e47 /webkit/port | |
| parent | fa98babe6a72b8af5975e09f76bf8ca7ab48d8c2 (diff) | |
| download | chromium_src-e354bc49d8c836cd5869a70afdac1ac836adbec4.zip chromium_src-e354bc49d8c836cd5869a70afdac1ac836adbec4.tar.gz chromium_src-e354bc49d8c836cd5869a70afdac1ac836adbec4.tar.bz2 | |
Chrome changes for WebKit merge 43114:43242
R=dglazkov
Review URL: http://codereview.chromium.org/109042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/bindings/v8/DOMObjectsInclude.h | 3 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_custom.cpp | 1 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_proxy.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/webkit/port/bindings/v8/DOMObjectsInclude.h b/webkit/port/bindings/v8/DOMObjectsInclude.h index 5e067b4..671e982 100644 --- a/webkit/port/bindings/v8/DOMObjectsInclude.h +++ b/webkit/port/bindings/v8/DOMObjectsInclude.h @@ -24,9 +24,10 @@ #include "CSSPageRule.h" #include "CSSRule.h" #include "CSSRuleList.h" -#include "CSSValueList.h" +#include "CSSStyleDeclaration.h" #include "CSSStyleRule.h" #include "CSSStyleSheet.h" +#include "CSSValueList.h" #include "CSSVariablesDeclaration.h" #include "CSSVariablesRule.h" #include "Database.h" diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp index 1faf33d..b930d47 100644 --- a/webkit/port/bindings/v8/v8_custom.cpp +++ b/webkit/port/bindings/v8/v8_custom.cpp @@ -47,6 +47,7 @@ #include "V8XPathNSResolver.h" #include "V8XPathResult.h" +#include "Attr.h" #include "Base64.h" #include "CanvasGradient.h" #include "CanvasPattern.h" diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp index 9180dc9..bed4ec4 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -43,6 +43,7 @@ #include "V8DOMWindow.h" #include "ChromiumBridge.h" +#include "CSSMutableStyleDeclaration.h" #include "DOMObjectsInclude.h" #include "DocumentLoader.h" #include "ScriptController.h" @@ -2467,7 +2468,7 @@ v8::Local<v8::Object> V8Proxy::InstantiateV8Object( { // Make a special case for document.all if (desc_type == V8ClassIndex::HTMLCOLLECTION && - static_cast<HTMLCollection*>(imp)->type() == HTMLCollection::DocAll) { + static_cast<HTMLCollection*>(imp)->type() == DocAll) { desc_type = V8ClassIndex::UNDETECTABLEHTMLCOLLECTION; } |