Changeset 102192 in webkit

Timestamp:

Dec 6, 2011, 4:45:49 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r95244.

Location:

branches/safari-534.53-branch/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)

branches/safari-534.53-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-06  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 95244
+
+    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-12-06  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534.53-branch/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()
 {

branches/safari-534.53-branch/Source/WebCore/editing/DeleteButtonController.h

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

branches/safari-534.53-branch/Source/WebCore/editing/Editor.cpp

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

branches/safari-534.53-branch/Source/WebCore/editing/Editor.h

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

branches/safari-534.53-branch/Source/WebCore/page/Page.cpp

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