Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)

New snapshot that fixes various bugs

Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

9 files changed, 125 insertions, 36 deletions

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index d4d3171f0..d1cf5e0f8 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,71 @@
+2012-11-23  Yury Semikhatsky  <yurys@chromium.org>
+
+        Unreviewed. Fix Chromium Win compilation after r135580.
+        https://bugs.webkit.org/show_bug.cgi?id=101772
+
+        * tests/WebFrameTest.cpp:
+
+2012-11-23  Sami Kyostila  <skyostil@chromium.org>
+
+        [chromium] Remove WebScreenInfo.{horizontal,vertical}DPI
+        https://bugs.webkit.org/show_bug.cgi?id=101772
+
+        Reviewed by Adam Barth.
+
+        Now that nothing is using WebScreenInfo.{horizontal,vertical}DPI we can simply
+        remove them.
+
+        * src/mac/WebScreenInfoFactory.mm:
+        (WebKit::WebScreenInfoFactory::screenInfo):
+        * src/win/WebScreenInfoFactory.cpp:
+        (WebKit::WebScreenInfoFactory::screenInfo):
+        * src/x11/WebScreenInfoFactory.cpp:
+        (WebKit::WebScreenInfoFactory::screenInfo):
+
+2012-11-22  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed.  Rolled DEPS.
+
+        * DEPS:
+
+2012-11-22  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Add OS!="ios" to guard for gcc_version in WebKit.gyp
+        https://bugs.webkit.org/show_bug.cgi?id=103007
+
+        Reviewed by Adam Barth.
+
+        This matches the guards used in chromium's chrome/chrome_browser.gypi.
+
+        * WebKit.gyp:
+
+2012-11-22  Stephen Chenney  <schenney@chromium.org>
+
+        [Chromium]: Removing gyp flags controlling Skia features.
+
+        Unreviewed, pre-tested rendering changes that have been waiting for a chance to rebaseline tests.
+
+        Enabled fixes for test rendering, and fast patsh for anti-aliased primitives.
+
+        * skia_webkit.gyp:
+
+2012-11-22  Dan Carney  <dcarney@google.com>
+
+        IDBRequestTest needs a v8 context
+        https://bugs.webkit.org/show_bug.cgi?id=102941
+
+        Reviewed by Jochen Eisinger.
+
+        Added v8 context to IDBRequestTest tests.
+
+        * tests/IDBRequestTest.cpp:
+        (IDBRequestTest):
+        (WebKit::IDBRequestTest::IDBRequestTest):
+        (WebKit::IDBRequestTest::context):
+        (WebKit::IDBRequestTest::scriptExecutionContext):
+        (WebKit):
+        (WebKit::TEST_F):
+
 2012-11-21  Tien-Ren Chen  <trchen@chromium.org>
 
         [chromium] Device scale factor should be no-op when applyDeviceScaleFactorInCompositor == 0
