1 files changed, 7 insertions, 5 deletions
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 319fbbc..22bd339 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -83,7 +83,7 @@
 #include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
 #include <WebCore/PlatformKeyboardEvent.h>
-#include <WebCore/PluginInfoStore.h>
+#include <WebCore/PluginData.h>
 #include <WebCore/PluginDatabase.h>
 #include <WebCore/PluginView.h>
 #include <WebCore/PrintContext.h>
@@ -1103,7 +1103,9 @@ void WebFrame::setTextSizeMultiplier(float multiplier)
 {
     Frame* coreFrame = core(this);
     ASSERT(coreFrame);
-    coreFrame->setZoomFactor(multiplier, ZoomTextOnly);
+
+    if (FrameView* view = coreFrame->view())
+        view->setZoomFactor(multiplier, ZoomTextOnly);
 }
 
 HRESULT WebFrame::inViewSourceMode(BOOL* flag)
@@ -1140,7 +1142,7 @@ HRESULT WebFrame::elementWithName(BSTR name, IDOMElement* form, IDOMElement** el
 
     HTMLFormElement *formElement = formElementFromDOMElement(form);
     if (formElement) {
-        Vector<HTMLFormControlElement*>& elements = formElement->formElements;
+        const Vector<HTMLFormControlElement*>& elements = formElement->associatedElements();
         AtomicString targetName((UChar*)name, SysStringLen(name));
         for (unsigned int i = 0; i < elements.size(); i++) {
             HTMLFormControlElement *elt = elements[i];
@@ -1338,7 +1340,7 @@ HRESULT WebFrame::controlsInForm(IDOMElement* form, IDOMElement** controls, int*
         return E_FAIL;
 
     int inCount = *cControls;
-    int count = (int) formElement->formElements.size();
+    int count = (int) formElement->associatedElements().size();
     *cControls = count;
     if (!controls)
         return S_OK;
@@ -1346,7 +1348,7 @@ HRESULT WebFrame::controlsInForm(IDOMElement* form, IDOMElement** controls, int*
         return E_FAIL;
 
     *cControls = 0;
-    Vector<HTMLFormControlElement*>& elements = formElement->formElements;
+    const Vector<HTMLFormControlElement*>& elements = formElement->associatedElements();
     for (int i = 0; i < count; i++) {
         if (elements.at(i)->isEnumeratable()) { // Skip option elements, other duds
             controls[*cControls] = DOMElement::createInstance(elements.at(i));