Changeset 95244 in webkit

Timestamp:

Sep 15, 2011, 5:17:50 PM (15 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=67884
Delete button icon does not properly update when the device resolution changes
dynamically
-and corresponding-
<rdar://problem/10104632>

Reviewed by Darin Adler.

In DeleteButtonController::deviceScaleFactorChanged(), if the delete button is
currently showing, hide it and re-show it, forcing it to re-create the deletion
UI.

• editing/DeleteButtonController.cpp:

(WebCore::DeleteButtonController::deviceScaleFactorChanged):

• editing/DeleteButtonController.h:
• editing/Editor.cpp:

(WebCore::Editor::deviceScaleFactorChanged):

• editing/Editor.h:

Iterate through all of the frames and propagate the deviceScaleFactorChange()
message to Editor.

• page/Page.cpp:

(WebCore::Page::setDeviceScaleFactor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/DeleteButtonController.cpp (modified) (1 diff)
• editing/DeleteButtonController.h (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/Editor.h (modified) (1 diff)
• page/Page.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-15  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=67884
+        Delete button icon does not properly update when the device resolution changes 
+        dynamically
+        -and corresponding-
+        <rdar://problem/10104632>
+
+        Reviewed by Darin Adler.
+
+        In DeleteButtonController::deviceScaleFactorChanged(), if the delete button is 
+        currently showing, hide it and re-show it, forcing it to re-create the deletion 
+        UI.
+        * editing/DeleteButtonController.cpp:
+        (WebCore::DeleteButtonController::deviceScaleFactorChanged):
+        * editing/DeleteButtonController.h:
+        * editing/Editor.cpp:
+        (WebCore::Editor::deviceScaleFactorChanged):
+        * editing/Editor.h:
+
+        Iterate through all of the frames and propagate the deviceScaleFactorChange() 
+        message to Editor.
+        * page/Page.cpp:
+        (WebCore::Page::setDeviceScaleFactor):
+
 2011-09-15  Chris Marrin  <cmarrin@apple.com>
 

trunk/Source/WebCore/editing/DeleteButtonController.cpp

@@ -186 +186 @@
 }
 
+void DeleteButtonController::deviceScaleFactorChanged()
+{
+    if (!enabled())
+        return;
+    
+    HTMLElement* currentTarget = m_target.get();
+    hide();
+
+    // Setting m_containerElement to 0 will force the deletionUI to be re-created with
+    // artwork of the appropriate resolution in show().
+    m_containerElement = 0;
+    show(currentTarget);
+}
+
 void DeleteButtonController::createDeletionUI()
 {

trunk/Source/WebCore/editing/DeleteButtonController.h

@@ -49 +49 @@
     void respondToChangedSelection(const VisibleSelection& oldSelection);
 
+    void deviceScaleFactorChanged();
+
     void show(HTMLElement*);
     void hide();

trunk/Source/WebCore/editing/Editor.cpp

@@ -3232 +3232 @@
 }
 
+void Editor::deviceScaleFactorChanged()
+{
+    m_deleteButtonController->deviceScaleFactorChanged();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/editing/Editor.h

@@ -379 +379 @@
     void deletedAutocorrectionAtPosition(const Position&, const String& originalString);
 
+    void deviceScaleFactorChanged();
+
 private:
     Frame* m_frame;

trunk/Source/WebCore/page/Page.cpp

@@ -650 +650 @@
 #endif
 
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
+        frame->editor()->deviceScaleFactorChanged();
+
     backForward()->markPagesForFullStyleRecalc();
 }