diff --git a/Source/WebKit/chromium/DEPS b/Source/WebKit/chromium/DEPS
index 222eb8b45..31ff1844f 100644
--- a/Source/WebKit/chromium/DEPS
+++ b/Source/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '169021'
+  'chromium_rev': '169306'
 }
 
 deps = {
diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
index 0dd53bfa3..92afddaa0 100644
--- a/Source/WebKit/chromium/WebKit.gyp
+++ b/Source/WebKit/chromium/WebKit.gyp
@@ -720,6 +720,7 @@
                                 'tests/FakeWebPlugin.cpp',
                                 'tests/FrameTestHelpers.cpp',
                                 'tests/IDBBindingUtilitiesTest.cpp',
+                                'tests/IDBRequestTest.cpp',
                                 'tests/LevelDBTest.cpp',
                                 'tests/ListenerLeakTest.cpp',
                                 'tests/LinkHighlightTest.cpp',
@@ -1077,7 +1078,7 @@
         },
     ], # targets
     'conditions': [
-        ['os_posix==1 and OS!="mac" and gcc_version>=46', {
+        ['os_posix==1 and OS!="mac" and OS!="ios" and gcc_version>=46', {
             'target_defaults': {
                 # Disable warnings about c++0x compatibility, as some names (such
                 # as nullptr) conflict with upcoming c++0x types.
diff --git a/Source/WebKit/chromium/skia_webkit.gyp b/Source/WebKit/chromium/skia_webkit.gyp
index 14a740d0c..0ecb0efb0 100644
--- a/Source/WebKit/chromium/skia_webkit.gyp
+++ b/Source/WebKit/chromium/skia_webkit.gyp
@@ -37,19 +37,8 @@
       'type': 'none',
       'direct_dependent_settings': {
         'defines': [
-          # temporary for landing Skia rev 3077 with minimal layout test breakage
-          'SK_SIMPLE_TWOCOLOR_VERTICAL_GRADIENTS',
-
-          # Temporarily disable the Skia fix in
-          # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that
-          # fix will require substantial rebaselining.
-          'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX',
-
-          # Temporarily ignore fix to antialias coverage, until we can rebaseline
-          'SK_USE_LEGACY_AA_COVERAGE',
-
-          # When enabled yields a 10x speedup on some devices.
-          'SK_DISABLE_FAST_AA_STROKE_RECT',
+          # Place defines here that require significant WebKit rebaselining, or that
+          # are otherwise best removed in WebKit and then rolled into Chromium.
         ],
       },
     },
diff --git a/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm b/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm
index 003c8eb6e..157c23192 100644
--- a/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm
+++ b/Source/WebKit/chromium/src/mac/WebScreenInfoFactory.mm
@@ -95,11 +95,7 @@ WebScreenInfo WebScreenInfoFactory::screenInfo(NSView* view)
 
     WebScreenInfo results;
 
-    float deviceDPI = 160 * deviceScaleFactor(view);
-    results.horizontalDPI = deviceDPI;
-    results.verticalDPI = deviceDPI;
     results.deviceScaleFactor = static_cast<int>(deviceScaleFactor(view));
-
     results.depth = NSBitsPerPixelFromDepth([screen depth]);
     results.depthPerComponent = NSBitsPerSampleFromDepth([screen depth]);
     results.isMonochrome =
diff --git a/Source/WebKit/chromium/src/win/WebScreenInfoFactory.cpp b/Source/WebKit/chromium/src/win/WebScreenInfoFactory.cpp
index 5a6c11214..e2bcd23a2 100644
--- a/Source/WebKit/chromium/src/win/WebScreenInfoFactory.cpp
+++ b/Source/WebKit/chromium/src/win/WebScreenInfoFactory.cpp
@@ -65,8 +65,7 @@ WebScreenInfo WebScreenInfoFactory::screenInfo(HWND window)
     ASSERT(hdc);
 
     WebScreenInfo results;
-    results.horizontalDPI = GetDeviceCaps(hdc, LOGPIXELSX);
-    results.verticalDPI = GetDeviceCaps(hdc, LOGPIXELSY);
+    // FIXME: Initialize the device scale factor.
     results.depth = devMode.dmBitsPerPel;
     results.depthPerComponent = devMode.dmBitsPerPel / 3;  // Assumes RGB
     results.isMonochrome = devMode.dmColor == DMCOLOR_MONOCHROME;
diff --git a/Source/WebKit/chromium/src/x11/WebScreenInfoFactory.cpp b/Source/WebKit/chromium/src/x11/WebScreenInfoFactory.cpp
index b6afa458b..49f3a96a5 100644
--- a/Source/WebKit/chromium/src/x11/WebScreenInfoFactory.cpp
+++ b/Source/WebKit/chromium/src/x11/WebScreenInfoFactory.cpp
@@ -44,7 +44,6 @@ namespace WebKit {
 // function, but it appears to return stale data after the screen is resized.
 WebScreenInfo WebScreenInfoFactory::screenInfo(Display* display, int screenNumber)
 {
-    const float inchesPerMillimeter = 25.4;
     // XDisplayWidth() and XDisplayHeight() return cached values. To ensure that
     // we return the correct dimensions after the screen is resized, query the
     // root window's geometry each time.
@@ -56,14 +55,8 @@ WebScreenInfo WebScreenInfoFactory::screenInfo(Display* display, int screenNumbe
         display, root, &rootRet, &x, &y, &width, &height, &border, &depth);
 
     WebScreenInfo results;
-    int displayWidth = DisplayWidth(display, screenNumber);
-    int displayWidthInMillimeters = DisplayWidthMM(display, screenNumber);
-    results.horizontalDPI = static_cast<int>(inchesPerMillimeter * displayWidth / displayWidthInMillimeters);
-
-    int displayHeight = DisplayHeight(display, screenNumber);
-    int displayHeightInMillimeters = DisplayHeightMM(display, screenNumber);
-    results.verticalDPI = static_cast<int>(inchesPerMillimeter * displayHeight / displayHeightInMillimeters);
 
+    // FIXME: Initialize the device scale factor.
     // FIXME: Not all screens use 8bpp.
     results.depthPerComponent = 8;
     results.depth = depth;
diff --git a/Source/WebKit/chromium/tests/IDBRequestTest.cpp b/Source/WebKit/chromium/tests/IDBRequestTest.cpp
index 27f6c1e6b..a0734e14c 100644
--- a/Source/WebKit/chromium/tests/IDBRequestTest.cpp
+++ b/Source/WebKit/chromium/tests/IDBRequestTest.cpp
@@ -28,23 +28,64 @@
 #include "IDBRequest.h"
 
 #include "DOMStringList.h"
+#include "Document.h"
+#include "Frame.h"
+#include "FrameTestHelpers.h"
 #include "IDBCursorBackendInterface.h"
 #include "IDBDatabaseBackendImpl.h"
 #include "IDBTransactionCoordinator.h"
+#include "WebFrame.h"
+#include "WebFrameImpl.h"
+#include "WebView.h"
 
 #include <gtest/gtest.h>
 
 #if ENABLE(INDEXED_DATABASE)
 
 using namespace WebCore;
+using namespace WebKit;
 
 namespace {
 
-TEST(IDBRequestTest, EventsAfterStopping)
+class IDBRequestTest : public testing::Test {
+public:
+    IDBRequestTest()
+        : m_webView(0)
+    {
+    }
+
+    void SetUp() OVERRIDE
+    {
+        m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank");
+        m_webView->setFocus(true);
+    }
+
+    void TearDown() OVERRIDE
+    {
+        m_webView->close();
+    }
+
+    v8::Handle<v8::Context> context()
+    {
+        return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->script()->mainWorldContext();
+    }
+
+    ScriptExecutionContext* scriptExecutionContext()
+    {
+        return static_cast<WebFrameImpl*>(m_webView->mainFrame())->frame()->document();
+    }
+
+private:
+    WebView* m_webView;
+};
+
+TEST_F(IDBRequestTest, EventsAfterStopping)
 {
-    ScriptExecutionContext* context = 0;
+    v8::HandleScope handleScope;
+    v8::Context::Scope scope(context());
+
     IDBTransaction* transaction = 0;
-    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
+    RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
     EXPECT_EQ(request->readyState(), "pending");
     request->stop();
 
@@ -59,11 +100,13 @@ TEST(IDBRequestTest, EventsAfterStopping)
     request->onSuccess(IDBKey::createInvalid(), IDBKey::createInvalid(), SerializedScriptValue::nullValue());
 }
 
-TEST(IDBRequestTest, AbortErrorAfterAbort)
+TEST_F(IDBRequestTest, AbortErrorAfterAbort)
 {
-    ScriptExecutionContext* context = 0;
+    v8::HandleScope handleScope;
+    v8::Context::Scope scope(context());
+
     IDBTransaction* transaction = 0;
-    RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::createInvalid(), transaction);
+    RefPtr<IDBRequest> request = IDBRequest::create(scriptExecutionContext(), IDBAny::createInvalid(), transaction);
     EXPECT_EQ(request->readyState(), "pending");
 
     // Simulate the IDBTransaction having received onAbort from back end and aborting the request:
diff --git a/Source/WebKit/chromium/tests/WebFrameTest.cpp b/Source/WebKit/chromium/tests/WebFrameTest.cpp
index f503541f5..29e0f0b6c 100644
--- a/Source/WebKit/chromium/tests/WebFrameTest.cpp
+++ b/Source/WebKit/chromium/tests/WebFrameTest.cpp
@@ -293,7 +293,7 @@ TEST_F(WebFrameTest, ScaleFactorShouldNotOscillate)
     registerMockedHttpURLLoad("scale_oscillate.html");
 
     FixedLayoutTestWebViewClient client;
-    client.m_screenInfo.horizontalDPI = 212;
+    client.m_screenInfo.deviceScaleFactor = static_cast<float>(1.325);
     int viewportWidth = 800;
     int viewportHeight = 1057;