From 5f000f6f06377295cba1d3246dbd601610cdbd16 Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Wed, 16 Nov 2011 18:02:14 +0000
Subject: Remove changes with upstream WebKit

Fix for bug 5626884, removing some small changes with upstream
that was spotted as part of CL:
https://android-git.corp.google.com/g/#/c/148917

No functional difference.

Change-Id: I62c8a24e17c3ab86eebff997b87e5bced88e0807
---
 Source/WebCore/bindings/v8/V8Proxy.cpp | 4 ----
 Source/WebCore/css/CSSParser.cpp       | 1 -
 Source/WebCore/loader/FrameLoader.cpp  | 4 ++--
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'Source')

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
-- 
cgit v1.1