diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-11-17 05:49:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 05:49:29 -0800 |
| commit | 06150b212d47bb8d3dfb0415931f27cf7d56d269 (patch) | |
| tree | e6b975f8e42084c9f293cc1eb7024a55f4c6ed37 /Source | |
| parent | 1343dcc6f50e1060fc392a2866438c1495449d0f (diff) | |
| parent | 5f000f6f06377295cba1d3246dbd601610cdbd16 (diff) | |
| download | external_webkit-06150b212d47bb8d3dfb0415931f27cf7d56d269.zip external_webkit-06150b212d47bb8d3dfb0415931f27cf7d56d269.tar.gz external_webkit-06150b212d47bb8d3dfb0415931f27cf7d56d269.tar.bz2 | |
Merge "Remove changes with upstream WebKit"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/bindings/v8/V8Proxy.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/css/CSSParser.cpp | 1 | ||||
| -rw-r--r-- | Source/WebCore/loader/FrameLoader.cpp | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/Source/WebCore/bindings/v8/V8Proxy.cpp b/Source/WebCore/bindings/v8/V8Proxy.cpp index 80c4789..d90cf1c 100644 --- a/Source/WebCore/bindings/v8/V8Proxy.cpp +++ b/Source/WebCore/bindings/v8/V8Proxy.cpp @@ -83,10 +83,6 @@ #include <wtf/UnusedParam.h> #include <wtf/text/StringConcatenate.h> -#if PLATFORM(ANDROID) -#include <wtf/text/CString.h> -#endif - namespace WebCore { // Static list of registered extensions diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp index df9d252..78b6b24 100644 --- a/Source/WebCore/css/CSSParser.cpp +++ b/Source/WebCore/css/CSSParser.cpp @@ -1962,7 +1962,6 @@ bool CSSParser::parseValue(int propId, bool important) case CSSPropertyTextOverline: case CSSPropertyTextUnderline: return false; - #if ENABLE(WCSS) case CSSPropertyWapInputFormat: validPrimitive = true; diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp index ee0397b..f999fdb 100644 --- a/Source/WebCore/loader/FrameLoader.cpp +++ b/Source/WebCore/loader/FrameLoader.cpp @@ -1109,7 +1109,7 @@ void FrameLoader::handleFallbackContent() } void FrameLoader::provisionalLoadStarted() -{ +{ if (m_stateMachine.firstLayoutDone()) m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoad); m_frame->navigationScheduler()->cancel(true); @@ -2299,7 +2299,7 @@ void FrameLoader::finishedLoadingDocument(DocumentLoader* loader) if (m_stateMachine.creatingInitialEmptyDocument()) return; #endif - + #if !ENABLE(WEB_ARCHIVE) m_client->finishedLoading(loader); #else |