Changeset 24097 in webkit

Timestamp:

Jul 8, 2007, 8:37:19 AM (18 years ago)

Author:

rwlbuis

Message:

Reviewed by Mitz.

​http://bugs.webkit.org/show_bug.cgi?id=10752
The inspector should not respond to Make Text Smaller/Bigger commands

Use the -webkit-text-size-adjust property to ignore text sizing
and do not take the zoom factor into account for line height when
-webkit-text-size-adjust is set to none.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/ignore-text-zoom-expected.checksum (added)
• LayoutTests/fast/css/ignore-text-zoom-expected.png (added)
• LayoutTests/fast/css/ignore-text-zoom-expected.txt (added)
• LayoutTests/fast/css/ignore-text-zoom.html (added)
• LayoutTests/qt/ChangeLog (modified) (1 diff)
• LayoutTests/qt/Skipped (modified) (1 diff)
• LayoutTests/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/cssstyleselector.cpp (modified) (1 diff)
• WebCore/page/inspector/inspector.css (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/DumpRenderTree.m (modified) (1 diff)
• WebKitTools/DumpRenderTree/EventSendingController.m (modified) (3 diffs)

trunk/LayoutTests/ChangeLog ¶

@@ +1 @@
+2007-07-08  Rob Buis  <buis@kde.org>
+
+        Reviewed by Mitz.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=14209
+        DRT should be able to deal with text zoom
+        http://bugs.webkit.org/show_bug.cgi?id=10752
+        The inspector should not respond to Make Text Smaller/Bigger commands
+
+        * fast/css/ignore-text-zoom-expected.checksum: Added.
+        * fast/css/ignore-text-zoom-expected.png: Added.
+        * fast/css/ignore-text-zoom-expected.txt: Added.
+        * fast/css/ignore-text-zoom.html: Added.
+        * win/Skipped:
+
 2007-07-08  Mitz Pettel  <mitz@webkit.org>
 

trunk/LayoutTests/qt/ChangeLog ¶

@@ +1 @@
+2007-07-08  Rob Buis  <buis@kde.org>
+
+        Reviewed by Mitz.
+
+        To pass fast/css/ignore-text-zoom textZoomIn/textZoomOut
+        must be implemented in the qt DumpRenderTree version.
+
+        * Skipped:
+
 2007-06-21  Lars Knoll <lars@trolltech.com>
 

trunk/LayoutTests/qt/Skipped ¶

@@ -53 +53 @@
 fast/css/acid2-pixel.html
 fast/css/acid2.html
+fast/css/ignore-text-zoom
 fast/css/resize-corner-tracking.html
 

trunk/LayoutTests/win/Skipped ¶

@@ -64 +64 @@
 fast/css/beforeSelectorOnCodeElement.html
 fast/css/font_property_normal.html
+fast/css/ignore-text-zoom
 fast/css/rtl-ordering.html
 fast/css/text-security.html

trunk/WebCore/ChangeLog ¶

@@ +1 @@
+2007-07-08  Rob Buis  <buis@kde.org>
+
+        Reviewed by Mitz.
+
+        http://bugs.webkit.org/show_bug.cgi?id=10752
+        The inspector should not respond to Make Text Smaller/Bigger commands
+
+        Use the -webkit-text-size-adjust property to ignore text sizing        
+        and do not take the zoom factor into account for line height when
+        -webkit-text-size-adjust is set to none.
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * page/inspector/inspector.css:
+
 2007-07-08  Darin Adler  <darin@apple.com>
 

trunk/WebCore/css/cssstyleselector.cpp ¶

@@ -3148 +3148 @@
             // Scale for the font zoom factor only for types other than "em" and "ex", since those are
             // already based on the font size.
-            if (type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS && m_document->frame()) {
+            if (type != CSSPrimitiveValue::CSS_EMS && type != CSSPrimitiveValue::CSS_EXS && style->textSizeAdjust() && m_document->frame()) {
                 multiplier = m_document->frame()->zoomFactor() / 100.0;
             }

trunk/WebCore/page/inspector/inspector.css ¶

@@ -34 +34 @@
     font-family: Lucida Grande, sans-serif;
     margin: 0;
+    -webkit-text-size-adjust: none;
 }
 

trunk/WebKitTools/ChangeLog ¶

@@ +1 @@
+2007-07-08  Rob Buis  <buis@kde.org>
+
+        Reviewed by Mitz.
+
+        http://bugs.webkit.org/show_bug.cgi?id=14209
+        DRT should be able to deal with text zoom
+
+        Allow increasing/decreasing text zoom using eventSender.
+
+        * DumpRenderTree/DumpRenderTree.m:
+        (runTest):
+        * DumpRenderTree/EventSendingController.m:
+        (+[EventSendingController initialize]):
+        (+[EventSendingController isSelectorExcludedFromWebScript:]):
+        (-[EventSendingController textZoomIn]):
+        (-[EventSendingController textZoomOut]):
+
 2007-07-07  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKitTools/DumpRenderTree/DumpRenderTree.m ¶

@@ -1469 +1469 @@
 
     [(EditingDelegate *)[[mainFrame webView] editingDelegate] setAcceptsEditing:YES];
+    [[mainFrame webView] makeTextStandardSize:nil];
     [[mainFrame webView] setTabKeyCyclesThroughElements: YES];
     done = NO;

trunk/WebKitTools/DumpRenderTree/EventSendingController.m ¶

@@ -93 +93 @@
         @"submit", 
         @"textInput", 
+        @"textzoomin",
+        @"textzoomout",
         @"unload",
         @"zoom",
@@ -108 +110 @@
             || aSelector == @selector(enableDOMUIEventLogging:)
             || aSelector == @selector(fireKeyboardEventsToElement:)
-            || aSelector == @selector(clearKillRing))
+            || aSelector == @selector(clearKillRing)
+            || aSelector == @selector(textZoomIn)
+            || aSelector == @selector(textZoomOut))
         return NO;
     return YES;
@@ -198 +202 @@
         down = YES;
     }
+}
+
+- (void)textZoomIn
+{
+    [[mainFrame webView] makeTextLarger:self];
+}
+
+- (void)textZoomOut
+{
+    [[mainFrame webView] makeTextSmaller:self];
 }