[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 78a34710545086c6e632a3784ce37936997a451b
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 24 01:50:42 2010 +0000

    <rdar://problem/7569820> svg/custom/text-zoom.xhtml fails on Windows
    https://bugs.webkit.org/show_bug.cgi?id=34006
    
    Reviewed by Maciej Stachowiak.
    
    WebKit/win:
    
    * WebPreferences.cpp:
    (WebPreferences::initializeDefaultSettings): Added WebKitZoomsTextOnlyPreferenceKey
    with a default value of true.
    
    LayoutTests:
    
    * platform/win/svg/custom/text-zoom-expected.txt: Removed.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4e70317..3c2aa84 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-23  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/7569820> svg/custom/text-zoom.xhtml fails on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=34006
+
+        * platform/win/svg/custom/text-zoom-expected.txt: Removed.
+
 2010-01-23  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/win/svg/custom/text-zoom-expected.txt b/LayoutTests/platform/win/svg/custom/text-zoom-expected.txt
deleted file mode 100644
index 218683f..0000000
--- a/LayoutTests/platform/win/svg/custom/text-zoom-expected.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x9
-  RenderBlock {html} at (0,0) size 800x9
-    RenderBody {body} at (9,9) size 782x0
-layer at (0,36) size 120x120
-  RenderBlock (positioned) {div} at (0,36) size 120x120 [bgcolor=#FF0000]
-layer at (0,36) size 240x245
-  RenderBlock (positioned) {div} at (0,36) size 240x240
-    RenderSVGRoot {svg} at (9,45) size 120x120
-      RenderPath {rect} at (9,45) size 120x120 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00 L50.00,0.00 L50.00,50.00 L0.00,50.00 Z"]
-    RenderText {#text} at (0,0) size 0x0
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 4a3d84c..eb64e43 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-23  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/7569820> svg/custom/text-zoom.xhtml fails on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=34006
+
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings): Added WebKitZoomsTextOnlyPreferenceKey
+        with a default value of true.
+
 2010-01-20  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/win/WebPreferences.cpp b/WebKit/win/WebPreferences.cpp
index 56d01b5..cd982fd 100644
--- a/WebKit/win/WebPreferences.cpp
+++ b/WebKit/win/WebPreferences.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -212,6 +212,7 @@ void WebPreferences::initializeDefaultSettings()
     CFDictionaryAddValue(defaults, CFSTR(WebKitDatabasesEnabledPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitLocalStorageEnabledPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitExperimentalNotificationsEnabledPreferenceKey), kCFBooleanFalse);
+    CFDictionaryAddValue(defaults, CFSTR(WebKitZoomsTextOnlyPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitAllowAnimatedImagesPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitAllowAnimatedImageLoopingPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults, CFSTR(WebKitDisplayImagesKey), kCFBooleanTrue);

-- 
WebKit Debian packaging