Reviewed by Hyatt.

        fixes the width:auto problem in
        <rdar://problem/3698344> REGRESSION (143?-144): macrumors.com tabs are compressed and illegible

        * khtml/css/cssstyleselector.cpp:
        (khtml::CSSStyleSelector::applyProperty):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index a182675aa311f3614b8d5e582ce7f7f8057a66dd..a9e3a189905c566988af5b593200be3786d771cb 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -6,8 +6,6 @@
        objectVersion = 39;
        objects = {
                014CEA440018CDF011CA2923 = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                DEBUG_CFLAGS = "";
                                GCC_DYNAMIC_NO_PIC = NO;
@@ -24,8 +22,6 @@
                        name = Development;
                };
                014CEA450018CDF011CA2923 = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -58,8 +54,7 @@
                };
                034768E0FF38A50411DB9C8B = {
                        explicitFileType = wrapper.framework;
-                       fallbackIsa = PBXFileReference;
-                       isa = PBXFrameworkReference;
+                       isa = PBXFileReference;
                        path = JavaScriptCore.framework;
                        refType = 3;
                        sourceTree = BUILT_PRODUCTS_DIR;
@@ -1847,8 +1842,6 @@
                        };
                };
                F58C8A1D025BD408018635CA = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                INSTALL_PATH = "@executable_path/../Frameworks";
                                SECTORDER_FLAGS = "";
@@ -2000,9 +1993,8 @@
                        sourceTree = "<group>";
                };
                F692A8540255597D01FF60F7 = {
-                       fallbackIsa = PBXFileReference;
                        fileEncoding = 30;
-                       isa = PBXExecutableFileReference;
+                       isa = PBXFileReference;
                        lastKnownFileType = text.script.perl;
                        path = create_hash_table;
                        refType = 4;

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cbe69ca57a7ee20408bef4e6e7d3ffc7fdb184d1..8a11211d25ca79ac1b9cf39b6f1f9639cfefa87f 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+
+2004-07-09  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Hyatt.
+        
+        fixes the width:auto problem in
+        <rdar://problem/3698344> REGRESSION (143?-144): macrumors.com tabs are compressed and illegible
+        
+        * khtml/css/cssstyleselector.cpp:
+        (khtml::CSSStyleSelector::applyProperty):
+
+=======
 2004-07-09  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by me
@@ -7,6 +19,7 @@
         * layout-tests/editing/deleting/delete-image-004-expected.txt:
         * layout-tests/editing/selection/extend-by-character-006-expected.txt:
 
+
 2004-07-09  Chris Blumenberg  <cblu@apple.com>
 
        Allowed my change for 3715785 to compile on Jaguar.

diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index f6885785c697ffa51efe784e48d418d774df364a..16f8d2371415c2dc72c0090ae46798ca153a6c65 100644 (file)
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -2526,7 +2526,7 @@ void CSSStyleSelector::applyProperty( int id, DOM::CSSValueImpl *value )
                 apply = true;
             }
         }
-        else if (id != CSS_PROP_MAX_WIDTH && primitiveValue &&
+        if (id != CSS_PROP_MAX_WIDTH && primitiveValue &&
            primitiveValue->getIdent() == CSS_VAL_AUTO)
         {
             //kdDebug( 6080 ) << "found value=auto" << endl;

diff --git a/WebKit/Plugins.subproj/npruntime.h b/WebKit/Plugins.subproj/npruntime.h
index b3993c52bfe052658608a35224639edb121d88f3..9cc7a08e1c2ca9a8d82d3dbf74aacf97b7c938d5 100644 (file)
--- a/WebKit/Plugins.subproj/npruntime.h
+++ b/WebKit/Plugins.subproj/npruntime.h
@@ -1,32 +1,5 @@
 /*
- * Copyright © 2004, Apple Computer, Inc. and The Mozilla Foundation. 
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * 1.  Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
- * Foundation ("Mozilla") nor the names of their contributors may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR
- * THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
  *
  * Revision 1 (March 4, 2004):
  * Initial proposal.
@@ -56,10 +29,6 @@
  * NPIdentifier becomes a void*, was int32_t
  * Remove NP_IsValidIdentifier, renamed NP_IdentifierFromUTF8 to NP_GetIdentifier
  * Added NPVariant and modified functions to use this new type.
- *
- * Revision 8 (July 9, 2004):
- * Updated to joint Apple-Mozilla license.
- *
  */
 #ifndef _NP_RUNTIME_H_
 #define _NP_RUNTIME_H_